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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/app/access_key.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="access_key">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.AccessKeyManage' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container project-setting" ng-controller="AccessKeyController">
<section class="col-md-10 col-md-offset-1 panel hidden">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">{{'Config.AccessKeyManage' | translate }} (
{{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> )
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body row">
<section class="context" ng-show="hasAssignUserPermission">
<section class="form-horizontal">
<div class="alert alert-info no-radius" role="alert">
<strong>Tips:</strong>
<ul>
<li>{{'AccessKey.Tips.1' | translate }}</li>
<li>{{'AccessKey.Tips.2' | translate }}</li>
<li>{{'AccessKey.Tips.3' | translate }}</li>
<ul>
<li>{{'AccessKey.Tips.3.1' | translate }}</li>
<li>{{'AccessKey.Tips.3.2' | translate }}</li>
<li>{{'AccessKey.Tips.3.3' | translate }}</li>
</ul>
</ul>
</div>
</section>
<section>
<div class="row">
<form class="col-sm-8 form-inline" ng-submit="create()">
<div class="form-group">
<select class="form-control input-sm" style="width: 450px;" ng-model="addAccessKeySelectedEnv">
<option value="">{{'Cluster.PleaseChooseEnvironment' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="addAccessKeySelectedEnv == ''">{{'App.Setting.Add' | translate }}
</button>
</form>
</div>
</section>
<!--application info-->
<section ng-repeat="env in envs" ng-value="env">
<hr>
<h4>{{'Common.Environment' | translate }}: {{env}}
</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'AccessKey.ConfigAccessKeys.Secret' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Status' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModify' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModifyTime' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Operator' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!accessKeys[env] || accessKeys[env].length < 1)">
<td colspan="5" style="text-align: center;">{{'AccessKey.NoAccessKeyServiceTips' | translate }}</td>
</tr>
<tr ng-show="accessKeys[env] && accessKeys[env].length > 0"
ng-repeat="accessKey in accessKeys[env]">
<td style="text-align: center;">{{accessKey.secret}}</td>
<td style="text-align: center;" ng-style="{'color': accessKey.enabled ? '#5cb85c' : '#d20707'}">{{accessKey.enabled ? ('AccessKey.Operator.Enabled' | translate) : ('AccessKey.Operator.Disabled' | translate) }}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedBy}}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td style="text-align: center;">
<a href="javascript:;"
ng-click="enable(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Enable' | translate}}</a>
<a href="javascript:;"
ng-click="disable(accessKey.id, env)" ng-if="accessKey.enabled">{{'AccessKey.Operator.Disable' | translate}}</a>
<a href="javascript:;"
ng-click="remove(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Remove' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</section>
</section>
<section class="context" ng-show="!hasAssignUserPermission">
<div class="panel-body text-center">
<h4 translate="App.AccessKey.NoPermissionTips" translate-value-users="{{admins.join(',')}}"></h4>
</div>
</section>
</div>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/AccessKeyService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/AccessKeyController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="access_key">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.AccessKeyManage' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container project-setting" ng-controller="AccessKeyController">
<section class="col-md-10 col-md-offset-1 panel hidden">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">{{'Config.AccessKeyManage' | translate }} (
{{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> )
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body row">
<section class="context" ng-show="hasAssignUserPermission">
<section class="form-horizontal">
<div class="alert alert-info no-radius" role="alert">
<strong>Tips:</strong>
<ul>
<li>{{'AccessKey.Tips.1' | translate }}</li>
<li>{{'AccessKey.Tips.2' | translate }}</li>
<li>{{'AccessKey.Tips.3' | translate }}</li>
<ul>
<li>{{'AccessKey.Tips.3.1' | translate }}</li>
<li>{{'AccessKey.Tips.3.2' | translate }}</li>
<li>{{'AccessKey.Tips.3.3' | translate }}</li>
</ul>
</ul>
</div>
</section>
<section>
<div class="row">
<form class="col-sm-8 form-inline" ng-submit="create()">
<div class="form-group">
<select class="form-control input-sm" style="width: 450px;" ng-model="addAccessKeySelectedEnv">
<option value="">{{'Cluster.PleaseChooseEnvironment' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="addAccessKeySelectedEnv == ''">{{'App.Setting.Add' | translate }}
</button>
</form>
</div>
</section>
<!--application info-->
<section ng-repeat="env in envs" ng-value="env">
<hr>
<h4>{{'Common.Environment' | translate }}: {{env}}
</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'AccessKey.ConfigAccessKeys.Secret' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Status' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModify' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModifyTime' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Operator' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!accessKeys[env] || accessKeys[env].length < 1)">
<td colspan="5" style="text-align: center;">{{'AccessKey.NoAccessKeyServiceTips' | translate }}</td>
</tr>
<tr ng-show="accessKeys[env] && accessKeys[env].length > 0"
ng-repeat="accessKey in accessKeys[env]">
<td style="text-align: center;">{{accessKey.secret}}</td>
<td style="text-align: center;" ng-style="{'color': accessKey.enabled ? '#5cb85c' : '#d20707'}">{{accessKey.enabled ? ('AccessKey.Operator.Enabled' | translate) : ('AccessKey.Operator.Disabled' | translate) }}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedBy}}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td style="text-align: center;">
<a href="javascript:;"
ng-click="enable(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Enable' | translate}}</a>
<a href="javascript:;"
ng-click="disable(accessKey.id, env)" ng-if="accessKey.enabled">{{'AccessKey.Operator.Disable' | translate}}</a>
<a href="javascript:;"
ng-click="remove(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Remove' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</section>
</section>
<section class="context" ng-show="!hasAssignUserPermission">
<div class="panel-body text-center">
<h4 translate="App.AccessKey.NoPermissionTips" translate-value-users="{{admins.join(',')}}"></h4>
</div>
</section>
</div>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/AccessKeyService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/AccessKeyController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/config/sync.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="sync_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Sync.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="SyncItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Sync.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Sync.FistStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Sync.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Sync.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Sync.NextStep' | translate }}
</button>
<button type="button" class="btn btn-success" ng-show="syncItemStep == 2 && hasDiff"
ng-click="syncItems()" ng-disabled="syncBtnDisabled">{{'Config.Sync.Sync' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Sync.Tips' | translate }}:</strong>
<ul>
<li>{{'Config.Sync.Tips1' | translate }}</li>
<li>{{'Config.Sync.Tips2' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncNamespace' | translate }}</label>
<div class="col-sm-6">
<h4 ng-bind="pageContext.namespaceName"></h4>
</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncToCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="true" apollo-select="collectSelectedClusters"
apollo-not-checked-env="pageContext.env"
apollo-not-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<div class="row" ng-show="syncItemStep == 1" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-2 text-right">
<label class="control-label">{{'Config.Sync.NeedToSyncItem' | translate }}</label>
</div>
<div class="col-sm-10">
<div class="row text-right" style="margin-bottom: 5px; margin-right: 0px;">
{{'Config.Sync.SortByLastModifyTime' | translate }}
{{'Config.Sync.BeginTime' | translate }}:<input type="date" ng-model="filterBeginTime">
{{'Config.Sync.EndTime' | translate }}: <input type="date" ng-model="filterEndTime">
<button class="btn btn-sm btn-primary"
ng-click="filter()">{{'Config.Sync.Filter' | translate }}</button>
<button class="btn btn-sm btn-default"
ng-click="resetFilter()">{{'Config.Sync.Rest' | translate }}</button>
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td><input type="checkbox" ng-click="toggleItemsCheckedStatus()"></td>
<td class="hover" ng-click="col='key';desc=!desc;">
{{'Config.Sync.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td>{{'Config.Sync.ItemValue' | translate }}</td>
<td class="hover" ng-click="col='dataChangeCreatedTime';desc=!desc;">
{{'Config.Sync.ItemCreateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td class="hover" ng-click="col='dataChangeLastModifiedTime';desc=!desc;">
{{'Config.Sync.ItemUpdateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in viewItems|orderBy:col:desc">
<td width="10%"><input type="checkbox" ng-checked="item.checked"
ng-click="switchSelect(item)"></td>
<td width="20%">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' : ''"></span>
</td>
<td class="cursor-pointer" width="40%" ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...' : ''"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2" ng-repeat="clusterDiff in clusterDiffs">
<h4 class="text-center">
{{'Common.Environment' | translate }}:<span ng-bind="clusterDiff.namespace.env"></span>
{{'Common.Cluster' | translate }}:<span ng-bind="clusterDiff.namespace.clusterName"></span>
<span
ng-show="!clusterDiff.extInfo">{{'Common.Namespace' | translate }}:{{pageContext.namespaceName}}</span>
</h4>
<div class="text-center"
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 || clusterDiff.extInfo">
<span
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 && !clusterDiff.extInfo">{{'Config.Sync.NoNeedSyncItem' | translate }}</span>
<span ng-show="clusterDiff.extInfo" ng-bind="clusterDiff.extInfo"></span>, {{'Config.Sync.IgnoreSync' | translate }}
</div>
<div class="row" style="margin-top: 10px;"
ng-show="clusterDiff.diffs.updateItems.length + clusterDiff.diffs.createItems.length > 0">
<div class="form-horizontal">
<div class="col-sm-12">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>{{'Config.Sync.Step2Type' | translate }}</td>
<td>{{'Config.Sync.Step2Key' | translate }}</td>
<td>{{'Config.Sync.Step2SyncBefore' | translate }}</td>
<td>{{'Config.Sync.Step2SyncAfter' | translate }}</td>
<td>{{'Config.Sync.Step2Comment' | translate }}</td>
<td>{{'Config.Sync.Step2Operator' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="createItem in clusterDiff.diffs.createItems">
<td width="5%">{{'Config.Sync.NewAdd' | translate }}</td>
<td width="15%" ng-bind="createItem.key"></td>
<td width="30%"></td>
<td width="30%" ng-bind="createItem.value"></td>
<td width="15%" ng-bind="createItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'create', createItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
<tr ng-repeat="updateItem in clusterDiff.diffs.updateItems">
<td width="5%">{{'Config.Sync.Update' | translate }}</td>
<td width="15%" ng-bind="updateItem.key"></td>
<td width="30%" ng-bind="updateItem.oldValue"></td>
<td width="30%" ng-bind="updateItem.value"></td>
<td width="15%" ng-bind="updateItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'update', updateItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--step 3-->
<div class="row text-center" ng-show="syncItemStep == 3 && syncSuccess">
<img src="../img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncSuccessfully' | translate }}</h3>
</div>
<div class="row text-center" ng-show="syncItemStep == 3 && !syncSuccess">
<img src="../img/sync-error.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncFailed' | translate }}</h3>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/SyncConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="sync_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Sync.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="SyncItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Sync.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Sync.FistStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Sync.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Sync.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Sync.NextStep' | translate }}
</button>
<button type="button" class="btn btn-success" ng-show="syncItemStep == 2 && hasDiff"
ng-click="syncItems()" ng-disabled="syncBtnDisabled">{{'Config.Sync.Sync' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Sync.Tips' | translate }}:</strong>
<ul>
<li>{{'Config.Sync.Tips1' | translate }}</li>
<li>{{'Config.Sync.Tips2' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncNamespace' | translate }}</label>
<div class="col-sm-6">
<h4 ng-bind="pageContext.namespaceName"></h4>
</div>
</div>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Sync.SyncToCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="true" apollo-select="collectSelectedClusters"
apollo-not-checked-env="pageContext.env"
apollo-not-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<div class="row" ng-show="syncItemStep == 1" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-2 text-right">
<label class="control-label">{{'Config.Sync.NeedToSyncItem' | translate }}</label>
</div>
<div class="col-sm-10">
<div class="row text-right" style="margin-bottom: 5px; margin-right: 0px;">
{{'Config.Sync.SortByLastModifyTime' | translate }}
{{'Config.Sync.BeginTime' | translate }}:<input type="date" ng-model="filterBeginTime">
{{'Config.Sync.EndTime' | translate }}: <input type="date" ng-model="filterEndTime">
<button class="btn btn-sm btn-primary"
ng-click="filter()">{{'Config.Sync.Filter' | translate }}</button>
<button class="btn btn-sm btn-default"
ng-click="resetFilter()">{{'Config.Sync.Rest' | translate }}</button>
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td><input type="checkbox" ng-click="toggleItemsCheckedStatus()"></td>
<td class="hover" ng-click="col='key';desc=!desc;">
{{'Config.Sync.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td>{{'Config.Sync.ItemValue' | translate }}</td>
<td class="hover" ng-click="col='dataChangeCreatedTime';desc=!desc;">
{{'Config.Sync.ItemCreateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
<td class="hover" ng-click="col='dataChangeLastModifiedTime';desc=!desc;">
{{'Config.Sync.ItemUpdateTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in viewItems|orderBy:col:desc">
<td width="10%"><input type="checkbox" ng-checked="item.checked"
ng-click="switchSelect(item)"></td>
<td width="20%">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' : ''"></span>
</td>
<td class="cursor-pointer" width="40%" ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...' : ''"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
<td width="15%">
<span
ng-bind="item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2" ng-repeat="clusterDiff in clusterDiffs">
<h4 class="text-center">
{{'Common.Environment' | translate }}:<span ng-bind="clusterDiff.namespace.env"></span>
{{'Common.Cluster' | translate }}:<span ng-bind="clusterDiff.namespace.clusterName"></span>
<span
ng-show="!clusterDiff.extInfo">{{'Common.Namespace' | translate }}:{{pageContext.namespaceName}}</span>
</h4>
<div class="text-center"
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 || clusterDiff.extInfo">
<span
ng-show="clusterDiff.diffs.createItems.length + clusterDiff.diffs.updateItems.length == 0 && !clusterDiff.extInfo">{{'Config.Sync.NoNeedSyncItem' | translate }}</span>
<span ng-show="clusterDiff.extInfo" ng-bind="clusterDiff.extInfo"></span>, {{'Config.Sync.IgnoreSync' | translate }}
</div>
<div class="row" style="margin-top: 10px;"
ng-show="clusterDiff.diffs.updateItems.length + clusterDiff.diffs.createItems.length > 0">
<div class="form-horizontal">
<div class="col-sm-12">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>{{'Config.Sync.Step2Type' | translate }}</td>
<td>{{'Config.Sync.Step2Key' | translate }}</td>
<td>{{'Config.Sync.Step2SyncBefore' | translate }}</td>
<td>{{'Config.Sync.Step2SyncAfter' | translate }}</td>
<td>{{'Config.Sync.Step2Comment' | translate }}</td>
<td>{{'Config.Sync.Step2Operator' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="createItem in clusterDiff.diffs.createItems">
<td width="5%">{{'Config.Sync.NewAdd' | translate }}</td>
<td width="15%" ng-bind="createItem.key"></td>
<td width="30%"></td>
<td width="30%" ng-bind="createItem.value"></td>
<td width="15%" ng-bind="createItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'create', createItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
<tr ng-repeat="updateItem in clusterDiff.diffs.updateItems">
<td width="5%">{{'Config.Sync.Update' | translate }}</td>
<td width="15%" ng-bind="updateItem.key"></td>
<td width="30%" ng-bind="updateItem.oldValue"></td>
<td width="30%" ng-bind="updateItem.value"></td>
<td width="15%" ng-bind="updateItem.comment"></td>
<td width="5%">
<a data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Sync.NoSyncItem' | translate }}"
ng-click="removeItem(clusterDiff.diffs, 'update', updateItem)">{{'Config.Sync.Delete' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--step 3-->
<div class="row text-center" ng-show="syncItemStep == 3 && syncSuccess">
<img src="../img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncSuccessfully' | translate }}</h3>
</div>
<div class="row text-center" ng-show="syncItemStep == 3 && !syncSuccess">
<img src="../img/sync-error.png" style="height: 100px; width: 100px">
<h3>{{'Config.Sync.SyncFailed' | translate }}</h3>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/SyncConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/service-adminservice.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.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.adminService.serviceName" . }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.adminService.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.adminService.service.port }}
targetPort: {{ .Values.adminService.service.targetPort }}
selector:
app: {{ include "apollo.adminService.fullName" . }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.adminService.serviceName" . }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.adminService.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.adminService.service.port }}
targetPort: {{ .Values.adminService.service.targetPort }}
selector:
app: {{ include "apollo.adminService.fullName" . }} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-apollo-config-server-test-beta.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.
#
---
# configmap for apollo-config-server-test-beta
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-test-beta
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-test-beta
labels:
app: service-apollo-meta-server-test-beta
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-test-beta
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-test-beta
labels:
app: service-apollo-config-server-test-beta
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30004
selector:
app: pod-apollo-config-server-test-beta
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-test-beta
labels:
app: statefulset-apollo-config-server-test-beta
spec:
serviceName: service-apollo-meta-server-test-beta
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-test-beta
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-test-beta
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-test-beta
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-test-beta
configMap:
name: configmap-apollo-config-server-test-beta
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-test-beta
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-test-beta
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-test-beta.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-test-beta
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-test-beta
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-test-beta
labels:
app: service-apollo-meta-server-test-beta
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-test-beta
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-test-beta
labels:
app: service-apollo-config-server-test-beta
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30004
selector:
app: pod-apollo-config-server-test-beta
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-test-beta
labels:
app: statefulset-apollo-config-server-test-beta
spec:
serviceName: service-apollo-meta-server-test-beta
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-test-beta
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-test-beta
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-test-beta
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-test-beta
configMap:
name: configmap-apollo-config-server-test-beta
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-test-beta
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-test-beta
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-test-beta.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/deployment-configservice.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.
#
---
# configmap for apollo-configservice
kind: ConfigMap
apiVersion: v1
metadata:
{{- $configServiceFullName := include "apollo.configService.fullName" . }}
name: {{ $configServiceFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.configdb.serviceName" .}}:{{include "apollo.configdb.servicePort" .}}/{{ .Values.configdb.dbName }}{{ if .Values.configdb.connectionStringProperties }}?{{ .Values.configdb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "configdb.userName is required!" .Values.configdb.userName }}
spring.datasource.password = {{ required "configdb.password is required!" .Values.configdb.password }}
apollo.config-service.url = {{ include "apollo.configService.serviceUrl" .}}
apollo.admin-service.url = {{ include "apollo.adminService.serviceUrl" .}}
{{- if .Values.configService.config.contextPath }}
server.servlet.context-path = {{ .Values.configService.config.contextPath }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $configServiceFullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.configService.replicaCount }}
selector:
matchLabels:
app: {{ $configServiceFullName }}
{{- with .Values.configService.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $configServiceFullName }}
spec:
{{- with .Values.configService.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: volume-configmap-{{ $configServiceFullName }}
configMap:
name: {{ $configServiceFullName }}
items:
- key: application-github.properties
path: application-github.properties
defaultMode: 420
containers:
- name: {{ .Values.configService.name }}
image: "{{ .Values.configService.image.repository }}:{{ .Values.configService.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.configService.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.configService.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.configService.config.profiles | quote }}
{{- range $key, $value := .Values.configService.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: volume-configmap-{{ $configServiceFullName }}
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
livenessProbe:
tcpSocket:
port: {{ .Values.configService.containerPort }}
initialDelaySeconds: {{ .Values.configService.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.configService.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.configService.config.contextPath }}/health
port: {{ .Values.configService.containerPort }}
initialDelaySeconds: {{ .Values.configService.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.configService.readiness.periodSeconds }}
resources:
{{- toYaml .Values.configService.resources | nindent 12 }}
{{- with .Values.configService.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.configService.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.configService.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-configservice
kind: ConfigMap
apiVersion: v1
metadata:
{{- $configServiceFullName := include "apollo.configService.fullName" . }}
name: {{ $configServiceFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.configdb.serviceName" .}}:{{include "apollo.configdb.servicePort" .}}/{{ .Values.configdb.dbName }}{{ if .Values.configdb.connectionStringProperties }}?{{ .Values.configdb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "configdb.userName is required!" .Values.configdb.userName }}
spring.datasource.password = {{ required "configdb.password is required!" .Values.configdb.password }}
apollo.config-service.url = {{ include "apollo.configService.serviceUrl" .}}
apollo.admin-service.url = {{ include "apollo.adminService.serviceUrl" .}}
{{- if .Values.configService.config.contextPath }}
server.servlet.context-path = {{ .Values.configService.config.contextPath }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $configServiceFullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.configService.replicaCount }}
selector:
matchLabels:
app: {{ $configServiceFullName }}
{{- with .Values.configService.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $configServiceFullName }}
spec:
{{- with .Values.configService.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: volume-configmap-{{ $configServiceFullName }}
configMap:
name: {{ $configServiceFullName }}
items:
- key: application-github.properties
path: application-github.properties
defaultMode: 420
containers:
- name: {{ .Values.configService.name }}
image: "{{ .Values.configService.image.repository }}:{{ .Values.configService.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.configService.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.configService.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.configService.config.profiles | quote }}
{{- range $key, $value := .Values.configService.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: volume-configmap-{{ $configServiceFullName }}
mountPath: /apollo-configservice/config/application-github.properties
subPath: application-github.properties
livenessProbe:
tcpSocket:
port: {{ .Values.configService.containerPort }}
initialDelaySeconds: {{ .Values.configService.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.configService.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.configService.config.contextPath }}/health
port: {{ .Values.configService.containerPort }}
initialDelaySeconds: {{ .Values.configService.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.configService.readiness.periodSeconds }}
resources:
{{- toYaml .Values.configService.resources | nindent 12 }}
{{- with .Values.configService.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.configService.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.configService.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/namespace-panel-header.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<header class="row namespace-attribute-panel">
<div class="row">
<div class="col-md-6" style="padding-bottom:5px;">
<span class="text-center namespace-attribute-public label label-primary no-radius">
<span data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Header.Title.PrivateTips' | translate:this }}"
ng-show="!namespace.isPublic">{{'Component.Namespace.Header.Title.Private' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.PublicTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.parentAppId == namespace.baseInfo.appId">{{'Component.Namespace.Header.Title.Public' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.ExtendTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.isLinkedNamespace"
ng-click="goToParentAppConfigPage(namespace)">{{'Component.Namespace.Header.Title.Extend' | translate }}</span>
</span>
<span class="text-center namespace-attribute-public label label-info no-radius">
<span ng-bind="namespace.format" style="width:30px;"></span>
</span>
</div>
<div class="col-md-6 text-right" style="padding-right:23px;">
<span data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false">
<span class="label no-radius cursor-pointer" data-toggle="collapse" data-target="#BODY{{namespace.id}}"
aria-expanded="false" ng-click="showNamespaceBody = !showNamespaceBody"
ng-show="namespace.initialized">
<a>{{'Component.Namespace.Header.Title.ExpandAndCollapse' | translate }}</a>
</span>
</span>
</div>
</div>
</header>
<!--branch nav-->
<header class="panel-heading second-panel-heading" ng-show="namespace.initialized && namespace.hasBranch">
<div class="row">
<div class="col-md-8 pull-left">
<ul class="nav nav-tabs">
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch == 'master'}"
ng-click="switchBranch('master', true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Master' | translate }}
</a>
</li>
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch != 'master'}"
ng-click="switchBranch(namespace.branchName, true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Grayscale' | translate }}
</a>
</li>
</ul>
</div>
</div>
</header> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<header class="row namespace-attribute-panel">
<div class="row">
<div class="col-md-6" style="padding-bottom:5px;">
<span class="text-center namespace-attribute-public label label-primary no-radius">
<span data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Header.Title.PrivateTips' | translate:this }}"
ng-show="!namespace.isPublic">{{'Component.Namespace.Header.Title.Private' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.PublicTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.parentAppId == namespace.baseInfo.appId">{{'Component.Namespace.Header.Title.Public' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.ExtendTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.isLinkedNamespace"
ng-click="goToParentAppConfigPage(namespace)">{{'Component.Namespace.Header.Title.Extend' | translate }}</span>
</span>
<span class="text-center namespace-attribute-public label label-info no-radius">
<span ng-bind="namespace.format" style="width:30px;"></span>
</span>
</div>
<div class="col-md-6 text-right" style="padding-right:23px;">
<span data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false">
<span class="label no-radius cursor-pointer" data-toggle="collapse" data-target="#BODY{{namespace.id}}"
aria-expanded="false" ng-click="showNamespaceBody = !showNamespaceBody"
ng-show="namespace.initialized">
<a>{{'Component.Namespace.Header.Title.ExpandAndCollapse' | translate }}</a>
</span>
</span>
</div>
</div>
</header>
<!--branch nav-->
<header class="panel-heading second-panel-heading" ng-show="namespace.initialized && namespace.hasBranch">
<div class="row">
<div class="col-md-8 pull-left">
<ul class="nav nav-tabs">
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch == 'master'}"
ng-click="switchBranch('master', true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Master' | translate }}
</a>
</li>
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch != 'master'}"
ng-click="switchBranch(namespace.branchName, true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Grayscale' | translate }}
</a>
</li>
</ul>
</div>
</div>
</header> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case9.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/delete_app_cluster_namespace.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="delete_app_cluster_namespace">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<title>{{'Delete.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="DeleteAppClusterNamespaceController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<!-- delete app -->
<section class="row">
<h5>{{'Delete.DeleteApp' | translate }}
<small>
{{'Delete.DeleteAppTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="app.appId">
<small> {{'Delete.AppIdTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getAppInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'Delete.AppInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="app.info" ng-bind="app.info"></h5>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="deleteAppBtnDisabled"
ng-click="deleteApp()">
{{'Delete.DeleteApp' | translate }}
</button>
</div>
</div>
</form>
</section>
<!-- delete cluster -->
<section class="row">
<h5>{{'Delete.DeleteCluster' | translate }}
<small>
{{'Delete.DeleteClusterTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="cluster.appId">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Delete.EnvName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="cluster.env">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.ClusterName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="cluster.name">
<small>{{'Delete.ClusterNameTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info"
ng-click="getClusterInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" viv clform-group>
<label class="col-sm-2 control-label">
{{'Delete.ClusterInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="cluster.info" ng-bind="cluster.info"></h5>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="deleteClusterBtnDisabled"
ng-click="deleteCluster()">
{{'Delete.DeleteCluster' | translate }}
</button>
</div>
</div>
</form>
</section>
<!-- delete app namespace -->
<section class="row">
<h5>{{'Delete.DeleteNamespace' | translate }}
<small>{{'Delete.DeleteNamespaceTips' | translate }}</small>
</h5>
<small>
{{'Delete.DeleteNamespaceTips2' | translate }}
</small>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="appNamespace.appId">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Delete.AppNamespaceName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="appNamespace.name">
<small>{{'Delete.AppNamespaceNameTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getAppNamespaceInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" viv clform-group>
<label class="col-sm-2 control-label">
{{'Delete.AppNamespaceInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="appNamespace.info" ng-bind="appNamespace.info"></h5>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="deleteAppNamespaceBtnDisabled" ng-click="deleteAppNamespace()">
{{'Delete.DeleteNamespace' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/controller/DeleteAppClusterNamespaceController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="delete_app_cluster_namespace">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<title>{{'Delete.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="DeleteAppClusterNamespaceController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<!-- delete app -->
<section class="row">
<h5>{{'Delete.DeleteApp' | translate }}
<small>
{{'Delete.DeleteAppTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="app.appId">
<small> {{'Delete.AppIdTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getAppInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'Delete.AppInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="app.info" ng-bind="app.info"></h5>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="deleteAppBtnDisabled"
ng-click="deleteApp()">
{{'Delete.DeleteApp' | translate }}
</button>
</div>
</div>
</form>
</section>
<!-- delete cluster -->
<section class="row">
<h5>{{'Delete.DeleteCluster' | translate }}
<small>
{{'Delete.DeleteClusterTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="cluster.appId">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Delete.EnvName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="cluster.env">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.ClusterName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="cluster.name">
<small>{{'Delete.ClusterNameTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info"
ng-click="getClusterInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" viv clform-group>
<label class="col-sm-2 control-label">
{{'Delete.ClusterInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="cluster.info" ng-bind="cluster.info"></h5>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="deleteClusterBtnDisabled"
ng-click="deleteCluster()">
{{'Delete.DeleteCluster' | translate }}
</button>
</div>
</div>
</form>
</section>
<!-- delete app namespace -->
<section class="row">
<h5>{{'Delete.DeleteNamespace' | translate }}
<small>{{'Delete.DeleteNamespaceTips' | translate }}</small>
</h5>
<small>
{{'Delete.DeleteNamespaceTips2' | translate }}
</small>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="appNamespace.appId">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Delete.AppNamespaceName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="appNamespace.name">
<small>{{'Delete.AppNamespaceNameTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getAppNamespaceInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" viv clform-group>
<label class="col-sm-2 control-label">
{{'Delete.AppNamespaceInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="appNamespace.info" ng-bind="appNamespace.info"></h5>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="deleteAppNamespaceBtnDisabled" ng-click="deleteAppNamespace()">
{{'Delete.DeleteNamespace' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/controller/DeleteAppClusterNamespaceController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case1-new.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.
#
timeout: 1001
batch: 2001
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<section class="branch-panel-body" ng-if="namespace.initialized &&
(namespace.hasBranch && namespace.displayControl.currentOperateBranch != 'master')">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label"
ng-show="namespace.branch.itemModifiedCnt > 0">{{'Component.Namespace.Branch.IsChanged' | translate }}
<span class="badge label badge-white namespace-label"
ng-bind="namespace.branch.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.branch.lockOwner">{{'Component.Namespace.Branch.ChangeUser' | translate }}:
<span ng-bind="namespace.branch.lockOwner"></span>
</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<a type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.ContinueGrayscalePublish' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-click="publish(namespace.branch)">
{{'Component.Namespace.Branch.GrayscalePublish' | translate }}
</a>
<a type="button" class="btn btn-primary btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.MergeToMasterAndPublish' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-click="mergeAndPublish(namespace.branch)">
{{'Component.Namespace.Branch.AllPublish' | translate }}
</a>
<a type="button" class="btn btn-warning btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.DiscardGrayscaleVersion' | translate }}" ng-show="(namespace.hasReleasePermission
|| (!namespace.branch.latestRelease && namespace.hasModifyPermission))"
ng-click="preDeleteBranch(namespace.branch)">
{{'Component.Namespace.Branch.DiscardGrayscale' | translate }}
</a>
</div>
</div>
</header>
<div id="BODY{{namespace.branch.id}}"
ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden">
<span style="color: red">{{'Component.Namespace.Branch.NoPermissionTips' | translate }}</span>
</div>
<!--second header-->
<header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden">
<div class="row">
<div class="col-md-12 pull-left">
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace.branch, 'table')"
ng-show="namespace.isPropertiesFormat">
<a ng-class="{node_active:namespace.branch.viewType == 'table'}">
<img src="img/table.png">
{{'Component.Namespace.Branch.Tab.Configuration' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace.branch, 'rule')">
<a ng-class="{node_active:namespace.branch.viewType == 'rule'}">
<img src="img/rule.png">
{{'Component.Namespace.Branch.Tab.GrayscaleRule' | translate }}
<span class="badge badge-grey"
ng-bind="namespace.branch.grayIps.length + namespace.branch.grayApps.length"></span>
</a>
</li>
<li role="presentation" ng-click="switchView(namespace.branch, 'instance')">
<a ng-class="{node_active:namespace.branch.viewType == 'instance'}">
<img src="img/machine.png">
{{'Component.Namespace.Branch.Tab.GrayscaleInstance' | translate }}
<span class="badge badge-grey"
ng-bind="namespace.branch.latestReleaseInstances.total"></span>
</a>
</li>
<li role="presentation" ng-click="switchView(namespace.branch, 'history')">
<a ng-class="{node_active:namespace.branch.viewType == 'history'}">
<img src="img/change.png">
{{'Component.Namespace.Branch.Tab.ChangeHistory' | translate }}
</a>
</li>
</ul>
</div>
</div>
</header>
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--items-->
<div class="namespace-view-table" ng-show="namespace.branch.viewType == 'table'">
<div class="panel panel-default" ng-if="namespace.hasBranch">
<div class="panel-heading">
{{'Component.Namespace.Branch.Body.Item' | translate }}
<button type="button" class="btn btn-primary btn-sm pull-right" style="margin-top: -4px;"
ng-show="namespace.hasModifyPermission" ng-click="createItem(namespace.branch)">
<img src="img/plus.png">
{{'Component.Namespace.Branch.Body.AddedItem' | translate }}
</button>
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Branch.Body.PublishState' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Branch.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemMasterValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemGrayscaleValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Branch.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Branch.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.branch.branchItems |orderBy:col:desc"
ng-if="config.item.key">
<td width="7%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ClickToSeeItemValue' | translate }}"
ng-if="config.isModified || config.isDeleted"
ng-click="showText(config.oldValue)">{{'Component.Namespace.Branch.Body.ItemNoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ItemEffective' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Branch.Body.ItemPublished' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span>
<span class="label label-info" ng-if="!config.isDeleted && config.masterItemExists"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ChangedFromMaster' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span>
<span class="label label-success"
ng-if="!config.isDeleted && !config.masterItemExists" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.AddedByGrayscale' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span>
</td>
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.masterReleaseValue)">
<span ng-bind="config.masterReleaseValue | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="10%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="10%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="9%" class="text-center">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.Op.Modify' | translate }}"
ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.Op.Delete' | translate }}"
ng-if="!config.isDeleted"
ng-click="preDeleteItem(namespace.branch, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
</tr>
</tbody>
</table>
</div>
<div class="panel panel-default"
ng-if="namespace.branch.masterItems && namespace.branch.masterItems.length > 0">
<div class="panel-heading">
{{'Component.Namespace.MasterBranch.Body.Title' | translate }}
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>{{'Component.Namespace.MasterBranch.Body.PublishState' | translate }}</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.MasterBranch.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.MasterBranch.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.MasterBranch.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.MasterBranch.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.MasterBranch.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.MasterBranch.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.branch.masterItems |orderBy:col:desc"
ng-if="config.item.key">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ClickToSeeItemValue' | translate }}"
ng-if="config.isModified || config.isDeleted"
ng-click="showText(config.oldValue)">{{'Component.Namespace.MasterBranch.Body.ItemNoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ItemEffective' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.MasterBranch.Body.ItemPublished' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.AddedItem' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ModifiedItem' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span>
</td>
<td width="35%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="12%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="5%" class="text-center">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ModifyItem' | translate }}"
ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
</tr>
</tbody>
</table>
</div>
</div>
<!--gray rules-->
<div class="rules-manage-view row" ng-show="namespace.branch.viewType == 'rule'">
<div class="alert alert-warning no-radius"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
<strong>Tips:</strong>
{{'Component.Namespace.Branch.GrayScaleRule.NoPermissionTips' | translate }}
</div>
<table class="table table-bordered table-hover">
<thead>
<tr>
<th>{{'Component.Namespace.Branch.GrayScaleRule.AppId' | translate }}</th>
<th>{{'Component.Namespace.Branch.GrayScaleRule.IpList' | translate }}</th>
<th>{{'Component.Namespace.Branch.GrayScaleRule.Operator' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="ruleItem in namespace.branch.rules.ruleItems">
<td width="20%" ng-bind="ruleItem.clientAppId"></td>
<td width="70%" ng-show="!ruleItem.ApplyToAllInstances"
ng-bind="ruleItem.clientIpList.join(', ')"></td>
<td width="70%" ng-show="ruleItem.ApplyToAllInstances">
{{'Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances' | translate }}</td>
<td class="text-center" width="10%">
<img src="img/edit.png" class="i-20 hover" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.GrayScaleRule.Modify' | translate }}"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission"
ng-click="editRuleItem(namespace.branch, ruleItem)">
<img src="img/cancel.png" class="i-20 hover" style="margin-left: 5px;"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.GrayScaleRule.Delete' | translate }}"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission"
ng-click="deleteRuleItem(namespace.branch, ruleItem)">
</td>
</tr>
</tbody>
</table>
<button class="btn btn-primary" ng-if="namespace.hasModifyPermission || namespace.hasReleasePermission"
ng-show="(namespace.isPublic && !namespace.isLinkedNamespace) ||
((!namespace.isPublic || namespace.isLinkedNamespace)
&& (!namespace.branch.rules
|| !namespace.branch.rules.ruleItems
|| !namespace.branch.rules.ruleItems.length))"
ng-click="addRuleItem(namespace.branch)">{{'Component.Namespace.Branch.GrayScaleRule.AddNewRule' | translate }}
</button>
</div>
<!--instances -->
<div class="panel panel-default" ng-show="namespace.branch.viewType == 'instance'">
<div class="panel-heading text-right">
<button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Instance.RefreshList' | translate }}"
ng-click="refreshInstancesInfo(namespace.branch)">
<img ng-src="{{ '/img/refresh.png' | prefixPath }}" />
</button>
</div>
<div class="panel-body">
<div class="panel-default" ng-if="namespace.branch.latestReleaseInstances.total > 0">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Instance.ItemToSee' | translate }}"
ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{namespace.baseInfo.clusterName}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.branch.latestRelease.id}}">
{{namespace.branch.latestRelease.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Branch.Instance.InstanceAppId' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceClusterName' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceDataCenter' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceIp' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceGetItemTime' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.branch.latestReleaseInstances.content">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
<div class="row text-center"
ng-show="namespace.branch.latestReleaseInstances.content.length < namespace.branch.latestReleaseInstances.total">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace.branch)">{{'Component.Namespace.Branch.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.branch.latestReleaseInstances.total == 0">
{{'Component.Namespace.Branch.Instance.NoInstance' | translate }}
</div>
</div>
</div>
<!--history view-->
<div class="J_historyview history-view" ng-show="namespace.branch.viewType == 'history'">
<div class="media" ng-show="namespace.branch.commits && namespace.branch.commits.length"
ng-repeat="commits in namespace.branch.commits">
<div class="media-body">
<div class="row">
<div class="col-md-6 col-sm-6 ">
<h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3>
</div>
<div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div>
</div>
<!--properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Branch.History.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemKey' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Branch.History.NewAdded' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Branch.History.Modified' | translate }}
</td>
<td width="20%" title="{{item.newItem.key}}">
<span ng-bind="item.newItem.key | limitTo: 250"></span>
<span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Branch.History.Deleted' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
<!--not properties format-->
<div ng-if="!namespace.isPropertiesFormat">
<div ng-repeat="item in commits.changeSets.createItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.value">
</textarea>
</div>
<div ng-repeat="item in commits.changeSets.updateItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.newItem.value">
</textarea>
</div>
</div>
</div>
<hr>
</div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-show="!namespace.branch.hasLoadAllCommit"
ng-click="loadCommitHistory(namespace.branch)">{{'Component.Namespace.Branch.History.LoadMore' | translate }}
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center"
ng-show="!namespace.branch.commits || !namespace.branch.commits.length">
{{'Component.Namespace.Branch.History.NoHistory' | translate }}
</div>
</div>
</section>
</div>
</section> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<section class="branch-panel-body" ng-if="namespace.initialized &&
(namespace.hasBranch && namespace.displayControl.currentOperateBranch != 'master')">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label"
ng-show="namespace.branch.itemModifiedCnt > 0">{{'Component.Namespace.Branch.IsChanged' | translate }}
<span class="badge label badge-white namespace-label"
ng-bind="namespace.branch.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.branch.lockOwner">{{'Component.Namespace.Branch.ChangeUser' | translate }}:
<span ng-bind="namespace.branch.lockOwner"></span>
</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<a type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.ContinueGrayscalePublish' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-click="publish(namespace.branch)">
{{'Component.Namespace.Branch.GrayscalePublish' | translate }}
</a>
<a type="button" class="btn btn-primary btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.MergeToMasterAndPublish' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-click="mergeAndPublish(namespace.branch)">
{{'Component.Namespace.Branch.AllPublish' | translate }}
</a>
<a type="button" class="btn btn-warning btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.DiscardGrayscaleVersion' | translate }}" ng-show="(namespace.hasReleasePermission
|| (!namespace.branch.latestRelease && namespace.hasModifyPermission))"
ng-click="preDeleteBranch(namespace.branch)">
{{'Component.Namespace.Branch.DiscardGrayscale' | translate }}
</a>
</div>
</div>
</header>
<div id="BODY{{namespace.branch.id}}"
ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden">
<span style="color: red">{{'Component.Namespace.Branch.NoPermissionTips' | translate }}</span>
</div>
<!--second header-->
<header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden">
<div class="row">
<div class="col-md-12 pull-left">
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace.branch, 'table')"
ng-show="namespace.isPropertiesFormat">
<a ng-class="{node_active:namespace.branch.viewType == 'table'}">
<img src="img/table.png">
{{'Component.Namespace.Branch.Tab.Configuration' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace.branch, 'rule')">
<a ng-class="{node_active:namespace.branch.viewType == 'rule'}">
<img src="img/rule.png">
{{'Component.Namespace.Branch.Tab.GrayscaleRule' | translate }}
<span class="badge badge-grey"
ng-bind="namespace.branch.grayIps.length + namespace.branch.grayApps.length"></span>
</a>
</li>
<li role="presentation" ng-click="switchView(namespace.branch, 'instance')">
<a ng-class="{node_active:namespace.branch.viewType == 'instance'}">
<img src="img/machine.png">
{{'Component.Namespace.Branch.Tab.GrayscaleInstance' | translate }}
<span class="badge badge-grey"
ng-bind="namespace.branch.latestReleaseInstances.total"></span>
</a>
</li>
<li role="presentation" ng-click="switchView(namespace.branch, 'history')">
<a ng-class="{node_active:namespace.branch.viewType == 'history'}">
<img src="img/change.png">
{{'Component.Namespace.Branch.Tab.ChangeHistory' | translate }}
</a>
</li>
</ul>
</div>
</div>
</header>
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--items-->
<div class="namespace-view-table" ng-show="namespace.branch.viewType == 'table'">
<div class="panel panel-default" ng-if="namespace.hasBranch">
<div class="panel-heading">
{{'Component.Namespace.Branch.Body.Item' | translate }}
<button type="button" class="btn btn-primary btn-sm pull-right" style="margin-top: -4px;"
ng-show="namespace.hasModifyPermission" ng-click="createItem(namespace.branch)">
<img src="img/plus.png">
{{'Component.Namespace.Branch.Body.AddedItem' | translate }}
</button>
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Branch.Body.PublishState' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Branch.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemMasterValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemGrayscaleValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Branch.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Branch.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Branch.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.branch.branchItems |orderBy:col:desc"
ng-if="config.item.key">
<td width="7%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ClickToSeeItemValue' | translate }}"
ng-if="config.isModified || config.isDeleted"
ng-click="showText(config.oldValue)">{{'Component.Namespace.Branch.Body.ItemNoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ItemEffective' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Branch.Body.ItemPublished' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span>
<span class="label label-info" ng-if="!config.isDeleted && config.masterItemExists"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ChangedFromMaster' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span>
<span class="label label-success"
ng-if="!config.isDeleted && !config.masterItemExists" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.AddedByGrayscale' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span>
</td>
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.masterReleaseValue)">
<span ng-bind="config.masterReleaseValue | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="10%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="10%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="9%" class="text-center">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.Op.Modify' | translate }}"
ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.Op.Delete' | translate }}"
ng-if="!config.isDeleted"
ng-click="preDeleteItem(namespace.branch, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
</tr>
</tbody>
</table>
</div>
<div class="panel panel-default"
ng-if="namespace.branch.masterItems && namespace.branch.masterItems.length > 0">
<div class="panel-heading">
{{'Component.Namespace.MasterBranch.Body.Title' | translate }}
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>{{'Component.Namespace.MasterBranch.Body.PublishState' | translate }}</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.MasterBranch.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.MasterBranch.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.MasterBranch.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.MasterBranch.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.MasterBranch.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.MasterBranch.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.branch.masterItems |orderBy:col:desc"
ng-if="config.item.key">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ClickToSeeItemValue' | translate }}"
ng-if="config.isModified || config.isDeleted"
ng-click="showText(config.oldValue)">{{'Component.Namespace.MasterBranch.Body.ItemNoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ItemEffective' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.MasterBranch.Body.ItemPublished' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.AddedItem' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.ModifiedItem' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span>
</td>
<td width="35%" class="cursor-pointer"
title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="12%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="5%" class="text-center">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.MasterBranch.Body.ModifyItem' | translate }}"
ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
</tr>
</tbody>
</table>
</div>
</div>
<!--gray rules-->
<div class="rules-manage-view row" ng-show="namespace.branch.viewType == 'rule'">
<div class="alert alert-warning no-radius"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
<strong>Tips:</strong>
{{'Component.Namespace.Branch.GrayScaleRule.NoPermissionTips' | translate }}
</div>
<table class="table table-bordered table-hover">
<thead>
<tr>
<th>{{'Component.Namespace.Branch.GrayScaleRule.AppId' | translate }}</th>
<th>{{'Component.Namespace.Branch.GrayScaleRule.IpList' | translate }}</th>
<th>{{'Component.Namespace.Branch.GrayScaleRule.Operator' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="ruleItem in namespace.branch.rules.ruleItems">
<td width="20%" ng-bind="ruleItem.clientAppId"></td>
<td width="70%" ng-show="!ruleItem.ApplyToAllInstances"
ng-bind="ruleItem.clientIpList.join(', ')"></td>
<td width="70%" ng-show="ruleItem.ApplyToAllInstances">
{{'Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances' | translate }}</td>
<td class="text-center" width="10%">
<img src="img/edit.png" class="i-20 hover" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Branch.GrayScaleRule.Modify' | translate }}"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission"
ng-click="editRuleItem(namespace.branch, ruleItem)">
<img src="img/cancel.png" class="i-20 hover" style="margin-left: 5px;"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.GrayScaleRule.Delete' | translate }}"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission"
ng-click="deleteRuleItem(namespace.branch, ruleItem)">
</td>
</tr>
</tbody>
</table>
<button class="btn btn-primary" ng-if="namespace.hasModifyPermission || namespace.hasReleasePermission"
ng-show="(namespace.isPublic && !namespace.isLinkedNamespace) ||
((!namespace.isPublic || namespace.isLinkedNamespace)
&& (!namespace.branch.rules
|| !namespace.branch.rules.ruleItems
|| !namespace.branch.rules.ruleItems.length))"
ng-click="addRuleItem(namespace.branch)">{{'Component.Namespace.Branch.GrayScaleRule.AddNewRule' | translate }}
</button>
</div>
<!--instances -->
<div class="panel panel-default" ng-show="namespace.branch.viewType == 'instance'">
<div class="panel-heading text-right">
<button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Instance.RefreshList' | translate }}"
ng-click="refreshInstancesInfo(namespace.branch)">
<img ng-src="{{ '/img/refresh.png' | prefixPath }}" />
</button>
</div>
<div class="panel-body">
<div class="panel-default" ng-if="namespace.branch.latestReleaseInstances.total > 0">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Branch.Instance.ItemToSee' | translate }}"
ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{namespace.baseInfo.clusterName}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.branch.latestRelease.id}}">
{{namespace.branch.latestRelease.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Branch.Instance.InstanceAppId' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceClusterName' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceDataCenter' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceIp' | translate }}</td>
<td>{{'Component.Namespace.Branch.Instance.InstanceGetItemTime' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.branch.latestReleaseInstances.content">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
<div class="row text-center"
ng-show="namespace.branch.latestReleaseInstances.content.length < namespace.branch.latestReleaseInstances.total">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace.branch)">{{'Component.Namespace.Branch.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.branch.latestReleaseInstances.total == 0">
{{'Component.Namespace.Branch.Instance.NoInstance' | translate }}
</div>
</div>
</div>
<!--history view-->
<div class="J_historyview history-view" ng-show="namespace.branch.viewType == 'history'">
<div class="media" ng-show="namespace.branch.commits && namespace.branch.commits.length"
ng-repeat="commits in namespace.branch.commits">
<div class="media-body">
<div class="row">
<div class="col-md-6 col-sm-6 ">
<h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3>
</div>
<div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div>
</div>
<!--properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Branch.History.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemKey' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Branch.History.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Branch.History.NewAdded' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Branch.History.Modified' | translate }}
</td>
<td width="20%" title="{{item.newItem.key}}">
<span ng-bind="item.newItem.key | limitTo: 250"></span>
<span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Branch.History.Deleted' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
<!--not properties format-->
<div ng-if="!namespace.isPropertiesFormat">
<div ng-repeat="item in commits.changeSets.createItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.value">
</textarea>
</div>
<div ng-repeat="item in commits.changeSets.updateItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.newItem.value">
</textarea>
</div>
</div>
</div>
<hr>
</div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-show="!namespace.branch.hasLoadAllCommit"
ng-click="loadCommitHistory(namespace.branch)">{{'Component.Namespace.Branch.History.LoadMore' | translate }}
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center"
ng-show="!namespace.branch.commits || !namespace.branch.commits.length">
{{'Component.Namespace.Branch.History.NoHistory' | translate }}
</div>
</div>
</section>
</div>
</section> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/system_info.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="system_info">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<title>{{'SystemInfo.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="SystemInfoController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<section class="row">
<h3>{{'SystemInfo.Title' | translate }}
</h3>
<h6 ng-show="systemInfo.version">{{'SystemInfo.SystemVersion' | translate }}: {{systemInfo.version}}
</h6>
<h6 translate="SystemInfo.Tips1" translate-value-server-config-url="server_config.html"
translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
</h6>
<h6 translate="SystemInfo.Tips2"
translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
</h6>
<div ng-repeat="env in systemInfo.environments">
<hr>
<h4>{{'Common.Environment' | translate }}: {{env.env}}
</h4>
<h5>{{'SystemInfo.Active' | translate }}: {{env.active}}
<span ng-show="env.active == false"
style="color: #a94442;">{{'SystemInfo.ActiveTips' | translate }}</span>
</h5>
<h5>{{'SystemInfo.MetaServerAddress' | translate }}: {{env.metaServerAddress}}</h5>
<div ng-show="env.errorMessage" ng-bind="env.errorMessage" class="alert alert-danger"
role="alert">
</div>
<h4 class="text-center">{{'SystemInfo.ConfigServices' | translate }}</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'SystemInfo.ConfigServices.Name' | translate }}</th>
<th>{{'SystemInfo.ConfigServices.InstanceId' | translate }}</th>
<th>{{'SystemInfo.ConfigServices.HomePageUrl' | translate }}</th>
<th>{{'SystemInfo.ConfigServices.CheckHealth' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!env.configServices || env.configServices.length < 1)">
<td colspan="4">{{'SystemInfo.NoConfigServiceTips' | translate }}</td>
</tr>
<tr ng-show="env.configServices && env.configServices.length > 0"
ng-repeat="service in env.configServices">
<td>{{service.appName}}</td>
<td>{{service.instanceId}}</td>
<td>{{service.homepageUrl}}</td>
<td><a href="javascript:;"
ng-click="check(service.instanceId, service.homepageUrl)">{{'SystemInfo.Check' | translate }}</a>
</td>
</tr>
</tbody>
</table>
<h4 class="text-center">{{'SystemInfo.AdminServices' | translate }}</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'SystemInfo.AdminServices.Name' | translate }}</th>
<th>{{'SystemInfo.AdminServices.InstanceId' | translate }}</th>
<th>{{'SystemInfo.AdminServices.HomePageUrl' | translate }}</th>
<th>{{'SystemInfo.AdminServices.CheckHealth' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!env.adminServices || env.adminServices.length < 1)">
<td colspan="4">{{'SystemInfo.NoAdminServiceTips' | translate }}</td>
</tr>
<tr ng-show="env.adminServices && env.adminServices.length > 0"
ng-repeat="service in env.adminServices">
<td>{{service.appName}}</td>
<td>{{service.instanceId}}</td>
<td>{{service.homepageUrl}}</td>
<td><a href="javascript:;"
ng-click="check(service.instanceId, service.homepageUrl)">{{'SystemInfo.Check' | translate }}</a>
</tr>
</tbody>
</table>
</div>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/SystemInfoService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/controller/SystemInfoController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="system_info">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<title>{{'SystemInfo.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="SystemInfoController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<section class="row">
<h3>{{'SystemInfo.Title' | translate }}
</h3>
<h6 ng-show="systemInfo.version">{{'SystemInfo.SystemVersion' | translate }}: {{systemInfo.version}}
</h6>
<h6 translate="SystemInfo.Tips1" translate-value-server-config-url="server_config.html"
translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
</h6>
<h6 translate="SystemInfo.Tips2"
translate-value-wiki-url="https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide">
</h6>
<div ng-repeat="env in systemInfo.environments">
<hr>
<h4>{{'Common.Environment' | translate }}: {{env.env}}
</h4>
<h5>{{'SystemInfo.Active' | translate }}: {{env.active}}
<span ng-show="env.active == false"
style="color: #a94442;">{{'SystemInfo.ActiveTips' | translate }}</span>
</h5>
<h5>{{'SystemInfo.MetaServerAddress' | translate }}: {{env.metaServerAddress}}</h5>
<div ng-show="env.errorMessage" ng-bind="env.errorMessage" class="alert alert-danger"
role="alert">
</div>
<h4 class="text-center">{{'SystemInfo.ConfigServices' | translate }}</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'SystemInfo.ConfigServices.Name' | translate }}</th>
<th>{{'SystemInfo.ConfigServices.InstanceId' | translate }}</th>
<th>{{'SystemInfo.ConfigServices.HomePageUrl' | translate }}</th>
<th>{{'SystemInfo.ConfigServices.CheckHealth' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!env.configServices || env.configServices.length < 1)">
<td colspan="4">{{'SystemInfo.NoConfigServiceTips' | translate }}</td>
</tr>
<tr ng-show="env.configServices && env.configServices.length > 0"
ng-repeat="service in env.configServices">
<td>{{service.appName}}</td>
<td>{{service.instanceId}}</td>
<td>{{service.homepageUrl}}</td>
<td><a href="javascript:;"
ng-click="check(service.instanceId, service.homepageUrl)">{{'SystemInfo.Check' | translate }}</a>
</td>
</tr>
</tbody>
</table>
<h4 class="text-center">{{'SystemInfo.AdminServices' | translate }}</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'SystemInfo.AdminServices.Name' | translate }}</th>
<th>{{'SystemInfo.AdminServices.InstanceId' | translate }}</th>
<th>{{'SystemInfo.AdminServices.HomePageUrl' | translate }}</th>
<th>{{'SystemInfo.AdminServices.CheckHealth' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!env.adminServices || env.adminServices.length < 1)">
<td colspan="4">{{'SystemInfo.NoAdminServiceTips' | translate }}</td>
</tr>
<tr ng-show="env.adminServices && env.adminServices.length > 0"
ng-repeat="service in env.adminServices">
<td>{{service.appName}}</td>
<td>{{service.instanceId}}</td>
<td>{{service.homepageUrl}}</td>
<td><a href="javascript:;"
ng-click="check(service.instanceId, service.homepageUrl)">{{'SystemInfo.Check' | translate }}</a>
</tr>
</tbody>
</table>
</div>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/SystemInfoService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/controller/SystemInfoController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppDeletionEvent.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.common.entity.App;
import com.google.common.base.Preconditions;
import org.springframework.context.ApplicationEvent;
public class AppDeletionEvent extends ApplicationEvent {
public AppDeletionEvent(Object source) {
super(source);
}
public App getApp() {
Preconditions.checkState(source != null);
return (App) this.source;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.common.entity.App;
import com.google.common.base.Preconditions;
import org.springframework.context.ApplicationEvent;
public class AppDeletionEvent extends ApplicationEvent {
public AppDeletionEvent(Object source) {
super(source);
}
public App getApp() {
Preconditions.checkState(source != null);
return (App) this.source;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case2-new.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.
#
batch: 2001
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
batch: 2001
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/templates/NOTES.txt | Portal url for current release:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "apollo.portal.fullName" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "apollo.portal.fullName" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "apollo.portal.serviceName" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "apollo.portal.fullName" . }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8070 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8070:8070
{{- end }}
{{- if .Values.ingress.enabled }}
Ingress:
{{- range $host := .Values.ingress.hosts }}
{{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
{{- end }}
{{- end }}
{{- end }} | Portal url for current release:
{{- if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "apollo.portal.fullName" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "apollo.portal.fullName" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "apollo.portal.serviceName" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "apollo.portal.fullName" . }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8070 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8070:8070
{{- end }}
{{- if .Values.ingress.enabled }}
Ingress:
{{- range $host := .Values.ingress.hosts }}
{{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
{{- end }}
{{- end }}
{{- end }} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-core/src/test/java/com/ctrip/framework/test/tools/AloneRunner.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.test.tools;
import org.junit.runner.Description;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.JUnit4;
import org.junit.runners.model.InitializationError;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/21
*/
public class AloneRunner extends Runner {
private static final String CONSTRUCTOR_ERROR_FORMAT = "Custom runner class %s should have a public constructor with signature %s(Class testClass)";
private final Runner realRunner;
private final ClassLoader testCaseClassloader;
public AloneRunner(Class<?> clazz) throws InitializationError {
AloneWith annotation = clazz.getAnnotation(
AloneWith.class);
Class<? extends Runner> realClassRunnerClass =
annotation == null ? JUnit4.class : annotation.value();
if (AloneRunner.class.isAssignableFrom(realClassRunnerClass)) {
throw new InitializationError("Dead-loop code");
}
testCaseClassloader = new AloneClassLoader();
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
try {
Class<?> newTestCaseClass = testCaseClassloader.loadClass(clazz.getName());
Class<? extends Runner> realRunnerClass = (Class<? extends Runner>) testCaseClassloader
.loadClass(realClassRunnerClass.getName());
realRunner = buildRunner(realRunnerClass, newTestCaseClass);
} catch (ReflectiveOperationException e) {
throw new InitializationError(e);
} finally {
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
}
public Description getDescription() {
return realRunner.getDescription();
}
public void run(RunNotifier runNotifier) {
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
realRunner.run(runNotifier);
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
protected Runner buildRunner(Class<? extends Runner> runnerClass,
Class<?> testClass) throws ReflectiveOperationException, InitializationError {
try {
return runnerClass.getConstructor(Class.class).newInstance(testClass);
} catch (NoSuchMethodException e) {
String simpleName = runnerClass.getSimpleName();
throw new InitializationError(String.format(
CONSTRUCTOR_ERROR_FORMAT, simpleName, simpleName));
}
}
} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.test.tools;
import org.junit.runner.Description;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.JUnit4;
import org.junit.runners.model.InitializationError;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/21
*/
public class AloneRunner extends Runner {
private static final String CONSTRUCTOR_ERROR_FORMAT = "Custom runner class %s should have a public constructor with signature %s(Class testClass)";
private final Runner realRunner;
private final ClassLoader testCaseClassloader;
public AloneRunner(Class<?> clazz) throws InitializationError {
AloneWith annotation = clazz.getAnnotation(
AloneWith.class);
Class<? extends Runner> realClassRunnerClass =
annotation == null ? JUnit4.class : annotation.value();
if (AloneRunner.class.isAssignableFrom(realClassRunnerClass)) {
throw new InitializationError("Dead-loop code");
}
testCaseClassloader = new AloneClassLoader();
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
try {
Class<?> newTestCaseClass = testCaseClassloader.loadClass(clazz.getName());
Class<? extends Runner> realRunnerClass = (Class<? extends Runner>) testCaseClassloader
.loadClass(realClassRunnerClass.getName());
realRunner = buildRunner(realRunnerClass, newTestCaseClass);
} catch (ReflectiveOperationException e) {
throw new InitializationError(e);
} finally {
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
}
public Description getDescription() {
return realRunner.getDescription();
}
public void run(RunNotifier runNotifier) {
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
realRunner.run(runNotifier);
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
protected Runner buildRunner(Class<? extends Runner> runnerClass,
Class<?> testClass) throws ReflectiveOperationException, InitializationError {
try {
return runnerClass.getConstructor(Class.class).newInstance(testClass);
} catch (NoSuchMethodException e) {
String simpleName = runnerClass.getSimpleName();
throw new InitializationError(String.format(
CONSTRUCTOR_ERROR_FORMAT, simpleName, simpleName));
}
}
} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./doc/images/logo/logo-img.png | PNG
IHDR \1 pHYs .# .#x?v IDATxMR w5cGaW W zRS;Y+py&g9BӜVp
^X B~<OD{&S] PI AzlQ >g_$||q -I
$y(|vjgҖR)
N AH2 DͧK)yX]\7 &I 襏$GIS$)q92mA{YM R8 vj<̺.3ﺯ_- s
' TM}Drн /(%*XH R8 ٣ub۰-p: ( P 7RA"}B }tr2ʵe . Ify( tNrr/n
f QP8 KfyX.Q.aWQQ. Q8 z`2K[0+} (k(E @O) Htqfy8d 5uP N `>Cdq`W>.MD c
' 0]d\#xiWPE ) @O)ཋ FJ zQ8 |X@. ~ b&}:
( 숂 8 @) TM9( Osg/.
g ( UM}_.%9,wyX?, iS8 P5Q VLML; p OНɹ_19NW4@ ;p _ѭ w/gr{E0 |Ċ 0"y8s p I>Êi r. S8 `dlJr R5}ĩ ./a ? Fj<L^0' | d1' | duWIΓ\,Q (M A$J& | 0q
' NK&I
i\,狛a
j$'iK&ʦ3ޤ-\ v) [US-$9,M{r|9_\ ( ;ɜ$/
G]| H( US $9M[4+myx ) PLw28m ?s/F {( sUS - ǚ ]%9Kr p( L $iWO.K N تҖLNboc N ؊OҖLMY= ) 6;sfl F @( ê>J[4yY: w<u( ӥp ws6&9_ L Ol =>sv vC oR5AU jYڢ9 ۴œu cp 'UM}ta( #OK j%$ʦzs;7 m4^0 ]IΒ/Y K `º*˲I 7IV' Op 0AUS.( @6u Cp 0!]dy$ K.K ; 8iM [KxrQ: @_) X'iMM >y }p 0B& Q' Q8 E * ( N) p 0`& P 0Y
' h x L ( @]%9]A M ` M `Pޥ]<Y -
' =h x @) I[<. `SN zjY( Ir/nJ Q
' =MVIM lm$g' ) h uvt p P@i&/&
{d9_K x
R4 >]œA TM4ɯ &mt /Q8 آGE${ p,ə W
' [R5I9& }ڵA >p aUSϒG ،wi' S8 ؐ?/ *ʙ N ~PiO, ۴A iS8 NUS'9^{ rκt `N C'i( %I[<qf ) 'zhrX8
=gv S8 US $Y%yY6 g]%9Y p US `' [p $& x۴k' p |Y wi'ץ s }ҝϹ 0ϓ\vq 6 @{>,a( rvt `N Iz?*ɲp ]M p) U5q${ k'A aR8 &jꃴs^ P ( R5i:VM ZiN.J C n<I zm≵ ~. `ۺU( |ɋ$US `>JjrX8
X; 0JUSe a " ' TM}v x `4>Mre MzjY @X8 Ϫ TIVN `Ъ>N[6+ `*,A rN Az?mE( SrX p NԳege Lk'ץ s OQ5Y?l ϓ\VM}R: [N A(a( |۴k'7 g ( ًk'A p ViWM^ /VC ۣp RwB"ɳY .Ҟع. <'u ީ4_Q6 iO l 7 j9_ l N Uc'v ` sB ` 't &ˉ 8 't &ω 0'u $:& S SUS'ydp KGg O US =sX8
td/nJ uUSϒ\F ;Lrݽw zN تO't $v! sR ؊%yY: 6ɉ; O
' UM}"N cҖN.K > QUSϒ\F wd]5q N 4ɟIJg `4Q5t : FTM}e ۴'vnJ S8 ~HIqB ݸJ[:, I UM}:& auǥ ) ߥjꓴ&{e 0A{It *'u 'z9 ɛ|qR: L $US'yY: <rd/nJ P8 IiO rtrY: Lϥ W5Q( _{IUS Sp |QԳ&& KjA `N > gڿ j! `~+ 衪WI~- ~Ur) 7ݧAM $목J p WIib 6e 0N $IQ6 `U5I 0
' @( 0n>- @ &jYeI `'~t Jg
&_ Mr/nJ !R8 /
J2S: sR &W6 `>* LLW6yY: mڥA `(N `"Ory, CIźt 'u `:& 9{It ҖM& Axt _p #V5Q( St 賟Jg +N Of9_ }d FH 6eC @ Y8 Ϳ. F]|qS: lU P6 :Lzt e ( UM} e ؕ$US %twwW: 9 `n̖e P (e (j/y K' L p l t $) ( @/) 09?ݕ |EIl }vd/.K mS8 &$ _t $8 =l p =l t ) @) ) 0j
' 3& 0J' p =l t ( @G J QQ8 <ɋ9 R: `4N lt `'N (H &I t $e $t x* ' P A N `ǔM Gt ) UM ! G vj$ au N `9 ^;Np @) ) OR !t Q: 08oI 9
' %US W8
0Ly )N ( ; c 6L ذ/狋! 1 ؠӖM G 6l9_\
Q6 d/ɺ[S ^P8 YG ؎$] S8
<& v=Ktt @q
' 9 I8LrQ: ( $& n= P |lt `^VM* t U: 0yy L <QW6Y'+ I/.K `ZN Or e ?n̔N إK &( vB y! >Yڂ< |ϓ( ] `N +>It ojU Owww3 @oUM}9 r8/ R8 Ϩ(
Q 6l9_\ 8) 'TM:& p&9X7 0>? }ӕMQ6 m/ɺ 6J ,a pg ( xjUs l˪OK `\~+ zj$K ؒ/狋! HR5Qu ctd/.K `N \&yV: ]-ܔ \: :& 4 &9/ S8 `Ҫ>O SjU : LV'I^ PȿE T5QJ (6l9_\ ( 09US'NW8
@iWiK'7 0,? l $IK `xN * USJ `X `2>It e9_K `N &9Zץ N 0zUS' J )8Ot 8t O QzE t `+%t M2[ O
' RI ҖNnJ Q: lEM $~ f/9Lrp z S5*ɯs 0Ӯf[?u~Gt]G~{}m6 $y/K _N gI,{2r{r.kc?BQ,nӞB p hth <5"&UM}OQ J[:) ~G AQ6RB:ɍO_|ssݣ2$gIN
', 0
USZ: [q_,Yad]. 2 eqz/K < s .\FdswGd& ~m: &N A d]&yV: O.je P5A (XC|qT: e) 0hUS_$yQ: _u%>>QBor8- rN O^: sXNvU5Y,ͿE p u1%i &K؊ne襀Pm|qS: p TMa( S`B/( »|1+ S8 `p>K,`b\ĉ z YE LY R5q?J t$},q lۿ L ѝҹNW8
Xݯ\x`<Z?9| pd
0 ( <& 6r gJTIκqrz`3 X8 `>M{ #pLNʁ( l/b]: ۧp @UM}M m
&@_) lmV sR ! x%f$' m/9 2 ' Zԫ$0 o\lTv$a0 j9_ ( [US %tJʠdս?9^ >6r. P8 u|sާ]29 ʨ~ O{/fC
' RgIs ۴K& IzV2 @g9_ ) ;USϒY:@Or's1zpi R8 WS:`$yd. x' pZ `N t >yڢu(&TM}xl~[! z) `ޥ-lGGi,-! z) `$9{sڽ
إ|qT: p @/8LmEars;( H( PS:Or6X~hy$ ;|q]: ?F &]ڢɺtߺIe lջ|1+ p @QN #6ٜu TM}vD,狳! ~
' 0bo.\ 0bI_ . :N hlEW<9IrdhqZ `N (jU_K E`'O[:Q<i R8 `窦>JW hx m|qS: O ~ PT`vU5yUE|?# Y8 `>M{ I襪x ۿE |; v{rl C.md]:tΒ( '9rZ `8 `l 0(qԳ'Kxgio 7p NTM}9 EA ~D ,\!r, S8 `몦O{Jǃn-U T5Ip/J ~. IXE*Ɂ 0FbA&ê ' lUGI* %9Yץ BiN^9I? 蝗 M֥ R jYa@ q | At&9s:սg[} '( [Q5~xp˛$t>, Gx}: : lYMJ[4YGӪӞDtfg IDATIW ' l\Գ$s 3;@s9_\ ~. Q:+ ۴A f9_%9H ; ' lTiK &}9 A^w@) _N ؘ\:PNd/nJ}i_Kg&}: z 0*gQ6xd9_Kjꋴk'e,mmU8 ' lD7g $/VC LIԫX;v6u $? hJ &*ɿM v$
Ge/& =` V5Iץs b'?q"+8 P ~H 3`w r8K2K=`K ?jU_K &ZC y; @!
' |_ Orb6 `>J>pX8
0nIM S ?§ɀm{H`8e;U(%Y 0eN .USϒY:0ZiWM.Ju/>؆.! ˺ -Ү( \Puv
`K * ' <Y'I^obU: W5iNM F ݳp TM wͻM`U: ۱/Β̒\N N x$J FmJ|qtp`\%N vI Ynr 3; = >fܦ-1ߔ 0N x
MM/eZqb 숅 IIt`%9S %yY: 0xVN v 0 rX@tO^'y]80l{i l's L jY?K 6r( (:8?t t aU: 0hWIf& |rLr:+ `
, EUS 't`ަ]6) a,ɲt`~Y! _am9_ + =iWiϲ<ժt p gUM}u ܦ]5qB V5QuQr EN U O2S6`Se$W s^: ) IUS<+$G݃A ؘ<,ɛQay-w N 7US'r۽Y'C 0~]19x/J # ' |iMo e ve9_Jr[8
0 VN D t&s pr8+ iYiO( bU: ) 1&M2 -$GIJgzYw
t z[7 eWIu н]'9, $t p cMJlr]: $rYGIޔ^ ( ' $n|7t ϓ,-+' d {M/Q6?^
p uk/J oU5Iץs d `C, X7> C/Γ;eǬ l n| RGI^
p ucI~Q6`eY, r N &̺ If: K''X9 AN ͺ vp? ' e ^'9, +' ? tY7 =T вr , Lue`2, X9 NN ɺ ( 0QNG 0D
' tR: P t<* `N &j$J R6( Y 'P8 U @Q& Y 04
' b&O >A 'S8 bM N IN &jY9"nl _tw 7P8 U @& J'0y ⧻ ز_ ݗM.K(:^({h p 0
S6 :Kg*0- nl b&t >p 0~' ;wl hU }g `ĪOr Ƅ)y/K $9Mr/nJ + ' v ee ؒWs ;t >S8 U l Y[ Μ gN TI(؉7tyjo} }]&lM}3-eUS'yY:V >C `^'y^:u&}1qAd}OrX ֗^w$Yw_/YT5Es [w/>W 4 (_s [wd/<H?^ $9H[$y\0[dS.ߩj4_źt Q8 !0 & Lbc.\FYW:Lt`.! F `ds [ulrY:MZrQr}
(('u^c|q]: @( Lԫ$l <?^avOW>Iׯ}/$USϒY:Ur8- ON Fjxcj9_t8ݦ-UM}u &9p g|uc|rV
^P+(x"`4{%x0ȅӬ4V0
ZATC%#Dq_?zq ZeG9JyWa`_Pnmf |XEě5 | `@&Ch۬IrUD\p?_sO'x+wCvЊ' ]ap 0bCSh\E S8}0}T&; +; y c<2+eL^pF?qVLjX T|щS`x F ' {r h|iS!p
R~ *2>ap4"fG d38 T]v cw]?#o#MU;e = x5U.;1+eL\1~x<f!*"dw ' l' =7_/^EĿ;zTuvcVe<]s skO4<yw\f^] qT*; e p4°| GvW漍+shE<fVCDSO胦 UD܇Ix `p c%5 ŧxT6;
o}8ӈWvpRi `_v G69 ˕ ]6+e2+]< alB7Y)Rc4Udw 'dB `Ԝp c>Co#J*?$|vnwSDL7 % " ITUvĈx[y 76;>|PW +; 9!"#gR.ou1~{ofO'l{ ""~Wa<C6"V p C"q /MUgGC !N<d@D|x?fw ';= 0J/; \ a4f\J!uDkVfV4;~?ew 'R `\ O~)h<<q ]p
3軫 z1 ~a| Mw OH5_/^EĿ;W J qT/ߕ *Wjw߲;]g N zf^lÑgs6+:"ޅ <x:d ¸!84U͎ 8' |
c&ӬY)ۈX <כY)vWP\Għ( dp /W>
s&R^JD?PDvV 9u{+@]g +u zb^\Few kSw 4wtBp:q}\nCz.O@?}T&; p vж) 066J2Ina~ ;]g @8 cDdG0\RR#Lj!"gd0xt ?WJ ϕ: =0_/& AT}v H Z5_/ӘT*; mN8 06
R9kv5U.">dw 8 ~ eVdV&" "b]u^N* 4
Z?>'6+mDGw."b9+e3+e4U
) fp }oݸJST é&u#~7h."~ o 0x' (MUˎ`jt?:W@؝X
0X' 6_/'$ji'!_SՏ;uv @ N &/7MUo#Y)WTXJr CZzɿA
zq<Ǧ v?F7-@+>ErvF؆ӯOoz ' t7_Y)Tcw!j ^ bp ]' h>;~6" /[hfJdOMU"Cvlm +u :u:+MUO#:!9)"o˻g^Ld,W@?j 8 q @|q ED; mD$g tQdG/R:/\A~ ;go| ` N :fw7ޡ>EcV嬔UD,[yR!uv ,
mSՏMDI
""5+Řgk>" > 08' !t߇WìWq O' |ˏRVR.C荛x:y
6 C\seVuD;N. x7ٝjwuvM [<|?5+e^F$SMUEć n S< [_5+rV]<P p$ pݱf\F&|.;nkz ku A18 >4Uʎv^l SkvWuyf @w@d]RtEn 0pofNSٝv) ϟ?g7 : }StӬXfw 1"˥kCb;KS r @7L+M$/#b Mv 𧮳 N mv3+] y."bct iz;f @7@7=DĻgV*"`~ . ڀy9_/& 28 H6_/{n~̎[vc7 ;_ g38 7 ǦWt aKp t {' <dnz @ =`t¯Nj|̎ 8 @z*"^dw Mval ;!C^@ z 4; C7t CF'uv 08 u {3cnjNw 8 5 $_fw s @7 `tn߹] K' ymvM1:!"r [' yd ~v [' y<Tnq &:;_yr w N h ~&;\Rކ 0lY)#Hw R ^28 atMFn g1:7@'M ap &;<R"bp&at>5 C n 8dv?; ""f\f)'9/vW 9&; &~xt҉xd 2 ؗ MpH~`] 0n/#.; N9Ιf df7x=+e A ?~ ؗ d~DMFkê /Jy 9e^L ap p^ ?n8Y)7&~r A ? 08 8iv ?9d|f\E߳; :ݬW;ч "<3 z ༦@DDv?; :""6R.C8 ""^g Lvw1_dw Mv.|<EDl#8w#@ LpEċ y9+e 0 x. f T]v3+& Mp7R#8w ? N &;r 嬔WMv ' gfOt
#0+e
Ar y4UL@" 08 8iv ~̎l"";` ^ؼ <C <.bVʻx0 gdGp6'o ' fmv훕rMv }V4;N{# ' -s2t*;J[nVevgHY ' f}lz Y"";`.°o 0r } A.op890+mvgf | @0b^eGЮY)" #}#6 Wzȴ]R.#.`V |dG vM`H2|7";`^JwvV0r ?cp .GCMUo#hϬiD4 #>w;`<S : ] Uv ] Vdk #6 3' -Uv ]">"!Fev 18 h4; Fl @{\9Uv |f7 | @{ܵ yeW tum # Y' fH}lz AknU: ]j}#5 r@JyfY0`| ep Ђz5 i @k"SvЋz2 N ap97U Jy/; lf ˰rx t @;< ~Y)qJdGЊUv 4; jaz <E<}v30MUo"!F3 N :; FdfL#Mv {agp t *;VxC Vf8 N ώf ŬNmD| 28 8=8?o̬ˈ how *; Fȳ s N NC 8 N&".# 8E^p~5 cp pz`d>vg fL"I t>@Iv o |*; V*; F- @ $; Fȑ2+eo; 8xw08z1n i9u:s @kn8 @
N18 8iv *;ٽpz=+:;Ze bp pZ G˻ Zw I.ep t iqx@^8d8\g7 iv*; ln{#A IDAT8)h bp p:dp7ݝ0 N98z ' 3yh>; n8wIv N N[Fp>ޤ SNe # ' pd &; g 3 q#Mvs 9d 68d 4n Mv 'Sv &;J 8dH60SV =p>N8 ::;
K/ @' 4; FcSՏ gV$n/^NǚFCv ' 10d 9o8 <
t i#FN7y@Am`$ ' GOMUgGp :)'p ' ǛdH8d\J#j5U ;`^f D $; Fb qf\GEv uW H`^ N 7dp4 -7 m #*; x*=4U͎pR^R Mv$; x~@9ns]gp0 # Gyl8ܬˈ 7v_ # t' c Q"";^( # t' Ǚf|l1;N}o0N8 g #pR^E zo= s 8 Mv G ro za 28 8;оMv G 8ku} Ю#Y)Ws]O / N 4_/
0ތ7?p T6">ew9 Hep p8v} 3+2"dw {?O 8' N o n_Nv N 7;~ oJm`& n 0~ `0\_N8v pԁvCMU?FCv |d7 ep p Mv oKC& x `^L`8C%/]>4' @} Nx O 8 i N 3&l1L86; h E'5 `{mD|f ep piv IJ bV4;n dp t %i 9够|L 28 8 #8 h4;@{^d ep t $zhV$<}/wsmv |n `Ob gpON7\짩Mv ܫ ` N 18iv 1 i o gpO?d 0Nmv N ' @4Un`?R
Ŭ?Q12; ' y
A 4;m` N ' ڳ Fg ޜpb `'Оmv y L6; 8- dY) FbV7{mv C %m h>f@]d dp z66 `Z2_/\ ~<x㵟^g 0Z ~ N=xY) j= qڳ`o F~q}"! pv' Cm M؋N=N| `? @{6lHSN8 18 ؏ o Fyf cp t7^eV4 "Ŭ6; 8
x
Q@W/ Iv 0>' q}&= ߤ~f@ 6 ~ ' ؙd% 8+ g.A6 ]b/N8\f bp | Mv {d fLxp ap p@L :` bp@/ 險f7w5 = 8+ f t
'6; g! pV' @6GȬoME gp >5 @`/0P `\ N l~pIv Y)Fq e| 2 p Iv |NZ2_/&
x <4; & N8鉦]d ap ddIv |$; `L N Nj Iv { 5 g ) N l Uv 1; 8 mv gw d 4.` x < d m sf 18 2}`/ iv X \ `0 `\ gT}v p `(& cap s od u Cv |n t @mv 08 xz1nz [ gbp 08 `/' |Ӭ gp s\f ap 0 Y 008 `/' a p' c t t\n 08 4; 8 {18 `/' @iv 38 >f 7| 1; Mv 0' d gp @W N xMv |}v X & <f Ev i& N xMv |6; @ C T& f tcv 0 Uv p ghz C5_/
<ry ߰. p\nx6 9 !; Sv {q 0~x 6`/ `0P `< N !d } Mv 0 <cv ԫ d<2 8 =r\g7 WE1g z 2ch6; 7\g a / <&; ";y f |pzl 7!w?hcv 0 ' @x˵_@l 018 `_ b56|d7 ap | 0'r d ap tev {f n I?C| gcp t$;m `g ^&0dMU; 8 fM؛ t&;8 f7R N
肗vFħ ޘq1; xx- Alv#H&Ю `\ N
` = +&m m؋ K2 Y g 6`o* E2 s\>F Fm ^^g cp mv $;x, wGz`^N3 8+ l`O F_&0>28 ؏=2;m Mv {1. 18 CSv!gnmD<dw 0J { K2 Y ]2 Fa7z? Ne^ ` `& d lۋ N .fpMv 4F5 o 6`+
>fw 0*wu:оmv 0>' @8j6 1;L 38 &; ̑Ms e ޜp `ަvMrO c 8; =5U!h$;m O#=1_/&
0' !; l q@6u:p ^ 0 0?J&; 3n ` N !hυvF N<< 0 Iv [e 0X o61h# pv' k y@[V ev Cv 0N' 18v9z\@{f^L`$ 8 `wT0~ q7j_&0 R )'Оb V *;L`$< R hSNzʵ: Y4 cp p8hI $; Fb 0p Mt Ne ^d 18 8PS՛ ε: *;iv @ 1Z4_/\o 轟nr 80p Z oIy| 8'.?T ֧r | 38 8 k Ѽ
7Wyl 28 8BS՛b n˻x e u' 7h zr4~sB
&; / m` m @8ݤV);F1; / y586"~ 7>1zLjk3 60p/$; 荻Tx! Mfp." ; HS1< Hep pQ~DvM8 ? - nK?LSo#/tډt Юiv ' Vi'(Sj 6; 7 08vs\>ӛ G nUvjUSW4>q f e &" wdx @'81_/^vW: z1; > {2"/ݛܬM _iXbOi Tw
9 ~"l DĿ# ;c~M|qe
Cv N Nd^E 0p~xflH_r͎_ PMUO# qs ܇ *x˕^ev C|y̩d &" 74nլp Ljgl N N>; F|4U$n)' cvdG0<_\/Wn ϟ c^<FEv ߚ~ iJن | {2IG蕦n p iGiD *\G0VN7!ļPtCv @ m| NG 1 UUmv @ gH\ v|.r06N7Ӛ߽0@s6 ' fp1
!q d>2@Nܶ }9 `PcNgVۈ1p\N#4~9 }T&; &<`skSwάmD uN3@MMU J 6lE808XfG Ъ&MD|_'ӈxS@| m"0WrrN9pnMU?P. m ~fp pz0ʵ:6" @+.+3z_\/[Q 3sv mxHNkV&\M0Ds\n#$~}[wW6 s @;CA8 MD+;4U?~ ' @g8 &"#W Ϭ!1;`^_P.s8' ?s @;6apr'6 N Nx:]8 vxZ].R{ C!UD+5 J m[Υ4Uʎf\F6 kw
0fb~bo7UɎ N s 'p.W]. gev @_
( Sp Вz6"~寧 #8Y)28k^\/ieMUO# x:v38o#_ fVri
l3@6 C^e8 q\n"}v Ǧ~Tk<}{ȭ= sp Ю08US x";]G*8 2_"l6 ϟ k^"MvȼcVۈ1|;
i r @602v|O'G?75UmzTuSՓKD-"~q[gڦ͞Ȏ@HG`yp#A;,Pu-6"0OETCFYVۖ%J ߃RThrW7, ny|WGS ٤iΫ#jGv4lGh,( ^ W$G p@vg4I òN#:4OHrV[Wv4 = 4xjkGӛvc4- YvUu<o ^28 رj1Kv4UG;g~ >&9]vmu? P^$y^ w z ]T[ˮ['yS i3tݎv4=MdCmYuu p cYW;yZ&Qq
s+'7!'?: <jqosO};WG[y Ͳ'Phr* K' O`Z\%yYohzS nMm; x/·V uҎ?T7 | 818
$vo O <|( 6CͯO(/6V|_ W\8 x4VwKrҎ!֤iΓZ캷m_0@yݎ 18 x" ?:ݛ4eG캓nnGS< : 8 5.x2$ # xI̪#ӎhzَ/$?&y~Mu _q WYW p|3@Lf .ɲ<|8.U4l0 ӹɁXvuTw (GyRhnGY;'I~N2]Ի{ o ϒ8`oGSW IDATï1iu
7۲n# dzwhb l 8hz;_->d7|EquOE ?* ][^kG$o72_-N-x =N |LVw[;TG4&Ms e# ( n- Ԛŕi^'yUWLrZ =6#ͯ(/_]K . <_2]y{X&MNrVWk]wU +4<:ɥ 08 xb&y6tV ә4ͳ$7o wIN]g
cS pp.ų/?c(6 XWw Վ\TG N uu 8 b e]'Gu _դiN# < NѲ. ͪ < '֎yx s4_-H:r4 9 Ѳn`_̪ s' 5@]99LN 迳Iӌ# # oM e]'i; * @;^s e]%y] OfV 38 A[v,ɛ b4Ϫ# : ÕYuu]7Nt: 08 bZa; @߽4iu N u ÷/#$/ } @O ZW Ɂ[vM . ٤iΫ# 08 ͕ Uu ' y5_-N# is @v4N/ -*ISg&M)< B' y9_-N#gtk (fp Po] eu `tk&MsR p N ꭫?8 @ 18 (֎7I>Tw pU @ O9 8D' xZ#r @??u9_-UG F' |4 Ccp hSGIf @/&Mc$
N ]u jqR A q Cbp ೮ 4Iu 08 @Wfts < ~n `cZ 8? mu3i<\:*N 뮫# ΅ ~q8Eu`<$ j]V ~18~{5_-N#4ɇw6iO @:]u𗮪eC +'og·e.<ɛv<iYu |xV A-n b4~^ @/:J2]wx.
;}u 3_-& t] AM4U) oˮ N ɳ: .ˮNr]q
! " ~28|Z̪#ˮ]v$[ ٤iΫ# 6|8`,n$w) U2 -38 /WN`\U_]6i- i Cbp _'?<ã-fuI- r4Ϫ# <{|8`,"x
GI.# \9,'vW ŤiN# |x
:|;I^W QYu p_ _oT<:5i$WI Տˮ[WG 3N ϕ?We]'9O2/NYu 38 ??-vuI~L``&M3 g' =IUw jZWG6O>ƵmU 3 pU |j:ɵ'P0ǓUG
6Quhot\ l> .ɲnC ' mu M^W ˲fyxf}q
;JrY \8 4Vw .i;T0<yK[ ߖ]wS O\8 hzcuM\UG0Lˮ{k'0n ~ |UG0Lˮ䙝79 l4 `\U |8`]wq /7W aZUw .I;V0|y2qu Dz.# ' : .GIVGp]vu'I$ s l4Ϫ# iGӫ<\H |UGp8]w! (Eu >08 O#{5_-Ϋ#8,ˮ%9 _y5i 38 Oޕax;_-I-wO ?o |
|jqyuyum4$$ǵ% } Kj3]w캓$M9 }1 3N $G)vo# I&Ms"O) ՚e]UG WI^Vw [q MC79d G0}Lr ~ Q"e,"I< < N |Nؚwh:>g8ɋz $' 7N +'0,?WYu|βˮp ş =y~&eCs;1i<<9"O ߗ]w] ' 0_-. V%9oGS lW&M"O C~u }ap 0 $ɿ; MoC[ \ `WI~ C;VG2>N# ` ŋ$Tw ; M-9'ǵ5 e]VG T38 jq P M}L$Ó쇻$'ˮ p N dZ\$gu3M;^UG.}r<ϛ/: WgIn q MC)LY '2@oˮ bp 002I[]v4? [v *' 3_-Nةytr[ &MsoP N hZMSuS :OF( ]1 p N hZ'ع7h:}s<INblO캫 fp 0Pb
!0:4i$
R>YKr:O `8IW< M#`>$<J\I ^vݬ: ) |Ir\< (6iggr?p%9]vMu S18 jq MVG nt8`G,n\ T N lZ<KrߨCq MC O
яˮ[WG < `w6eudiuyO|(NoV T N e&9e"`8&M: ) ɛI6:yV |fti o Yu N`lיWw [u<iYu v4+'p,ց4 Yu Pzn'8`X p_ $g @I:sIr\lߖ]wS . Yu PƥYu uW qK'cYi ] 6N Ϭ: ( ۬: غ ]08 80hN(et=4 i fp pf@9qu u3 at=캛$o;:JrQ M' kV E`^M: `[ N +''Ng]w䲺غYu Yu ϓW.| iΫ# rQ .@l̪;U l WNG]wWN`h&M3 ^' ΕO6:yQ $I&M: { rQ_Ÿ:ݲ19NrQ = N p+ ax.\9 U W8dˮNت$ $ _͒UG [r4 Oͪ^{9_-(캛 C5 N 7WNpd=_-NC@]ƕIӜWG < 7 zyj xbˮd0DW ep iGӛ$o;;å!ph]wcuUǓ x ̬: GI~> l4Ϫ# HWpH]6`bL >g:/zZf6<Yu u&MsR 5 N S+' ^9Kr=_-NC,n ` ' ˸r<q|xQ bV lO9 > Mo %eZ̪C`]wd^l? }u =7_-np %olLY<h]wU 9. 5f)OVP-E2fP K' |Q;^%PyZv,`\TG | __v(/؝Yu u9 3?W7 ':Yu'yю!04Yj7ˮWG ' <+'6%!0@ `^N: N jhzMu0GI~epEO cp c͒UG jZųqu ugyQ ) Movybhu7q ȟ ^18 [\ƕ`<u?ah'M3
j1NUw >xsQ F_Uw [udu! . M*ɇ`Β\W!.| (ɬ: 18 \T ujq5_-U>\@Uw [N: o֎$;A{k'!]wWN` N ^ vjqY {j\ l٤iΫ# fp wiGӛ$;WjqZ du$;3 J
I#<WYu`xOf\ j1NUw Cq;^W>4U V%9Yvmu px\8 `+* <Nqfq (. E N &
Tx5_-iuٲn 0,&MsR MIUw ɵ:qhV jq:*|L2ތߙ48IWlݏˮ[WG Å Mo\?P8ɯrZ<YvU Y̪ bp ֵ,>InŸ:z: غ# 'ap 胣$|Xo,m ͪ ap N>9Kj1۬: غI̪# `p . ~Uj:-nMuu1 v iGӛ$; ~8/ف$ % ]L:Oxf캛4iu 0l' T;:@Jr3_-!P2]uu ;}u `ZMSuO2kGuu<I\$guu?.n] ' <4gI~W:ʲ<tU O Mo̊3 $j:Eu uǛ F [I |Neuڤiy ]eV O7,}sfZ U [w p '7_-. }v4]4U oˮ Å *̒| FgIwZ\WYu ʅ Jl;v4m4kd0L?.n] ' hGӷIUw |$\Wqq l,*`X\9 J0 $|XW^ˮaOf\ 'u (5_-.`$Mu|IaP $a 7s Rhz}u3;j:ì: غ$ 38 0<GI^ax:Ųb
Ct1i ` PnĬ8`W2_-:: غ
| I2_-IΪ; vMv45iI~ e# }-yLr3_-3}0L `p @WYW Ocq;CK&Ms e ' J;Β| x"I~oIu |,]uu ~28 O$b6_-UYvm|0
Ct<iYu < @/W$ (1E;zހ^4M qd3, *. Khz}u@$WgvYu uGq x$N y pC5O2kGS:7&Msyuu[vMu \8 &E
&Eu W p ޛ$g =>E;^Wie# s }0NrW gIwZ\Wg1 qu W ~08 6O댋3 gv<kBe$ySli @yR 1_-&g>ᙝuug4ϒ$9*N.ɲnC r }2N:g'uZ\yf0غ$h ю缌gvqPW9 y2uu@O %|1 ͕Yu. }u <|3 |ޛ$ QSe# q }5NrW s) Ӭ: 'N [b pd] pMf䬺غfuW @ $?Uw 39I `>&9]v yR }7_u~{fgV ,&&`X, w\8 `W$[>&{fm\9NrT[l]WN ߸p kG$; q_jqR 0l\Vw [w O 0h:K`O3;le ! r4 @? 0$/-ou|1͓ Nr $I~n |Hku Krю7!I&`X~^v ' J;
`'\9 \8 `:Yu@|L2ތQ&M0DXv 0N I# 8ɯ|8a\T ;14ͳ ԎIΫ; $jCFʲ뮓 (ɬ: cp `uTw Ы$Eu{c`IӜTG 5 N v4L`2_-֞K]w䲺؉ `Cu@ᙝKql4 38 `6 rN3;|βn\Tw ; B;^犁( IDATat %9]wcuu'M3 M&Ww ؇v4-wd\ i< ҎIWw Reg1 Q bp !zM;#>az5i i pp6$o;U O Ԏ(\n|4yu {' v4J2 s tV YvM`'f p"ɻ=6`]ƕIӌ# 28 K?TG wh`-6.!Pͪ 28 ൣm F'a
\TG]wcuuǓUG cp I:ɋ=rَ7 ŤiUG ap g!= Mg Dz&y_lQ `7 N hzMu@ύYu /'MsZ l N; wPUˮ[ʕ s$ # z.Eu6 vl4 v hG$yphzS p-&`' 28 0:/ tV A0DǓq% B;^y C70,6ցMYu ' h6ISP];#8 ˮLغ$ @ WhGӫ$o;
Ň;W9 |v4 8<v4,m N\V a3:PD>4 vIӜWG <F'a ]b0T N 6]zӎ+'0T'M3 |` =캛$;MYu m N u F' CsA_\8 N ;lF'MuoGӫԲni IӜTG gp i 0iN/-2`bP { `3:Ww |rլ: ؉9 M/ F |znuWIWw ;qY < lQ; hz[ _aV ٤i^TG _ oCu#oGӷ5]q' +' G N `6ctqu <Eu ǓUG _ v`3:'+NhzS 캛$`'.&M: 2 ؑv4å>:,~ 7 s' CɋWZvm`'IӜTG v MIye͒| v z @;^菻np̪i4 ٌNTw $mulò뮒 v 1 xBh: PC; U ;|4 یN|rQ ۶uw N\NYu G' PE:vĘ
(~ @/ @v4Mr ų# زn̫;4Iu N ft2Ç v ,~ h z
u .p إhzU $ N4yu ' P \TSYv,`'f @lF'Mu0H7C2 vl4/# ' .Nmϋp]w}u~ @O @lF'`0.:̪84ͬ: H~n ~gZ\%yYwhڤi&غ$'ˮ3 B. @8ɻ`o% ( r' _$ #tَ7Pmu7T IӜTG !38 jG$1: c;Ϊ#Gfy Uu 2 E|P|qu ɲn
IӜWG 28 <q :z2`' v4s\TG@ m̪;x>iqu " ISl ']wCuyV H;^hI2W`7 <9 3W]N؉IӜTG !18 =Ԏ$o;^oθ: ؉$ 8$' t 8tw<ʲn' IӜWG 08 vCuPf.0gV !zߎo#` -6eugWG !08 =7ᰌ`]&X Ĭ: hzS lsdVif 0t' 0hz0| )؊e]ųt0TyV Cfp 1_-N vnjlEu Gq v wh!Yv:`'IӜTG P Wq`ʸ: ؙ * sY\7Cpَ70DˮI؉IӜWG z`>:"1 08 =6_-N yJvlu4 Iӌ# `h N `` M;#@\&X iUG ٻ6|w8s]]+{©U QgaVq+ ky;G'PO 0:}:opbʬ=ܬΒ< zu?dQ(>S An >r:Nrp:ʹm< ]uV 8 "&0tMS`# x0' giyu;Ⱥ뮒 zbڶ ?@: ע: r:Kջx]weuЋgӶ}^ r:M'@:腟 + X$9 zz> ]waLvQ r:M2 zu:8|ڶ N `?xb>VG IΫ;^ e{ ?W7 bY%;^Of'7m$O;^
- 38 vr:MU : 荟 n[d{70\?'ϭ*Lv\ vr:M2 zu&>9 z L' |
÷Of#O$/;^<Yu A,ɳWo擙aEóqu 18N7CjC뮻i' v"QuЫ|2 ErCu>mۓ ' CiyuЫleZw8(> nqD? |2{_ |u]&yWŴmO# ` XnVgIUw z=.#sV fu _j!8 κ뮒 zlڶ e' w:xp@o. ` @fud^]b$/;^<Q ' PChd:"]uЋŴm# ` @f<ɳW?'W@]wR: YnVp
. RSN`Iu sIuЫdv[ ouﳽZEu 욿
ppIWw z3N#5mPcuW +: eu ;Wa:O$g^v{뷮~> `8 rz `^'ƴmӮ:3mGIG$y\]} ' q <fu䢺]nn8|4$9uõI =jx_/m/(:ۑ*) xp hY-f |23,7m$/;^|Eu_oڶ #IUCr < x$$ɿ;^OfmOs .ɺIߏOˠd|=U. \'y t sY U:@duӶ.N6!:j ;⣓JNcT_{rW_ڞ2F]wu p <f<ɿ;^-瓙O? 40<w-hXa\>cpUU~窰 @ϖM0|'3G2m$Ww xquPMv_J Kuoi(I : rH2 zd:MӶ~`xdѩ%rrpe4 zܬNT|2WG kڶփz}q'\ 18 -7$Ϫ;^}>VG mڶW3 U]c\M2Bfp =YnVgIW'Eum;NcuЋwIN]:Ҵm;.q-|l'W ` @q$G)@'`L2ɋ߭nQ XO/LU<WPnKk 8x' Ѓfud^ : Ӷ=I wINz_22qz 솻O Gep lY&yumHmuЋ;x|8dIe P xT' U )
Cvd>
f_PƵ{0T+.&~=
^ FMs͍- Y'`M< @/^n\ W~sE8N0CqU~ܖ N d9ￌۛWeQ ;dYyc|2; ߴmo/ ?]wU ӕ7e|;^ >T FMOog Y: $ zq䤸!Ӷ 痑 }|ڶI:'~O ~_F| +ox8x4O @x0ӶJQ&s3= ŵ b<_v}{s A[nVW.|23`O ]u_pM8L\' ?d?ܸV8X< @dvY ϴm_I0To]: @4/$]q<pq$G)@^'qu0L]ξiH q k;\pX N To<; bY]&yQ:i^$Ww !٧>*tہ}&e fp00# }>rjW'Eu0lo2 ٻ$m{_& ?o=ru- `ύ[/ |}{ssY
PbY])vǻ$̑@mHmu(^ ] ^9 x,< @9^UG cڶ:T ].ۓO^Ο ё9 x $u {C|2{^ i۞%; ]' ! 7j#{ss[ зf*9 ]WV gڶWq p>O.]wU'08A'9~L>־ r'wlQ iێg
we|r] 389/#}ۛ>-7_{7N#6m[ bu- | ٨iN %yZ0 }ZnVНU $9 O̧̓m&eW' pP`4gMVG <fu:uy^'$EV c?d{ɫu8DN8x$Wg;4q s̰Cwj bK~ cպ^7 ' h4~Axùᇷ77ϫ# rz_ @w>]TG |lڶ$Vw wٞzr `4ϳ ʜr:,7l9 l\ Gm{? |7I. 5ɨi-C $A CqHTr {i.m/m;. ' |?߷77r:IWdfpi^%yV 0 ˩'- { ѨiN [d : ] E # I|?m \Uqr g58ۑɋڒw:k,7l]^8Y }ҩ' /8l(sɧoon# r:Nr8d6 TӶ= Cu]U S FMs2jl 8v16\ Yu vY 0p$qڶӶ=N ~c4ϓ'yVݲ~x{s:s-7$?Uw n>-# > <ٞzDo08kszr;*F0dIu"ɷ uu]V
ࠍ$L
>UuZnVI zdvU O9% %v|r[P8Hg;2yQ[2x߽YTG |fz 擙+7m۳$]u xLy>j$?1 >EM`=` HӴmG 'A5YE 9,7qcD`w>]TG <iێ ].\:o'`8۷XJx{ssU gu @o'6m۫$Ϫ; $^s[ W 3jQ,&6& fYU:PU ̓{ڶӶ0HN8c4'^xf\ GI'-瓙 0XӶ? I뮻x(N8&I _";"&0dw< mϒ8m۫i۞U <' {k4l62}x{ssU f5NcuЫv>]VG mڶl `ē/? ~h3$W qY 굱 p@.}!Iq I~<|ruk >+u1ji}d >ܬ@: ?XTw E$>mӶ=TvM-7$ z|2[TG <i^'yZ Wē ' 'r ]V zs N (ɷq p ' ͍/?RyUw |2{U PeڶWi !q N1jl:0y{ssZ fu:{qaa>= 4mۓ> ` OJ ܨiNFMsb&t4*. Ⱥn j9'@ M^8aZnV dv[ #γ 0<'08 ݨiGM!W : ջd G ` Or'hhro qu pxY\CwV . w O\5 <
5Y_v Poonn#ðܬ :z9Ϊ# vѴmϒt <wI뮻!W IDAT '@FM|4~a SNǵ $/ 2 Q=IMvڶϫca38z1ji+ nqu piyuЫ|2{_ ӓ$մm10RxP9oS]ܜTG ÷ܬ< zz># m< $g뮻 '5iI cܓa@oyM`輱Ϊ (,ɿm{9mۓ` p|QӜ'Y$9*Naoon.#aZnVIns l9 N >ôm/ `'e{Zź\U |1' _l4Q&> y] ٻl |E (ɷInm{V1' :˸/Iu0<jWOf# Ѵm>X Ir`8d9 5E~.^66*q 4ɏӶ}5mۓ` d4gInkKqu 0,jIuЫ }IΫ; Y$m/m{\ >Of<j$]wCy^ r:'0t'}$; i$Ӷ=v ϹLcGCW rHwlQ 0 g 켣$ݴmm;v ;9) ѨiN#ܬg{'0\g C$; O8mK epG| o8~[nVٞn :`\G x5;`w ϡҸ: {ITG M z$/; +GIkvިi ꌫܬN|[j1WG "q |'^5;p N@t4WI>:G9 eu Ы7̕Y =Zwm\O &kv\9$?%yVSN/ܬ / Er ;Jm]o?suHFM3m'%+?y^ fuupNZ'3G2m۳lO@ LXw+r 8&cv7Y.x$뮻L Ag{͎M ,۷=ggݟ𗖛ih|>y
U 0GI5m۫i۞ =285ɨi=[qu 7.^Of huWI^Ww 0(ϒ\Oֵ0P'0@9Or9qu y|НU 8 xhGImOcep2jQ\'>N5ax fudQdv[ p]weu 4OӶ]T b4$?e
{g4`]Ę]\+I# om{;mqu N`}tɷ-nZnV$/;^' $뮻 zi^L:r'ǜj Uu r пyk28=TYu {"0dwIΫ# uߟ x N;=fp{Ʃ& ٨iW7 cYădv[ ﭻ2ɻ N`p b\ 씋$G@o'Eu : 3'FMs*N5anXnV$Tw r[wU 08 6jQ\%>0< 52$@^' >ɢ: ᴓEu5Y$ϊS్Zj (aM )'/; 8XNzڶ!5i^%TӸ: ܬN|[|> , 8hO4m[/18 2jq$Ԗ@qu P: dvY Ywm; 8xOjڶ'! Q\$1N59 rz Wy `]d{- TzzڶϫCo?su QӜf6%|{s:x<8u'-@o` a}u {|u"N8B9Orcqu 16!{? u]d{: ٞvrZ
x4}+:{ܬN̫;^'3o Ӫ %O4mEu "W#58ɫ_ۛ*ۻWaz= <i^o Ib NfW [nVg.Yu nQ Yi:E <QӜ*ɷ-G@qW:$/; %״m}z6jIm\ wq ٻd 7 i^O:z4j$i%:r'yQ: 6w '&vzpuyu qu GZ°0̮# E
-0 -7!M º: W@ NB ܸ: xX8 J- Ǻ. O x`' FMs<jB ړQӜTG 20do擙#jyu |"W284jq$jK`,a 87 @Ϊ x|{uu |mm{\ ¨iΓojC zOf YT gzvڶ! N _*-p [nV$O;ŃF$/; 3 %iڶ/ʨiN}Ciq
ӰI8 Of ԚIg z|uC`_8>èiΒ\ ۸: *16!{ml@6w ^$ R>Ѩi.t */ܬg{*0\g 씋lZ }4m! N/x4WI-p[nV>p dv[ ?~π 쳣$?N:v QӜ&7?~9O:ͻx Xw" gOrڶ! N5YxPb\ |fuWg}u ;۠ $WӶ=)dp`4$]Gfa\ | 0̮# ]{uu <Im$v
ȨiGM*Ȇ]Mu iY\GCvoi @4m۳%'po4'^6Qӌ?ܬt|2 `* i^VG08!uGbk\ E\ICf>9 мմmC o4gI~cܬI @<4೬6ɲ س$WӶ=)R' Q\&;O: SN=a{9̮# K$w &iuT18 x4WI^T
,`,7.N7 } $?M:*ppFMs*NJ}5 ~mY g*0\}u ku$; 'ݴm N8(9Mr o`>W s :AXT @eu<&ƨiβ=1oN' ܬqE t x뮻L zbڶӶ=`pA5y.&0y^ eu Ыuu =Mr5m 7j$Ww j\ $jIuЛw^ fuWI~ p NQ *!W[nV'q |2{_ 9 Cp:bp 8Ug)@?sԹ`^'W Ӻn,; %N*g4In=
qu f<7 @oUG 0xl?s tӶuu1cp Mk8 8D8MẘOf ۺϕ m/#!09KSMP@'yR |2[TG p]H ыi۾qu<~lUw i@hY$Yu gQ $WF' {o416C5sY |2 బ2 xdOct &/;2 8,ɳ7w^ Pii۞V28a/x4blyu fu䢺b> 0* P(ۓNNK'Q '~3=5Iu E|23* 8TF'-Gc)W-7$Wg $ (ri۞U08ao4uM_W9 m9̮# "]u N''U')WP-7$Ϫ;e` vº N'켏&G)nz2jfu a $# {6j16ڸ: ">a^'W [,; `tӶ?cp5Y.்`H8ɋWg ߬2ɛ /Ne'IWqu Eu Ыmu F',v :`Y-< z.Fe u]%y] ;脝dpN16¸: r:7Ia Dg CN9'QӜr $G@o~OfW ]weu v ;a4I ڸ: r']`~:s 2:agP~l{G9=vY b>VG ZwlO ~atN08 "ɓ7o٢: Ew cN(gpBc 7$ɷ @\^?dQ ;R'06z2=tY |2 $o; `PGglh4/$Ϫ;& 5 cF'08Q `\ `Y ' zu>WG CYwU Nxt'<c<=qIuЛ: zpV ;Gep£06 A/,7$Vw r $/; `h N蝱 FM3n * |2 ' ft£08W&@qu fu'K >} ;zclW.ZnV< |2{_ "ۡ% +z1j u l:d: )' /m{V 0FMsd^ Qӌ`,7q|>НU cZwe7 :`p t qt`ؾOf P: clqu fuiuЛwlQ ]wuu AFMs\ ՖqmCwV Ŝr iu`pW36vظ: vE7?' $/; `\ N*9 PiY zs l? v _~lrU'P: b> ]lO >͇qu/.{:j?(q"ɓ7o擙j kq | m4'16Ǹ: r:Ir^? { /dpg?)UM1Y
COfW ]w]u 왧qE;_Ov?67 }1ǴܬI zsdQ ;: 7Ӷ`9bl쟧9fu +td: vٺ뮒 =bڶ>ɨi.clqu <$O#Of 'Ϋ `Oͧm{V ~08/ݏM^Tw |зfuW 'Zwu :> j4 o\ : w: "]u 쩋i۞VG NFMsoJd4'Зf<ɳ7; >Ӻn3 Q+ h4ϓt h\ }XnV%: |2{_ {"N9 /urڶ!&~g4q,?0< "ɓ7٫ W{伺 lO:1:w NUk5!WC[nVI @oUG [weW _i 08?FMs&&=5Iu<0?ð]' s/m;i~$\eNqu <fuYuЛwlQ C$; `ͧm{V 08 7ܬt nڶv 5E `\ dW0̮# `h]weu i۞VGP,ɼ<5 kj 0dwq i- 厲 WP䀍f xd Jҁa[' 0T뮻 !<IrU A-u R<7o擙` п8 i^VGP 8۱Qu @qu |fupW !Xw bڶ~>P'*# )Oo.b,
COfW p(]w]u Ӷ}^ 389098ɋ7wq T8 ~5y<H N?@ 84뮻J (qu@y; vĸ: >rZd0deu Eu $#x<'`4I.; vӖIWB y6m[v 5q+ 3Op0d' )' Ӷ='wIuz^ fY|S]2 غn|W s1m[ɀ2{ g.^' \$ 9Jr5mcp2P9K`f\ dY-2Uu uu e{#ep2@9MUw qu r:Ir^.Yu {뮻; <d`FMs +1O5?pdv[ W Ӷ= U<TϪcy% ٻd uJ bڶ<,5e d4Hfuı0lg 'YT %y5m @,ɋ=4{ITG a>]UG muWI^Vw =Zyd FMs S XnV'I zs YT @}3mEudύ8Uu {v{)T zOf# O$Uw @};mqu_d+ ܸ:õܬ'yV|2 E' մmO#:'{l4
!8L8N7; ̺: ЗlW`Q<O2 qu k'-Uu ]w]u i: xQӜ i#8,4ƣ0dwF4 ?i>mh6Xmð' [wݫ$; `.m{R 38?IVG и:ñܬΒ< zz>]VG jQ v =2j$/; j\ aXnVq c``]weu i|QӜ)>= `ȾOf @/ 0pi>p
o mY&Ww y#q u& rڶ'|piuo@ WI# `QӜ%yQp r:) w7m IDATi>uV`
̬ ΄Ӱ 8zWEO9igV8miZπtI'~Hd |y6IU -7kZ ՠǥCuS NU%U: te$th$gt `7u}e @eu=.\'I v4C^: i vkOؼxO6P6sߥC C+8/_v4;$>Mr_Ti ،>]Odp:UudT:zw\K=&i7ϥs [s7
OK voPחI^셫_*|5uD{bPok) ?͚M1NPDn E VK G 6$YI. f:_wtGA].tkE/}7YӸ־L83:ꃫS e\,!hbz_s [Ө7t ؠ't`c>bRIa(Ͽx}sɞTeص$\,T>7? ؠOp k:ɭXc]D9˪rT Ň$YӸ GNHI~,Kf|_:3YLtv74 Ƞ/b=6mڍYK &9/ _)NU%t#!EVE؊bڍ]f FY ~Ե醰?~S.}1 qxO(NUd؇ 2,m7, bص_L./נ}.t*gOr}?(NU yYL7e, b: fQohl' ?u}sئ\r]4
o=CӬiޔIqzߥs OY˙,Y2J>7tz 'iJu$inP ?gMsQ:ıS8)hJ6nJ<ׇ$ H1}J ! 5$KSں&PL/IΔR{ G}M .ыpd1FJ xqKy eL0aKOWu}UM >KrL8)SUIU:|!b~\^1YLo 7Ўx um!K&'op1@IogM3. X)ЩӬN 0WY$xoehX:5oGt 0 4
ǀ}yM璉:ҠYOā$Qf-CᤀNU]'yU:zd9bzzCEQ P)& ~VO ؍Z T8N@w22YL/co/} aYZ :)&ԫ7YPO jNvSUgI~)`%ȪhcI9! 4q <*g4
_Oc|;k!Y?L3`Mӓ$q >U: kP3qU9<_y tĵ{ bJG`f?Ora ih e `I!L` Γ꺛_'V<ˬ>q4L8t $WYM35YLOt`kFi @; 29LA]*|W8
ZgGL8ٍy j ɼt ` 2NsJ&fM3O2 iVvf>kuv-[t OrDY`&$.ؚwް_: .~ ?YLϚ}0 be ɬi2-J8B&7˥(3YLO>]h${ Qr/~j A]dU<12-TuWs 쀢 Ga^$l?GE @;
!k7g %ZgN* He m7YLM.v0
J k}26&&;wIYM3-؆?f)lU:Or~\K],I^l7t u=CjlJ& 3~Vׯ 7qo N* Ŭ(M~t`k&) `'u}ټ̍f 0kӍ@d:Uu_s l Gk{
vtz vb}]M1Cu;YO\HΚf\:D(lPN\7 & bzdT:57 A]_.<Ʌi& $OL:pA $+p&Y_J jvK zϥsppf2/ 8L)[( j4!DdC:U&ɿK wYMnK&uWs [Qox[: pL96j]<p9k!Bd:Uu6V *ri$,IU:5oGt x
4
`9e m5 p\
'Щy J xYM.K}1YLIzCk u=}&>;x fMt6P8yNUuc*pZ3/ d1E_hG! ugwYM&@)'~4>3u69 'enK0w&i7ʤf?zC 1q K砘$YKL8IN} NUl wY t `k ;Iq( {k4I'@˽5g0:Uu?s <UVEA`M$*ؚp\:
꺟)P4}j H]x'Te4:wU:bjw:ۇQoxV: uWs5&S<Zìi\7|S:!T՛( >$g&`(@ ;W>YӜ* n:vյi 6ՠ}"N SU'I 쯟jr[: bMs ּ! fPחqЭ-\$5a 6mP'YM; IfMs[:ȡ{ h e`?%, l} G?J&YQ4Zkw>달
v /z-{S:ȡ1:Uu9 ~>r9. d1 't`k9
/J xA]ϓP:O.m 6nV7k_ ΚtCbP
웫ܖhh+e guE <UY\P٠YO> y) Pt Sq岫l_h72 W( NvM VfM3fl'y9qJTI$/Kgzri0<d1&t`k&P 8Hv=rg5d^:>iV }3k Ƅ9 >$f<W6,'Y }q Or2.qmSe5iIj*!x ̄Ti 7thb:Nc |?
ߗ \Nt$txqQ( i.Kw/ K Ury[:d1= ٕ "
& A]ϳ `IN g{VNUu
(>?oˮ lܼt ` lʺpU:ǑKRϚl9^gVA]Kw
'm^: p,M7Q&6{;
oK ذ~ GmYKhY\d59Q OKgS {SU} ld1=Ire,V܍z! a~9OIgMs[:1n죟fMt}e TIVQvTؾڬ_: ځmKi( ެi'9K2)|7nʄ?Щy vTbz9i:e z̛ud^ Xԝ1`|5YȄTiMl;}L' EV8،wINM ˬi.c ^
5?`t29{{\Kc0YLI97t 8
7!& {̴`gUXX:>Q8BI~.h$t8$m ae A]_'yU:Ϫh2/ IqQ( I25I'_R .ə 8&f~ @74t g4 7wϪ<PhPקCN:UՏqvg5} pL&Y_J f2
l Ҡ/c-C\e5t o=dQv5kn$:Ib;
jl > F J'gMU6h7INr^[:ľP8Y9q潽Y.nAL8mv>
? PʺDt=e}@͚"YV>J/~NN\G$onAMӓ$mu5
C 毬8BH2*8J 'j ʀMJrlE]{; IfMsD. YӜ'6V w1!J;zs f,FC!ŴfoG q`{l4KY\&9@(q]8 f'f xo 1k9WI1k ܬi>ΚU`W~\<ZG[8TU7ws CЁ0YLϓ*ؚQof ߕα#_Ϲ- 3kqvk\:@IS Et296Y.bz:v@4
ߔ uMs [tb} jP'Iǽ@`75Q? '&`OR+^ }sL< ͚253m.ə acG
( '9%,Abڍ5yft / `>$v4}s xuaXlstNU*8HWInˣ {l^: 5 Ft C.e+cԳ9[Ong5$gY(^ ]$ɸt MnrtWte X 89oΚf^: .fvӎr&^
_:ĮӧO3zIS:pP[g&Np`;ލz~ fP$?HWI`'u}_s t7k!v&K } yMc ̚ftYtM ؕY\$6= O/mNM CӛtM7I^l7 ƥ|}z4g, ~fu/ `ƃ>) bWp! ﲚlFbzt`kFt C6kyVkj$ P̬i*T8
./sDӛpb 岯l{<ס͎1 -;c4YӸ^5YӼI2)hcrI Y.=6YLOX:5Qoh W+#UΚ?ka ̚<I]:/r$Z_8_!v䛛r^:U 8t㬮{p5ٺ {m۔{(pnr!toKaM~ץs [s>
V ؠDӟ&9]߸.Ivw G1o>}*ak:U5U-s$mL-! h}6y*9 eW >"vkEzI1<OQ6C2 }~ mwI5MW6Xv Tr ''iJ һ_:0,/s [vK hA]_g\̚f1y J Vyɸt `/MMK N `g6}]V~\ +'g jVNM^fl :d1==f Ŭi. Zo)M Y\$K OJ؆VNb r^:p$ӡލz! s'gMs. Q5<}(i픓NL7~>&p.}Z >5mOIVs
f^؍ xrҺI~ulgvP:5Qoh: @yM$̚ X5uNk唓VNL7lr]:$ [s5
(d] %~4M5 _N
GK릜p6'Q66YLI^l ͚"~mYӼa$ 88Y uSNӧ6SU$?ll&C>Qoت ՠԟϚH 8Piqx$mYY٦ 'M]D.> Y\&sڷyl i܍I'ôjI+&ndA{\
hv Qoh,; I[NV@i& К)'mpҚ$&p&Iy \) 6\}a /) bpҩ$ߕlpeK 6ƥlNҒ(@ L$?lQox[: .( rP! ':IC @wQ6 lݨ7 KJ'Kx.d5~ 8>I(,$K _: @ J' ut8z &\<d1=IrQ:5?z! JQ: `\:s l$ɛ$/J vJZb]6rhn t|Crrȅq N)@K|Q6yU8
=Qoh @NTS ֩7I]:3&MyL660
J 7v35muNK vꍲ bf^fUU6v L:Av nIΒR:3r9/ k59'>(zà `Wu}:Or. .`P6&ie$L'}q SU 9olK_f<^p(fMs;nVNdZOrQ8ǣ ԄW:ooqp&YV//Z $&|?
ߗ o֓?_9o#rjcV>ZO7( 5iqhq K r/ Pr_/X|UX! JTͯc:sUvuVn=9QϚf^:C Z69R6?0YLOHD`_cޖ m:ͪLi rժے` 꺟) WPS8TU?^h>$
d1fu%z;
ǥC lں\O75d>ODu±S:ͬibJ!N% mlQ[L> ^QoxZ: &tJ\B̪rY4
0$9͚_:C Dd9ϪlrM=bś( QoxY: S &\OWm ŁEZoP$?gM{R8 +7&d1=ɪ\]j*p~oJ xn :d (ܠm~ Κf\:tTIMje)& h^ @jc|ry[.l\7m ǫd\8WNU'W VY.ǥC&K&.b ?GE שӬ˘br|>du~#m0ӬVJ)gM3/ } IDAT B6nAY.C&L1QoxV: gU98 į
,- j4!^N:U&ɿK 6Crtx*L#ͨ7tR (JɄGO>' A]4s c4C}/O] F'9U6MӬ.dBp&t 8}.<4'pHu}_s E5Mt?l}VM|`Lӓ.dc/pzCQ `g:UyW.wII7m(u't`Κf/sd9oy9Y]а ~= DY rs]ʪ|tn٠|Ǩ5ͼt?Bt `&&/81[W& cezuѩ*+wg$qHyVȽN:U&ɿK 6ffffݏ t L3aO}Ȫx2/ 4$q-7ٻ2N't`#C>,$N/ ގzq @t fY*Y.oFA]4s ;n4!~o
':M9Ad1gU41ݍz! X9_9ϡ)e 0$9Or:k:MŌ~M _: æXa.wJ2nfMs^c7 Yu)s>NK 6/&N <Ot uu
GMzuIƮSЛ$qypW+u <.xI7^t( <}Qo xq8'jݎ٩_J vY͆S:K >I߇jJ,'t6ɏQ6x v2å& Y]TոSU'q<79٫1{3d{7R& a M7L<au=OC Ϛfo4M CNل]3` DCxR8 <ɇ!{1~S_: , g#hbڏ &MF WN;U5 I~TmnQ{S:g{RSUIS:dI7˥Td1&'yY6 @'9 F SU'Y.rtk=)غ̚t}pb* 0YLO'eV'gM 6l j(SLNU]vti4$J _:@t<O7Ed1ur`FU T՛$q 6u_:U.'iIΒ* ؚ~VΊ*>SU
>{Ҟ&i?N l[t `tSUI a~Hr 3kY]/ ؞.>-x$.n!{yͶLӳ&ɋq 7- :Y OVyNUݮiF̚:I'@{;O>
Щq#f,"FXSwt `X՚AhA]O] VϚdN:UՏ ك`d1}:& / .u dSIJ Šߔ PzN'[&Mӓb>.h Ot XEuSUgpfM1 AK>yINb| 7uzm' }\h שT4rGҩ<ɬi.-؊u]=M|Y.ǥCjnGie p:U5NKL5CcVkvpfM3Nt`+u/JN잃/ v0t Tn`e;Uua / ؊~'.R8TiVcaf ^ ѩ$q} (i'gpxfMs䟥s zPק%ԄtXóMnjPd* TI.+ALz5<ʬi.\l\FIO/ 6YLI~! ʸO2. حNU}^mp`~Tz <F?kE@{K<>}'\gO
<[Mxbz}i7 FN\$t`,A8 >j 5.ĄtpeC)<d1}
eM xt,eMXHtj.WY.FIsOӿY.?,I ;Et `7:UϪl \KgXmtu:pP,!8,$.h 웷p\: ]V _bZZY\v=: 8 IKLn( {^FXbZZ'u* c'9V 7 -֩n8+vNKaK 6fC@vV8Y ʘ= cc >i^ lO Uu9
Ьin-؈>Փru:pA&d1Q z< hNUtj yuI
ЬiI>lDwWOI<ۛtd1=Kr xޖ l^N\! թuRCWOu:p\,.j
>zC Brx \*GfMsdR:lu}'Մt`, K`M$MM ( B! `3^%]Y RN:*w<\,!ot {d^ lֺlI/t81kqoڠ'ۧO\oO<77ubzdQ kINGe "g`[jRA]_&y]:,56`N4#aS6Ϭ&Q68& :Q6vTE~ u
'p~,YM^M\zy f'_F؝ѺITs ϲV 'NY.Lӳ$Q68 l k?tu"]}7뭾o{Iwˏ<r9. .\&yQ8
vޖ <_Nl]Kd4 cR> N9v: _?& .& TxfM>U u
'pnyb&& ?
.\u`(%SNp 愓d a?K`L~6!i^ < >NNKY\'yW:$/uփosI
<ryY:c]6iJ Qd <e Jr~⸝guM
8<[rIw
<]t z! S6ȋ&( Y|LrQ:$[+ӧOhlzw\K`?( 8`&OҽY.KA]&yY:h5 t[N[z\yƥ M U: pMf {Mp2d[dry[:) ɨ7, xe^$wtʘ5<U u*|>NCdŎECu 'H `) -*I'J'k\: h[plpҩ*M`\, Ku2.j Qo e\C͚2Os 3w91᤻>&Z =ew5
C lq3Y OwpgɑS6h~ }Q6yU8
Jtvo4Iޕ<~O8Ti|p}bɑ,'IQ68doGm k@Tռt <A]n7=᤻t#.\E
CvQ 8H뛯K ؑ Nz9Gn6]8L7 ʣ p`:Uu9 vNUK`.' v:L82My8t?z! Yl PHtr\fM1@!n6V8TYz<Pd1 Cw_: 8&iJ (b}ߐa k&'Xry[:7YLI~,g[ e}s} {ENUnrgcݎMN|,yƥ{,N Qot 8 :ɪlb
8ʋ$ׯ SNpt7@,cOgZM.K `# >! ̫$!
SNl۱z/% ƥ[$N ɨ7. xNU@&SUJÔ8nq65dc;~g2(ͳjp8
SU$?FKZΔ8(xlp 3. ݚ,I+8 K SUgI9 u3CwINd=7ed1'F4
ߗ <e EOZ̔8uML8n1}D&Y;h$C > <ˬV~a>N nyd1= mr1
oK SUI^pTոtk=4_> üt vjU aK SUob1sةnlݸt ૺ}gN{^=7lV b:N] lU: p :Uu 6>#-5k$J ҫA]?N~, K`&i7ɏs 1QoxY: `V lXr ƥ _uo~nYOl&G`ćo6 `tj Ӿ6ZO9*K| 'pخn! 'h |P SUݘ: -?vv s~y}t mr5
C _שmׯЬi.ܕg݃|rdʹY.C]Ŵ'h t I^r/\VK ܠOL8yWMS'h 7 @I+HЩ7C '/Sݧ~ y l<N ]F t4>jV
ɓxn!؞b&N 7X: $/J 82/m)>T8TY|؆=4 ը7|_: u:Ot#:4kIޕ>}7>uI<rUͣ6 [pi/SN`uMO-XK`{&4 vޖ <<fNK͚:ɇ9? 'px U:1 ج8 * bN{Voztd=S xtf 'h |~, kV %uZh4iS)NӁr V ը7 <<1
kP~S
'~`#/ ͳJƥ _שq W?t[:HoP8f4qmލz! ֩~ K /K`fMst<zۍ:p8yMh$C SUgq\O] ]}x> lw7ild1=IrM 7 zq]P'9Y.oKasu1ދaY<xc'ne/ )S6 ֩$?uC"RѼt t N02,ɨt 6n\: :Uuک$*'n=p ϣ:!
'>J ظQo8/ NUu;U5O$ y9Mt707/ ͚,$J ` IӬ.w,
{٩dHҔףӧO:KSNc$ mG!'t G?ϞFX'9Y.}A]$s z̄t`iqM ZI g+ EV `fMqPP: _Y U8ݛL$9 :UuZ:t 7
'˼t hq lƬig* <p ANE&i7^G `S~TUt6f^: _-IEK`.J `B vg\: 3/ >y |t`ibOt gf zmI;̚:] =z 'te\: ;- K`c ƆI9'fL$/K `',C SNc^: _->=-0YLOY
plƥ y <z·9$|pҩ8tgNk'yQ: ;f]8 `w^v_:1/ H~ zȄJ6tXl</{ %K`#'=1ӯ?M )' ;SUoJyfMsku`_|+s t\^npL9 (5v0F
'&xmM p^w[:~80< rK 8BxY\'+6,t4N.il ~n2. rAy6t39Y.?ng/'it #/ g $m#|Vi U+0sp$gt+KZ ӦV
g:,ʼn`<P@lK/*I;|<~r#Ώ
'E~@S /s ( @KUku9pr ,Yv 狏{! :h
vp f,/!^2t 2 AgpN __T8f~ 47 ""F!"; ejwA lZ:; p Ǜ lr>9|ԄM> d s P8NG'x?U8?
eYCjE ˋ! :Ev x|X [d`'~ e e`;*"ns@mU8?Ev v
sZM ^͔ȵJ PEv SFxVe Qv v 7x*;7˲F h i _lm :n 'AmN jB e`;]D\g{tXcNz|g Z ڥV[d.; {} Zd`k ֯դ, 5z}p8eYe`s ߟ β t(; ۹ {苏N|F h7 :e(!"; tX/>V8Kv 6 @뽺 F"; tC_|pA{ lx` @ɴ"; tC_[_F`neV|`_ ߋ~Q8oKDs@G={Ƀ+tˇP >{ o y9 PĄ8Ev 6g 0 A?Z U.Pp9/t { @2 '`Y lŇO Z [r>_dg3:; Ne ku˳6 'aYN lų6 N^ >t7v0CV vZd_f IDAT}N~
'-S=NCr P?g2YxzN(EZ7e 9 Gr>_EmvWuv 2 {u}/; @N.xC|_8; ˛_Tp P?g2$8 ʛ_ _ll P8)f3 u9; @Gy>AlͱRj,Ko~3 @w\||p ~ lr> Ab}8 lӈxNd Av 7 'p8 l-s 6 A/E1N~Oq Ǜ^ 9.>e Av 6 ]G_'OF`g
':; 4 A ll :|;: 8,~d P[r>_E:;to:aey Y ]/Av67$p
ͮ}L} ˋ{! :h y5; _Yͮ} Av d`cA"+u <"; 6 A*; tٷ/p8ڕlދ _eZr>_dg|o ''P8iAv :> o fRj,˻ lD{&~ P?g2 ]e uv 6*; 4 <3m ^mE9Vx p ~.*; t:px l= b E1FL8$E/9 3or C t˩ k ' w؈ 4I/; @yV"*;t̋` ':; |c N&; t ز,M8i k h { y 5: O",8ȆøFz ; ]/
Oe :4Ibd M ԁZd`# ݦ 3vYd.R8S/; < N pKv 6& P^v r>_dgEY89G.; y p PW J 8,NZAv xr8 @~Q3 5
'p@˲4=<^g ^v :Ri XW |˳vy sg2?ojx@cY ³vy jf=-e [ Lg 8 dI> 5S8Ye`# b N"N
n Ev 6b UD?E1HʛZK\||! Mg|+ @~Q3<]vNpx 4* Mp *; uv 8Uv m hAv R8Y*; p<.>V P8 v8 A.˗ @8< a.]v I8 p(cV s; <̈́: & ϙL| ]p*; H/ 4 Q80 pq 8:' \
) @;f ~Q 3<KP i 3 u Q 8j
' g pN ؈ &; t .; t Ɨ p(
'p - 6p FN ؈ Q8 `#
'@e h8^v g:| 6
'p Ye N V :.; @) _/; ˲N " 2; !) Dh& l@ ` bp `" @n 4 @x <l N0z؈ b Zyp 1 ~$; t @"; t81 ~ lUv
+u ؈ IO 4Mv 6 ph
'pxp ?`N { T
'p/uv X) Q <x|r>_#Z ; ˲\eg`#K,K E
]dާ dV.& dާ N @yj 88^v 6 '7Ev `/\jAv u R/; 7 NV 7 :j DY8q
f2ݤEE1 *; @}-8Ć;V N@X
}bۥ ؏eY31¡F
' R8?K/; lp:; [e ( v 걊pH= g:8hAv `/<3hWKL8E/; 0 (aUv *; ; *; 9 {CV
'phĵ2 M}}^d v,K2 pH
Yd o8h hXs &ap> $ޗڥ ؋Uv 2 ]peILXg ޗh^v `/\xڗ? ' pL8i' $hG sve"ɲ,WixV lv peVzkԁ)' M| z#_ }+7]g B| s&^/@G:U/; 'wqNޏh -YH` ^/; [Q ; eY %N t"; s o,KveRjC;- i lL o @Y:; 'Jx dYOUv6p @{@<RgU~Q3 t"; [1 o @<RgU^v @'-S eLV@="; fL `y N$e`sdι'>O/; Ev s> 3@\端GdYw)izؚF3 uZd`+ >e`k U߯Y:; [[d S؊ neY:^ !} ) H(z؊F3 uZd`+ N؉@ p8 ln:| ӟ t8Ye`+ ;qzCV 'PAv @',~QA N\ 'w04v fYl|<v6Kɪ 9k 'lg< hEv v 9
'Pt8YEMv &p \ݜ@"+uFdg`k Ev P k,Evv2 ]r9/Ne'y ^W 8jnҴP(z"; 5g2 ]u);NZj:| pb`;
;Q8i$"^f NL9d`'>xp_K k,K2lNy/lO K{9 Zd`gf^^Pdq iZj:|
ku /tuv `k.gnP/N؉
hu89g^&@ Ev d iYζ߫ 1ϚpK۲<`_i7 x< '˲oU=` e\k.gM8[ I
n~QD V ڠ^7})'pX lo:|
< v:Vd v P8z=xXdu @xHq 4Uv v2 lvY|<PC_T8 /QUv Zv:,CAv `+W M~M8Ro U
os JW^U~ Uv b :cUv Z*; ;d r,Uvb :h ,]d`gW hpN \e`oL]竇a WHvZz`xV ey ݝǃ A7Sw {u ]e 5*;۫n @\e`o
' 3n&B Av `+e ; t_P8\ Uv Z*; ;d 6yY A~b1E/;;ӌG>OUvv6 l*; q> 3@G N ; ^g є[* lvYC7 Q_ G 'FKAmβW hp t\֗cԄ=n M@#Ͳ F8 O"uvGDp_/E1^\e qU)3 jYʧuv*< 87 ~QFċ F Av Sp0]D|@88 . e^9 V@ E/;{1 @c|ʈ
hYv |<EUNei g MUD|@#̲*; lצ Av | M8Sin PiAv `# ghJS81sv c:,":; f ˲\d`R8Yx~Qxq<f HcɑI( @̲_YD b 3) SN :m d t4 oRE\e v =f83r>_p,˻X#C/E1~L@f+ 4"^f瀎yoz΄SNN l Yv jc ; t9鹅1M) jɳ ,; {3 &k :YCIL8y/՛ &G : {*9t9鹅1m?d9 8unrT ,K珓@kNPC Yv &Gg1 hYv f :r>{o|N SN :"e`N .e'svg$٤pb k e `fYMo: h+@K(; U[' |er>kopz/eY~^JnN(; @g$ v^ ,g!8 t
yvdY_E] `[gprD"Y t8Yd`E1
&neYC pE1AܟJ
>pP.A6Y͛qz! (; o ,Ų,g˲<61^";|rmf:PM[t8: p~¸VZTAOq (; s> d;hdvyɧpn~Rg :j nn"&7 [x,Uv31ȷ7ps(z!8Qv 6Te.2
˲A( K@0 ]w9/6N֠qP?#Tcxg&TqdEqs@y@ySvsu:g Ɵ7pa-dx yl m nX Qv Ev ҉K yY. ? o)X{YݼTk|hwd*(; t"; TӅk л1[lL8HU>g Q7d YD B ,ED\d AeYCpX "^f jpR}w/ (ohQv j :֡1
3 kzYCPQv ֗y-+u""ns^qbGZ3'n ~Q" Q j(; a{'4VN[9`7>\ p."s t(; t"; |!; vY.uu mж/U(NCpPZ)F8Qv 0
4՛p6fYekh6Ȅh oGl:j &J,"^f瀎Z@SUuȳD:|<Eī@D\mVeY"v? _'!8j fN7(BEv xJZ";@G; 4Ͷp 'BEV nt@(z:;t"; <,\,eV @DpVKd
LMA *NY
r- TuF9 :%9 Gqȷ*@; ;5 N>Eć ZkVs@-:os thYj b?u: P74 -8 g "; lbYp6ph e);9 {a14|~ eI"k(z!8,u jsVrf ` g%܄շ]4 a V8veɗ-;{; N!8j% q jŃ 1ZK@ r> }h.X_t;b:9 t8e6 qj=/ β,"Cv##tu,]NM(A_f! :ܦjk v&W? ˲| n.L:$de . اAJ7̲ hj( &_Ox C,v
'~/E1A=ɗJ ` ~^S~QDį9 _5{1J|t,; ] Yv 3 N`]|'Fv&[X姈Roݠ^Xw M\8\Eq LQ P>jCO `e&"s Ų,Cf |iSpa 4)3?M#l:-x pn Q: -q]$7X(_ԧz`:LUvj0 a mYwq nC٠ބ A4{FѸ k:| c\f!E @.r Z9lq8JztJh|ﳗIupdt _'!t89 z{fpI#,˫p6QUΣQnMso 'BShvt8Eć
y:xo MQ Жe9 g3 mY
̲ f8>oL9p2
re 5yf ,w!UM7q!go}xk IDAT"4Ë0` ~`:A hk=of e9A# s{9m
'Շi L9 "Q 2#L٤f?, @sQ8&"βC|< D ,9$A4)' tt:'쭡MTM f@s
@,K8i S̲ Zp Ô =oM:o úz St 0mNe7)L9(;@*;yL7q)N[UDs kDᜯf\{-{I:$tt86nP6!"*; M舑 _nA(a Q=u &b/s | ɇ 2^|k xT+
'|O`{t d Fe v Ӳ,Gt qU0r>4Ne}_`kJ'Q0 NF!g 4 (Yv QC|CL80M(z!ȧt e5 <@8&&x99T4ˋ pMC(fa 4zY{
Bh9e 3 <iqozɲ,>)'|t IX M
R&<thϗ!&D8`&e9NR6{o~, N/ҥ 3 <`g5,,/AvChe i Bh ktx&
C}cN{fhMx,L7&,˃hct4 ?2 <r>_ pR 0}>_g!htKD |7e/ӈ5;Ev h#Mxx|@] rI&hwhp)"t4x:x!˴S RU:yls8[ p e(dyɗP:a\M_&9t,Uv heYc :"~Q6GQD<r>r pIutsȟlm/4OU:o :"~Q6 n@st {P=U:2#b,Kyx|h
z~ '^D,;4 N~ur[1V|bn@y=J'?)@}Mz&3vu _A@(N#?!.krUD8zqVMY&a4,{! T98/e&Mw{9C>jB [@MQD 8U6ޅ h2M Ӱ8P6a3h j9cN'h8AMY6طqFǡ Lۂ~ 8j: >ò,Mx4@[\C*\s@M?P:t89S6|Vf[/r ٲ,e9Y۲,G!h g4y-k)X_4_ƸW+Ixs O2 jR= -;j/Rqǃxxjp
M(z!hpr7 NNÍ`;OID̲s ? P!Oa
-ۈ,*;t x~Pa&s rpBk(@sep 5
Zn"J 9 g2;,Ӊpb8A{T
'ܨ~sܗM j,Dį9 R6$ՙ ˲<]]v|<>79g '
UYǽN4pr6 N j נ = -nYg6; H/r V3 _{m?_~ ˲e}.>E?s t80bO
˲TV~
{qf8 ^:`NՁgULYDV ^`e6/^
m5 dYB{hql @ RYM+u" HA[V"0 NN*;tndB[= 4Lb4". i~[ٲ,6f'xU?֕:@,KvWv6V谓~Q"bxt αB9 O"bCMj_0Z hY5 2 NE}+tI(N5h p߬1:ۻP6I9[X`
E$^L/a+ +tpm ՊAD8uDaADXYM+u"ՁeYg" uDMEvڭ_gs f Pu. q eYp\UDlr>?)NՁֹNU )3Uv`# B˲,ӈxeYMطx&FiʳVDmb{3 NYDvYG/l:>\W6
' b˲EOR(MDO1x|l%&p
j=i'JqZ ;>[ںM heY."4". vY8>_iC//a_$:"z˲t,p&[Gl:K'{SY~heY O(qY=4MDM8MD+;_.NN8ДZfډ[5<#l\ Uv `eXiD:"~3ՄC; {1MliY6/ s(F!8>n: 7yXG/l:l^Yu ײ,gqNu ˲t:\KAVWR 'ZϙE/;i:,[5<Qq?D9V\e } ܲ,W˲ D8@ۈeYeYpU:s [=$K 6f7 NfqPi:1Մn@[] ,˫6(zS tn/Igg~Q܅Cghߌ 27 uD̦Ét_o"_9,4; P~Q}
x8hBExm6r>O?ocyUZ kv> 3,; @eY~fmr 8&* 8
W"34"MD ei$oZ:"L{tC(Dī @(N"M?vnY tSJKx 6|9ehȄeY~ hhW25'wd?s`3t8(P~Q eh& @DIJ,慎q?1EDMHv&vWjĄ,K뱨gq?evhuD̬ΡnDĿs ;/*; <ki "bfuYD3; &NN"e S r('Wot8q;ZUWl,˓ @UEY(#M5 Rǧ ^_5bN(ڋh&g:\ED/"vuЛ'3e|
eh;S ZbYe9P6 Uvo5fIDD("d vI]||oh@CܯYeE1 p 9 )O_: E4;| [*DDb/s ;j^ njhB#TvY @{)!&4x? |~ [M,hA#Wʂt' uDw8UXeY GCD\)T*U8cOC|ex ߋ>HQM{]||?U;S4>X8 ǡz?'p)MVAM8"4],;|/ i۸_s /YD3;ey 8Nēp6C{qto|<s8&}9C|QD̳s {˲,('/s]}d RTwv`o| Z9
g34mO3u> Fs {r>oŠFN""Eqp qj Mw(8LآIq?&]
%|~cq,^v [Eqg34ŇVBAk'qN\8y ^DAӸ?ܰKL7q?t8IKDŲ,d *AJ6/\DI[ǟ" ^ir7;7 e9e )|/P҃c&(L d\Wv`^il$"_Ao˲| 6u 7<P>$ wثeYC |: &fb,w> "9ߗycߧ^8l86?yI[}3dVG*7
l_ ލey 1YXn~ղ,Mh'
pl>\Oit$"_XcS#iO
S<wJ&]( bqZ/$; s,g~NB}]c x[#|d
'gv`n"b`L!/Yn"b6t}ܿsۿDgZ a
¬ əppfQV
"z@iOZYA5=7ǎ?Le d1Kod^?ceULz1zn! 9lFDɄ2$?l͢iK!N_ nۓ!`ӔOHr@$hRU$K M"y]ϒ\4y,m}d3a쥵 3)؊z4!f 'Cm7=+ 9
kw*]&FkRUI~-؊uNK `><CkؤIUM|fn,mk,e^$`|MsT:c p2M{ V]_<5viUL fp. #3 zd{a['hvҝɬM2q_G͢iJxANdRU&}90U8<CdlؽIU1vnۣ! e>}zx4^rˮ_./by]-PׇT82$sGyq 2`olcf%z<_~~Y4np|T@9JP0h] 0>XC*8qI7dm=ئ&<T߮t咇m8?gU`[` u} u
% h\ڎ|ps)|Y_,uA Ms[:c
p$qZtGoχ/%KW^];ĸ-IU]&t`.m;+ o3Iy/9|"~
ʇg4J(wl:mWE+S:UWC+ %9r
ԗP(9f %%y`&ULt`~t0l˧e`h' ̓|P,Irk5|y] & M* )U8Iܲa<|Q r<I3aR ~z~k lƤf1ݺmJ u}l-/LMe0lX(h>>WU>86da-tbd9m, ƨ2݁QqɃU"Ic )A
0`>K
iW<Bʃ]S>%I%{v 'p$ t yN7S?.`8 Im 00-e6&ݤ
^~/kaupMM<yܺCTTk S,Ws ;T6y] %v.J<x(y) y]Ϣlt {W:u/` cWq{pu=Mb_7p3sANzx( r 32&pH~[m <O<V:ru}|l9䵖C.k t [[qp 0~ٗ?~?u ءlApH}N3Ikt`g^E 6FͺmWC u>JPF vg^צX4mbY N) GѠo y]O\Zg /|_8
[g|ANs ;*ɲt IU-S,PݺmC e>M{ve? ؞UMmMNzQ < e |ټI~-#/N `;e8<BݻwJgfZ%t`.m;+ B}uQ: }~tx 0`_eg5pxM3- b0$n#Y^t lR`?Cnetrٗc oltMEdݶ$7s E( W( Az? C*z 38LWY)(Fx e *! VsS:3( 7&C| 6tMݻw3l̤n|_:PźmgC Ti_K
I2]4m H&pM3- b4$Yx2N 7( ɕ q lt Ol$Yi*vt( ^Ys ^8+ NiE$t l$[4ͲtMUᤷ, (N. w y]{4ɃWq& lJ؆{W:FMec
xuJ ]Q6>R@(qYvb4! `( E
pn?N 8&GM ʚq F$I^zY: egl&$ [Y_HQ6>tL9ɫ$'qR6>0&'$ SU_FQQ6>^y]{te Q6>rV:6rIb I7I& 0egD;xom{V: t_aL:( Z4ʹtm儓Ĕ^Ť F,[EY`u}LW1l|Y 6I<aWIn'Uu\: <eW D?ݚI<} AEӬJضQNL9>EI'J' Ju /3O3`u}߱KN 5e3J{W:V7@o>vY: |M_6Ys-yom{V:!XwINMs]: l W pr|ы$ͤf LaL 9 ȼ &O}I'&0
^Fvey7Oi&Up #i漿pzlb #ЗM^쥫EӬJؕ(r<ϓZ n _c 4QVY &WK߽{tT$!e7InPZ_tx<ƛu۞0V~lE,K V1 EJإpr<ګ$IU aTIU]
qL7آy] {l;y] _l<Y v0y8eY
IDAT/yzRU Sg*/;7`;u=Mr f~5 y] 3u- bp $Tլt äQ6t-ic== {/|_8
QANdݶIJ TC| /8z<& [OtC Ƽg&k9_4A \wV: 0(?OrRU< ظIU-4s c 弮.倽Jr&bIe ']Ɣi~JT 6bRU/'UnA}6&J0\ P$w+IU$w '9Yt /0^_y ) l7?,`o[Ze qh!J: 'In$Ws ":- aT,_eL77ޯ# تy] ;Q6 섓$T4s [~ kRUI~.$ǞAMy+t&G=jU uhi 섓$Wbr<OIVZ IUT*&;S66K( ɫ$; ؘ~l<Y ' s|WJ'' bu Jgnݶ! KA{?C f>z\,fU:>8ɺm\ ڋ$$ 3t/4/ Khu, y]b-<qF|ݻTQ[n6 &ɺmoKIULru,hܬg$1qnlnLMc ֯gAY4Y'$Ibd`^%bp+tVQ66:Xg_*Yo8NzZ: Яe[Ex{8P;xU6 02W]04^* I~Y Vv |SJL4ɯs bW,T8
0N?* <MR9ةߒ̼ CVth?pIUƭ`vY: ׯбؖuJ
/]E\@yjUL56EӬJ7Vլt `t^$i&Uo0:K( sV: P|RIp}?V 0tg6&&\(| '0U`
l] 6t+t<3vݶC O=yătN8 e=6>inKG&|=`[O{# TI( u M f(g?$t vvv e`ΕM>τϘT29QI7^aע-؍7=+ `]4K #֯t`tMsT:>S8m܌ >ٺmK&U5M2Iqnۣ! YyU( M٢i\zhi.KgV|ƺmH0m/:դJ&UrRUI~ ;n`|OlӼJ< #ЯM W&_gWL6^. a 1(jݶ! ռϒt*ݴA xy]'t`)|E9rdnA QZ,-2n[>ҏ?OtF>]ĭUVؑ79+ bN aRUi' jvnY f^GI.[ eZ_K F.ɱQ8yIU %9tnډ[ [d au=MW6yQ8
f ˧˸ =>#M,IrM$ݡ@Iom{V:>qL;3Y qhiCpHsnɪt1؝'pu /u2sY8H y`6ܧ[s[:Ȑ(<Aߥs "ɩi' 7*c}R1@ U$` @)6(͢iJ'T*v'9[y C2i۲^` jݶ! >i xj-PݢiJ"'G_ tNV ~=>uޖPڼgI93M;- `um-PҏY1D
'0$( |9 {n۳! J2$ƬlV?dr.M3+ bN!{Y >`]cae:tkvV ݼϒ%!$Gq>L
'4$.̬U,n붽, y] +xPMrzP/fY:Đ)|IUbOnK~
i܌պmC 2YttN A?,υ $բiC 0pt?T ߤ 5Y f 2eMIy]= |F_8 |f#L8F:Kb`'9_Y 4i1C3p͗ƸYw ~yh!@d&Uu {aKrne bRUG+~* ) K(/.|_: 5; >k71nCN6Y{ OpdnU OMΒ.Y~ ~|y=ܤ+J5ۢiK
Ty4J7dU:Lea0Dt]2H~KW<- `u=MW4 WoMsZ:Ę(lH6^ äx%E`$ӭҹ- `I~(ț$狦Zy] c`%9<Y
'4$.\%9]Qb@Q&n! va^&ߗ{>ݴe ЗLOtGѺS8ٰIU]FtOnKϤfu >I8tœA k^קIs tDd&Uu:>`qj؉~,ݭa1q!YnJr-0$+8*-R8قIU&t
R< `ެtmG/c/|$Eܖ9+P6 YE
'[2U|xl p `u}lptOnKxh U:[p%V #wx, iE`~Tl^'&`Ou}<e(lѤbw-0nw~X |I_49KlXtmYy.( ;M >tv@d&Uu cEm, T4Ʈ>ɑ2.0F~nΰ[') #cΎ(l٤t HW<Y3Y9m/K ش%e<AI') #d):Irne nLei ۺmOJ شy]OӕM<~P<ټӝ( cc):nF_3
YҼOZ:I'EҳX U:;p#V $I~KW<1f frks Xʼ_<T *]dU:uphU:(: ]KSO`X&UuITx`0*>JBG*r4A1Y&غ-tCpcV 'L3"tQ_F
_8Lt+MCf4gC " Wvݥ;<7CrL * `4M 'Y&9_4m(.S,8,79. P)0$n~厛8Cʜi&n |U:hzu x* ؼy]?P: 'ZSI!Z?cX[ʜ$?0V Џ_D8w \Zp~Y4yLᤐu4xt+w]0 Og0x9˹0,i \-fZ:ġS8)hRU؋ wy_>q(OA._Jy]\
ܤ+,K>f6T2~m)6]-O+L 6.ɱU:z2L Mc P8)lRU/ƃ&ܥ}i=N`k~v*nF_wdd0Vy=KW4lv4CQ8&tyJW@q8¨%և4J& vݶ4AoH_Ƌ+~KW<q_wwS&T!v(IU'tJwznY`#&Uu% ʦ$S%V`XQJ;afbB-s~Q8U4OahU9tnm@y]lK x~,v EӜ)IU 'O aʋ$M|0)& %n[es<Cvdr4e~Q( <բiCW
'{fRUI~-ݧ8;ie*@YW붝xM&p>d2 >Ѣi9C
'{hRU}/ҕOc
[^
$Gu ƼgIΣ gǺ q4!4=4In` ` =L@y(ap&U5r4>m{Y:c<ϥs |ÅExbTu}jL 6iNKNT29 xtm8~=·LL0u ¼_&Y&p- (e(YI|l͢iKNؤJ}P.`bz 0$Z A?U( zge j^Ӽb3` +?=7xxu<O";r xܧ+\5e<rd:)& wEaP8sm88 $馡FeŒy_*9"(n! f^gIQ:ݧ;3YE-`2w2 %]45p2 :I9 ة"u? M8]d咣$ߗK@!t/tSMܶчEӬJaL ͢iKNbRU$K `/<1 )%IW$yw <Krn?J2|*}%sI_`L`?'9^4m <@Lef
<Äǿ r9I@t % <LټI.ܥ+\$%f
0}4C4
'ҏ_ 05CS>e3pCn Mtϙi_K _]h( EӜ) ̤fI9 Fu۞)
X
oV(YkXrY4ǗPTyK $u;>JB4zXSJ7:]\O,y~X0~IL .Tu<d |r /.c$IWBY}Ex|P/ӏ&
@M(ì0 eݶC |l^קI~-g_+_Ir=ڛy?$J%ߗIzh!6
'6$. ``.m;+ c^&y]: [w )V ;2"%Mm4'CNnRUgIQ: @$vԷKa_b}2 O)$cu(NF`RU$? ӕMvvCkx }.w]U: q * d^׳$ pNMEdQv\ |u.K x0et yhel:#2Y T |jݶ! d^/ӭyU8
\-fZ:gɈ.J #w1>Nre p81Y,M {>Iy]M6yQ6 '9Y4R8ix mK y5& !9]4ݻw3:N9
'@3I.P: ]4ilɈMj !Zt8]Y vj4!>+uFlݶ$s ]!֗MVQ6 M N* `Lmk70Pܼ >t4f 'a ͔M=2Mw
p(f&E tc r cfݶC <X4 J' E890
'7+ ` .m{V:} e9/ S89 m? $9- sC9 f4!(C! 0IQ ޔ a7J) u 6e`hIJ ؐ$E89`
'k ptaO ɢi 8t /]TaI ߨ^4ͪtS89`m@ \te9 iC NܺmWq պmgC |pM Oth!
' Et / ,,E tDل?ݻw3'&ULt '9Z lڼWI~( nLMl?1 `_'* #v1 O2S6SL8O&U2*ɫQ uۮJ ئy]LrE( O7t 'Ikp je7q SeDᄿXu r eYt]qq z4!o
'|R_:9- 8H=+ `҉ &<w+=6Yt `\vV:@Iy PŢifC0 &E뷥s &nIt \)
'|պmO\ Mm( ` ,,c ݹIrR:b6$? ]ce29 QI2]4Ąb MOrli8J F>ɉ ϡp£( qnu {n1 ݧlr[:dO6I|_: 0X& O0IVI^ C f OO:9I s* <^?zN ͘)L8&Uuf͋Q am, `I'q <_he '<[qN S6 L:q < p7K'9 AP6~4J' (Q
'|u^&K [eQ: 譲 ݻwJg`$&U5KҔ 읋uJ y] 'Y%yQ8
.M3+ 1ᄍo+t |H`L: BلQ8aN ( @_:9) ;&l חN.J R6ءEӬ [pVJ' pM
X42J' ;ݻwJg`&ULt `gM
,IS: PբiCpL8aL: lL: ut [t A`( I2]4 p8N 5e=t Cل"N %e=t lB1
' ( h)P ;t l0 J' 0:&pBJ' 0h& t l^ݻw3p&ULt єM n^IVI^ < {Ä2 E`Msdp il 1ᄽ` =e1 b4!C&L: l0B& `(NJ' ~Q6/ {&-Jt IRt ]( ){] %iJ VvY: YIDAT3IVI^ (0 &t 8P& h4trS8
& '5N `m{Y: t EՋYa {ͤ ؙ$Se >trQ8
eńaRU$I^ cP6. 2eץs P6apL8amJwl $& |J7ޤ ؞$W6aL8aP&UunI' nM6t ۼgI9 `dLM"d ߺ; *& <R۲. FDل3ATtN^ CtnY ϼI.c, |$'- t Ϣl7 |7&:)0xZ&y]: @ne __:YE xߒ̔M FA J x_&#ߔ {>ߔM شV4E( *0F&0*%iJ =qdݶץ 0n^Y z4!`NIU!p (&tݶvE xpdhA`[NIU !t !-L]K'q& aO2]4 5$I^ tnY y] !IrhA`NIULwt !m, u} 8<7&:AP8 Lju %V ޘt Jg X4ͬt%ƤΒt ذ$'붵4e\ `,t5ʤfI9 `CnLmkL+ {m^׳8 `E,KN88:NJp INM y]Oӭq& '.Y /,* ͺmJ 3 &ɢinKN8XzV #'t xy]; `~K2[4 <ޤI^ _qdݶƴ0
>Os oMsZ: H2Yt $uۺ9zg2 CheON7iq/
G ]vV: l˼L tdhSg#U: uۮL }P+ 0vQ n )p T$$? OBa e^$K $INMc1| |ƤΓ\: &]a i^׳$M _Ms^:;IU͒a v
Hu}dg2 }EӬJ!`vdl F>Il E\'9JrU8
&ɱ < 'z2 0:wINm{]: y][{ ]$9]4
'r &]+8 /, iC)M$28 6om{V: żӝɼ* qO29_Ь24 7 x$W6_LӍ; oqH 'LznY t+tnK!i_K `,tFr c]i 0$ߗ '-t IU 'Y%yQ8
>ɬ_ lм_&Y&p MEܖcpүعLC,
+t ` .YذIU%G g ; |
2IUM pX pxB;I^ @QV(X p=0Y@
2+v : G;$
G `7Ё S8 b `M5Y ռϓ\: [un !Q8 W,T8
sl0 ؼOҝ˸ 0>oMsV: "رIU&t /=/ xy]L7Y ؈tSMKCpLa I2[ y]&9i' Cv
(K
W'y]: 6ə: 0lv `MsY:pMa wn y]'t *]tp{vb0 ~-]T y]O]l EӜ IU&t tSMm0 Fn^V 짛tSMKJ̤ (&ɺmoK vg^V 79+ <SC 7=+ (vLS( .TU ) T4v Mٺmh L; (mEQ:u
'&U2YL; &SM 0 `gL5R8T[5 wnɪt `v U@)Nq `&9[ L; 8SM`N`L; & f Fj#pe j |3N T8N T `i'I/ ` L5Q80 $97 ؆~Y G W7INM5Q8T4]ĭ 0cnA 4e >f4gC ۡp#O;9[5 a{n۳! 3$( tSM\S8'yU8
.]jr[: pu}nE }EӜl ܤV
0~Im0 p ]-l4 IU ŭ `~K7a wu2]u, [rh* -8 :Mrj qKrnA f^t/ `$97 IUU t+t f 2$q! tSMnKQ85iܪ &A k^G.T6 ݧ+8 (TYܪw79mt[ .3%Yaa ^Jrc3lf̀m30q% ?O<R D:ik{HhrY; 8 |u>XQ82nQpS$ ϺNr| p z&tj, h4_RֹzU }y C)Esg) O$EW5 @-I. 3; @O7ɥ9( xU 9A jE د)[M pѸiU
{?R&A bҶ') 8x?R&AP8^d4^ bqY; @_M4xv <Mf ãpظi :e[ /0i/)hmo˫lxMU
7)EA hҶ_\&Z m|N æpٸi ^>hv I ɼv0( 6nW5 s RJ lפmGIf $WөG@V) [1nj \l5Q4 ءI۞fO & IتqӌRM TvR4 L<e62 mWөG@( ;1nxU >b1 M d 8N)sMS8v+U
&A (&m{O ]Y `/Ms \=h[, 衮xr'$9W4jP8j4_U
%h 0 <R<Ih2 8^
'ލ:W 딢ɲv ^+\&\7 &@o( ( $[,nk &m{S$ ( pT7nQs>Ih2 S<^S4zK
E #x h ;' P}JdV; x U) p 읢 O `MQ8zO vN R<R4K :E ^L J<`pE$ I 7S<wNry5^
'`$xr x E fҶF /udY;( x #ɥ x 2L8D
'A7yʀC$ 7)M浃 py<
$9?+g uœ$ +GM fҶpSjࠍ,eɧI `/SN I2iF I)k'(f8\)M s&m%eGA 딢ɲvNOc+ 2e[ ¤mOS2 0TIfI.S3) Gi4'IJW >o& դmG(aR2
'7Yps( '7IfwŬv ؖIz@]']MA Fӝ2N)k ]Y<
VgsfWnR8s; C˔ɲr ثE اɬv!P8v س㷻g, Pƹ$ +p=$m& pݹms6 ;s䟺I 8 ?R6~N=xW7eͧY 4gs ') x6˫vS8xn{ MJdV; ' m& ;p9O)r m& ] IfIf u[Oλπ3w3 c {&Y N`GM%eqy|=sXx= t[Ol=X9 w6e( C`Mcp nRJ&A I۞f?U MƳt^9 QR8أEJ {|=sX,F fҶ_R'+G JMs2k :ɷ[ 908?R |s2?N z`4)Ck G˔a 혴(;6}ɜK%~R8qx]/N ii!m0 @OfR>9 >=d]21 #5i/)vkU2v5:_ 0
' |s` xB`L ( lM& ( Q8076 å|WJ& L@lOΒ|L R>xdp$N иiN pŐ8>$s% `&m{Ku }%y, 7fĐ8T% YDϏK&
' Gf4Yo?1 nzfvXl 6iQJVZ`'Lu P sz7,+g xIۮf2N }ltl1 N x4n' }lSJ& 鶟2kfS9 ~r}^ 8p* 8FOa[O bK) "9z
m F,;":Y<R8M;S,`=6l1 xIn> :
w?R ̯o p N
Vgrwżr PV'xe$OI6db, [pN( x9R21 I۞dVPl@÷*S
&˚a 8
' FŠ @r4ɇyXan`@%
' T1nӬ'I>V
My( ԤmGy0\o5YL<: za4'Y9κmAO7H)֍ 699NU o( [O5|5s{X, `-(je`wa`(N S<ϰo% <gҶ2~7f0)s Kzq3J^"赛$ˬ%i 2-@\AS8 $O_܌
![\ Lv59KɌb.aO, GDmCòZL7ظ[,~V 6 +FZ=Mj: 5) @UDYi bnX 7iQ@i jX3% qӜi e) ?Rl 4l, M,(
m%MN$R8w7iC8vudӶ x1'zس̓ ءg
);Ňjru5Hab1 F!\06$e7
' PF)eULIփī b,/d8{ 2iۿelݿcd$Q&Q87#YMByE Z<V yRNI=ٌٜ|_^uY Ynϫ6 ( {< 9}xͳ3 `$nXn9 _mߒ6yϣ_ 2$ Q$NTh"l IENDB` | PNG
IHDR \1 pHYs .# .#x?v IDATxMR w5cGaW W zRS;Y+py&g9BӜVp
^X B~<OD{&S] PI AzlQ >g_$||q -I
$y(|vjgҖR)
N AH2 DͧK)yX]\7 &I 襏$GIS$)q92mA{YM R8 vj<̺.3ﺯ_- s
' TM}Drн /(%*XH R8 ٣ub۰-p: ( P 7RA"}B }tr2ʵe . Ify( tNrr/n
f QP8 KfyX.Q.aWQQ. Q8 z`2K[0+} (k(E @O) Htqfy8d 5uP N `>Cdq`W>.MD c
' 0]d\#xiWPE ) @O)ཋ FJ zQ8 |X@. ~ b&}:
( 숂 8 @) TM9( Osg/.
g ( UM}_.%9,wyX?, iS8 P5Q VLML; p OНɹ_19NW4@ ;p _ѭ w/gr{E0 |Ċ 0"y8s p I>Êi r. S8 `dlJr R5}ĩ ./a ? Fj<L^0' | d1' | duWIΓ\,Q (M A$J& | 0q
' NK&I
i\,狛a
j$'iK&ʦ3ޤ-\ v) [US-$9,M{r|9_\ ( ;ɜ$/
G]| H( US $9M[4+myx ) PLw28m ?s/F {( sUS - ǚ ]%9Kr p( L $iWO.K N تҖLNboc N ؊OҖLMY= ) 6;sfl F @( ê>J[4yY: w<u( ӥp ws6&9_ L Ol =>sv vC oR5AU jYڢ9 ۴œu cp 'UM}ta( #OK j%$ʦzs;7 m4^0 ]IΒ/Y K `º*˲I 7IV' Op 0AUS.( @6u Cp 0!]dy$ K.K ; 8iM [KxrQ: @_) X'iMM >y }p 0B& Q' Q8 E * ( N) p 0`& P 0Y
' h x L ( @]%9]A M ` M `Pޥ]<Y -
' =h x @) I[<. `SN zjY( Ir/nJ Q
' =MVIM lm$g' ) h uvt p P@i&/&
{d9_K x
R4 >]œA TM4ɯ &mt /Q8 آGE${ p,ə W
' [R5I9& }ڵA >p aUSϒG ،wi' S8 ؐ?/ *ʙ N ~PiO, ۴A iS8 NUS'9^{ rκt `N C'i( %I[<qf ) 'zhrX8
=gv S8 US $Y%yY6 g]%9Y p US `' [p $& x۴k' p |Y wi'ץ s }ҝϹ 0ϓ\vq 6 @{>,a( rvt `N Iz?*ɲp ]M p) U5q${ k'A aR8 &jꃴs^ P ( R5i:VM ZiN.J C n<I zm≵ ~. `ۺU( |ɋ$US `>JjrX8
X; 0JUSe a " ' TM}v x `4>Mre MzjY @X8 Ϫ TIVN `Ъ>N[6+ `*,A rN Az?mE( SrX p NԳege Lk'ץ s OQ5Y?l ϓ\VM}R: [N A(a( |۴k'7 g ( ًk'A p ViWM^ /VC ۣp RwB"ɳY .Ҟع. <'u ީ4_Q6 iO l 7 j9_ l N Uc'v ` sB ` 't &ˉ 8 't &ω 0'u $:& S SUS'ydp KGg O US =sX8
td/nJ uUSϒ\F ;Lrݽw zN تO't $v! sR ؊%yY: 6ɉ; O
' UM}"N cҖN.K > QUSϒ\F wd]5q N 4ɟIJg `4Q5t : FTM}e ۴'vnJ S8 ~HIqB ݸJ[:, I UM}:& auǥ ) ߥjꓴ&{e 0A{It *'u 'z9 ɛ|qR: L $US'yY: <rd/nJ P8 IiO rtrY: Lϥ W5Q( _{IUS Sp |QԳ&& KjA `N > gڿ j! `~+ 衪WI~- ~Ur) 7ݧAM $목J p WIib 6e 0N $IQ6 `U5I 0
' @( 0n>- @ &jYeI `'~t Jg
&_ Mr/nJ !R8 /
J2S: sR &W6 `>* LLW6yY: mڥA `(N `"Ory, CIźt 'u `:& 9{It ҖM& Axt _p #V5Q( St 賟Jg +N Of9_ }d FH 6eC @ Y8 Ϳ. F]|qS: lU P6 :Lzt e ( UM} e ؕ$US %twwW: 9 `n̖e P (e (j/y K' L p l t $) ( @/) 09?ݕ |EIl }vd/.K mS8 &$ _t $8 =l p =l t ) @) ) 0j
' 3& 0J' p =l t ( @G J QQ8 <ɋ9 R: `4N lt `'N (H &I t $e $t x* ' P A N `ǔM Gt ) UM ! G vj$ au N `9 ^;Np @) ) OR !t Q: 08oI 9
' %US W8
0Ly )N ( ; c 6L ذ/狋! 1 ؠӖM G 6l9_\
Q6 d/ɺ[S ^P8 YG ؎$] S8
<& v=Ktt @q
' 9 I8LrQ: ( $& n= P |lt `^VM* t U: 0yy L <QW6Y'+ I/.K `ZN Or e ?n̔N إK &( vB y! >Yڂ< |ϓ( ] `N +>It ojU Owww3 @oUM}9 r8/ R8 Ϩ(
Q 6l9_\ 8) 'TM:& p&9X7 0>? }ӕMQ6 m/ɺ 6J ,a pg ( xjUs l˪OK `\~+ zj$K ؒ/狋! HR5Qu ctd/.K `N \&yV: ]-ܔ \: :& 4 &9/ S8 `Ҫ>O SjU : LV'I^ PȿE T5QJ (6l9_\ ( 09US'NW8
@iWiK'7 0,? l $IK `xN * USJ `X `2>It e9_K `N &9Zץ N 0zUS' J )8Ot 8t O QzE t `+%t M2[ O
' RI ҖNnJ Q: lEM $~ f/9Lrp z S5*ɯs 0Ӯf[?u~Gt]G~{}m6 $y/K _N gI,{2r{r.kc?BQ,nӞB p hth <5"&UM}OQ J[:) ~G AQ6RB:ɍO_|ssݣ2$gIN
', 0
USZ: [q_,Yad]. 2 eqz/K < s .\FdswGd& ~m: &N A d]&yV: O.je P5A (XC|qT: e) 0hUS_$yQ: _u%>>QBor8- rN O^: sXNvU5Y,ͿE p u1%i &K؊ne襀Pm|qS: p TMa( S`B/( »|1+ S8 `p>K,`b\ĉ z YE LY R5q?J t$},q lۿ L ѝҹNW8
Xݯ\x`<Z?9| pd
0 ( <& 6r gJTIκqrz`3 X8 `>M{ #pLNʁ( l/b]: ۧp @UM}M m
&@_) lmV sR ! x%f$' m/9 2 ' Zԫ$0 o\lTv$a0 j9_ ( [US %tJʠdս?9^ >6r. P8 u|sާ]29 ʨ~ O{/fC
' RgIs ۴K& IzV2 @g9_ ) ;USϒY:@Or's1zpi R8 WS:`$yd. x' pZ `N t >yڢu(&TM}xl~[! z) `ޥ-lGGi,-! z) `$9{sڽ
إ|qT: p @/8LmEars;( H( PS:Or6X~hy$ ;|q]: ?F &]ڢɺtߺIe lջ|1+ p @QN #6ٜu TM}vD,狳! ~
' 0bo.\ 0bI_ . :N hlEW<9IrdhqZ `N (jU_K E`'O[:Q<i R8 `窦>JW hx m|qS: O ~ PT`vU5yUE|?# Y8 `>M{ I襪x ۿE |; v{rl C.md]:tΒ( '9rZ `8 `l 0(qԳ'Kxgio 7p NTM}9 EA ~D ,\!r, S8 `몦O{Jǃn-U T5Ip/J ~. IXE*Ɂ 0FbA&ê ' lUGI* %9Yץ BiN^9I? 蝗 M֥ R jYa@ q | At&9s:սg[} '( [Q5~xp˛$t>, Gx}: : lYMJ[4YGӪӞDtfg IDATIW ' l\Գ$s 3;@s9_\ ~. Q:+ ۴A f9_%9H ; ' lTiK &}9 A^w@) _N ؘ\:PNd/nJ}i_Kg&}: z 0*gQ6xd9_Kjꋴk'e,mmU8 ' lD7g $/VC LIԫX;v6u $? hJ &*ɿM v$
Ge/& =` V5Iץs b'?q"+8 P ~H 3`w r8K2K=`K ?jU_K &ZC y; @!
' |_ Orb6 `>J>pX8
0nIM S ?§ɀm{H`8e;U(%Y 0eN .USϒY:0ZiWM.Ju/>؆.! ˺ -Ү( \Puv
`K * ' <Y'I^obU: W5iNM F ݳp TM wͻM`U: ۱/Β̒\N N x$J FmJ|qtp`\%N vI Ynr 3; = >fܦ-1ߔ 0N x
MM/eZqb 숅 IIt`%9S %yY: 0xVN v 0 rX@tO^'y]80l{i l's L jY?K 6r( (:8?t t aU: 0hWIf& |rLr:+ `
, EUS 't`ަ]6) a,ɲt`~Y! _am9_ + =iWiϲ<ժt p gUM}u ܦ]5qB V5QuQr EN U O2S6`Se$W s^: ) IUS<+$G݃A ؘ<,ɛQay-w N 7US'r۽Y'C 0~]19x/J # ' |iMo e ve9_Jr[8
0 VN D t&s pr8+ iYiO( bU: ) 1&M2 -$GIJgzYw
t z[7 eWIu н]'9, $t p cMJlr]: $rYGIޔ^ ( ' $n|7t ϓ,-+' d {M/Q6?^
p uk/J oU5Iץs d `C, X7> C/Γ;eǬ l n| RGI^
p ucI~Q6`eY, r N &̺ If: K''X9 AN ͺ vp? ' e ^'9, +' ? tY7 =T вr , Lue`2, X9 NN ɺ ( 0QNG 0D
' tR: P t<* `N &j$J R6( Y 'P8 U @Q& Y 04
' b&O >A 'S8 bM N IN &jY9"nl _tw 7P8 U @& J'0y ⧻ ز_ ݗM.K(:^({h p 0
S6 :Kg*0- nl b&t >p 0~' ;wl hU }g `ĪOr Ƅ)y/K $9Mr/nJ + ' v ee ؒWs ;t >S8 U l Y[ Μ gN TI(؉7tyjo} }]&lM}3-eUS'yY:V >C `^'y^:u&}1qAd}OrX ֗^w$Yw_/YT5Es [w/>W 4 (_s [wd/<H?^ $9H[$y\0[dS.ߩj4_źt Q8 !0 & Lbc.\FYW:Lt`.! F `ds [ulrY:MZrQr}
(('u^c|q]: @( Lԫ$l <?^avOW>Iׯ}/$USϒY:Ur8- ON Fjxcj9_t8ݦ-UM}u &9p g|uc|rV
^P+(x"`4{%x0ȅӬ4V0
ZATC%#Dq_?zq ZeG9JyWa`_Pnmf |XEě5 | `@&Ch۬IrUD\p?_sO'x+wCvЊ' ]ap 0bCSh\E S8}0}T&; +; y c<2+eL^pF?qVLjX T|щS`x F ' {r h|iS!p
R~ *2>ap4"fG d38 T]v cw]?#o#MU;e = x5U.;1+eL\1~x<f!*"dw ' l' =7_/^EĿ;zTuvcVe<]s skO4<yw\f^] qT*; e p4°| GvW漍+shE<fVCDSO胦 UD܇Ix `p c%5 ŧxT6;
o}8ӈWvpRi `_v G69 ˕ ]6+e2+]< alB7Y)Rc4Udw 'dB `Ԝp c>Co#J*?$|vnwSDL7 % " ITUvĈx[y 76;>|PW +; 9!"#gR.ou1~{ofO'l{ ""~Wa<C6"V p C"q /MUgGC !N<d@D|x?fw ';= 0J/; \ a4f\J!uDkVfV4;~?ew 'R `\ O~)h<<q ]p
3軫 z1 ~a| Mw OH5_/^EĿ;W J qT/ߕ *Wjw߲;]g N zf^lÑgs6+:"ޅ <x:d ¸!84U͎ 8' |
c&ӬY)ۈX <כY)vWP\Għ( dp /W>
s&R^JD?PDvV 9u{+@]g +u zb^\Few kSw 4wtBp:q}\nCz.O@?}T&; p vж) 066J2Ina~ ;]g @8 cDdG0\RR#Lj!"gd0xt ?WJ ϕ: =0_/& AT}v H Z5_/ӘT*; mN8 06
R9kv5U.">dw 8 ~ eVdV&" "b]u^N* 4
Z?>'6+mDGw."b9+e3+e4U
) fp }oݸJST é&u#~7h."~ o 0x' (MUˎ`jt?:W@؝X
0X' 6_/'$ji'!_SՏ;uv @ N &/7MUo#Y)WTXJr CZzɿA
zq<Ǧ v?F7-@+>ErvF؆ӯOoz ' t7_Y)Tcw!j ^ bp ]' h>;~6" /[hfJdOMU"Cvlm +u :u:+MUO#:!9)"o˻g^Ld,W@?j 8 q @|q ED; mD$g tQdG/R:/\A~ ;go| ` N :fw7ޡ>EcV嬔UD,[yR!uv ,
mSՏMDI
""5+Řgk>" > 08' !t߇WìWq O' |ˏRVR.C荛x:y
6 C\seVuD;N. x7ٝjwuvM [<|?5+e^F$SMUEć n S< [_5+rV]<P p$ pݱf\F&|.;nkz ku A18 >4Uʎv^l SkvWuyf @w@d]RtEn 0pofNSٝv) ϟ?g7 : }StӬXfw 1"˥kCb;KS r @7L+M$/#b Mv 𧮳 N mv3+] y."bct iz;f @7@7=DĻgV*"`~ . ڀy9_/& 28 H6_/{n~̎[vc7 ;_ g38 7 ǦWt aKp t {' <dnz @ =`t¯Nj|̎ 8 @z*"^dw Mval ;!C^@ z 4; C7t CF'uv 08 u {3cnjNw 8 5 $_fw s @7 `tn߹] K' ymvM1:!"r [' yd ~v [' y<Tnq &:;_yr w N h ~&;\Rކ 0lY)#Hw R ^28 atMFn g1:7@'M ap &;<R"bp&at>5 C n 8dv?; ""f\f)'9/vW 9&; &~xt҉xd 2 ؗ MpH~`] 0n/#.; N9Ιf df7x=+e A ?~ ؗ d~DMFkê /Jy 9e^L ap p^ ?n8Y)7&~r A ? 08 8iv ?9d|f\E߳; :ݬW;ч "<3 z ༦@DDv?; :""6R.C8 ""^g Lvw1_dw Mv.|<EDl#8w#@ LpEċ y9+e 0 x. f T]v3+& Mp7R#8w ? N &;r 嬔WMv ' gfOt
#0+e
Ar y4UL@" 08 8iv ~̎l"";` ^ؼ <C <.bVʻx0 gdGp6'o ' fmv훕rMv }V4;N{# ' -s2t*;J[nVevgHY ' f}lz Y"";`.°o 0r } A.op890+mvgf | @0b^eGЮY)" #}#6 Wzȴ]R.#.`V |dG vM`H2|7";`^JwvV0r ?cp .GCMUo#hϬiD4 #>w;`<S : ] Uv ] Vdk #6 3' -Uv ]">"!Fev 18 h4; Fl @{\9Uv |f7 | @{ܵ yeW tum # Y' fH}lz AknU: ]j}#5 r@JyfY0`| ep Ђz5 i @k"SvЋz2 N ap97U Jy/; lf ˰rx t @;< ~Y)qJdGЊUv 4; jaz <E<}v30MUo"!F3 N :; FdfL#Mv {agp t *;VxC Vf8 N ώf ŬNmD| 28 8=8?o̬ˈ how *; Fȳ s N NC 8 N&".# 8E^p~5 cp pz`d>vg fL"I t>@Iv o |*; V*; F- @ $; Fȑ2+eo; 8xw08z1n i9u:s @kn8 @
N18 8iv *;ٽpz=+:;Ze bp pZ G˻ Zw I.ep t iqx@^8d8\g7 iv*; ln{#A IDAT8)h bp p:dp7ݝ0 N98z ' 3yh>; n8wIv N N[Fp>ޤ SNe # ' pd &; g 3 q#Mvs 9d 68d 4n Mv 'Sv &;J 8dH60SV =p>N8 ::;
K/ @' 4; FcSՏ gV$n/^NǚFCv ' 10d 9o8 <
t i#FN7y@Am`$ ' GOMUgGp :)'p ' ǛdH8d\J#j5U ;`^f D $; Fb qf\GEv uW H`^ N 7dp4 -7 m #*; x*=4U͎pR^R Mv$; x~@9ns]gp0 # Gyl8ܬˈ 7v_ # t' c Q"";^( # t' Ǚf|l1;N}o0N8 g #pR^E zo= s 8 Mv G ro za 28 8;оMv G 8ku} Ю#Y)Ws]O / N 4_/
0ތ7?p T6">ew9 Hep p8v} 3+2"dw {?O 8' N o n_Nv N 7;~ oJm`& n 0~ `0\_N8v pԁvCMU?FCv |d7 ep p Mv oKC& x `^L`8C%/]>4' @} Nx O 8 i N 3&l1L86; h E'5 `{mD|f ep piv IJ bV4;n dp t %i 9够|L 28 8 #8 h4;@{^d ep t $zhV$<}/wsmv |n `Ob gpON7\짩Mv ܫ ` N 18iv 1 i o gpO?d 0Nmv N ' @4Un`?R
Ŭ?Q12; ' y
A 4;m` N ' ڳ Fg ޜpb `'Оmv y L6; 8- dY) FbV7{mv C %m h>f@]d dp z66 `Z2_/\ ~<x㵟^g 0Z ~ N=xY) j= qڳ`o F~q}"! pv' Cm M؋N=N| `? @{6lHSN8 18 ؏ o Fyf cp t7^eV4 "Ŭ6; 8
x
Q@W/ Iv 0>' q}&= ߤ~f@ 6 ~ ' ؙd% 8+ g.A6 ]b/N8\f bp | Mv {d fLxp ap p@L :` bp@/ 險f7w5 = 8+ f t
'6; g! pV' @6GȬoME gp >5 @`/0P `\ N l~pIv Y)Fq e| 2 p Iv |NZ2_/&
x <4; & N8鉦]d ap ddIv |$; `L N Nj Iv { 5 g ) N l Uv 1; 8 mv gw d 4.` x < d m sf 18 2}`/ iv X \ `0 `\ gT}v p `(& cap s od u Cv |n t @mv 08 xz1nz [ gbp 08 `/' |Ӭ gp s\f ap 0 Y 008 `/' a p' c t t\n 08 4; 8 {18 `/' @iv 38 >f 7| 1; Mv 0' d gp @W N xMv |}v X & <f Ev i& N xMv |6; @ C T& f tcv 0 Uv p ghz C5_/
<ry ߰. p\nx6 9 !; Sv {q 0~x 6`/ `0P `< N !d } Mv 0 <cv ԫ d<2 8 =r\g7 WE1g z 2ch6; 7\g a / <&; ";y f |pzl 7!w?hcv 0 ' @x˵_@l 018 `_ b56|d7 ap | 0'r d ap tev {f n I?C| gcp t$;m `g ^&0dMU; 8 fM؛ t&;8 f7R N
肗vFħ ޘq1; xx- Alv#H&Ю `\ N
` = +&m m؋ K2 Y g 6`o* E2 s\>F Fm ^^g cp mv $;x, wGz`^N3 8+ l`O F_&0>28 ؏=2;m Mv {1. 18 CSv!gnmD<dw 0J { K2 Y ]2 Fa7z? Ne^ ` `& d lۋ N .fpMv 4F5 o 6`+
>fw 0*wu:оmv 0>' @8j6 1;L 38 &; ̑Ms e ޜp `ަvMrO c 8; =5U!h$;m O#=1_/&
0' !; l q@6u:p ^ 0 0?J&; 3n ` N !hυvF N<< 0 Iv [e 0X o61h# pv' k y@[V ev Cv 0N' 18v9z\@{f^L`$ 8 `wT0~ q7j_&0 R )'Оb V *;L`$< R hSNzʵ: Y4 cp p8hI $; Fb 0p Mt Ne ^d 18 8PS՛ ε: *;iv @ 1Z4_/\o 轟nr 80p Z oIy| 8'.?T ֧r | 38 8 k Ѽ
7Wyl 28 8BS՛b n˻x e u' 7h zr4~sB
&; / m` m @8ݤV);F1; / y586"~ 7>1zLjk3 60p/$; 荻Tx! Mfp." ; HS1< Hep pQ~DvM8 ? - nK?LSo#/tډt Юiv ' Vi'(Sj 6; 7 08vs\>ӛ G nUvjUSW4>q f e &" wdx @'81_/^vW: z1; > {2"/ݛܬM _iXbOi Tw
9 ~"l DĿ# ;c~M|qe
Cv N Nd^E 0p~xflH_r͎_ PMUO# qs ܇ *x˕^ev C|y̩d &" 74nլp Ljgl N N>; F|4U$n)' cvdG0<_\/Wn ϟ c^<FEv ߚ~ iJن | {2IG蕦n p iGiD *\G0VN7!ļPtCv @ m| NG 1 UUmv @ gH\ v|.r06N7Ӛ߽0@s6 ' fp1
!q d>2@Nܶ }9 `PcNgVۈ1p\N#4~9 }T&; &<`skSwάmD uN3@MMU J 6lE808XfG Ъ&MD|_'ӈxS@| m"0WrrN9pnMU?P. m ~fp pz0ʵ:6" @+.+3z_\/[Q 3sv mxHNkV&\M0Ds\n#$~}[wW6 s @;CA8 MD+;4U?~ ' @g8 &"#W Ϭ!1;`^_P.s8' ?s @;6apr'6 N Nx:]8 vxZ].R{ C!UD+5 J m[Υ4Uʎf\F6 kw
0fb~bo7UɎ N s 'p.W]. gev @_
( Sp Вz6"~寧 #8Y)28k^\/ieMUO# x:v38o#_ fVri
l3@6 C^e8 q\n"}v Ǧ~Tk<}{ȭ= sp Ю08US x";]G*8 2_"l6 ϟ k^"MvȼcVۈ1|;
i r @602v|O'G?75UmzTuSՓKD-"~q[gڦ͞Ȏ@HG`yp#A;,Pu-6"0OETCFYVۖ%J ߃RThrW7, ny|WGS ٤iΫ#jGv4lGh,( ^ W$G p@vg4I òN#:4OHrV[Wv4 = 4xjkGӛvc4- YvUu<o ^28 رj1Kv4UG;g~ >&9]vmu? P^$y^ w z ]T[ˮ['yS i3tݎv4=MdCmYuu p cYW;yZ&Qq
s+'7!'?: <jqosO};WG[y Ͳ'Phr* K' O`Z\%yYohzS nMm; x/·V uҎ?T7 | 818
$vo O <|( 6CͯO(/6V|_ W\8 x4VwKrҎ!֤iΓZ캷m_0@yݎ 18 x" ?:ݛ4eG캓nnGS< : 8 5.x2$ # xI̪#ӎhzَ/$?&y~Mu _q WYW p|3@Lf .ɲ<|8.U4l0 ӹɁXvuTw (GyRhnGY;'I~N2]Ի{ o ϒ8`oGSW IDATï1iu
7۲n# dzwhb l 8hz;_->d7|EquOE ?* ][^kG$o72_-N-x =N |LVw[;TG4&Ms e# ( n- Ԛŕi^'yUWLrZ =6#ͯ(/_]K . <_2]y{X&MNrVWk]wU +4<:ɥ 08 xb&y6tV ә4ͳ$7o wIN]g
cS pp.ų/?c(6 XWw Վ\TG N uu 8 b e]'Gu _դiN# < NѲ. ͪ < '֎yx s4_-H:r4 9 Ѳn`_̪ s' 5@]99LN 迳Iӌ# # oM e]'i; * @;^s e]%y] OfV 38 A[v,ɛ b4Ϫ# : ÕYuu]7Nt: 08 bZa; @߽4iu N u ÷/#$/ } @O ZW Ɂ[vM . ٤iΫ# 08 ͕ Uu ' y5_-N# is @v4N/ -*ISg&M)< B' y9_-N#gtk (fp Po] eu `tk&MsR p N ꭫?8 @ 18 (֎7I>Tw pU @ O9 8D' xZ#r @??u9_-UG F' |4 Ccp hSGIf @/&Mc$
N ]u jqR A q Cbp ೮ 4Iu 08 @Wfts < ~n `cZ 8? mu3i<\:*N 뮫# ΅ ~q8Eu`<$ j]V ~18~{5_-N#4ɇw6iO @:]u𗮪eC +'og·e.<ɛv<iYu |xV A-n b4~^ @/:J2]wx.
;}u 3_-& t] AM4U) oˮ N ɳ: .ˮNr]q
! " ~28|Z̪#ˮ]v$[ ٤iΫ# 6|8`,n$w) U2 -38 /WN`\U_]6i- i Cbp _'?<ã-fuI- r4Ϫ# <{|8`,"x
GI.# \9,'vW ŤiN# |x
:|;I^W QYu p_ _oT<:5i$WI Տˮ[WG 3N ϕ?We]'9O2/NYu 38 ??-vuI~L``&M3 g' =IUw jZWG6O>ƵmU 3 pU |j:ɵ'P0ǓUG
6Quhot\ l> .ɲnC ' mu M^W ˲fyxf}q
;JrY \8 4Vw .i;T0<yK[ ߖ]wS O\8 hzcuM\UG0Lˮ{k'0n ~ |UG0Lˮ䙝79 l4 `\U |8`]wq /7W aZUw .I;V0|y2qu Dz.# ' : .GIVGp]vu'I$ s l4Ϫ# iGӫ<\H |UGp8]w! (Eu >08 O#{5_-Ϋ#8,ˮ%9 _y5i 38 Oޕax;_-I-wO ?o |
|jqyuyum4$$ǵ% } Kj3]w캓$M9 }1 3N $G)vo# I&Ms"O) ՚e]UG WI^Vw [q MC79d G0}Lr ~ Q"e,"I< < N |Nؚwh:>g8ɋz $' 7N +'0,?WYu|βˮp ş =y~&eCs;1i<<9"O ߗ]w] ' 0_-. V%9oGS lW&M"O C~u }ap 0 $ɿ; MoC[ \ `WI~ C;VG2>N# ` ŋ$Tw ; M-9'ǵ5 e]VG T38 jq P M}L$Ó쇻$'ˮ p N dZ\$gu3M;^UG.}r<ϛ/: WgIn q MC)LY '2@oˮ bp 002I[]v4? [v *' 3_-Nةytr[ &MsoP N hZMSuS :OF( ]1 p N hZ'ع7h:}s<INblO캫 fp 0Pb
!0:4i$
R>YKr:O `8IW< M#`>$<J\I ^vݬ: ) |Ir\< (6iggr?p%9]vMu S18 jq MVG nt8`G,n\ T N lZ<KrߨCq MC O
яˮ[WG < `w6eudiuyO|(NoV T N e&9e"`8&M: ) ɛI6:yV |fti o Yu N`lיWw [u<iYu v4+'p,ց4 Yu Pzn'8`X p_ $g @I:sIr\lߖ]wS . Yu PƥYu uW qK'cYi ] 6N Ϭ: ( ۬: غ ]08 80hN(et=4 i fp pf@9qu u3 at=캛$o;:JrQ M' kV E`^M: `[ N +''Ng]w䲺غYu Yu ϓW.| iΫ# rQ .@l̪;U l WNG]wWN`h&M3 ^' ΕO6:yQ $I&M: { rQ_Ÿ:ݲ19NrQ = N p+ ax.\9 U W8dˮNت$ $ _͒UG [r4 Oͪ^{9_-(캛 C5 N 7WNpd=_-NC@]ƕIӜWG < 7 zyj xbˮd0DW ep iGӛ$o;;å!ph]wcuUǓ x ̬: GI~> l4Ϫ# HWpH]6`bL >g:/zZf6<Yu u&MsR 5 N S+' ^9Kr=_-NC,n ` ' ˸r<q|xQ bV lO9 > Mo %eZ̪C`]wd^l? }u =7_-np %olLY<h]wU 9. 5f)OVP-E2fP K' |Q;^%PyZv,`\TG | __v(/؝Yu u9 3?W7 ':Yu'yю!04Yj7ˮWG ' <+'6%!0@ `^N: N jhzMu0GI~epEO cp c͒UG jZųqu ugyQ ) Movybhu7q ȟ ^18 [\ƕ`<u?ah'M3
j1NUw >xsQ F_Uw [udu! . M*ɇ`Β\W!.| (ɬ: 18 \T ujq5_-U>\@Uw [N: o֎$;A{k'!]wWN` N ^ vjqY {j\ l٤iΫ# fp wiGӛ$;WjqZ du$;3 J
I#<WYu`xOf\ j1NUw Cq;^W>4U V%9Yvmu px\8 `+* <Nqfq (. E N &
Tx5_-iuٲn 0,&MsR MIUw ɵ:qhV jq:*|L2ތߙ48IWlݏˮ[WG Å Mo\?P8ɯrZ<YvU Y̪ bp ֵ,>InŸ:z: غ# 'ap 胣$|Xo,m ͪ ap N>9Kj1۬: غI̪# `p . ~Uj:-nMuu1 v iGӛ$; ~8/ف$ % ]L:Oxf캛4iu 0l' T;:@Jr3_-!P2]uu ;}u `ZMSuO2kGuu<I\$guu?.n] ' <4gI~W:ʲ<tU O Mo̊3 $j:Eu uǛ F [I |Neuڤiy ]eV O7,}sfZ U [w p '7_-. }v4]4U oˮ Å *̒| FgIwZ\WYu ʅ Jl;v4m4kd0L?.n] ' hGӷIUw |$\Wqq l,*`X\9 J0 $|XW^ˮaOf\ 'u (5_-.`$Mu|IaP $a 7s Rhz}u3;j:ì: غ$ 38 0<GI^ax:Ųb
Ct1i ` PnĬ8`W2_-:: غ
| I2_-IΪ; vMv45iI~ e# }-yLr3_-3}0L `p @WYW Ocq;CK&Ms e ' J;Β| x"I~oIu |,]uu ~28 O$b6_-UYvm|0
Ct<iYu < @/W$ (1E;zހ^4M qd3, *. Khz}u@$WgvYu uGq x$N y pC5O2kGS:7&Msyuu[vMu \8 &E
&Eu W p ޛ$g =>E;^Wie# s }0NrW gIwZ\Wg1 qu W ~08 6O댋3 gv<kBe$ySli @yR 1_-&g>ᙝuug4ϒ$9*N.ɲnC r }2N:g'uZ\yf0غ$h ю缌gvqPW9 y2uu@O %|1 ͕Yu. }u <|3 |ޛ$ QSe# q }5NrW s) Ӭ: 'N [b pd] pMf䬺غfuW @ $?Uw 39I `>&9]v yR }7_u~{fgV ,&&`X, w\8 `W$[>&{fm\9NrT[l]WN ߸p kG$; q_jqR 0l\Vw [w O 0h:K`O3;le ! r4 @? 0$/-ou|1͓ Nr $I~n |Hku Krю7!I&`X~^v ' J;
`'\9 \8 `:Yu@|L2ތQ&M0DXv 0N I# 8ɯ|8a\T ;14ͳ ԎIΫ; $jCFʲ뮓 (ɬ: cp `uTw Ы$Eu{c`IӜTG 5 N v4L`2_-֞K]w䲺؉ `Cu@ᙝKql4 38 `6 rN3;|βn\Tw ; B;^犁( IDATat %9]wcuu'M3 M&Ww ؇v4-wd\ i< ҎIWw Reg1 Q bp !zM;#>az5i i pp6$o;U O Ԏ(\n|4yu {' v4J2 s tV YvM`'f p"ɻ=6`]ƕIӌ# 28 K?TG wh`-6.!Pͪ 28 ൣm F'a
\TG]wcuuǓUG cp I:ɋ=rَ7 ŤiUG ap g!= Mg Dz&y_lQ `7 N hzMu@ύYu /'MsZ l N; wPUˮ[ʕ s$ # z.Eu6 vl4 v hG$yphzS p-&`' 28 0:/ tV A0DǓq% B;^y C70,6ցMYu ' h6ISP];#8 ˮLغ$ @ WhGӫ$o;
Ň;W9 |v4 8<v4,m N\V a3:PD>4 vIӜWG <F'a ]b0T N 6]zӎ+'0T'M3 |` =캛$;MYu m N u F' CsA_\8 N ;lF'MuoGӫԲni IӜTG gp i 0iN/-2`bP { `3:Ww |rլ: ؉9 M/ F |znuWIWw ;qY < lQ; hz[ _aV ٤i^TG _ oCu#oGӷ5]q' +' G N `6ctqu <Eu ǓUG _ v`3:'+NhzS 캛$`'.&M: 2 ؑv4å>:,~ 7 s' CɋWZvm`'IӜTG v MIye͒| v z @;^菻np̪i4 ٌNTw $mulò뮒 v 1 xBh: PC; U ;|4 یN|rQ ۶uw N\NYu G' PE:vĘ
(~ @/ @v4Mr ų# زn̫;4Iu N ft2Ç v ,~ h z
u .p إhzU $ N4yu ' P \TSYv,`'f @lF'Mu0H7C2 vl4/# ' .Nmϋp]w}u~ @O @lF'`0.:̪84ͬ: H~n ~gZ\%yYwhڤi&غ$'ˮ3 B. @8ɻ`o% ( r' _$ #tَ7Pmu7T IӜTG !38 jG$1: c;Ϊ#Gfy Uu 2 E|P|qu ɲn
IӜWG 28 <q :z2`' v4s\TG@ m̪;x>iqu " ISl ']wCuyV H;^hI2W`7 <9 3W]N؉IӜTG !18 =Ԏ$o;^oθ: ؉$ 8$' t 8tw<ʲn' IӜWG 08 vCuPf.0gV !zߎo#` -6eugWG !08 =7ᰌ`]&X Ĭ: hzS lsdVif 0t' 0hz0| )؊e]ųt0TyV Cfp 1_-N vnjlEu Gq v wh!Yv:`'IӜTG P Wq`ʸ: ؙ * sY\7Cpَ70DˮI؉IӜWG z`>:"1 08 =6_-N yJvlu4 Iӌ# `h N `` M;#@\&X iUG ٻ6|w8s]]+{©U QgaVq+ ky;G'PO 0:}:opbʬ=ܬΒ< zu?dQ(>S An >r:Nrp:ʹm< ]uV 8 "&0tMS`# x0' giyu;Ⱥ뮒 zbڶ ?@: ע: r:Kջx]weuЋgӶ}^ r:M'@:腟 + X$9 zz> ]waLvQ r:M2 zu:8|ڶ N `?xb>VG IΫ;^ e{ ?W7 bY%;^Of'7m$O;^
- 38 vr:MU : 荟 n[d{70\?'ϭ*Lv\ vr:M2 zu&>9 z L' |
÷Of#O$/;^<Yu A,ɳWo擙aEóqu 18N7CjC뮻i' v"QuЫ|2 ErCu>mۓ ' CiyuЫleZw8(> nqD? |2{_ |u]&yWŴmO# ` XnVgIUw z=.#sV fu _j!8 κ뮒 zlڶ e' w:xp@o. ` @fud^]b$/;^<Q ' PChd:"]uЋŴm# ` @f<ɳW?'W@]wR: YnVp
. RSN`Iu sIuЫdv[ ouﳽZEu 욿
ppIWw z3N#5mPcuW +: eu ;Wa:O$g^v{뷮~> `8 rz `^'ƴmӮ:3mGIG$y\]} ' q <fu䢺]nn8|4$9uõI =jx_/m/(:ۑ*) xp hY-f |23,7m$/;^|Eu_oڶ #IUCr < x$$ɿ;^OfmOs .ɺIߏOˠd|=U. \'y t sY U:@duӶ.N6!:j ;⣓JNcT_{rW_ڞ2F]wu p <f<ɿ;^-瓙O? 40<w-hXa\>cpUU~窰 @ϖM0|'3G2m$Ww xquPMv_J Kuoi(I : rH2 zd:MӶ~`xdѩ%rrpe4 zܬNT|2WG kڶփz}q'\ 18 -7$Ϫ;^}>VG mڶW3 U]c\M2Bfp =YnVgIW'Eum;NcuЋwIN]:Ҵm;.q-|l'W ` @q$G)@'`L2ɋ߭nQ XO/LU<WPnKk 8x' Ѓfud^ : Ӷ=I wINz_22qz 솻O Gep lY&yumHmuЋ;x|8dIe P xT' U )
Cvd>
f_PƵ{0T+.&~=
^ FMs͍- Y'`M< @/^n\ W~sE8N0CqU~ܖ N d9ￌۛWeQ ;dYyc|2; ߴmo/ ?]wU ӕ7e|;^ >T FMOog Y: $ zq䤸!Ӷ 痑 }|ڶI:'~O ~_F| +ox8x4O @x0ӶJQ&s3= ŵ b<_v}{s A[nVW.|23`O ]u_pM8L\' ?d?ܸV8X< @dvY ϴm_I0To]: @4/$]q<pq$G)@^'qu0L]ξiH q k;\pX N To<; bY]&yQ:i^$Ww !٧>*tہ}&e fp00# }>rjW'Eu0lo2 ٻ$m{_& ?o=ru- `ύ[/ |}{ssY
PbY])vǻ$̑@mHmu(^ ] ^9 x,< @9^UG cڶ:T ].ۓO^Ο ё9 x $u {C|2{^ i۞%; ]' ! 7j#{ss[ зf*9 ]WV gڶWq p>O.]wU'08A'9~L>־ r'wlQ iێg
we|r] 389/#}ۛ>-7_{7N#6m[ bu- | ٨iN %yZ0 }ZnVНU $9 O̧̓m&eW' pP`4gMVG <fu:uy^'$EV c?d{ɫu8DN8x$Wg;4q s̰Cwj bK~ cպ^7 ' h4~Axùᇷ77ϫ# rz_ @w>]TG |lڶ$Vw wٞzr `4ϳ ʜr:,7l9 l\ Gm{? |7I. 5ɨi-C $A CqHTr {i.m/m;. ' |?߷77r:IWdfpi^%yV 0 ˩'- { ѨiN [d : ] E # I|?m \Uqr g58ۑɋڒw:k,7l]^8Y }ҩ' /8l(sɧoon# r:Nr8d6 TӶ= Cu]U S FMs2jl 8v16\ Yu vY 0p$qڶӶ=N ~c4ϓ'yVݲ~x{s:s-7$?Uw n>-# > <ٞzDo08kszr;*F0dIu"ɷ uu]V
ࠍ$L
>UuZnVI zdvU O9% %v|r[P8Hg;2yQ[2x߽YTG |fz 擙+7m۳$]u xLy>j$?1 >EM`=` HӴmG 'A5YE 9,7qcD`w>]TG <iێ ].\:o'`8۷XJx{ssU gu @o'6m۫$Ϫ; $^s[ W 3jQ,&6& fYU:PU ̓{ڶӶ0HN8c4'^xf\ GI'-瓙 0XӶ? I뮻x(N8&I _";"&0dw< mϒ8m۫i۞U <' {k4l62}x{ssU f5NcuЫv>]VG mڶl `ē/? ~h3$W qY 굱 p@.}!Iq I~<|ruk >+u1ji}d >ܬ@: ?XTw E$>mӶ=TvM-7$ z|2[TG <i^'yZ Wē ' 'r ]V zs N (ɷq p ' ͍/?RyUw |2{U PeڶWi !q N1jl:0y{ssZ fu:{qaa>= 4mۓ> ` OJ ܨiNFMsb&t4*. Ⱥn j9'@ M^8aZnV dv[ #γ 0<'08 ݨiGM!W : ջd G ` Or'hhro qu pxY\CwV . w O\5 <
5Y_v Poonn#ðܬ :z9Ϊ# vѴmϒt <wI뮻!W IDAT '@FM|4~a SNǵ $/ 2 Q=IMvڶϫca38z1ji+ nqu piyuЫ|2{_ ӓ$մm10RxP9oS]ܜTG ÷ܬ< zz># m< $g뮻 '5iI cܓa@oyM`輱Ϊ (,ɿm{9mۓ` p|QӜ'Y$9*Naoon.#aZnVIns l9 N >ôm/ `'e{Zź\U |1' _l4Q&> y] ٻl |E (ɷInm{V1' :˸/Iu0<jWOf# Ѵm>X Ir`8d9 5E~.^66*q 4ɏӶ}5mۓ` d4gInkKqu 0,jIuЫ }IΫ; Y$m/m{\ >Of<j$]wCy^ r:'0t'}$; i$Ӷ=v ϹLcGCW rHwlQ 0 g 켣$ݴmm;v ;9) ѨiN#ܬg{'0\g C$; O8mK epG| o8~[nVٞn :`\G x5;`w ϡҸ: {ITG M z$/; +GIkvިi ꌫܬN|[j1WG "q |'^5;p N@t4WI>:G9 eu Ы7̕Y =Zwm\O &kv\9$?%yVSN/ܬ / Er ;Jm]o?suHFM3m'%+?y^ fuupNZ'3G2m۳lO@ LXw+r 8&cv7Y.x$뮻L Ag{͎M ,۷=ggݟ𗖛ih|>y
U 0GI5m۫i۞ =285ɨi=[qu 7.^Of huWI^Ww 0(ϒ\Oֵ0P'0@9Or9qu y|НU 8 xhGImOcep2jQ\'>N5ax fudQdv[ p]weu 4OӶ]T b4$?e
{g4`]Ę]\+I# om{;mqu N`}tɷ-nZnV$/;^' $뮻 zi^L:r'ǜj Uu r пyk28=TYu {"0dwIΫ# uߟ x N;=fp{Ʃ& ٨iW7 cYădv[ ﭻ2ɻ N`p b\ 씋$G@o'Eu : 3'FMs*N5anXnV$Tw r[wU 08 6jQ\%>0< 52$@^' >ɢ: ᴓEu5Y$ϊS్Zj (aM )'/; 8XNzڶ!5i^%TӸ: ܬN|[|> , 8hO4m[/18 2jq$Ԗ@qu P: dvY Ywm; 8xOjڶ'! Q\$1N59 rz Wy `]d{- TzzڶϫCo?su QӜf6%|{s:x<8u'-@o` a}u {|u"N8B9Orcqu 16!{? u]d{: ٞvrZ
x4}+:{ܬN̫;^'3o Ӫ %O4mEu "W#58ɫ_ۛ*ۻWaz= <i^o Ib NfW [nVg.Yu nQ Yi:E <QӜ*ɷ-G@qW:$/; %״m}z6jIm\ wq ٻd 7 i^O:z4j$i%:r'yQ: 6w '&vzpuyu qu GZ°0̮# E
-0 -7!M º: W@ NB ܸ: xX8 J- Ǻ. O x`' FMs<jB ړQӜTG 20do擙#jyu |"W284jq$jK`,a 87 @Ϊ x|{uu |mm{\ ¨iΓojC zOf YT gzvڶ! N _*-p [nV$O;ŃF$/; 3 %iڶ/ʨiN}Ciq
ӰI8 Of ԚIg z|uC`_8>èiΒ\ ۸: *16!{ml@6w ^$ R>Ѩi.t */ܬg{*0\g 씋lZ }4m! N/x4WI-p[nV>p dv[ ?~π 쳣$?N:v QӜ&7?~9O:ͻx Xw" gOrڶ! N5YxPb\ |fuWg}u ;۠ $WӶ=)dp`4$]Gfa\ | 0̮# ]{uu <Im$v
ȨiGM*Ȇ]Mu iY\GCvoi @4m۳%'po4'^6Qӌ?ܬt|2 `* i^VG08!uGbk\ E\ICf>9 мմmC o4gI~cܬI @<4೬6ɲ س$WӶ=)R' Q\&;O: SN=a{9̮# K$w &iuT18 x4WI^T
,`,7.N7 } $?M:*ppFMs*NJ}5 ~mY g*0\}u ku$; 'ݴm N8(9Mr o`>W s :AXT @eu<&ƨiβ=1oN' ܬqE t x뮻L zbڶӶ=`pA5y.&0y^ eu Ыuu =Mr5m 7j$Ww j\ $jIuЛw^ fuWI~ p NQ *!W[nV'q |2{_ 9 Cp:bp 8Ug)@?sԹ`^'W Ӻn,; %N*g4In=
qu f<7 @oUG 0xl?s tӶuu1cp Mk8 8D8MẘOf ۺϕ m/#!09KSMP@'yR |2[TG p]H ыi۾qu<~lUw i@hY$Yu gQ $WF' {o416C5sY |2 బ2 xdOct &/;2 8,ɳ7w^ Pii۞V28a/x4blyu fu䢺b> 0* P(ۓNNK'Q '~3=5Iu E|23* 8TF'-Gc)W-7$Wg $ (ri۞U08ao4uM_W9 m9̮# "]u N''U')WP-7$Ϫ;e` vº N'켏&G)nz2jfu a $# {6j16ڸ: ">a^'W [,; `tӶ?cp5Y.்`H8ɋWg ߬2ɛ /Ne'IWqu Eu Ыmu F',v :`Y-< z.Fe u]%y] ;脝dpN16¸: r:7Ia Dg CN9'QӜr $G@o~OfW ]weu v ;a4I ڸ: r']`~:s 2:agP~l{G9=vY b>VG ZwlO ~atN08 "ɓ7o٢: Ew cN(gpBc 7$ɷ @\^?dQ ;R'06z2=tY |2 $o; `PGglh4/$Ϫ;& 5 cF'08Q `\ `Y ' zu>WG CYwU Nxt'<c<=qIuЛ: zpV ;Gep£06 A/,7$Vw r $/; `h N蝱 FM3n * |2 ' ft£08W&@qu fu'K >} ;zclW.ZnV< |2{_ "ۡ% +z1j u l:d: )' /m{V 0FMsd^ Qӌ`,7q|>НU cZwe7 :`p t qt`ؾOf P: clqu fuiuЛwlQ ]wuu AFMs\ ՖqmCwV Ŝr iu`pW36vظ: vE7?' $/; `\ N*9 PiY zs l? v _~lrU'P: b> ]lO >͇qu/.{:j?(q"ɓ7o擙j kq | m4'16Ǹ: r:Ir^? { /dpg?)UM1Y
COfW ]w]u 왧qE;_Ov?67 }1ǴܬI zsdQ ;: 7Ӷ`9bl쟧9fu +td: vٺ뮒 =bڶ>ɨi.clqu <$O#Of 'Ϋ `Oͧm{V ~08/ݏM^Tw |зfuW 'Zwu :> j4 o\ : w: "]u 쩋i۞VG NFMsoJd4'Зf<ɳ7; >Ӻn3 Q+ h4ϓt h\ }XnV%: |2{_ {"N9 /urڶ!&~g4q,?0< "ɓ7٫ W{伺 lO:1:w NUk5!WC[nVI @oUG [weW _i 08?FMs&&=5Iu<0?ð]' s/m;i~$\eNqu <fuYuЛwlQ C$; `ͧm{V 08 7ܬt nڶv 5E `\ dW0̮# `h]weu i۞VGP,ɼ<5 kj 0dwq i- 厲 WP䀍f xd Jҁa[' 0T뮻 !<IrU A-u R<7o擙` п8 i^VGP 8۱Qu @qu |fupW !Xw bڶ~>P'*# )Oo.b,
COfW p(]w]u Ӷ}^ 389098ɋ7wq T8 ~5y<H N?@ 84뮻J (qu@y; vĸ: >rZd0deu Eu $#x<'`4I.; vӖIWB y6m[v 5q+ 3Op0d' )' Ӷ='wIuz^ fY|S]2 غn|W s1m[ɀ2{ g.^' \$ 9Jr5mcp2P9K`f\ dY-2Uu uu e{#ep2@9MUw qu r:Ir^.Yu {뮻; <d`FMs +1O5?pdv[ W Ӷ= U<TϪcy% ٻd uJ bڶ<,5e d4Hfuı0lg 'YT %y5m @,ɋ=4{ITG a>]UG muWI^Vw =Zyd FMs S XnV'I zs YT @}3mEudύ8Uu {v{)T zOf# O$Uw @};mqu_d+ ܸ:õܬ'yV|2 E' մmO#:'{l4
!8L8N7; ̺: ЗlW`Q<O2 qu k'-Uu ]w]u i: xQӜ i#8,4ƣ0dwF4 ?i>mh6Xmð' [wݫ$; `.m{R 38?IVG и:ñܬΒ< zz>]VG jQ v =2j$/; j\ aXnVq c``]weu i|QӜ)>= `ȾOf @/ 0pi>p
o mY&Ww y#q u& rڶ'|piuo@ WI# `QӜ%yQp r:) w7m IDATi>uV`
̬ ΄Ӱ 8zWEO9igV8miZπtI'~Hd |y6IU -7kZ ՠǥCuS NU%U: te$th$gt `7u}e @eu=.\'I v4C^: i vkOؼxO6P6sߥC C+8/_v4;$>Mr_Ti ،>]Odp:UudT:zw\K=&i7ϥs [s7
OK voPחI^셫_*|5uD{bPok) ?͚M1NPDn E VK G 6$YI. f:_wtGA].tkE/}7YӸ־L83:ꃫS e\,!hbz_s [Ө7t ؠ't`c>bRIa(Ͽx}sɞTeص$\,T>7? ؠOp k:ɭXc]D9˪rT Ň$YӸ GNHI~,Kf|_:3YLtv74 Ƞ/b=6mڍYK &9/ _)NU%t#!EVE؊bڍ]f FY ~Ե醰?~S.}1 qxO(NUd؇ 2,m7, bص_L./נ}.t*gOr}?(NU yYL7e, b: fQohl' ?u}sئ\r]4
o=CӬiޔIqzߥs OY˙,Y2J>7tz 'iJu$inP ?gMsQ:ıS8)hJ6nJ<ׇ$ H1}J ! 5$KSں&PL/IΔR{ G}M .ыpd1FJ xqKy eL0aKOWu}UM >KrL8)SUIU:|!b~\^1YLo 7Ўx um!K&'op1@IogM3. X)ЩӬN 0WY$xoehX:5oGt 0 4
ǀ}yM璉:ҠYOā$Qf-CᤀNU]'yU:zd9bzzCEQ P)& ~VO ؍Z T8N@w22YL/co/} aYZ :)&ԫ7YPO jNvSUgI~)`%ȪhcI9! 4q <*g4
_Oc|;k!Y?L3`Mӓ$q >U: kP3qU9<_y tĵ{ bJG`f?Ora ih e `I!L` Γ꺛_'V<ˬ>q4L8t $WYM35YLOt`kFi @; 29LA]*|W8
ZgGL8ٍy j ɼt ` 2NsJ&fM3O2 iVvf>kuv-[t OrDY`&$.ؚwް_: .~ ?YLϚ}0 be ɬi2-J8B&7˥(3YLO>]h${ Qr/~j A]dU<12-TuWs 쀢 Ga^$l?GE @;
!k7g %ZgN* He m7YLM.v0
J k}26&&;wIYM3-؆?f)lU:Or~\K],I^l7t u=CjlJ& 3~Vׯ 7qo N* Ŭ(M~t`k&) `'u}ټ̍f 0kӍ@d:Uu_s l Gk{
vtz vb}]M1Cu;YO\HΚf\:D(lPN\7 & bzdT:57 A]_.<Ʌi& $OL:pA $+p&Y_J jvK zϥsppf2/ 8L)[( j4!DdC:U&ɿK wYMnK&uWs [Qox[: pL96j]<p9k!Bd:Uu6V *ri$,IU:5oGt x
4
`9e m5 p\
'Щy J xYM.K}1YLIzCk u=}&>;x fMt6P8yNUuc*pZ3/ d1E_hG! ugwYM&@)'~4>3u69 'enK0w&i7ʤf?zC 1q K砘$YKL8IN} NUl wY t `k ;Iq( {k4I'@˽5g0:Uu?s <UVEA`M$*ؚp\:
꺟)P4}j H]x'Te4:wU:bjw:ۇQoxV: uWs5&S<Zìi\7|S:!T՛( >$g&`(@ ;W>YӜ* n:vյi 6ՠ}"N SU'I 쯟jr[: bMs ּ! fPחqЭ-\$5a 6mP'YM; IfMs[:ȡ{ h e`?%, l} G?J&YQ4Zkw>달
v /z-{S:ȡ1:Uu9 ~>r9. d1 't`k9
/J xA]ϓP:O.m 6nV7k_ ΚtCbP
웫ܖhh+e guE <UY\P٠YO> y) Pt Sq岫l_h72 W( NvM VfM3fl'y9qJTI$/Kgzri0<d1&t`k&P 8Hv=rg5d^:>iV }3k Ƅ9 >$f<W6,'Y }q Or2.qmSe5iIj*!x ̄Ti 7thb:Nc |?
ߗ \Nt$txqQ( i.Kw/ K Ury[:d1= ٕ "
& A]ϳ `IN g{VNUu
(>?oˮ lܼt ` lʺpU:ǑKRϚl9^gVA]Kw
'm^: p,M7Q&6{;
oK ذ~ GmYKhY\d59Q OKgS {SU} ld1=Ire,V܍z! a~9OIgMs[:1n죟fMt}e TIVQvTؾڬ_: ځmKi( ެi'9K2)|7nʄ?Щy vTbz9i:e z̛ud^ Xԝ1`|5YȄTiMl;}L' EV8،wINM ˬi.c ^
5?`t29{{\Kc0YLI97t 8
7!& {̴`gUXX:>Q8BI~.h$t8$m ae A]_'yU:Ϫh2/ IqQ( I25I'_R .ə 8&f~ @74t g4 7wϪ<PhPקCN:UՏqvg5} pL&Y_J f2
l Ҡ/c-C\e5t o=dQv5kn$:Ib;
jl > F J'gMU6h7INr^[:ľP8Y9q潽Y.nAL8mv>
? PʺDt=e}@͚"YV>J/~NN\G$onAMӓ$mu5
C 毬8BH2*8J 'j ʀMJrlE]{; IfMsD. YӜ'6V w1!J;zs f,FC!ŴfoG q`{l4KY\&9@(q]8 f'f xo 1k9WI1k ܬi>ΚU`W~\<ZG[8TU7ws CЁ0YLϓ*ؚQof ߕα#_Ϲ- 3kqvk\:@IS Et296Y.bz:v@4
ߔ uMs [tb} jP'Iǽ@`75Q? '&`OR+^ }sL< ͚253m.ə acG
( '9%,Abڍ5yft / `>$v4}s xuaXlstNU*8HWInˣ {l^: 5 Ft C.e+cԳ9[Ong5$gY(^ ]$ɸt MnrtWte X 89oΚf^: .fvӎr&^
_:ĮӧO3zIS:pP[g&Np`;ލz~ fP$?HWI`'u}_s t7k!v&K } yMc ̚ftYtM ؕY\$6= O/mNM CӛtM7I^l7 ƥ|}z4g, ~fu/ `ƃ>) bWp! ﲚlFbzt`kFt C6kyVkj$ P̬i*T8
./sDӛpb 岯l{<ס͎1 -;c4YӸ^5YӼI2)hcrI Y.=6YLOX:5Qoh W+#UΚ?ka ̚<I]:/r$Z_8_!v䛛r^:U 8t㬮{p5ٺ {m۔{(pnr!toKaM~ץs [s>
V ؠDӟ&9]߸.Ivw G1o>}*ak:U5U-s$mL-! h}6y*9 eW >"vkEzI1<OQ6C2 }~ mwI5MW6Xv Tr ''iJ һ_:0,/s [vK hA]_g\̚f1y J Vyɸt `/MMK N `g6}]V~\ +'g jVNM^fl :d1==f Ŭi. Zo)M Y\$K OJ؆VNb r^:p$ӡލz! s'gMs. Q5<}(i픓NL7~>&p.}Z >5mOIVs
f^؍ xrҺI~ulgvP:5Qoh: @yM$̚ X5uNk唓VNL7lr]:$ [s5
(d] %~4M5 _N
GK릜p6'Q66YLI^l ͚"~mYӼa$ 88Y uSNӧ6SU$?ll&C>Qoت ՠԟϚH 8Piqx$mYY٦ 'M]D.> Y\&sڷyl i܍I'ôjI+&ndA{\
hv Qoh,; I[NV@i& К)'mpҚ$&p&Iy \) 6\}a /) bpҩ$ߕlpeK 6ƥlNҒ(@ L$?lQox[: .( rP! ':IC @wQ6 lݨ7 KJ'Kx.d5~ 8>I(,$K _: @ J' ut8z &\<d1=IrQ:5?z! JQ: `\:s l$ɛ$/J vJZb]6rhn t|Crrȅq N)@K|Q6yU8
=Qoh @NTS ֩7I]:3&MyL660
J 7v35muNK vꍲ bf^fUU6v L:Av nIΒR:3r9/ k59'>(zà `Wu}:Or. .`P6&ie$L'}q SU 9olK_f<^p(fMs;nVNdZOrQ8ǣ ԄW:ooqp&YV//Z $&|?
ߗ o֓?_9o#rjcV>ZO7( 5iqhq K r/ Pr_/X|UX! JTͯc:sUvuVn=9QϚf^:C Z69R6?0YLOHD`_cޖ m:ͪLi rժے` 꺟) WPS8TU?^h>$
d1fu%z;
ǥC lں\O75d>ODu±S:ͬibJ!N% mlQ[L> ^QoxZ: &tJ\B̪rY4
0$9͚_:C Dd9ϪlrM=bś( QoxY: S &\OWm ŁEZoP$?gM{R8 +7&d1=ɪ\]j*p~oJ xn :d (ܠm~ Κf\:tTIMje)& h^ @jc|ry[.l\7m ǫd\8WNU'W VY.ǥC&K&.b ?GE שӬ˘br|>du~#m0ӬVJ)gM3/ } IDAT B6nAY.C&L1QoxV: gU98 į
,- j4!^N:U&ɿK 6Crtx*L#ͨ7tR (JɄGO>' A]4s c4C}/O] F'9U6MӬ.dBp&t 8}.<4'pHu}_s E5Mt?l}VM|`Lӓ.dc/pzCQ `g:UyW.wII7m(u't`Κf/sd9oy9Y]а ~= DY rs]ʪ|tn٠|Ǩ5ͼt?Bt `&&/81[W& cezuѩ*+wg$qHyVȽN:U&ɿK 6ffffݏ t L3aO}Ȫx2/ 4$q-7ٻ2N't`#C>,$N/ ގzq @t fY*Y.oFA]4s ;n4!~o
':M9Ad1gU41ݍz! X9_9ϡ)e 0$9Or:k:MŌ~M _: æXa.wJ2nfMs^c7 Yu)s>NK 6/&N <Ot uu
GMzuIƮSЛ$qypW+u <.xI7^t( <}Qo xq8'jݎ٩_J vY͆S:K >I߇jJ,'t6ɏQ6x v2å& Y]TոSU'q<79٫1{3d{7R& a M7L<au=OC Ϛfo4M CNل]3` DCxR8 <ɇ!{1~S_: , g#hbڏ &MF WN;U5 I~TmnQ{S:g{RSUIS:dI7˥Td1&'yY6 @'9 F SU'Y.rtk=)غ̚t}pb* 0YLO'eV'gM 6l j(SLNU]vti4$J _:@t<O7Ed1ur`FU T՛$q 6u_:U.'iIΒ* ؚ~VΊ*>SU
>{Ҟ&i?N l[t `tSUI a~Hr 3kY]/ ؞.>-x$.n!{yͶLӳ&ɋq 7- :Y OVyNUݮiF̚:I'@{;O>
Щq#f,"FXSwt `X՚AhA]O] VϚdN:UՏ ك`d1}:& / .u dSIJ Šߔ PzN'[&Mӓb>.h Ot XEuSUgpfM1 AK>yINb| 7uzm' }\h שT4rGҩ<ɬi.-؊u]=M|Y.ǥCjnGie p:U5NKL5CcVkvpfM3Nt`+u/JN잃/ v0t Tn`e;Uua / ؊~'.R8TiVcaf ^ ѩ$q} (i'gpxfMs䟥s zPק%ԄtXóMnjPd* TI.+ALz5<ʬi.\l\FIO/ 6YLI~! ʸO2. حNU}^mp`~Tz <F?kE@{K<>}'\gO
<[Mxbz}i7 FN\$t`,A8 >j 5.ĄtpeC)<d1}
eM xt,eMXHtj.WY.FIsOӿY.?,I ;Et `7:UϪl \KgXmtu:pP,!8,$.h 웷p\: ]V _bZZY\v=: 8 IKLn( {^FXbZZ'u* c'9V 7 -֩n8+vNKaK 6fC@vV8Y ʘ= cc >i^ lO Uu9
Ьin-؈>Փru:pA&d1Q z< hNUtj yuI
ЬiI>lDwWOI<ۛtd1=Kr xޖ l^N\! թuRCWOu:p\,.j
>zC Brx \*GfMsdR:lu}'Մt`, K`M$MM ( B! `3^%]Y RN:*w<\,!ot {d^ lֺlI/t81kqoڠ'ۧO\oO<77ubzdQ kINGe "g`[jRA]_&y]:,56`N4#aS6Ϭ&Q68& :Q6vTE~ u
'p~,YM^M\zy f'_F؝ѺITs ϲV 'NY.Lӳ$Q68 l k?tu"]}7뭾o{Iwˏ<r9. .\&yQ8
vޖ <_Nl]Kd4 cR> N9v: _?& .& TxfM>U u
'pnyb&& ?
.\u`(%SNp 愓d a?K`L~6!i^ < >NNKY\'yW:$/uփosI
<ryY:c]6iJ Qd <e Jr~⸝guM
8<[rIw
<]t z! S6ȋ&( Y|LrQ:$[+ӧOhlzw\K`?( 8`&OҽY.KA]&yY:h5 t[N[z\yƥ M U: pMf {Mp2d[dry[:) ɨ7, xe^$wtʘ5<U u*|>NCdŎECu 'H `) -*I'J'k\: h[plpҩ*M`\, Ku2.j Qo e\C͚2Os 3w91᤻>&Z =ew5
C lq3Y OwpgɑS6h~ }Q6yU8
Jtvo4Iޕ<~O8Ti|p}bɑ,'IQ68doGm k@Tռt <A]n7=᤻t#.\E
CvQ 8H뛯K ؑ Nz9Gn6]8L7 ʣ p`:Uu9 vNUK`.' v:L82My8t?z! Yl PHtr\fM1@!n6V8TYz<Pd1 Cw_: 8&iJ (b}ߐa k&'Xry[:7YLI~,g[ e}s} {ENUnrgcݎMN|,yƥ{,N Qot 8 :ɪlb
8ʋ$ׯ SNpt7@,cOgZM.K `# >! ̫$!
SNl۱z/% ƥ[$N ɨ7. xNU@&SUJÔ8nq65dc;~g2(ͳjp8
SU$?FKZΔ8(xlp 3. ݚ,I+8 K SUgI9 u3CwINd=7ed1'F4
ߗ <e EOZ̔8uML8n1}D&Y;h$C > <ˬV~a>N nyd1= mr1
oK SUI^pTոtk=4_> üt vjU aK SUob1sةnlݸt ૺ}gN{^=7lV b:N] lU: p :Uu 6>#-5k$J ҫA]?N~, K`&i7ɏs 1QoxY: `V lXr ƥ _uo~nYOl&G`ćo6 `tj Ӿ6ZO9*K| 'pخn! 'h |P SUݘ: -?vv s~y}t mr5
C _שmׯЬi.ܕg݃|rdʹY.C]Ŵ'h t I^r/\VK ܠOL8yWMS'h 7 @I+HЩ7C '/Sݧ~ y l<N ]F t4>jV
ɓxn!؞b&N 7X: $/J 82/m)>T8TY|؆=4 ը7|_: u:Ot#:4kIޕ>}7>uI<rUͣ6 [pi/SN`uMO-XK`{&4 vޖ <<fNK͚:ɇ9? 'px U:1 ج8 * bN{Voztd=S xtf 'h |~, kV %uZh4iS)NӁr V ը7 <<1
kP~S
'~`#/ ͳJƥ _שq W?t[:HoP8f4qmލz! ֩~ K /K`fMst<zۍ:p8yMh$C SUgq\O] ]}x> lw7ild1=IrM 7 zq]P'9Y.oKasu1ދaY<xc'ne/ )S6 ֩$?uC"RѼt t N02,ɨt 6n\: :Uuک$*'n=p ϣ:!
'>J ظQo8/ NUu;U5O$ y9Mt707/ ͚,$J ` IӬ.w,
{٩dHҔףӧO:KSNc$ mG!'t G?ϞFX'9Y.}A]$s z̄t`iqM ZI g+ EV `fMqPP: _Y U8ݛL$9 :UuZ:t 7
'˼t hq lƬig* <p ANE&i7^G `S~TUt6f^: _-IEK`.J `B vg\: 3/ >y |t`ibOt gf zmI;̚:] =z 'te\: ;- K`c ƆI9'fL$/K `',C SNc^: _->=-0YLOY
plƥ y <z·9$|pҩ8tgNk'yQ: ;f]8 `w^v_:1/ H~ zȄJ6tXl</{ %K`#'=1ӯ?M )' ;SUoJyfMsku`_|+s t\^npL9 (5v0F
'&xmM p^w[:~80< rK 8BxY\'+6,t4N.il ~n2. rAy6t39Y.?ng/'it #/ g $m#|Vi U+0sp$gt+KZ ӦV
g:,ʼn`<P@lK/*I;|<~r#Ώ
'E~@S /s ( @KUku9pr ,Yv 狏{! :h
vp f,/!^2t 2 AgpN __T8f~ 47 ""F!"; ejwA lZ:; p Ǜ lr>9|ԄM> d s P8NG'x?U8?
eYCjE ˋ! :Ev x|X [d`'~ e e`;*"ns@mU8?Ev v
sZM ^͔ȵJ PEv SFxVe Qv v 7x*;7˲F h i _lm :n 'AmN jB e`;]D\g{tXcNz|g Z ڥV[d.; {} Zd`k ֯դ, 5z}p8eYe`s ߟ β t(; ۹ {苏N|F h7 :e(!"; tX/>V8Kv 6 @뽺 F"; tC_|pA{ lx` @ɴ"; tC_[_F`neV|`_ ߋ~Q8oKDs@G={Ƀ+tˇP >{ o y9 PĄ8Ev 6g 0 A?Z U.Pp9/t { @2 '`Y lŇO Z [r>_dg3:; Ne ku˳6 'aYN lų6 N^ >t7v0CV vZd_f IDAT}N~
'-S=NCr P?g2YxzN(EZ7e 9 Gr>_EmvWuv 2 {u}/; @N.xC|_8; ˛_Tp P?g2$8 ʛ_ _ll P8)f3 u9; @Gy>AlͱRj,Ko~3 @w\||p ~ lr> Ab}8 lӈxNd Av 7 'p8 l-s 6 A/E1N~Oq Ǜ^ 9.>e Av 6 ]G_'OF`g
':; 4 A ll :|;: 8,~d P[r>_E:;to:aey Y ]/Av67$p
ͮ}L} ˋ{! :h y5; _Yͮ} Av d`cA"+u <"; 6 A*; tٷ/p8ڕlދ _eZr>_dg|o ''P8iAv :> o fRj,˻ lD{&~ P?g2 ]e uv 6*; 4 <3m ^mE9Vx p ~.*; t:px l= b E1FL8$E/9 3or C t˩ k ' w؈ 4I/; @yV"*;t̋` ':; |c N&; t ز,M8i k h { y 5: O",8ȆøFz ; ]/
Oe :4Ibd M ԁZd`# ݦ 3vYd.R8S/; < N pKv 6& P^v r>_dgEY89G.; y p PW J 8,NZAv xr8 @~Q3 5
'p@˲4=<^g ^v :Ri XW |˳vy sg2?ojx@cY ³vy jf=-e [ Lg 8 dI> 5S8Ye`# b N"N
n Ev 6b UD?E1HʛZK\||! Mg|+ @~Q3<]vNpx 4* Mp *; uv 8Uv m hAv R8Y*; p<.>V P8 v8 A.˗ @8< a.]v I8 p(cV s; <̈́: & ϙL| ]p*; H/ 4 Q80 pq 8:' \
) @;f ~Q 3<KP i 3 u Q 8j
' g pN ؈ &; t .; t Ɨ p(
'p - 6p FN ؈ Q8 `#
'@e h8^v g:| 6
'p Ye N V :.; @) _/; ˲N " 2; !) Dh& l@ ` bp `" @n 4 @x <l N0z؈ b Zyp 1 ~$; t @"; t81 ~ lUv
+u ؈ IO 4Mv 6 ph
'pxp ?`N { T
'p/uv X) Q <x|r>_#Z ; ˲\eg`#K,K E
]dާ dV.& dާ N @yj 88^v 6 '7Ev `/\jAv u R/; 7 NV 7 :j DY8q
f2ݤEE1 *; @}-8Ć;V N@X
}bۥ ؏eY31¡F
' R8?K/; lp:; [e ( v 걊pH= g:8hAv `/<3hWKL8E/; 0 (aUv *; ; *; 9 {CV
'phĵ2 M}}^d v,K2 pH
Yd o8h hXs &ap> $ޗڥ ؋Uv 2 ]peILXg ޗh^v `/\xڗ? ' pL8i' $hG sve"ɲ,WixV lv peVzkԁ)' M| z#_ }+7]g B| s&^/@G:U/; 'wqNޏh -YH` ^/; [Q ; eY %N t"; s o,KveRjC;- i lL o @Y:; 'Jx dYOUv6p @{@<RgU~Q3 t"; [1 o @<RgU^v @'-S eLV@="; fL `y N$e`sdι'>O/; Ev s> 3@\端GdYw)izؚF3 uZd`+ >e`k U߯Y:; [[d S؊ neY:^ !} ) H(z؊F3 uZd`+ N؉@ p8 ln:| ӟ t8Ye`+ ;qzCV 'PAv @',~QA N\ 'w04v fYl|<v6Kɪ 9k 'lg< hEv v 9
'Pt8YEMv &p \ݜ@"+uFdg`k Ev P k,Evv2 ]r9/Ne'y ^W 8jnҴP(z"; 5g2 ]u);NZj:| pb`;
;Q8i$"^f NL9d`'>xp_K k,K2lNy/lO K{9 Zd`gf^^Pdq iZj:|
ku /tuv `k.gnP/N؉
hu89g^&@ Ev d iYζ߫ 1ϚpK۲<`_i7 x< '˲oU=` e\k.gM8[ I
n~QD V ڠ^7})'pX lo:|
< v:Vd v P8z=xXdu @xHq 4Uv v2 lvY|<PC_T8 /QUv Zv:,CAv `+W M~M8Ro U
os JW^U~ Uv b :cUv Z*; ;d r,Uvb :h ,]d`gW hpN \e`oL]竇a WHvZz`xV ey ݝǃ A7Sw {u ]e 5*;۫n @\e`o
' 3n&B Av `+e ; t_P8\ Uv Z*; ;d 6yY A~b1E/;;ӌG>OUvv6 l*; q> 3@G N ; ^g є[* lvYC7 Q_ G 'FKAmβW hp t\֗cԄ=n M@#Ͳ F8 O"uvGDp_/E1^\e qU)3 jYʧuv*< 87 ~QFċ F Av Sp0]D|@88 . e^9 V@ E/;{1 @c|ʈ
hYv |<EUNei g MUD|@#̲*; lצ Av | M8Sin PiAv `# ghJS81sv c:,":; f ˲\d`R8Yx~Qxq<f HcɑI( @̲_YD b 3) SN :m d t4 oRE\e v =f83r>_p,˻X#C/E1~L@f+ 4"^f瀎yoz΄SNN l Yv jc ; t9鹅1M) jɳ ,; {3 &k :YCIL8y/՛ &G : {*9t9鹅1m?d9 8unrT ,K珓@kNPC Yv &Gg1 hYv f :r>{o|N SN :"e`N .e'svg$٤pb k e `fYMo: h+@K(; U[' |er>kopz/eY~^JnN(; @g$ v^ ,g!8 t
yvdY_E] `[gprD"Y t8Yd`E1
&neYC pE1AܟJ
>pP.A6Y͛qz! (; o ,Ų,g˲<61^";|rmf:PM[t8: p~¸VZTAOq (; s> d;hdvyɧpn~Rg :j nn"&7 [x,Uv31ȷ7ps(z!8Qv 6Te.2
˲A( K@0 ]w9/6N֠qP?#Tcxg&TqdEqs@y@ySvsu:g Ɵ7pa-dx yl m nX Qv Ev ҉K yY. ? o)X{YݼTk|hwd*(; t"; TӅk л1[lL8HU>g Q7d YD B ,ED\d AeYCpX "^f jpR}w/ (ohQv j :֡1
3 kzYCPQv ֗y-+u""ns^qbGZ3'n ~Q" Q j(; a{'4VN[9`7>\ p."s t(; t"; |!; vY.uu mж/U(NCpPZ)F8Qv 0
4՛p6fYekh6Ȅh oGl:j &J,"^f瀎Z@SUuȳD:|<Eī@D\mVeY"v? _'!8j fN7(BEv xJZ";@G; 4Ͷp 'BEV nt@(z:;t"; <,\,eV @DpVKd
LMA *NY
r- TuF9 :%9 Gqȷ*@; ;5 N>Eć ZkVs@-:os thYj b?u: P74 -8 g "; lbYp6ph e);9 {a14|~ eI"k(z!8,u jsVrf ` g%܄շ]4 a V8veɗ-;{; N!8j% q jŃ 1ZK@ r> }h.X_t;b:9 t8e6 qj=/ β,"Cv##tu,]NM(A_f! :ܦjk v&W? ˲| n.L:$de . اAJ7̲ hj( &_Ox C,v
'~/E1A=ɗJ ` ~^S~QDį9 _5{1J|t,; ] Yv 3 N`]|'Fv&[X姈Roݠ^Xw M\8\Eq LQ P>jCO `e&"s Ų,Cf |iSpa 4)3?M#l:-x pn Q: -q]$7X(_ԧz`:LUvj0 a mYwq nC٠ބ A4{FѸ k:| c\f!E @.r Z9lq8JztJh|ﳗIupdt _'!t89 z{fpI#,˫p6QUΣQnMso 'BShvt8Eć
y:xo MQ Жe9 g3 mY
̲ f8>oL9p2
re 5yf ,w!UM7q!go}xk IDAT"4Ë0` ~`:A hk=of e9A# s{9m
'Շi L9 "Q 2#L٤f?, @sQ8&"βC|< D ,9$A4)' tt:'쭡MTM f@s
@,K8i S̲ Zp Ô =oM:o úz St 0mNe7)L9(;@*;yL7q)N[UDs kDᜯf\{-{I:$tt86nP6!"*; M舑 _nA(a Q=u &b/s | ɇ 2^|k xT+
'|O`{t d Fe v Ӳ,Gt qU0r>4Ne}_`kJ'Q0 NF!g 4 (Yv QC|CL80M(z!ȧt e5 <@8&&x99T4ˋ pMC(fa 4zY{
Bh9e 3 <iqozɲ,>)'|t IX M
R&<thϗ!&D8`&e9NR6{o~, N/ҥ 3 <`g5,,/AvChe i Bh ktx&
C}cN{fhMx,L7&,˃hct4 ?2 <r>_ pR 0}>_g!htKD |7e/ӈ5;Ev h#Mxx|@] rI&hwhp)"t4x:x!˴S RU:yls8[ p e(dyɗP:a\M_&9t,Uv heYc :"~Q6GQD<r>r pIutsȟlm/4OU:o :"~Q6 n@st {P=U:2#b,Kyx|h
z~ '^D,;4 N~ur[1V|bn@y=J'?)@}Mz&3vu _A@(N#?!.krUD8zqVMY&a4,{! T98/e&Mw{9C>jB [@MQD 8U6ޅ h2M Ӱ8P6a3h j9cN'h8AMY6طqFǡ Lۂ~ 8j: >ò,Mx4@[\C*\s@M?P:t89S6|Vf[/r ٲ,e9Y۲,G!h g4y-k)X_4_ƸW+Ixs O2 jR= -;j/Rqǃxxjp
M(z!hpr7 NNÍ`;OID̲s ? P!Oa
-ۈ,*;t x~Pa&s rpBk(@sep 5
Zn"J 9 g2;,Ӊpb8A{T
'ܨ~sܗM j,Dį9 R6$ՙ ˲<]]v|<>79g '
UYǽN4pr6 N j נ = -nYg6; H/r V3 _{m?_~ ˲e}.>E?s t80bO
˲TV~
{qf8 ^:`NՁgULYDV ^`e6/^
m5 dYB{hql @ RYM+u" HA[V"0 NN*;tndB[= 4Lb4". i~[ٲ,6f'xU?֕:@,KvWv6V谓~Q"bxt αB9 O"bCMj_0Z hY5 2 NE}+tI(N5h p߬1:ۻP6I9[X`
E$^L/a+ +tpm ՊAD8uDaADXYM+u"ՁeYg" uDMEvڭ_gs f Pu. q eYp\UDlr>?)NՁֹNU )3Uv`# B˲,ӈxeYMطx&FiʳVDmb{3 NYDvYG/l:>\W6
' b˲EOR(MDO1x|l%&p
j=i'JqZ ;>[ںM heY."4". vY8>_iC//a_$:"z˲t,p&[Gl:K'{SY~heY O(qY=4MDM8MD+;_.NN8ДZfډ[5<#l\ Uv `eXiD:"~3ՄC; {1MliY6/ s(F!8>n: 7yXG/l:l^Yu ײ,gqNu ˲t:\KAVWR 'ZϙE/;i:,[5<Qq?D9V\e } ܲ,W˲ D8@ۈeYeYpU:s [=$K 6f7 NfqPi:1Մn@[] ,˫6(zS tn/Igg~Q܅Cghߌ 27 uD̦Ét_o"_9,4; P~Q}
x8hBExm6r>O?ocyUZ kv> 3,; @eY~fmr 8&* 8
W"34"MD ei$oZ:"L{tC(Dī @(N"M?vnY tSJKx 6|9ehȄeY~ hhW25'wd?s`3t8(P~Q eh& @DIJ,慎q?1EDMHv&vWjĄ,K뱨gq?evhuD̬ΡnDĿs ;/*; <ki "bfuYD3; &NN"e S r('Wot8q;ZUWl,˓ @UEY(#M5 Rǧ ^_5bN(ڋh&g:\ED/"vuЛ'3e|
eh;S ZbYe9P6 Uvo5fIDD("d vI]||oh@CܯYeE1 p 9 )O_: E4;| [*DDb/s ;j^ njhB#TvY @{)!&4x? |~ [M,hA#Wʂt' uDw8UXeY GCD\)T*U8cOC|ex ߋ>HQM{]||?U;S4>X8 ǡz?'p)MVAM8"4],;|/ i۸_s /YD3;ey 8Nēp6C{qto|<s8&}9C|QD̳s {˲,('/s]}d RTwv`o| Z9
g34mO3u> Fs {r>oŠFN""Eqp qj Mw(8LآIq?&]
%|~cq,^v [Eqg34ŇVBAk'qN\8y ^DAӸ?ܰKL7q?t8IKDŲ,d *AJ6/\DI[ǟ" ^ir7;7 e9e )|/P҃c&(L d\Wv`^il$"_Ao˲| 6u 7<P>$ wثeYC |: &fb,w> "9ߗycߧ^8l86?yI[}3dVG*7
l_ ލey 1YXn~ղ,Mh'
pl>\Oit$"_XcS#iO
S<wJ&]( bqZ/$; s,g~NB}]c x[#|d
'gv`n"b`L!/Yn"b6t}ܿsۿDgZ a
¬ əppfQV
"z@iOZYA5=7ǎ?Le d1Kod^?ceULz1zn! 9lFDɄ2$?l͢iK!N_ nۓ!`ӔOHr@$hRU$K M"y]ϒ\4y,m}d3a쥵 3)؊z4!f 'Cm7=+ 9
kw*]&FkRUI~-؊uNK `><CkؤIUM|fn,mk,e^$`|MsT:c p2M{ V]_<5viUL fp. #3 zd{a['hvҝɬM2q_G͢iJxANdRU&}90U8<CdlؽIU1vnۣ! e>}zx4^rˮ_./by]-PׇT82$sGyq 2`olcf%z<_~~Y4np|T@9JP0h] 0>XC*8qI7dm=ئ&<T߮t咇m8?gU`[` u} u
% h\ڎ|ps)|Y_,uA Ms[:c
p$qZtGoχ/%KW^];ĸ-IU]&t`.m;+ o3Iy/9|"~
ʇg4J(wl:mWE+S:UWC+ %9r
ԗP(9f %%y`&ULt`~t0l˧e`h' ̓|P,Irk5|y] & M* )U8Iܲa<|Q r<I3aR ~z~k lƤf1ݺmJ u}l-/LMe0lX(h>>WU>86da-tbd9m, ƨ2݁QqɃU"Ic )A
0`>K
iW<Bʃ]S>%I%{v 'p$ t yN7S?.`8 Im 00-e6&ݤ
^~/kaupMM<yܺCTTk S,Ws ;T6y] %v.J<x(y) y]Ϣlt {W:u/` cWq{pu=Mb_7p3sANzx( r 32&pH~[m <O<V:ru}|l9䵖C.k t [[qp 0~ٗ?~?u ءlApH}N3Ikt`g^E 6FͺmWC u>JPF vg^צX4mbY N) GѠo y]O\Zg /|_8
[g|ANs ;*ɲt IU-S,PݺmC e>M{ve? ؞UMmMNzQ < e |ټI~-#/N `;e8<BݻwJgfZ%t`.m;+ B}uQ: }~tx 0`_eg5pxM3- b0$n#Y^t lR`?Cnetrٗc oltMEdݶ$7s E( W( Az? C*z 38LWY)(Fx e *! VsS:3( 7&C| 6tMݻw3l̤n|_:PźmgC Ti_K
I2]4m H&pM3- b4$Yx2N 7( ɕ q lt Ol$Yi*vt( ^Ys ^8+ NiE$t l$[4ͲtMUᤷ, (N. w y]{4ɃWq& lJ؆{W:FMec
xuJ ]Q6>R@(qYvb4! `( E
pn?N 8&GM ʚq F$I^zY: egl&$ [Y_HQ6>tL9ɫ$'qR6>0&'$ SU_FQQ6>^y]{te Q6>rV:6rIb I7I& 0egD;xom{V: t_aL:( Z4ʹtm儓Ĕ^Ť F,[EY`u}LW1l|Y 6I<aWIn'Uu\: <eW D?ݚI<} AEӬJضQNL9>EI'J' Ju /3O3`u}߱KN 5e3J{W:V7@o>vY: |M_6Ys-yom{V:!XwINMs]: l W pr|ы$ͤf LaL 9 ȼ &O}I'&0
^Fvey7Oi&Up #i漿pzlb #ЗM^쥫EӬJؕ(r<ϓZ n _c 4QVY &WK߽{tT$!e7InPZ_tx<ƛu۞0V~lE,K V1 EJإpr<ګ$IU aTIU]
qL7آy] {l;y] _l<Y v0y8eY
IDAT/yzRU Sg*/;7`;u=Mr f~5 y] 3u- bp $Tլt äQ6t-ic== {/|_8
QANdݶIJ TC| /8z<& [OtC Ƽg&k9_4A \wV: 0(?OrRU< ظIU-4s c 弮.倽Jr&bIe ']Ɣi~JT 6bRU/'UnA}6&J0\ P$w+IU$w '9Yt /0^_y ) l7?,`o[Ze qh!J: 'In$Ws ":- aT,_eL77ޯ# تy] ;Q6 섓$T4s [~ kRUI~.$ǞAMy+t&G=jU uhi 섓$Wbr<OIVZ IUT*&;S66K( ɫ$; ؘ~l<Y ' s|WJ'' bu Jgnݶ! KA{?C f>z\,fU:>8ɺm\ ڋ$$ 3t/4/ Khu, y]b-<qF|ݻTQ[n6 &ɺmoKIULru,hܬg$1qnlnLMc ֯gAY4Y'$Ibd`^%bp+tVQ66:Xg_*Yo8NzZ: Яe[Ex{8P;xU6 02W]04^* I~Y Vv |SJL4ɯs bW,T8
0N?* <MR9ةߒ̼ CVth?pIUƭ`vY: ׯбؖuJ
/]E\@yjUL56EӬJ7Vլt `t^$i&Uo0:K( sV: P|RIp}?V 0tg6&&\(| '0U`
l] 6t+t<3vݶC O=yătN8 e=6>inKG&|=`[O{# TI( u M f(g?$t vvv e`ΕM>τϘT29QI7^aע-؍7=+ `]4K #֯t`tMsT:>S8m܌ >ٺmK&U5M2Iqnۣ! YyU( M٢i\zhi.KgV|ƺmH0m/:դJ&UrRUI~ ;n`|OlӼJ< #ЯM W&_gWL6^. a 1(jݶ! ռϒt*ݴA xy]'t`)|E9rdnA QZ,-2n[>ҏ?OtF>]ĭUVؑ79+ bN aRUi' jvnY f^GI.[ eZ_K F.ɱQ8yIU %9tnډ[ [d au=MW6yQ8
f ˧˸ =>#M,IrM$ݡ@Iom{V:>qL;3Y qhiCpHsnɪt1؝'pu /u2sY8H y`6ܧ[s[:Ȑ(<Aߥs "ɩi' 7*c}R1@ U$` @)6(͢iJ'T*v'9[y C2i۲^` jݶ! >i xj-PݢiJ"'G_ tNV ~=>uޖPڼgI93M;- `um-PҏY1D
'0$( |9 {n۳! J2$ƬlV?dr.M3+ bN!{Y >`]cae:tkvV ݼϒ%!$Gq>L
'4$.̬U,n붽, y] +xPMrzP/fY:Đ)|IUbOnK~
i܌պmC 2YttN A?,υ $բiC 0pt?T ߤ 5Y f 2eMIy]= |F_8 |f#L8F:Kb`'9_Y 4i1C3p͗ƸYw ~yh!@d&Uu {aKrne bRUG+~* ) K(/.|_: 5; >k71nCN6Y{ OpdnU OMΒ.Y~ ~|y=ܤ+J5ۢiK
Ty4J7dU:Lea0Dt]2H~KW<- `u=MW4 WoMsZ:Ę(lH6^ äx%E`$ӭҹ- `I~(ț$狦Zy] c`%9<Y
'4$.\%9]Qb@Q&n! va^&ߗ{>ݴe ЗLOtGѺS8ٰIU]FtOnKϤfu >I8tœA k^קIs tDd&Uu:>`qj؉~,ݭa1q!YnJr-0$+8*-R8قIU&t
R< `ެtmG/c/|$Eܖ9+P6 YE
'[2U|xl p `u}lptOnKxh U:[p%V #wx, iE`~Tl^'&`Ou}<e(lѤbw-0nw~X |I_49KlXtmYy.( ;M >tv@d&Uu cEm, T4Ʈ>ɑ2.0F~nΰ[') #cΎ(l٤t HW<Y3Y9m/K ش%e<AI') #d):Irne nLei ۺmOJ شy]OӕM<~P<ټӝ( cc):nF_3
YҼOZ:I'EҳX U:;p#V $I~KW<1f frks Xʼ_<T *]dU:uphU:(: ]KSO`X&UuITx`0*>JBG*r4A1Y&غ-tCpcV 'L3"tQ_F
_8Lt+MCf4gC " Wvݥ;<7CrL * `4M 'Y&9_4m(.S,8,79. P)0$n~厛8Cʜi&n |U:hzu x* ؼy]?P: 'ZSI!Z?cX[ʜ$?0V Џ_D8w \Zp~Y4yLᤐu4xt+w]0 Og0x9˹0,i \-fZ:ġS8)hRU؋ wy_>q(OA._Jy]\
ܤ+,K>f6T2~m)6]-O+L 6.ɱU:z2L Mc P8)lRU/ƃ&ܥ}i=N`k~v*nF_wdd0Vy=KW4lv4CQ8&tyJW@q8¨%և4J& vݶ4AoH_Ƌ+~KW<q_wwS&T!v(IU'tJwznY`#&Uu% ʦ$S%V`XQJ;afbB-s~Q8U4OahU9tnm@y]lK x~,v EӜ)IU 'O aʋ$M|0)& %n[es<Cvdr4e~Q( <բiCW
'{fRUI~-ݧ8;ie*@YW붝xM&p>d2 >Ѣi9C
'{hRU}/ҕOc
[^
$Gu ƼgIΣ gǺ q4!4=4In` ` =L@y(ap&U5r4>m{Y:c<ϥs |ÅExbTu}jL 6iNKNT29 xtm8~=·LL0u ¼_&Y&p- (e(YI|l͢iKNؤJ}P.`bz 0$Z A?U( zge j^Ӽb3` +?=7xxu<O";r xܧ+\5e<rd:)& wEaP8sm88 $馡FeŒy_*9"(n! f^gIQ:ݧ;3YE-`2w2 %]45p2 :I9 ة"u? M8]d咣$ߗK@!t/tSMܶчEӬJaL ͢iKNbRU$K `/<1 )%IW$yw <Krn?J2|*}%sI_`L`?'9^4m <@Lef
<Äǿ r9I@t % <LټI.ܥ+\$%f
0}4C4
'ҏ_ 05CS>e3pCn Mtϙi_K _]h( EӜ) ̤fI9 Fu۞)
X
oV(YkXrY4ǗPTyK $u;>JB4zXSJ7:]\O,y~X0~IL .Tu<d |r /.c$IWBY}Ex|P/ӏ&
@M(ì0 eݶC |l^קI~-g_+_Ir=ڛy?$J%ߗIzh!6
'6$. ``.m;+ c^&y]: [w )V ;2"%Mm4'CNnRUgIQ: @$vԷKa_b}2 O)$cu(NF`RU$? ӕMvvCkx }.w]U: q * d^׳$ pNMEdQv\ |u.K x0et yhel:#2Y T |jݶ! d^/ӭyU8
\-fZ:gɈ.J #w1>Nre p81Y,M {>Iy]M6yQ6 '9Y4R8ix mK y5& !9]4ݻw3:N9
'@3I.P: ]4ilɈMj !Zt8]Y vj4!>+uFlݶ$s ]!֗MVQ6 M N* `Lmk70Pܼ >t4f 'a ͔M=2Mw
p(f&E tc r cfݶC <X4 J' E890
'7+ ` .m{V:} e9/ S89 m? $9- sC9 f4!(C! 0IQ ޔ a7J) u 6e`hIJ ؐ$E89`
'k ptaO ɢi 8t /]TaI ߨ^4ͪtS89`m@ \te9 iC NܺmWq պmgC |pM Oth!
' Et / ,,E tDل?ݻw3'&ULt '9Z lڼWI~( nLMl?1 `_'* #v1 O2S6SL8O&U2*ɫQ uۮJ ئy]LrE( O7t 'Ikp je7q SeDᄿXu r eYt]qq z4!o
'|R_:9- 8H=+ `҉ &<w+=6Yt `\vV:@Iy PŢifC0 &E뷥s &nIt \)
'|պmO\ Mm( ` ,,c ݹIrR:b6$? ]ce29 QI2]4Ąb MOrli8J F>ɉ ϡp£( qnu {n1 ݧlr[:dO6I|_: 0X& O0IVI^ C f OO:9I s* <^?zN ͘)L8&Uuf͋Q am, `I'q <_he '<[qN S6 L:q < p7K'9 AP6~4J' (Q
'|u^&K [eQ: 譲 ݻwJg`$&U5KҔ 읋uJ y] 'Y%yQ8
.M3+ 1ᄍo+t |H`L: BلQ8aN ( @_:9) ;&l חN.J R6ءEӬ [pVJ' pM
X42J' ;ݻwJg`&ULt `gM
,IS: PբiCpL8aL: lL: ut [t A`( I2]4 p8N 5e=t Cل"N %e=t lB1
' ( h)P ;t l0 J' 0:&pBJ' 0h& t l^ݻw3p&ULt єM n^IVI^ < {Ä2 E`Msdp il 1ᄽ` =e1 b4!C&L: l0B& `(NJ' ~Q6/ {&-Jt IRt ]( ){] %iJ VvY: YIDAT3IVI^ (0 &t 8P& h4trS8
& '5N `m{Y: t EՋYa {ͤ ؙ$Se >trQ8
eńaRU$I^ cP6. 2eץs P6apL8amJwl $& |J7ޤ ؞$W6aL8aP&UunI' nM6t ۼgI9 `dLM"d ߺ; *& <R۲. FDل3ATtN^ CtnY ϼI.c, |$'- t Ϣl7 |7&:)0xZ&y]: @ne __:YE xߒ̔M FA J x_&#ߔ {>ߔM شV4E( *0F&0*%iJ =qdݶץ 0n^Y z4!`NIU!p (&tݶvE xpdhA`[NIU !t !-L]K'q& aO2]4 5$I^ tnY y] !IrhA`NIULwt !m, u} 8<7&:AP8 Lju %V ޘt Jg X4ͬt%ƤΒt ذ$'붵4e\ `,t5ʤfI9 `CnLmkL+ {m^׳8 `E,KN88:NJp INM y]Oӭq& '.Y /,* ͺmJ 3 &ɢinKN8XzV #'t xy]; `~K2[4 <ޤI^ _qdݶƴ0
>Os oMsZ: H2Yt $uۺ9zg2 CheON7iq/
G ]vV: l˼L tdhSg#U: uۮL }P+ 0vQ n )p T$$? OBa e^$K $INMc1| |ƤΓ\: &]a i^׳$M _Ms^:;IU͒a v
Hu}dg2 }EӬJ!`vdl F>Il E\'9JrU8
&ɱ < 'z2 0:wINm{]: y][{ ]$9]4
'r &]+8 /, iC)M$28 6om{V: żӝɼ* qO29_Ь24 7 x$W6_LӍ; oqH 'LznY t+tnK!i_K `,tFr c]i 0$ߗ '-t IU 'Y%yQ8
>ɬ_ lм_&Y&p MEܖcpүعLC,
+t ` .YذIU%G g ; |
2IUM pX pxB;I^ @QV(X p=0Y@
2+v : G;$
G `7Ё S8 b `M5Y ռϓ\: [un !Q8 W,T8
sl0 ؼOҝ˸ 0>oMsV: "رIU&t /=/ xy]L7Y ؈tSMKCpLa I2[ y]&9i' Cv
(K
W'y]: 6ə: 0lv `MsY:pMa wn y]'t *]tp{vb0 ~-]T y]O]l EӜ IU&t tSMm0 Fn^V 짛tSMKJ̤ (&ɺmoK vg^V 79+ <SC 7=+ (vLS( .TU ) T4v Mٺmh L; (mEQ:u
'&U2YL; &SM 0 `gL5R8T[5 wnɪt `v U@)Nq `&9[ L; 8SM`N`L; & f Fj#pe j |3N T8N T `i'I/ ` L5Q80 $97 ؆~Y G W7INM5Q8T4]ĭ 0cnA 4e >f4gC ۡp#O;9[5 a{n۳! 3$( tSM\S8'yU8
.]jr[: pu}nE }EӜl ܤV
0~Im0 p ]-l4 IU ŭ `~K7a wu2]u, [rh* -8 :Mrj qKrnA f^t/ `$97 IUU t+t f 2$q! tSMnKQ85iܪ &A k^G.T6 ݧ+8 (TYܪw79mt[ .3%Yaa ^Jrc3lf̀m30q% ?O<R D:ik{HhrY; 8 |u>XQ82nQpS$ ϺNr| p z&tj, h4_RֹzU }y C)Esg) O$EW5 @-I. 3; @O7ɥ9( xU 9A jE د)[M pѸiU
{?R&A bҶ') 8x?R&AP8^d4^ bqY; @_M4xv <Mf ãpظi :e[ /0i/)hmo˫lxMU
7)EA hҶ_\&Z m|N æpٸi ^>hv I ɼv0( 6nW5 s RJ lפmGIf $WөG@V) [1nj \l5Q4 ءI۞fO & IتqӌRM TvR4 L<e62 mWөG@( ;1nxU >b1 M d 8N)sMS8v+U
&A (&m{O ]Y `/Ms \=h[, 衮xr'$9W4jP8j4_U
%h 0 <R<Ih2 8^
'ލ:W 딢ɲv ^+\&\7 &@o( ( $[,nk &m{S$ ( pT7nQs>Ih2 S<^S4zK
E #x h ;' P}JdV; x U) p 읢 O `MQ8zO vN R<R4K :E ^L J<`pE$ I 7S<wNry5^
'`$xr x E fҶF /udY;( x #ɥ x 2L8D
'A7yʀC$ 7)M浃 py<
$9?+g uœ$ +GM fҶpSjࠍ,eɧI `/SN I2iF I)k'(f8\)M s&m%eGA 딢ɲvNOc+ 2e[ ¤mOS2 0TIfI.S3) Gi4'IJW >o& դmG(aR2
'7Yps( '7IfwŬv ؖIz@]']MA Fӝ2N)k ]Y<
VgsfWnR8s; C˔ɲr ثE اɬv!P8v س㷻g, Pƹ$ +p=$m& pݹms6 ;s䟺I 8 ?R6~N=xW7eͧY 4gs ') x6˫vS8xn{ MJdV; ' m& ;p9O)r m& ] IfIf u[Oλπ3w3 c {&Y N`GM%eqy|=sXx= t[Ol=X9 w6e( C`Mcp nRJ&A I۞f?U MƳt^9 QR8أEJ {|=sX,F fҶ_R'+G JMs2k :ɷ[ 908?R |s2?N z`4)Ck G˔a 혴(;6}ɜK%~R8qx]/N ii!m0 @OfR>9 >=d]21 #5i/)vkU2v5:_ 0
' |s` xB`L ( lM& ( Q8076 å|WJ& L@lOΒ|L R>xdp$N иiN pŐ8>$s% `&m{Ku }%y, 7fĐ8T% YDϏK&
' Gf4Yo?1 nzfvXl 6iQJVZ`'Lu P sz7,+g xIۮf2N }ltl1 N x4n' }lSJ& 鶟2kfS9 ~r}^ 8p* 8FOa[O bK) "9z
m F,;":Y<R8M;S,`=6l1 xIn> :
w?R ̯o p N
Vgrwżr PV'xe$OI6db, [pN( x9R21 I۞dVPl@÷*S
&˚a 8
' FŠ @r4ɇyXan`@%
' T1nӬ'I>V
My( ԤmGy0\o5YL<: za4'Y9κmAO7H)֍ 699NU o( [O5|5s{X, `-(je`wa`(N S<ϰo% <gҶ2~7f0)s Kzq3J^"赛$ˬ%i 2-@\AS8 $O_܌
![\ Lv59KɌb.aO, GDmCòZL7ظ[,~V 6 +FZ=Mj: 5) @UDYi bnX 7iQ@i jX3% qӜi e) ?Rl 4l, M,(
m%MN$R8w7iC8vudӶ x1'zس̓ ءg
);Ňjru5Hab1 F!\06$e7
' PF)eULIփī b,/d8{ 2iۿelݿcd$Q&Q87#YMByE Z<V yRNI=ٌٜ|_^uY Ynϫ6 ( {< 9}xͳ3 `$nXn9 _mߒ6yϣ_ 2$ Q$NTh"l IENDB` | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-adminservice/src/main/resources/application-consul-discovery.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.
#
eureka.client.enabled=false
#consul enabled
spring.cloud.consul.enabled=true
spring.cloud.consul.discovery.enabled=true
spring.cloud.consul.service-registry.enabled=true
spring.cloud.consul.discovery.heartbeat.enabled=true
spring.cloud.consul.discovery.instance-id=apollo-adminservice
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
eureka.client.enabled=false
#consul enabled
spring.cloud.consul.enabled=true
spring.cloud.consul.discovery.enabled=true
spring.cloud.consul.service-registry.enabled=true
spring.cloud.consul.discovery.heartbeat.enabled=true
spring.cloud.consul.discovery.instance-id=apollo-adminservice
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ReleaseHistory.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.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "ReleaseHistory")
@SQLDelete(sql = "Update ReleaseHistory set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class ReleaseHistory extends BaseEntity {
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "ClusterName", nullable = false)
private String clusterName;
@Column(name = "NamespaceName", nullable = false)
private String namespaceName;
@Column(name = "BranchName", nullable = false)
private String branchName;
@Column(name = "ReleaseId")
private long releaseId;
@Column(name = "PreviousReleaseId")
private long previousReleaseId;
@Column(name = "Operation")
private int operation;
@Column(name = "OperationContext", nullable = false)
private String operationContext;
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 String getBranchName() {
return branchName;
}
public void setBranchName(String branchName) {
this.branchName = branchName;
}
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 int getOperation() {
return operation;
}
public void setOperation(int operation) {
this.operation = operation;
}
public String getOperationContext() {
return operationContext;
}
public void setOperationContext(String operationContext) {
this.operationContext = operationContext;
}
public String toString() {
return toStringHelper().add("appId", appId).add("clusterName", clusterName)
.add("namespaceName", namespaceName).add("branchName", branchName)
.add("releaseId", releaseId).add("previousReleaseId", previousReleaseId)
.add("operation", operation).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.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "ReleaseHistory")
@SQLDelete(sql = "Update ReleaseHistory set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class ReleaseHistory extends BaseEntity {
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "ClusterName", nullable = false)
private String clusterName;
@Column(name = "NamespaceName", nullable = false)
private String namespaceName;
@Column(name = "BranchName", nullable = false)
private String branchName;
@Column(name = "ReleaseId")
private long releaseId;
@Column(name = "PreviousReleaseId")
private long previousReleaseId;
@Column(name = "Operation")
private int operation;
@Column(name = "OperationContext", nullable = false)
private String operationContext;
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 String getBranchName() {
return branchName;
}
public void setBranchName(String branchName) {
this.branchName = branchName;
}
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 int getOperation() {
return operation;
}
public void setOperation(int operation) {
this.operation = operation;
}
public String getOperationContext() {
return operationContext;
}
public void setOperationContext(String operationContext) {
this.operationContext = operationContext;
}
public String toString() {
return toStringHelper().add("appId", appId).add("clusterName", clusterName)
.add("namespaceName", namespaceName).add("branchName", branchName)
.add("releaseId", releaseId).add("previousReleaseId", previousReleaseId)
.add("operation", operation).toString();
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/config/SampleRedisConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.springBootDemo.config;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
/**
* You may set up data like the following in Apollo:
* <br /><br />
* Properties Sample: application.properties
* <pre>
* redis.cache.enabled = true
* redis.cache.expireSeconds = 100
* redis.cache.clusterNodes = 1,2
* redis.cache.commandTimeout = 50
* redis.cache.someMap.key1 = a
* redis.cache.someMap.key2 = b
* redis.cache.someList[0] = c
* redis.cache.someList[1] = d
* </pre>
*
* Yaml Sample: application.yaml
* <pre>
* redis:
* cache:
* enabled: true
* expireSeconds: 100
* clusterNodes: 1,2
* commandTimeout: 50
* someMap:
* key1: a
* key2: b
* someList:
* - c
* - d
* </pre>
*
* To make <code>@ConditionalOnProperty</code> work properly, <code>apollo.bootstrap.enabled</code> should be set to true
* and <code>redis.cache.enabled</code> should also be set to true. Check 'src/main/resources/application.yml' for more information.
*
* @author Jason Song(song_s@ctrip.com)
*/
@ConditionalOnProperty("redis.cache.enabled")
@ConfigurationProperties(prefix = "redis.cache")
@Component("sampleRedisConfig")
@RefreshScope
public class SampleRedisConfig {
private static final Logger logger = LoggerFactory.getLogger(SampleRedisConfig.class);
private int expireSeconds;
private String clusterNodes;
private int commandTimeout;
private Map<String, String> someMap = Maps.newLinkedHashMap();
private List<String> someList = Lists.newLinkedList();
@PostConstruct
private void initialize() {
logger.info(
"SampleRedisConfig initialized - expireSeconds: {}, clusterNodes: {}, commandTimeout: {}, someMap: {}, someList: {}",
expireSeconds, clusterNodes, commandTimeout, someMap, someList);
}
public void setExpireSeconds(int expireSeconds) {
this.expireSeconds = expireSeconds;
}
public void setClusterNodes(String clusterNodes) {
this.clusterNodes = clusterNodes;
}
public void setCommandTimeout(int commandTimeout) {
this.commandTimeout = commandTimeout;
}
public Map<String, String> getSomeMap() {
return someMap;
}
public List<String> getSomeList() {
return someList;
}
@Override
public String toString() {
return String.format(
"[SampleRedisConfig] expireSeconds: %d, clusterNodes: %s, commandTimeout: %d, someMap: %s, someList: %s",
expireSeconds, clusterNodes, commandTimeout, someMap, someList);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.springBootDemo.config;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
/**
* You may set up data like the following in Apollo:
* <br /><br />
* Properties Sample: application.properties
* <pre>
* redis.cache.enabled = true
* redis.cache.expireSeconds = 100
* redis.cache.clusterNodes = 1,2
* redis.cache.commandTimeout = 50
* redis.cache.someMap.key1 = a
* redis.cache.someMap.key2 = b
* redis.cache.someList[0] = c
* redis.cache.someList[1] = d
* </pre>
*
* Yaml Sample: application.yaml
* <pre>
* redis:
* cache:
* enabled: true
* expireSeconds: 100
* clusterNodes: 1,2
* commandTimeout: 50
* someMap:
* key1: a
* key2: b
* someList:
* - c
* - d
* </pre>
*
* To make <code>@ConditionalOnProperty</code> work properly, <code>apollo.bootstrap.enabled</code> should be set to true
* and <code>redis.cache.enabled</code> should also be set to true. Check 'src/main/resources/application.yml' for more information.
*
* @author Jason Song(song_s@ctrip.com)
*/
@ConditionalOnProperty("redis.cache.enabled")
@ConfigurationProperties(prefix = "redis.cache")
@Component("sampleRedisConfig")
@RefreshScope
public class SampleRedisConfig {
private static final Logger logger = LoggerFactory.getLogger(SampleRedisConfig.class);
private int expireSeconds;
private String clusterNodes;
private int commandTimeout;
private Map<String, String> someMap = Maps.newLinkedHashMap();
private List<String> someList = Lists.newLinkedList();
@PostConstruct
private void initialize() {
logger.info(
"SampleRedisConfig initialized - expireSeconds: {}, clusterNodes: {}, commandTimeout: {}, someMap: {}, someList: {}",
expireSeconds, clusterNodes, commandTimeout, someMap, someList);
}
public void setExpireSeconds(int expireSeconds) {
this.expireSeconds = expireSeconds;
}
public void setClusterNodes(String clusterNodes) {
this.clusterNodes = clusterNodes;
}
public void setCommandTimeout(int commandTimeout) {
this.commandTimeout = commandTimeout;
}
public Map<String, String> getSomeMap() {
return someMap;
}
public List<String> getSomeList() {
return someList;
}
@Override
public String toString() {
return String.format(
"[SampleRedisConfig] expireSeconds: %d, clusterNodes: %s, commandTimeout: %d, someMap: %s, someList: %s",
expireSeconds, clusterNodes, commandTimeout, someMap, someList);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/SsoHeartbeatController.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.spi.SsoHeartbeatHandler;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Since sso auth information has a limited expiry time, so we need to do sso heartbeat to keep the
* information refreshed when unavailable
*
* @author Jason Song(song_s@ctrip.com)
*/
@Controller
@RequestMapping("/sso_heartbeat")
public class SsoHeartbeatController {
private final SsoHeartbeatHandler handler;
public SsoHeartbeatController(final SsoHeartbeatHandler handler) {
this.handler = handler;
}
@GetMapping
public void heartbeat(HttpServletRequest request, HttpServletResponse response) {
handler.doHeartbeat(request, response);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.spi.SsoHeartbeatHandler;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Since sso auth information has a limited expiry time, so we need to do sso heartbeat to keep the
* information refreshed when unavailable
*
* @author Jason Song(song_s@ctrip.com)
*/
@Controller
@RequestMapping("/sso_heartbeat")
public class SsoHeartbeatController {
private final SsoHeartbeatHandler handler;
public SsoHeartbeatController(final SsoHeartbeatHandler handler) {
this.handler = handler;
}
@GetMapping
public void heartbeat(HttpServletRequest request, HttpServletResponse response) {
handler.doHeartbeat(request, response);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigAnnotationTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.Collections;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
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)
*/
public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest {
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
private static final String APPLICATION_YAML_NAMESPACE = "application.yaml";
private static <T> T getBean(Class<T> beanClass, Class<?>... annotatedClasses) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses);
return context.getBean(beanClass);
}
private static <T> T getSimpleBean(Class<? extends T> clazz) {
return getBean(clazz, clazz);
}
@Override
@After
public void tearDown() throws Exception {
// clear the system properties
System.clearProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML);
super.tearDown();
}
@Test
public void testApolloConfig() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
String someKey = "someKey";
String someValue = "someValue";
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigBean1 bean = getBean(TestApolloConfigBean1.class, AppConfig1.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
Config yamlConfig = bean.getYamlConfig();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigWithWrongFieldType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigBean2.class, AppConfig2.class);
}
@Test
public void testApolloConfigWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
assertEquals(applicationConfig, bean.getSomeConfig());
}
@Test
public void testEnableApolloConfigResolveExpressionSimple() {
String someKey = "someKey-2020-11-14-1750";
String someValue = UUID.randomUUID().toString();
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config xxxConfig = mock(Config.class);
when(xxxConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig("xxx", xxxConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(xxxConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test
public void testEnableApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String someKey = "someKey-2020-11-14-1750";
final String someValue = UUID.randomUUID().toString();
final String resolvedNamespaceName = "yyy";
System.setProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE, resolvedNamespaceName);
Config yyyConfig = mock(Config.class);
when(yyyConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig(resolvedNamespaceName, yyyConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(yyyConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test(expected = BeanCreationException.class)
public void testEnableApolloConfigUnresolvedValueInField() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
mockConfig("xxx", mock(Config.class));
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
}
@Test(expected = IllegalArgumentException.class)
public void testEnableApolloConfigUnresolvable() {
getSimpleBean(TestEnableApolloConfigUnresolvableConfiguration.class);
}
@Test
public void testApolloConfigChangeListener() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloConfigChangeListenerBean1 bean = getBean(TestApolloConfigChangeListenerBean1.class, AppConfig3.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(4, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean2.class, AppConfig4.class);
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamCount() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean3.class, AppConfig5.class);
}
@Test
public void testApolloConfigChangeListenerWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloChildConfigChangeListener bean = getBean(TestApolloChildConfigChangeListener.class, AppConfig7.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(5, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeys() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
TestApolloConfigChangeListenerWithInterestedKeysBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeysBean.class, AppConfig8.class);
final ArgumentCaptor<Set> applicationConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
final ArgumentCaptor<Set> fxApolloConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
verify(applicationConfig, times(2))
.addChangeListener(any(ConfigChangeListener.class), applicationConfigInterestedKeys.capture(), anySetOf(String.class));
verify(fxApolloConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), fxApolloConfigInterestedKeys.capture(), anySetOf(String.class));
assertEquals(2, applicationConfigInterestedKeys.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set interestedKeys : applicationConfigInterestedKeys.getAllValues()) {
result.addAll(interestedKeys);
}
assertEquals(Sets.newHashSet("someKey", "anotherKey"), result);
assertEquals(1, fxApolloConfigInterestedKeys.getAllValues().size());
assertEquals(Collections.singletonList(Sets.newHashSet("anotherKey")), fxApolloConfigInterestedKeys.getAllValues());
}
@Test
public void testApolloConfigChangeListenerWithYamlFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
YamlConfigFile configFile = prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE,
readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigChangeListenerWithYamlFile bean = getBean(TestApolloConfigChangeListenerWithYamlFile.class, AppConfig9.class);
Config yamlConfig = bean.getYamlConfig();
SettableFuture<ConfigChangeEvent> future = bean.getConfigChangeEventFuture();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
assertFalse(future.isDone());
configFile.onRepositoryChange(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9-new.yml"));
ConfigChangeEvent configChangeEvent = future.get(100, TimeUnit.MILLISECONDS);
ConfigChange change = configChangeEvent.getChange(someKey);
assertEquals(someValue, change.getOldValue());
assertEquals(anotherValue, change.getNewValue());
assertEquals(anotherValue, yamlConfig.getProperty(someKey, null));
}
@Test
public void testApolloConfigChangeListenerResolveExpressionSimple() {
// for ignore, no listener use it
Config ignoreConfig = mock(Config.class);
mockConfig("ignore.for.listener", ignoreConfig);
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration.class);
// no using
verify(ignoreConfig, never()).addChangeListener(any(ConfigChangeListener.class));
// one invocation for spring value auto update and another for the @ApolloConfigChangeListener annotation
verify(applicationConfig, times(2)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace's name from system property.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSystemProperty() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
final String namespaceName = "magicRedis";
System.setProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE, namespaceName);
Config redisConfig = mock(Config.class);
mockConfig(namespaceName, redisConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(redisConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace from config. ${mysql.namespace} will be resolved by config from namespace
* application.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromApplicationNamespace() {
final String namespaceKey = "mysql.namespace";
final String namespaceName = "magicMysqlNamespaceApplication";
Properties properties = new Properties();
properties.setProperty(namespaceKey, namespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
Config mysqlConfig = mock(Config.class);
mockConfig(namespaceName, mysqlConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(mysqlConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerUnresolvedPlaceholder() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration.class);
}
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSelfYaml() throws IOException {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String resolvedValue = "resolve.from.self.yml";
YamlConfigFile yamlConfigFile = prepareYamlConfigFile(resolvedValue, readYamlContentAsConfigFileProperties(resolvedValue));
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration.class);
verify(yamlConfigFile, times(1)).addChangeListener(any(ConfigFileChangeListener.class));
}
@Test
public void testApolloConfigResolveExpressionDefault() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config defaultConfig = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig("default-2020-11-14-1733", defaultConfig);
mockConfig(APPLICATION_YAML_NAMESPACE, yamlConfig);
TestApolloConfigResolveExpressionDefaultConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionDefaultConfiguration.class);
assertSame(defaultConfig, configuration.getDefaultConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test
public void testApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE, namespaceName);
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE, yamlNamespaceName);
Config config = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigUnresolvedExpression() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
getSimpleBean(TestApolloConfigUnresolvedExpressionConfiguration.class);
}
@Test
public void testApolloConfigResolveExpressionFromApolloConfigNamespaceApplication() {
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
{
// hide variable scope
Properties properties = new Properties();
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY, namespaceName);
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML, yamlNamespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
}
final Config config = mock(Config.class);
final Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
private static class SystemPropertyKeyConstants {
static final String SIMPLE_NAMESPACE = "simple.namespace";
static final String REDIS_NAMESPACE = "redis.namespace";
static final String FROM_SYSTEM_NAMESPACE = "from.system.namespace";
static final String FROM_SYSTEM_YAML_NAMESPACE = "from.system.yaml.namespace";
static final String FROM_NAMESPACE_APPLICATION_KEY = "from.namespace.application.key";
static final String FROM_NAMESPACE_APPLICATION_KEY_YAML = "from.namespace.application.key.yaml";
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionDefaultConfiguration {
@ApolloConfig(value = "${simple.namespace:default-2020-11-14-1733}")
private Config defaultConfig;
@ApolloConfig(value = "${simple.yaml.namespace:" + APPLICATION_YAML_NAMESPACE + "}")
private Config yamlConfig;
public Config getDefaultConfig() {
return defaultConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfig(value = "${from.system.namespace}")
private Config config;
@ApolloConfig(value = "${from.system.yaml.namespace}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigUnresolvedExpressionConfiguration {
@ApolloConfig(value = "${so.complex.to.resolve}")
private Config config;
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication {
@ApolloConfig(value = "${from.namespace.application.key}")
private Config config;
@ApolloConfig(value = "${from.namespace.application.key.yaml}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration {
@ApolloConfigChangeListener("${simple.application:application}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfigChangeListener("${redis.namespace}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${mysql.namespace}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${i.can.not.be.resolved}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig("resolve.from.self.yml")
static class TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration {
/**
* value in file src/test/resources/spring/yaml/resolve.from.self.yml
*/
@ApolloConfigChangeListener("${i.can.resolve.from.self}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig(value = {ConfigConsts.NAMESPACE_APPLICATION, "${simple.namespace:xxx}"})
static class TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration {
@Value("${someKey-2020-11-14-1750}")
private String someKey;
public String getSomeKey() {
return this.someKey;
}
}
@Configuration
@EnableApolloConfig(value = "${unresolvable.property}")
static class TestEnableApolloConfigUnresolvableConfiguration {
}
@Configuration
@EnableApolloConfig
static class AppConfig1 {
@Bean
public TestApolloConfigBean1 bean() {
return new TestApolloConfigBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig2 {
@Bean
public TestApolloConfigBean2 bean() {
return new TestApolloConfigBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig3 {
@Bean
public TestApolloConfigChangeListenerBean1 bean() {
return new TestApolloConfigChangeListenerBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig4 {
@Bean
public TestApolloConfigChangeListenerBean2 bean() {
return new TestApolloConfigChangeListenerBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig5 {
@Bean
public TestApolloConfigChangeListenerBean3 bean() {
return new TestApolloConfigChangeListenerBean3();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig6 {
@Bean
public TestApolloChildConfigBean bean() {
return new TestApolloChildConfigBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig7 {
@Bean
public TestApolloChildConfigChangeListener bean() {
return new TestApolloChildConfigChangeListener();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig8 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeysBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeysBean();
}
}
@Configuration
@EnableApolloConfig(APPLICATION_YAML_NAMESPACE)
static class AppConfig9 {
@Bean
public TestApolloConfigChangeListenerWithYamlFile bean() {
return new TestApolloConfigChangeListenerWithYamlFile();
}
}
static class TestApolloConfigBean1 {
@ApolloConfig
private Config config;
@ApolloConfig(ConfigConsts.NAMESPACE_APPLICATION)
private Config anotherConfig;
@ApolloConfig(FX_APOLLO_NAMESPACE)
private Config yetAnotherConfig;
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getAnotherConfig() {
return anotherConfig;
}
public Config getYetAnotherConfig() {
return yetAnotherConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
static class TestApolloConfigBean2 {
@ApolloConfig
private String config;
}
static class TestApolloChildConfigBean extends TestApolloConfigBean1 {
@ApolloConfig
private Config someConfig;
public Config getSomeConfig() {
return someConfig;
}
}
static class TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent changeEvent1;
private ConfigChangeEvent changeEvent2;
private ConfigChangeEvent changeEvent3;
@ApolloConfigChangeListener
private void onChange1(ConfigChangeEvent changeEvent) {
this.changeEvent1 = changeEvent;
}
@ApolloConfigChangeListener(ConfigConsts.NAMESPACE_APPLICATION)
private void onChange2(ConfigChangeEvent changeEvent) {
this.changeEvent2 = changeEvent;
}
@ApolloConfigChangeListener({ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE})
private void onChange3(ConfigChangeEvent changeEvent) {
this.changeEvent3 = changeEvent;
}
public ConfigChangeEvent getChangeEvent1() {
return changeEvent1;
}
public ConfigChangeEvent getChangeEvent2() {
return changeEvent2;
}
public ConfigChangeEvent getChangeEvent3() {
return changeEvent3;
}
}
static class TestApolloConfigChangeListenerBean2 {
@ApolloConfigChangeListener
private void onChange(String event) {
}
}
static class TestApolloConfigChangeListenerBean3 {
@ApolloConfigChangeListener
private void onChange(ConfigChangeEvent event, String someParam) {
}
}
static class TestApolloChildConfigChangeListener extends TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent someChangeEvent;
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
this.someChangeEvent = changeEvent;
}
public ConfigChangeEvent getSomeChangeEvent() {
return someChangeEvent;
}
}
static class TestApolloConfigChangeListenerWithInterestedKeysBean {
@ApolloConfigChangeListener(interestedKeys = {"someKey"})
private void someOnChange(ConfigChangeEvent changeEvent) {}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE},
interestedKeys = {"anotherKey"})
private void anotherOnChange(ConfigChangeEvent changeEvent) {
}
}
static class TestApolloConfigChangeListenerWithYamlFile {
private SettableFuture<ConfigChangeEvent> configChangeEventFuture = SettableFuture.create();
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
@ApolloConfigChangeListener(APPLICATION_YAML_NAMESPACE)
private void onChange(ConfigChangeEvent event) {
configChangeEventFuture.set(event);
}
public SettableFuture<ConfigChangeEvent> getConfigChangeEventFuture() {
return configChangeEventFuture;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigFileChangeListener;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.SettableFuture;
import java.io.IOException;
import java.util.Collections;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.List;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
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)
*/
public class JavaConfigAnnotationTest extends AbstractSpringIntegrationTest {
private static final String FX_APOLLO_NAMESPACE = "FX.apollo";
private static final String APPLICATION_YAML_NAMESPACE = "application.yaml";
private static <T> T getBean(Class<T> beanClass, Class<?>... annotatedClasses) {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses);
return context.getBean(beanClass);
}
private static <T> T getSimpleBean(Class<? extends T> clazz) {
return getBean(clazz, clazz);
}
@Override
@After
public void tearDown() throws Exception {
// clear the system properties
System.clearProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY);
System.clearProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML);
super.tearDown();
}
@Test
public void testApolloConfig() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
String someKey = "someKey";
String someValue = "someValue";
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigBean1 bean = getBean(TestApolloConfigBean1.class, AppConfig1.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
Config yamlConfig = bean.getYamlConfig();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigWithWrongFieldType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigBean2.class, AppConfig2.class);
}
@Test
public void testApolloConfigWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloChildConfigBean bean = getBean(TestApolloChildConfigBean.class, AppConfig6.class);
assertEquals(applicationConfig, bean.getConfig());
assertEquals(applicationConfig, bean.getAnotherConfig());
assertEquals(fxApolloConfig, bean.getYetAnotherConfig());
assertEquals(applicationConfig, bean.getSomeConfig());
}
@Test
public void testEnableApolloConfigResolveExpressionSimple() {
String someKey = "someKey-2020-11-14-1750";
String someValue = UUID.randomUUID().toString();
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config xxxConfig = mock(Config.class);
when(xxxConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig("xxx", xxxConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(xxxConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test
public void testEnableApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String someKey = "someKey-2020-11-14-1750";
final String someValue = UUID.randomUUID().toString();
final String resolvedNamespaceName = "yyy";
System.setProperty(SystemPropertyKeyConstants.SIMPLE_NAMESPACE, resolvedNamespaceName);
Config yyyConfig = mock(Config.class);
when(yyyConfig.getProperty(eq(someKey), anyString())).thenReturn(someValue);
mockConfig(resolvedNamespaceName, yyyConfig);
TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration configuration =
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
// check
assertEquals(someValue, configuration.getSomeKey());
verify(yyyConfig, times(1)).getProperty(eq(someKey), anyString());
}
@Test(expected = BeanCreationException.class)
public void testEnableApolloConfigUnresolvedValueInField() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
mockConfig("xxx", mock(Config.class));
getSimpleBean(TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration.class);
}
@Test(expected = IllegalArgumentException.class)
public void testEnableApolloConfigUnresolvable() {
getSimpleBean(TestEnableApolloConfigUnresolvableConfiguration.class);
}
@Test
public void testApolloConfigChangeListener() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloConfigChangeListenerBean1 bean = getBean(TestApolloConfigChangeListenerBean1.class, AppConfig3.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(4, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamType() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean2.class, AppConfig4.class);
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerWithWrongParamCount() throws Exception {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getBean(TestApolloConfigChangeListenerBean3.class, AppConfig5.class);
}
@Test
public void testApolloConfigChangeListenerWithInheritance() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
final List<ConfigChangeListener> applicationListeners = Lists.newArrayList();
final List<ConfigChangeListener> fxApolloListeners = Lists.newArrayList();
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
applicationListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(applicationConfig).addChangeListener(any(ConfigChangeListener.class));
doAnswer(new Answer<Object>() {
@Override
public Object answer(InvocationOnMock invocation) throws Throwable {
fxApolloListeners.add(invocation.getArgumentAt(0, ConfigChangeListener.class));
return Void.class;
}
}).when(fxApolloConfig).addChangeListener(any(ConfigChangeListener.class));
ConfigChangeEvent someEvent = mock(ConfigChangeEvent.class);
ConfigChangeEvent anotherEvent = mock(ConfigChangeEvent.class);
TestApolloChildConfigChangeListener bean = getBean(TestApolloChildConfigChangeListener.class, AppConfig7.class);
//PropertySourcesProcessor add listeners to listen config changed of all namespace
assertEquals(5, applicationListeners.size());
assertEquals(1, fxApolloListeners.size());
for (ConfigChangeListener listener : applicationListeners) {
listener.onChange(someEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(someEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
for (ConfigChangeListener listener : fxApolloListeners) {
listener.onChange(anotherEvent);
}
assertEquals(someEvent, bean.getChangeEvent1());
assertEquals(someEvent, bean.getChangeEvent2());
assertEquals(anotherEvent, bean.getChangeEvent3());
assertEquals(someEvent, bean.getSomeChangeEvent());
}
@Test
public void testApolloConfigChangeListenerWithInterestedKeys() throws Exception {
Config applicationConfig = mock(Config.class);
Config fxApolloConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
mockConfig(FX_APOLLO_NAMESPACE, fxApolloConfig);
TestApolloConfigChangeListenerWithInterestedKeysBean bean = getBean(
TestApolloConfigChangeListenerWithInterestedKeysBean.class, AppConfig8.class);
final ArgumentCaptor<Set> applicationConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
final ArgumentCaptor<Set> fxApolloConfigInterestedKeys = ArgumentCaptor.forClass(Set.class);
verify(applicationConfig, times(2))
.addChangeListener(any(ConfigChangeListener.class), applicationConfigInterestedKeys.capture(), anySetOf(String.class));
verify(fxApolloConfig, times(1))
.addChangeListener(any(ConfigChangeListener.class), fxApolloConfigInterestedKeys.capture(), anySetOf(String.class));
assertEquals(2, applicationConfigInterestedKeys.getAllValues().size());
Set<String> result = Sets.newHashSet();
for (Set interestedKeys : applicationConfigInterestedKeys.getAllValues()) {
result.addAll(interestedKeys);
}
assertEquals(Sets.newHashSet("someKey", "anotherKey"), result);
assertEquals(1, fxApolloConfigInterestedKeys.getAllValues().size());
assertEquals(Collections.singletonList(Sets.newHashSet("anotherKey")), fxApolloConfigInterestedKeys.getAllValues());
}
@Test
public void testApolloConfigChangeListenerWithYamlFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
String anotherValue = "anotherValue";
YamlConfigFile configFile = prepareYamlConfigFile(APPLICATION_YAML_NAMESPACE,
readYamlContentAsConfigFileProperties("case9.yml"));
TestApolloConfigChangeListenerWithYamlFile bean = getBean(TestApolloConfigChangeListenerWithYamlFile.class, AppConfig9.class);
Config yamlConfig = bean.getYamlConfig();
SettableFuture<ConfigChangeEvent> future = bean.getConfigChangeEventFuture();
assertEquals(someValue, yamlConfig.getProperty(someKey, null));
assertFalse(future.isDone());
configFile.onRepositoryChange(APPLICATION_YAML_NAMESPACE, readYamlContentAsConfigFileProperties("case9-new.yml"));
ConfigChangeEvent configChangeEvent = future.get(100, TimeUnit.MILLISECONDS);
ConfigChange change = configChangeEvent.getChange(someKey);
assertEquals(someValue, change.getOldValue());
assertEquals(anotherValue, change.getNewValue());
assertEquals(anotherValue, yamlConfig.getProperty(someKey, null));
}
@Test
public void testApolloConfigChangeListenerResolveExpressionSimple() {
// for ignore, no listener use it
Config ignoreConfig = mock(Config.class);
mockConfig("ignore.for.listener", ignoreConfig);
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration.class);
// no using
verify(ignoreConfig, never()).addChangeListener(any(ConfigChangeListener.class));
// one invocation for spring value auto update and another for the @ApolloConfigChangeListener annotation
verify(applicationConfig, times(2)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace's name from system property.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSystemProperty() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
final String namespaceName = "magicRedis";
System.setProperty(SystemPropertyKeyConstants.REDIS_NAMESPACE, namespaceName);
Config redisConfig = mock(Config.class);
mockConfig(namespaceName, redisConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(redisConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
/**
* resolve namespace from config. ${mysql.namespace} will be resolved by config from namespace
* application.
*/
@Test
public void testApolloConfigChangeListenerResolveExpressionFromApplicationNamespace() {
final String namespaceKey = "mysql.namespace";
final String namespaceName = "magicMysqlNamespaceApplication";
Properties properties = new Properties();
properties.setProperty(namespaceKey, namespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
Config mysqlConfig = mock(Config.class);
mockConfig(namespaceName, mysqlConfig);
getSimpleBean(
TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration.class);
// if config was used, it must be invoked on method addChangeListener 1 time
verify(mysqlConfig, times(1)).addChangeListener(any(ConfigChangeListener.class));
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigChangeListenerUnresolvedPlaceholder() {
Config applicationConfig = mock(Config.class);
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, applicationConfig);
getSimpleBean(TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration.class);
}
@Test
public void testApolloConfigChangeListenerResolveExpressionFromSelfYaml() throws IOException {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String resolvedValue = "resolve.from.self.yml";
YamlConfigFile yamlConfigFile = prepareYamlConfigFile(resolvedValue, readYamlContentAsConfigFileProperties(resolvedValue));
getSimpleBean(TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration.class);
verify(yamlConfigFile, times(1)).addChangeListener(any(ConfigFileChangeListener.class));
}
@Test
public void testApolloConfigResolveExpressionDefault() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
Config defaultConfig = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig("default-2020-11-14-1733", defaultConfig);
mockConfig(APPLICATION_YAML_NAMESPACE, yamlConfig);
TestApolloConfigResolveExpressionDefaultConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionDefaultConfiguration.class);
assertSame(defaultConfig, configuration.getDefaultConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test
public void testApolloConfigResolveExpressionFromSystemProperty() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_NAMESPACE, namespaceName);
System.setProperty(SystemPropertyKeyConstants.FROM_SYSTEM_YAML_NAMESPACE, yamlNamespaceName);
Config config = mock(Config.class);
Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromSystemPropertyConfiguration.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
@Test(expected = BeanCreationException.class)
public void testApolloConfigUnresolvedExpression() {
mockConfig(ConfigConsts.NAMESPACE_APPLICATION, mock(Config.class));
getSimpleBean(TestApolloConfigUnresolvedExpressionConfiguration.class);
}
@Test
public void testApolloConfigResolveExpressionFromApolloConfigNamespaceApplication() {
final String namespaceName = "xxx6";
final String yamlNamespaceName = "yyy8.yml";
{
// hide variable scope
Properties properties = new Properties();
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY, namespaceName);
properties.setProperty(SystemPropertyKeyConstants.FROM_NAMESPACE_APPLICATION_KEY_YAML, yamlNamespaceName);
this.prepareConfig(ConfigConsts.NAMESPACE_APPLICATION, properties);
}
final Config config = mock(Config.class);
final Config yamlConfig = mock(Config.class);
mockConfig(namespaceName, config);
mockConfig(yamlNamespaceName, yamlConfig);
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication configuration = getSimpleBean(
TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication.class);
assertSame(config, configuration.getConfig());
assertSame(yamlConfig, configuration.getYamlConfig());
}
private static class SystemPropertyKeyConstants {
static final String SIMPLE_NAMESPACE = "simple.namespace";
static final String REDIS_NAMESPACE = "redis.namespace";
static final String FROM_SYSTEM_NAMESPACE = "from.system.namespace";
static final String FROM_SYSTEM_YAML_NAMESPACE = "from.system.yaml.namespace";
static final String FROM_NAMESPACE_APPLICATION_KEY = "from.namespace.application.key";
static final String FROM_NAMESPACE_APPLICATION_KEY_YAML = "from.namespace.application.key.yaml";
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionDefaultConfiguration {
@ApolloConfig(value = "${simple.namespace:default-2020-11-14-1733}")
private Config defaultConfig;
@ApolloConfig(value = "${simple.yaml.namespace:" + APPLICATION_YAML_NAMESPACE + "}")
private Config yamlConfig;
public Config getDefaultConfig() {
return defaultConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfig(value = "${from.system.namespace}")
private Config config;
@ApolloConfig(value = "${from.system.yaml.namespace}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@EnableApolloConfig
protected static class TestApolloConfigUnresolvedExpressionConfiguration {
@ApolloConfig(value = "${so.complex.to.resolve}")
private Config config;
}
@EnableApolloConfig
protected static class TestApolloConfigResolveExpressionFromApolloConfigNamespaceApplication {
@ApolloConfig(value = "${from.namespace.application.key}")
private Config config;
@ApolloConfig(value = "${from.namespace.application.key.yaml}")
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionSimpleConfiguration {
@ApolloConfigChangeListener("${simple.application:application}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromSystemPropertyConfiguration {
@ApolloConfigChangeListener("${redis.namespace}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerResolveExpressionFromApplicationNamespaceConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${mysql.namespace}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig
static class TestApolloConfigChangeListenerUnresolvedPlaceholderConfiguration {
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION,
"${i.can.not.be.resolved}"})
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig("resolve.from.self.yml")
static class TestApolloConfigChangeListenerResolveExpressionFromSelfYamlConfiguration {
/**
* value in file src/test/resources/spring/yaml/resolve.from.self.yml
*/
@ApolloConfigChangeListener("${i.can.resolve.from.self}")
private void onChange(ConfigChangeEvent event) {
}
}
@Configuration
@EnableApolloConfig(value = {ConfigConsts.NAMESPACE_APPLICATION, "${simple.namespace:xxx}"})
static class TestEnableApolloConfigResolveExpressionWithDefaultValueConfiguration {
@Value("${someKey-2020-11-14-1750}")
private String someKey;
public String getSomeKey() {
return this.someKey;
}
}
@Configuration
@EnableApolloConfig(value = "${unresolvable.property}")
static class TestEnableApolloConfigUnresolvableConfiguration {
}
@Configuration
@EnableApolloConfig
static class AppConfig1 {
@Bean
public TestApolloConfigBean1 bean() {
return new TestApolloConfigBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig2 {
@Bean
public TestApolloConfigBean2 bean() {
return new TestApolloConfigBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig3 {
@Bean
public TestApolloConfigChangeListenerBean1 bean() {
return new TestApolloConfigChangeListenerBean1();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig4 {
@Bean
public TestApolloConfigChangeListenerBean2 bean() {
return new TestApolloConfigChangeListenerBean2();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig5 {
@Bean
public TestApolloConfigChangeListenerBean3 bean() {
return new TestApolloConfigChangeListenerBean3();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig6 {
@Bean
public TestApolloChildConfigBean bean() {
return new TestApolloChildConfigBean();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig7 {
@Bean
public TestApolloChildConfigChangeListener bean() {
return new TestApolloChildConfigChangeListener();
}
}
@Configuration
@EnableApolloConfig
static class AppConfig8 {
@Bean
public TestApolloConfigChangeListenerWithInterestedKeysBean bean() {
return new TestApolloConfigChangeListenerWithInterestedKeysBean();
}
}
@Configuration
@EnableApolloConfig(APPLICATION_YAML_NAMESPACE)
static class AppConfig9 {
@Bean
public TestApolloConfigChangeListenerWithYamlFile bean() {
return new TestApolloConfigChangeListenerWithYamlFile();
}
}
static class TestApolloConfigBean1 {
@ApolloConfig
private Config config;
@ApolloConfig(ConfigConsts.NAMESPACE_APPLICATION)
private Config anotherConfig;
@ApolloConfig(FX_APOLLO_NAMESPACE)
private Config yetAnotherConfig;
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
public Config getConfig() {
return config;
}
public Config getAnotherConfig() {
return anotherConfig;
}
public Config getYetAnotherConfig() {
return yetAnotherConfig;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
static class TestApolloConfigBean2 {
@ApolloConfig
private String config;
}
static class TestApolloChildConfigBean extends TestApolloConfigBean1 {
@ApolloConfig
private Config someConfig;
public Config getSomeConfig() {
return someConfig;
}
}
static class TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent changeEvent1;
private ConfigChangeEvent changeEvent2;
private ConfigChangeEvent changeEvent3;
@ApolloConfigChangeListener
private void onChange1(ConfigChangeEvent changeEvent) {
this.changeEvent1 = changeEvent;
}
@ApolloConfigChangeListener(ConfigConsts.NAMESPACE_APPLICATION)
private void onChange2(ConfigChangeEvent changeEvent) {
this.changeEvent2 = changeEvent;
}
@ApolloConfigChangeListener({ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE})
private void onChange3(ConfigChangeEvent changeEvent) {
this.changeEvent3 = changeEvent;
}
public ConfigChangeEvent getChangeEvent1() {
return changeEvent1;
}
public ConfigChangeEvent getChangeEvent2() {
return changeEvent2;
}
public ConfigChangeEvent getChangeEvent3() {
return changeEvent3;
}
}
static class TestApolloConfigChangeListenerBean2 {
@ApolloConfigChangeListener
private void onChange(String event) {
}
}
static class TestApolloConfigChangeListenerBean3 {
@ApolloConfigChangeListener
private void onChange(ConfigChangeEvent event, String someParam) {
}
}
static class TestApolloChildConfigChangeListener extends TestApolloConfigChangeListenerBean1 {
private ConfigChangeEvent someChangeEvent;
@ApolloConfigChangeListener
private void someOnChange(ConfigChangeEvent changeEvent) {
this.someChangeEvent = changeEvent;
}
public ConfigChangeEvent getSomeChangeEvent() {
return someChangeEvent;
}
}
static class TestApolloConfigChangeListenerWithInterestedKeysBean {
@ApolloConfigChangeListener(interestedKeys = {"someKey"})
private void someOnChange(ConfigChangeEvent changeEvent) {}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, FX_APOLLO_NAMESPACE},
interestedKeys = {"anotherKey"})
private void anotherOnChange(ConfigChangeEvent changeEvent) {
}
}
static class TestApolloConfigChangeListenerWithYamlFile {
private SettableFuture<ConfigChangeEvent> configChangeEventFuture = SettableFuture.create();
@ApolloConfig(APPLICATION_YAML_NAMESPACE)
private Config yamlConfig;
@ApolloConfigChangeListener(APPLICATION_YAML_NAMESPACE)
private void onChange(ConfigChangeEvent event) {
configChangeEventFuture.set(event);
}
public SettableFuture<ConfigChangeEvent> getConfigChangeEventFuture() {
return configChangeEventFuture;
}
public Config getYamlConfig() {
return yamlConfig;
}
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./docs/zh/usage/apollo-user-guide.md | #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
3. 输入项目信息
* 部门：选择应用所在的部门
* 应用AppId：用来标识应用身份的唯一id，格式为string，需要和客户端app.properties中配置的app.id对应
* 应用名称：应用名，仅用于界面展示
* 应用负责人：选择的人默认会成为该项目的管理员，具备项目权限管理、集群创建、Namespace创建等权限
4. 点击提交
创建成功后，会自动跳转到项目首页
## 1.2 项目权限分配
### 1.2.1 项目管理员权限
项目管理员拥有以下权限：
1. 可以管理项目的权限分配
2. 可以创建集群
3. 可以创建Namespace
创建项目时填写的应用负责人默认会成为项目的管理员之一，如果还需要其他人也成为项目管理员，可以按照下面步骤操作：
1. 点击页面左侧的“管理项目”
* 
2. 搜索需要添加的成员并点击添加
* 
* 
### 1.2.2 配置编辑、发布权限
配置权限分为编辑和发布：
* 编辑权限允许用户在Apollo界面上创建、修改、删除配置
* 配置修改后只在Apollo界面上变化，不会影响到应用实际使用的配置
* 发布权限允许用户在Apollo界面上发布、回滚配置
* 配置只有在发布、回滚动作后才会被应用实际使用到
* Apollo在用户操作发布、回滚动作后实时通知到应用，并使最新配置生效
项目创建完，默认没有分配配置的编辑和发布权限，需要项目管理员进行授权。
1. 点击application这个namespace的授权按钮
* 
2. 分配修改权限
* 
3. 分配发布权限
* 
## 1.3 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
### 1.3.1 通过表格模式添加配置
1. 点击新增配置
* 
2. 输入配置项
* 
3. 点击提交
* 
### 1.3.2 通过文本模式编辑
Apollo除了支持表格模式，逐个添加、修改配置外，还提供文本模式批量添加、修改。
这个对于从已有的properties文件迁移尤其有用。
1. 切换到文本编辑模式
2. 点击右侧的修改配置按钮
3. 输入配置项，并点击提交修改
## 1.4 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
## 1.5 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
## 1.6 回滚已发布配置
如果发现已发布的配置有问题，可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。
这里的回滚机制类似于发布系统，发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本，但代码仓库中的代码是不会回滚的，从而开发可以在修复代码后重新发布。
Apollo中的回滚也是类似的机制，点击回滚后是将发布到客户端的配置回滚到上一个已发布版本，也就是说客户端读取到的配置会恢复到上一个版本，但页面上编辑状态的配置是不会回滚的，从而开发可以在修复配置后重新发布。
# 二、公共组件接入指南
## 2.1 公共组件和普通应用的区别
公共组件是指那些发布给其它应用使用的客户端代码，比如CAT客户端、Hermes Producer客户端等。
虽然这类组件是由其他团队开发、维护，但是运行时是在业务实际应用内的，所以本质上可以认为是应用的一部分。
通常情况下，这类组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
## 2.2 公共组件接入步骤
公共组件的接入步骤，和普通应用几乎一致，唯一的区别是公共组件需要创建自己唯一的Namespace。
所以，首先执行普通应用接入文档中的以下几个步骤，然后再按照本章节后面的步骤操作。
1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE)
2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90)
### 2.2.1 创建Namespace
创建Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权。
1. 点击页面左侧的添加Namespace
* 
2. 点击“创建新的Namespace”
* 
3. 输入公共组件的Namespace名称，需要注意的是Namespace名称全局唯一
* Apollo会默认把部门代号添加在最前面
* 
4. 点击提交后，页面会自动跳转到关联Namespace页面
* 首先，选中所有需要有这个Namespace的环境和集群，一般建议全选
* 其次，选中刚刚创建的namespace
* 最后，点击提交
* 
5. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
* 
2. 分配发布权限
* 
6. 点击“返回”回到项目页面
### 2.2.2 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
#### 2.2.2.1 通过表格模式添加配置
1. 点击新增配置
2. 输入配置项
3. 点击提交
#### 2.2.2.2 通过文本模式编辑
这部分和普通应用一致，具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。
### 2.2.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
### 2.2.4 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
对于公共组件的配置读取，可以参考上述文档中的“获取公共Namespace的配置”部分。
## 2.3 应用覆盖公用组件配置步骤
前面提到，通常情况下，公共组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
这里就讲一下应用如何覆盖公用组件的配置，简单起见，假设apollo-portal应用使用了hermes producer客户端，并且希望调整hermes的批量发送大小。
### 2.3.1 关联公共组件Namespace
1. 进入使用公共组件的应用项目首页，点击左侧的添加Namespace按钮
* 所以，在这个例子中，我们需要进入apollo-portal的首页。
* （添加Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权）
* 
2. 找到hermes producer的namespace，并选择需要关联到哪些环境和集群
3. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
2. 分配发布权限
4. 点击“返回”回到项目页面
### 2.3.2 覆盖公用组件配置
1. 点击新增配置
2. 输入要覆盖的配置项
3. 点击提交
### 2.3.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
3. 配置发布成功后，hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。
# 三、集群独立配置说明
在有些特殊情况下，应用有需求对不同的集群做不同的配置，比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。
在这种情况下，可以通过在Apollo创建不同的集群来解决。
## 3.1 创建集群
创建集群需要项目管理员权限，如果发现没有添加集群按钮，可以找项目管理员授权。
1. 点击页面左侧的“添加集群”按钮
* 
2. 输入集群名称，选择环境并提交
* 
3. 切换到对应的集群，修改配置并发布即可
* 
4. 通过上述配置，部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置
5. 如果应用还在其它机房部署了应用，那么在上述的配置下，会读到default集群下的配置。
# 四、多个AppId使用同一份配置
在一些情况下，尽管应用本身不是公共组件，但还是需要在多个AppId之间共用同一份配置，比如同一个产品的不同项目：XX-Web, XX-Service, XX-Job等。
这种情况下如果希望实现多个AppId使用同一份配置的话，基本概念和公共组件的配置是一致的。
具体来说，就是在其中一个AppId下创建一个namespace，写入公共的配置信息，然后在各个项目中读取该namespace的配置即可。
如果某个AppId需要覆盖公共的配置信息，那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。
具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。
# 五、灰度发布使用指南
通过灰度发布功能，可以实现：
1. 对于一些对程序有比较大影响的配置，可以先在一个或者多个实例生效，观察一段时间没问题后再全量发布配置。
2. 对于一些需要调优的配置参数，可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置，不断调整、测评一段时间后找出较优的配置再全量发布配置。
下面将结合一个实际例子来描述如何使用灰度发布功能。
## 5.1 场景介绍
100004458(apollo-demo)项目有两个客户端：
1. 10.32.21.19
2. 10.32.21.22
**灰度目标：**
* 当前有一个配置timeout=2000，我们希望对10.32.21.22灰度发布timeout=3000，对10.32.21.19仍然是timeout=2000。
## 5.2 创建灰度
首先点击application namespace右上角的`创建灰度`按钮。
点击确定后，灰度版本就创建成功了，页面会自动切换到`灰度版本`Tab。
## 5.3 灰度配置
点击`主版本的配置`中，timeout配置最右侧的`对此配置灰度`按钮
在弹出框中填入要灰度的值：3000，点击提交。
## 5.4 配置灰度规则
切换到`灰度规则`Tab，点击`新增规则`按钮
在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表，选择我们要灰度的IP，点击完成。
如果下拉框中没找到需要的IP，说明机器还没从Apollo取过配置，可以点击手动输入IP来输入，输入完后点击添加按钮
>注：对于公共Namespace的灰度规则，需要先指定要灰度的appId，然后再选择IP。
## 5.5 灰度发布
配置规则已经生效，不过灰度配置还没有发布。切换到`配置`Tab。
再次检查灰度的配置部分，如果没有问题，点击`灰度发布`。
在弹出框中可以看到主版本的值是2000，灰度版本即将发布的值是3000。填入其它信息后，点击发布。
发布后，切换到`灰度实例列表`Tab，就能看到10.32.21.22已经使用了灰度发布的值。
切换到`主版本`的`实例列表`，会看到主版本配置只有10.32.21.19在使用了。
后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效，规则的修改在规则点击完成后就会实时生效。
## 5.6 全量发布
如果灰度的配置测试下来比较理想，符合预期，那么就可以操作`全量发布`。
全量发布的效果是：
1. 灰度版本的配置会合并回主版本，在这个例子中，就是主版本的timeout会被更新成3000
2. 主版本的配置会自动进行一次发布
3. 在全量发布页面，可以选择是否保留当前灰度版本，默认为不保留。
我选择了不保留灰度版本，所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表，可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。
## 5.7 放弃灰度
如果灰度版本不理想或者不需要了，可以点击`放弃灰度`。
## 5.8 发布历史
点击主版本的`发布历史`按钮，可以看到当前namespace的主版本以及灰度版本的发布历史。
# 六、其它功能配置
## 6.1 配置查看权限
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
## 6.2 配置访问密钥
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
1. 项目管理员打开管理密钥页面
2. 为项目的每个环境生成访问密钥，注意默认是禁用的，建议在客户端都配置完成后再开启
3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥)
# 七、最佳实践
## 7.1 安全相关
配置中心作为基础服务，存储着公司非常重要的配置信息，所以安全因素需要大家重点关注，下面列举了一些注意事项供大家参考，也欢迎大家分享自己的实践案例。
### 7.1.1 认证
建议接入公司统一的身份认证系统，如 SSO、LDAP 等，接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
> 如果使用Apollo提供的Spring Security简单认证，务必记得要修改超级管理员apollo的密码
### 7.1.2 授权
Apollo 支持细粒度的权限控制，请务必根据实际情况做好权限控制：
1. [项目管理员权限](#_121-项目管理员权限)
* Apollo 默认允许所有登录用户创建项目，如果只允许部分用户创建项目，可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制)
2. [配置编辑、发布权限](#_122-配置编辑、发布权限)
* 配置编辑、发布权限支持按环境配置，比如开发环境开发人员可以自行完成配置编辑和发布的过程，但是生产环境发布权限交由测试或运维人员
* 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关，用于发布审核)，从而控制一次配置发布只能由一个人修改，另一个人发布，确保配置修改得到充分检查
3. [配置查看权限](#_61-配置查看权限)
* 可以指定某个环境只允许项目成员查看私有Namespace的配置，从而避免敏感配置泄露，如生产环境
### 7.1.3 系统访问
除了用户权限，在系统访问上也需要加以考虑：
1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的，所以出于安全考虑，禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网
2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5)，从而只有经过身份验证的客户端才能访问敏感配置
3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口，增强安全性
| #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
3. 输入项目信息
* 部门：选择应用所在的部门
* 应用AppId：用来标识应用身份的唯一id，格式为string，需要和客户端app.properties中配置的app.id对应
* 应用名称：应用名，仅用于界面展示
* 应用负责人：选择的人默认会成为该项目的管理员，具备项目权限管理、集群创建、Namespace创建等权限
4. 点击提交
创建成功后，会自动跳转到项目首页
## 1.2 项目权限分配
### 1.2.1 项目管理员权限
项目管理员拥有以下权限：
1. 可以管理项目的权限分配
2. 可以创建集群
3. 可以创建Namespace
创建项目时填写的应用负责人默认会成为项目的管理员之一，如果还需要其他人也成为项目管理员，可以按照下面步骤操作：
1. 点击页面左侧的“管理项目”
* 
2. 搜索需要添加的成员并点击添加
* 
* 
### 1.2.2 配置编辑、发布权限
配置权限分为编辑和发布：
* 编辑权限允许用户在Apollo界面上创建、修改、删除配置
* 配置修改后只在Apollo界面上变化，不会影响到应用实际使用的配置
* 发布权限允许用户在Apollo界面上发布、回滚配置
* 配置只有在发布、回滚动作后才会被应用实际使用到
* Apollo在用户操作发布、回滚动作后实时通知到应用，并使最新配置生效
项目创建完，默认没有分配配置的编辑和发布权限，需要项目管理员进行授权。
1. 点击application这个namespace的授权按钮
* 
2. 分配修改权限
* 
3. 分配发布权限
* 
## 1.3 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
### 1.3.1 通过表格模式添加配置
1. 点击新增配置
* 
2. 输入配置项
* 
3. 点击提交
* 
### 1.3.2 通过文本模式编辑
Apollo除了支持表格模式，逐个添加、修改配置外，还提供文本模式批量添加、修改。
这个对于从已有的properties文件迁移尤其有用。
1. 切换到文本编辑模式
2. 点击右侧的修改配置按钮
3. 输入配置项，并点击提交修改
## 1.4 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
## 1.5 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
## 1.6 回滚已发布配置
如果发现已发布的配置有问题，可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。
这里的回滚机制类似于发布系统，发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本，但代码仓库中的代码是不会回滚的，从而开发可以在修复代码后重新发布。
Apollo中的回滚也是类似的机制，点击回滚后是将发布到客户端的配置回滚到上一个已发布版本，也就是说客户端读取到的配置会恢复到上一个版本，但页面上编辑状态的配置是不会回滚的，从而开发可以在修复配置后重新发布。
# 二、公共组件接入指南
## 2.1 公共组件和普通应用的区别
公共组件是指那些发布给其它应用使用的客户端代码，比如CAT客户端、Hermes Producer客户端等。
虽然这类组件是由其他团队开发、维护，但是运行时是在业务实际应用内的，所以本质上可以认为是应用的一部分。
通常情况下，这类组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
## 2.2 公共组件接入步骤
公共组件的接入步骤，和普通应用几乎一致，唯一的区别是公共组件需要创建自己唯一的Namespace。
所以，首先执行普通应用接入文档中的以下几个步骤，然后再按照本章节后面的步骤操作。
1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE)
2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90)
### 2.2.1 创建Namespace
创建Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权。
1. 点击页面左侧的添加Namespace
* 
2. 点击“创建新的Namespace”
* 
3. 输入公共组件的Namespace名称，需要注意的是Namespace名称全局唯一
* Apollo会默认把部门代号添加在最前面
* 
4. 点击提交后，页面会自动跳转到关联Namespace页面
* 首先，选中所有需要有这个Namespace的环境和集群，一般建议全选
* 其次，选中刚刚创建的namespace
* 最后，点击提交
* 
5. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
* 
2. 分配发布权限
* 
6. 点击“返回”回到项目页面
### 2.2.2 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
#### 2.2.2.1 通过表格模式添加配置
1. 点击新增配置
2. 输入配置项
3. 点击提交
#### 2.2.2.2 通过文本模式编辑
这部分和普通应用一致，具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。
### 2.2.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
### 2.2.4 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
对于公共组件的配置读取，可以参考上述文档中的“获取公共Namespace的配置”部分。
## 2.3 应用覆盖公用组件配置步骤
前面提到，通常情况下，公共组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
这里就讲一下应用如何覆盖公用组件的配置，简单起见，假设apollo-portal应用使用了hermes producer客户端，并且希望调整hermes的批量发送大小。
### 2.3.1 关联公共组件Namespace
1. 进入使用公共组件的应用项目首页，点击左侧的添加Namespace按钮
* 所以，在这个例子中，我们需要进入apollo-portal的首页。
* （添加Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权）
* 
2. 找到hermes producer的namespace，并选择需要关联到哪些环境和集群
3. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
2. 分配发布权限
4. 点击“返回”回到项目页面
### 2.3.2 覆盖公用组件配置
1. 点击新增配置
2. 输入要覆盖的配置项
3. 点击提交
### 2.3.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
3. 配置发布成功后，hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。
# 三、集群独立配置说明
在有些特殊情况下，应用有需求对不同的集群做不同的配置，比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。
在这种情况下，可以通过在Apollo创建不同的集群来解决。
## 3.1 创建集群
创建集群需要项目管理员权限，如果发现没有添加集群按钮，可以找项目管理员授权。
1. 点击页面左侧的“添加集群”按钮
* 
2. 输入集群名称，选择环境并提交
* 
3. 切换到对应的集群，修改配置并发布即可
* 
4. 通过上述配置，部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置
5. 如果应用还在其它机房部署了应用，那么在上述的配置下，会读到default集群下的配置。
# 四、多个AppId使用同一份配置
在一些情况下，尽管应用本身不是公共组件，但还是需要在多个AppId之间共用同一份配置，比如同一个产品的不同项目：XX-Web, XX-Service, XX-Job等。
这种情况下如果希望实现多个AppId使用同一份配置的话，基本概念和公共组件的配置是一致的。
具体来说，就是在其中一个AppId下创建一个namespace，写入公共的配置信息，然后在各个项目中读取该namespace的配置即可。
如果某个AppId需要覆盖公共的配置信息，那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。
具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。
# 五、灰度发布使用指南
通过灰度发布功能，可以实现：
1. 对于一些对程序有比较大影响的配置，可以先在一个或者多个实例生效，观察一段时间没问题后再全量发布配置。
2. 对于一些需要调优的配置参数，可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置，不断调整、测评一段时间后找出较优的配置再全量发布配置。
下面将结合一个实际例子来描述如何使用灰度发布功能。
## 5.1 场景介绍
100004458(apollo-demo)项目有两个客户端：
1. 10.32.21.19
2. 10.32.21.22
**灰度目标：**
* 当前有一个配置timeout=2000，我们希望对10.32.21.22灰度发布timeout=3000，对10.32.21.19仍然是timeout=2000。
## 5.2 创建灰度
首先点击application namespace右上角的`创建灰度`按钮。
点击确定后，灰度版本就创建成功了，页面会自动切换到`灰度版本`Tab。
## 5.3 灰度配置
点击`主版本的配置`中，timeout配置最右侧的`对此配置灰度`按钮
在弹出框中填入要灰度的值：3000，点击提交。
## 5.4 配置灰度规则
切换到`灰度规则`Tab，点击`新增规则`按钮
在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表，选择我们要灰度的IP，点击完成。
如果下拉框中没找到需要的IP，说明机器还没从Apollo取过配置，可以点击手动输入IP来输入，输入完后点击添加按钮
>注：对于公共Namespace的灰度规则，需要先指定要灰度的appId，然后再选择IP。
## 5.5 灰度发布
配置规则已经生效，不过灰度配置还没有发布。切换到`配置`Tab。
再次检查灰度的配置部分，如果没有问题，点击`灰度发布`。
在弹出框中可以看到主版本的值是2000，灰度版本即将发布的值是3000。填入其它信息后，点击发布。
发布后，切换到`灰度实例列表`Tab，就能看到10.32.21.22已经使用了灰度发布的值。
切换到`主版本`的`实例列表`，会看到主版本配置只有10.32.21.19在使用了。
后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效，规则的修改在规则点击完成后就会实时生效。
## 5.6 全量发布
如果灰度的配置测试下来比较理想，符合预期，那么就可以操作`全量发布`。
全量发布的效果是：
1. 灰度版本的配置会合并回主版本，在这个例子中，就是主版本的timeout会被更新成3000
2. 主版本的配置会自动进行一次发布
3. 在全量发布页面，可以选择是否保留当前灰度版本，默认为不保留。
我选择了不保留灰度版本，所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表，可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。
## 5.7 放弃灰度
如果灰度版本不理想或者不需要了，可以点击`放弃灰度`。
## 5.8 发布历史
点击主版本的`发布历史`按钮，可以看到当前namespace的主版本以及灰度版本的发布历史。
# 六、其它功能配置
## 6.1 配置查看权限
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
## 6.2 配置访问密钥
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
1. 项目管理员打开管理密钥页面
2. 为项目的每个环境生成访问密钥，注意默认是禁用的，建议在客户端都配置完成后再开启
3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥)
# 七、最佳实践
## 7.1 安全相关
配置中心作为基础服务，存储着公司非常重要的配置信息，所以安全因素需要大家重点关注，下面列举了一些注意事项供大家参考，也欢迎大家分享自己的实践案例。
### 7.1.1 认证
建议接入公司统一的身份认证系统，如 SSO、LDAP 等，接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
> 如果使用Apollo提供的Spring Security简单认证，务必记得要修改超级管理员apollo的密码
### 7.1.2 授权
Apollo 支持细粒度的权限控制，请务必根据实际情况做好权限控制：
1. [项目管理员权限](#_121-项目管理员权限)
* Apollo 默认允许所有登录用户创建项目，如果只允许部分用户创建项目，可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制)
2. [配置编辑、发布权限](#_122-配置编辑、发布权限)
* 配置编辑、发布权限支持按环境配置，比如开发环境开发人员可以自行完成配置编辑和发布的过程，但是生产环境发布权限交由测试或运维人员
* 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关，用于发布审核)，从而控制一次配置发布只能由一个人修改，另一个人发布，确保配置修改得到充分检查
3. [配置查看权限](#_61-配置查看权限)
* 可以指定某个环境只允许项目成员查看私有Namespace的配置，从而避免敏感配置泄露，如生产环境
### 7.1.3 系统访问
除了用户权限，在系统访问上也需要加以考虑：
1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的，所以出于安全考虑，禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网
2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5)，从而只有经过身份验证的客户端才能访问敏感配置
3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口，增强安全性
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserInfoHolder.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.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
/**
* 不是ctrip的公司默认提供一个假用户
*/
public class DefaultUserInfoHolder implements UserInfoHolder {
public DefaultUserInfoHolder() {
}
@Override
public UserInfo getUser() {
UserInfo userInfo = new UserInfo();
userInfo.setUserId("apollo");
userInfo.setName("apollo");
return userInfo;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
/**
* 不是ctrip的公司默认提供一个假用户
*/
public class DefaultUserInfoHolder implements UserInfoHolder {
public DefaultUserInfoHolder() {
}
@Override
public UserInfo getUser() {
UserInfo userInfo = new UserInfo();
userInfo.setUserId("apollo");
userInfo.setName("apollo");
return userInfo;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/utils/ByteUtilTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.apollo.core.utils.ByteUtil;
import org.junit.Assert;
import org.junit.Test;
public class ByteUtilTest {
@Test
public void testInt3() {
Assert.assertEquals((byte)0, ByteUtil.int3(0));
Assert.assertEquals((byte)0, ByteUtil.int3(1));
}
@Test
public void testInt2() {
Assert.assertEquals((byte)0, ByteUtil.int2(0));
Assert.assertEquals((byte)0, ByteUtil.int2(1));
}
@Test
public void testInt1() {
Assert.assertEquals((byte)0, ByteUtil.int1(0));
Assert.assertEquals((byte)0, ByteUtil.int1(1));
}
@Test
public void testInt0() {
Assert.assertEquals((byte)0, ByteUtil.int0(0));
Assert.assertEquals((byte)1, ByteUtil.int0(1));
}
@Test
public void testToHexString() {
Assert.assertEquals("", ByteUtil.toHexString(new byte[] {}));
Assert.assertEquals("98", ByteUtil.toHexString(new byte[] {(byte)-104}));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.apollo.core.utils.ByteUtil;
import org.junit.Assert;
import org.junit.Test;
public class ByteUtilTest {
@Test
public void testInt3() {
Assert.assertEquals((byte)0, ByteUtil.int3(0));
Assert.assertEquals((byte)0, ByteUtil.int3(1));
}
@Test
public void testInt2() {
Assert.assertEquals((byte)0, ByteUtil.int2(0));
Assert.assertEquals((byte)0, ByteUtil.int2(1));
}
@Test
public void testInt1() {
Assert.assertEquals((byte)0, ByteUtil.int1(0));
Assert.assertEquals((byte)0, ByteUtil.int1(1));
}
@Test
public void testInt0() {
Assert.assertEquals((byte)0, ByteUtil.int0(0));
Assert.assertEquals((byte)1, ByteUtil.int0(1));
}
@Test
public void testToHexString() {
Assert.assertEquals("", ByteUtil.toHexString(new byte[] {}));
Assert.assertEquals("98", ByteUtil.toHexString(new byte[] {(byte)-104}));
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AppDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import javax.validation.constraints.Pattern;
public class AppDTO extends BaseDTO{
private long id;
private String name;
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String appId;
private String orgId;
private String orgName;
private String ownerName;
private String ownerDisplayName;
private String ownerEmail;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOwnerName() {
return ownerName;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public String getOwnerDisplayName() {
return ownerDisplayName;
}
public void setOwnerDisplayName(String ownerDisplayName) {
this.ownerDisplayName = ownerDisplayName;
}
public String getOwnerEmail() {
return ownerEmail;
}
public void setOwnerEmail(String ownerEmail) {
this.ownerEmail = ownerEmail;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.ctrip.framework.apollo.common.utils.InputValidator;
import javax.validation.constraints.Pattern;
public class AppDTO extends BaseDTO{
private long id;
private String name;
@Pattern(
regexp = InputValidator.CLUSTER_NAMESPACE_VALIDATOR,
message = "Invalid AppId format: " + InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE
)
private String appId;
private String orgId;
private String orgName;
private String ownerName;
private String ownerDisplayName;
private String ownerEmail;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public String getOwnerName() {
return ownerName;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public String getOwnerDisplayName() {
return ownerDisplayName;
}
public void setOwnerDisplayName(String ownerDisplayName) {
this.ownerDisplayName = ownerDisplayName;
}
public String getOwnerEmail() {
return ownerEmail;
}
public void setOwnerEmail(String ownerEmail) {
this.ownerEmail = ownerEmail;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.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.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "Cluster")
@SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Cluster extends BaseEntity implements Comparable<Cluster> {
@Column(name = "Name", nullable = false)
private String name;
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "ParentClusterId", nullable = false)
private long parentClusterId;
public String getAppId() {
return appId;
}
public String getName() {
return name;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setName(String name) {
this.name = name;
}
public long getParentClusterId() {
return parentClusterId;
}
public void setParentClusterId(long parentClusterId) {
this.parentClusterId = parentClusterId;
}
public String toString() {
return toStringHelper().add("name", name).add("appId", appId)
.add("parentClusterId", parentClusterId).toString();
}
@Override
public int compareTo(Cluster o) {
if (o == null || getId() > o.getId()) {
return 1;
}
if (getId() == o.getId()) {
return 0;
}
return -1;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.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.Table;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@Entity
@Table(name = "Cluster")
@SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0")
public class Cluster extends BaseEntity implements Comparable<Cluster> {
@Column(name = "Name", nullable = false)
private String name;
@Column(name = "AppId", nullable = false)
private String appId;
@Column(name = "ParentClusterId", nullable = false)
private long parentClusterId;
public String getAppId() {
return appId;
}
public String getName() {
return name;
}
public void setAppId(String appId) {
this.appId = appId;
}
public void setName(String name) {
this.name = name;
}
public long getParentClusterId() {
return parentClusterId;
}
public void setParentClusterId(long parentClusterId) {
this.parentClusterId = parentClusterId;
}
public String toString() {
return toStringHelper().add("name", name).add("appId", appId)
.add("parentClusterId", parentClusterId).toString();
}
@Override
public int compareTo(Cluster o) {
if (o == null || getId() > o.getId()) {
return 1;
}
if (getId() == o.getId()) {
return 0;
}
return -1;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/img/release-all.png | PNG
IHDR X IDATx^]MvZ/eD9(,ƚŜ `yg 9Ln`-CMQdP(|*TR [ X @` A^ dbhL
7$Ccn nW& tC q
2A И n H&4 ApCL A214 ze 1M7@7+@L i! ^ dbhL
7$CcB FOol AlB[ <)Ff
Zh
篎oZw|AXʆ@`z oفx"I"'/ƪJ_g'ʃ }RhbOB)ӭ)z2U E @ m/OֺS$Y"phPPbRtr6p qA
}#PC
1 \)m? qA
}!p(kbJΤ j pO5Z*t2$1
dx`˳mAWЏ}CB
ü](Q{zyUY9#AԛDBȬ<u "~^&FE ^fFglld7Uzrf < TY6}}^XmJZ12=Lʿ~#A}9T YUA} !1j\۱¢&Gp@Ev {#$1q)m+XX zO}G6Z^ V[rG>U } |}5oy'娾6Htp1b7
:BΧBO*弋So*H}kA*+HNJ{BdIA ,n)T{:P
2TU^bNS>η#996Ez;X|:w?hA_K$?7b,AP^-VU c0Ÿڏj-zs?4GCdEJ+Eb<2 >HE b^ E$qZ WxW{`]os?w lHU^ %(n{z#|E-'=*w͍z:CVvSი" ]NAן|u,zmMYB'RH}hg(kA0pۃ 28^?͆(w/}z;X Y{yWaC bT)*,֩kŊH#g>Ϙɮ~O !kAeܲO3ؘNKWM?HVt}"|fro >?R {v Dp<k`={)[mc=Tz;bk-HUg~u }lPAQzKMJ >
T QrIZ\OM\9HrP8w}8ĨTJ}-aT8F!/{Smت]?m:9;hQyW̆+'(pJ_g(@c>x /j}ù,@vS{<;DQ0Xv C7 ~9.M u4M(b qnRvnۂ
]^m J}יI";`2k#H &;q-4ps.'Oq-VL @F2q{NjKp22t^n8?x%A pc 9z6u*A@ǝrt=_Zl¹:uRIUe1\MSoǚ -j|$OټU7#kZV[,}W(uS:1pƗ7Db<eØ,1qk9,s[& (b+_R7& 6ױ 8k_ Lsg.DڤX NƍZXLzڭB e2_<xob6θ=N'
ApgIfw=eL>a
66!pnRk a}{uiD^ ¹J}N:O'bd97uƗW~'}{vQ^ 8iKY mv`] 83tK_T GAꦼ b, %*OǶݜ7$"S?FBɡ E*{7SrЖބ u#+6f1r+c !B?V|Wg\ϻg M2Y6OQ/BG\Gg!bShu !PHn\r3aGke|k`*m<%9z۶fb զ{ll^E9V1u8atF b> hk&h>-8ueUQ)_]tO}}/F'~8txޞ<A -T-BYD(K8wA/ N|Wl6Ԏ~Q1*3w]gҧ& d]b2buQ&eKTb3^Q?L զٹmw{/Sr6ꃫ!KW[,bJ2ME(Y8v)fIX1%G>Q1*g\6+Iog5J[f"l {Ow`'vdE[bqAHyJym[,UXg"?9}G*A ,b>)#MCr}'>. Zޅy
,i: x0,m~¹Ȥ'="!VR䔝ujA,fXy-f>A
e*|l`".v -\K[ѤNԦNrnbDSoOT#Lw8R %W&Zrl3TX1I [jy-|KCri-jy-e{NTkADZk!D\",^q% SmVf#˽m e{6^<ĭTGҡrbQ.C9m7+% ). !\^ .lfm'K2vlV k|u)77d. AULJ _qTyqJ^|Cȩb<;d1|*N˳zׂ kܫ=A
9 HVΤѷ:.QLZ)[^% > QSz*tu{]_W QSr, EANL4zo0;ةh$ w4h$ >0A l~-ڃ N"A{̌{D/Aà %v. hp3 \IAŘ (AW5 !`/ hBsh/ |;~G@A@& ;O$!IN<h
I # dA2(7m%=h$yp(
H@SmD J8)i H@Pa! hGpAp.w9h$ T; X4l| p \}i¹ 2 v< H1_@ A"!" 4 d y@ c |m# D CE k;h $/ _A @| AG@ 2 v< H1_@ A"!" 4 d y82:7# IENDB` | PNG
IHDR X IDATx^]MvZ/eD9(,ƚŜ `yg 9Ln`-CMQdP(|*TR [ X @` A^ dbhL
7$Ccn nW& tC q
2A И n H&4 ApCL A214 ze 1M7@7+@L i! ^ dbhL
7$CcB FOol AlB[ <)Ff
Zh
篎oZw|AXʆ@`z oفx"I"'/ƪJ_g'ʃ }RhbOB)ӭ)z2U E @ m/OֺS$Y"phPPbRtr6p qA
}#PC
1 \)m? qA
}!p(kbJΤ j pO5Z*t2$1
dx`˳mAWЏ}CB
ü](Q{zyUY9#AԛDBȬ<u "~^&FE ^fFglld7Uzrf < TY6}}^XmJZ12=Lʿ~#A}9T YUA} !1j\۱¢&Gp@Ev {#$1q)m+XX zO}G6Z^ V[rG>U } |}5oy'娾6Htp1b7
:BΧBO*弋So*H}kA*+HNJ{BdIA ,n)T{:P
2TU^bNS>η#996Ez;X|:w?hA_K$?7b,AP^-VU c0Ÿڏj-zs?4GCdEJ+Eb<2 >HE b^ E$qZ WxW{`]os?w lHU^ %(n{z#|E-'=*w͍z:CVvSი" ]NAן|u,zmMYB'RH}hg(kA0pۃ 28^?͆(w/}z;X Y{yWaC bT)*,֩kŊH#g>Ϙɮ~O !kAeܲO3ؘNKWM?HVt}"|fro >?R {v Dp<k`={)[mc=Tz;bk-HUg~u }lPAQzKMJ >
T QrIZ\OM\9HrP8w}8ĨTJ}-aT8F!/{Smت]?m:9;hQyW̆+'(pJ_g(@c>x /j}ù,@vS{<;DQ0Xv C7 ~9.M u4M(b qnRvnۂ
]^m J}יI";`2k#H &;q-4ps.'Oq-VL @F2q{NjKp22t^n8?x%A pc 9z6u*A@ǝrt=_Zl¹:uRIUe1\MSoǚ -j|$OټU7#kZV[,}W(uS:1pƗ7Db<eØ,1qk9,s[& (b+_R7& 6ױ 8k_ Lsg.DڤX NƍZXLzڭB e2_<xob6θ=N'
ApgIfw=eL>a
66!pnRk a}{uiD^ ¹J}N:O'bd97uƗW~'}{vQ^ 8iKY mv`] 83tK_T GAꦼ b, %*OǶݜ7$"S?FBɡ E*{7SrЖބ u#+6f1r+c !B?V|Wg\ϻg M2Y6OQ/BG\Gg!bShu !PHn\r3aGke|k`*m<%9z۶fb զ{ll^E9V1u8atF b> hk&h>-8ueUQ)_]tO}}/F'~8txޞ<A -T-BYD(K8wA/ N|Wl6Ԏ~Q1*3w]gҧ& d]b2buQ&eKTb3^Q?L զٹmw{/Sr6ꃫ!KW[,bJ2ME(Y8v)fIX1%G>Q1*g\6+Iog5J[f"l {Ow`'vdE[bqAHyJym[,UXg"?9}G*A ,b>)#MCr}'>. Zޅy
,i: x0,m~¹Ȥ'="!VR䔝ujA,fXy-f>A
e*|l`".v -\K[ѤNԦNrnbDSoOT#Lw8R %W&Zrl3TX1I [jy-|KCri-jy-e{NTkADZk!D\",^q% SmVf#˽m e{6^<ĭTGҡrbQ.C9m7+% ). !\^ .lfm'K2vlV k|u)77d. AULJ _qTyqJ^|Cȩb<;d1|*N˳zׂ kܫ=A
9 HVΤѷ:.QLZ)[^% > QSz*tu{]_W QSr, EANL4zo0;ةh$ w4h$ >0A l~-ڃ N"A{̌{D/Aà %v. hp3 \IAŘ (AW5 !`/ hBsh/ |;~G@A@& ;O$!IN<h
I # dA2(7m%=h$yp(
H@SmD J8)i H@Pa! hGpAp.w9h$ T; X4l| p \}i¹ 2 v< H1_@ A"!" 4 d y@ c |m# D CE k;h $/ _A @| AG@ 2 v< H1_@ A"!" 4 d y82:7# IENDB` | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/ConfigPropertySourcesProcessorHelper.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public interface ConfigPropertySourcesProcessorHelper extends Ordered {
void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public interface ConfigPropertySourcesProcessorHelper extends Ordered {
void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException;
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/ReleaseOpenApiServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.*;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class ReleaseOpenApiServiceTest extends AbstractOpenApiServiceTest {
private ReleaseOpenApiService releaseOpenApiService;
private String someAppId;
private String someEnv;
private String someCluster;
private String someNamespace;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
someEnv = "someEnv";
someCluster = "someCluster";
someNamespace = "someNamespace";
StringEntity responseEntity = new StringEntity("{}");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
releaseOpenApiService = new ReleaseOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testPublishNamespace() throws Exception {
String someReleaseTitle = "someReleaseTitle";
String someReleasedBy = "someReleasedBy";
NamespaceReleaseDTO namespaceReleaseDTO = new NamespaceReleaseDTO();
namespaceReleaseDTO.setReleaseTitle(someReleaseTitle);
namespaceReleaseDTO.setReleasedBy(someReleasedBy);
final ArgumentCaptor<HttpPost> request = ArgumentCaptor.forClass(HttpPost.class);
releaseOpenApiService.publishNamespace(someAppId, someEnv, someCluster, someNamespace, namespaceReleaseDTO);
verify(httpClient, times(1)).execute(request.capture());
HttpPost post = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s/releases", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), post.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testPublishNamespaceWithError() throws Exception {
String someReleaseTitle = "someReleaseTitle";
String someReleasedBy = "someReleasedBy";
NamespaceReleaseDTO namespaceReleaseDTO = new NamespaceReleaseDTO();
namespaceReleaseDTO.setReleaseTitle(someReleaseTitle);
namespaceReleaseDTO.setReleasedBy(someReleasedBy);
when(statusLine.getStatusCode()).thenReturn(400);
releaseOpenApiService.publishNamespace(someAppId, someEnv, someCluster, someNamespace, namespaceReleaseDTO);
}
@Test
public void testGetLatestActiveRelease() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
releaseOpenApiService.getLatestActiveRelease(someAppId, someEnv, someCluster, someNamespace);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s/releases/latest", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetLatestActiveReleaseWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(400);
releaseOpenApiService.getLatestActiveRelease(someAppId, someEnv, someCluster, someNamespace);
}
@Test
public void testRollbackRelease() throws Exception {
long someReleaseId = 1L;
String someOperator = "someOperator";
final ArgumentCaptor<HttpPut> request = ArgumentCaptor.forClass(HttpPut.class);
releaseOpenApiService.rollbackRelease(someEnv, someReleaseId, someOperator);
verify(httpClient, times(1)).execute(request.capture());
HttpPut put = request.getValue();
assertEquals(
String.format("%s/envs/%s/releases/%s/rollback?operator=%s", someBaseUrl, someEnv, someReleaseId, someOperator),
put.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testRollbackReleaseWithError() throws Exception {
long someReleaseId = 1L;
String someOperator = "someOperator";
when(statusLine.getStatusCode()).thenReturn(400);
releaseOpenApiService.rollbackRelease(someEnv, someReleaseId, someOperator);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.*;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.StringEntity;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class ReleaseOpenApiServiceTest extends AbstractOpenApiServiceTest {
private ReleaseOpenApiService releaseOpenApiService;
private String someAppId;
private String someEnv;
private String someCluster;
private String someNamespace;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
someEnv = "someEnv";
someCluster = "someCluster";
someNamespace = "someNamespace";
StringEntity responseEntity = new StringEntity("{}");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
releaseOpenApiService = new ReleaseOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testPublishNamespace() throws Exception {
String someReleaseTitle = "someReleaseTitle";
String someReleasedBy = "someReleasedBy";
NamespaceReleaseDTO namespaceReleaseDTO = new NamespaceReleaseDTO();
namespaceReleaseDTO.setReleaseTitle(someReleaseTitle);
namespaceReleaseDTO.setReleasedBy(someReleasedBy);
final ArgumentCaptor<HttpPost> request = ArgumentCaptor.forClass(HttpPost.class);
releaseOpenApiService.publishNamespace(someAppId, someEnv, someCluster, someNamespace, namespaceReleaseDTO);
verify(httpClient, times(1)).execute(request.capture());
HttpPost post = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s/releases", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), post.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testPublishNamespaceWithError() throws Exception {
String someReleaseTitle = "someReleaseTitle";
String someReleasedBy = "someReleasedBy";
NamespaceReleaseDTO namespaceReleaseDTO = new NamespaceReleaseDTO();
namespaceReleaseDTO.setReleaseTitle(someReleaseTitle);
namespaceReleaseDTO.setReleasedBy(someReleasedBy);
when(statusLine.getStatusCode()).thenReturn(400);
releaseOpenApiService.publishNamespace(someAppId, someEnv, someCluster, someNamespace, namespaceReleaseDTO);
}
@Test
public void testGetLatestActiveRelease() throws Exception {
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
releaseOpenApiService.getLatestActiveRelease(someAppId, someEnv, someCluster, someNamespace);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s/namespaces/%s/releases/latest", someBaseUrl, someEnv, someAppId, someCluster,
someNamespace), get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetLatestActiveReleaseWithError() throws Exception {
when(statusLine.getStatusCode()).thenReturn(400);
releaseOpenApiService.getLatestActiveRelease(someAppId, someEnv, someCluster, someNamespace);
}
@Test
public void testRollbackRelease() throws Exception {
long someReleaseId = 1L;
String someOperator = "someOperator";
final ArgumentCaptor<HttpPut> request = ArgumentCaptor.forClass(HttpPut.class);
releaseOpenApiService.rollbackRelease(someEnv, someReleaseId, someOperator);
verify(httpClient, times(1)).execute(request.capture());
HttpPut put = request.getValue();
assertEquals(
String.format("%s/envs/%s/releases/%s/rollback?operator=%s", someBaseUrl, someEnv, someReleaseId, someOperator),
put.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testRollbackReleaseWithError() throws Exception {
long someReleaseId = 1L;
String someOperator = "someOperator";
when(statusLine.getStatusCode()).thenReturn(400);
releaseOpenApiService.rollbackRelease(someEnv, someReleaseId, someOperator);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/sql/delta/v151-v160/apolloconfigdb-v151-v160.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 config db from v1.5.1 to v1.6.0
Use ApolloConfigDB;
CREATE TABLE `AccessKey` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
`IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) NOT NULL DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问密钥'; | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT 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 config db from v1.5.1 to v1.6.0
Use ApolloConfigDB;
CREATE TABLE `AccessKey` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
`IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(32) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(32) NOT NULL DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问密钥'; | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseKeyGenerator.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.utils;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.common.utils.UniqueKeyGenerator;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ReleaseKeyGenerator extends UniqueKeyGenerator {
/**
* Generate the release key in the format: timestamp+appId+cluster+namespace+hash(ipAsInt+counter)
*
* @param namespace the namespace of the release
* @return the unique release key
*/
public static String generateReleaseKey(Namespace namespace) {
return generate(namespace.getAppId(), namespace.getClusterName(), namespace.getNamespaceName());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.utils;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.common.utils.UniqueKeyGenerator;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ReleaseKeyGenerator extends UniqueKeyGenerator {
/**
* Generate the release key in the format: timestamp+appId+cluster+namespace+hash(ipAsInt+counter)
*
* @param namespace the namespace of the release
* @return the unique release key
*/
public static String generateReleaseKey(Namespace namespace) {
return generate(namespace.getAppId(), namespace.getClusterName(), namespace.getNamespaceName());
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/java/com/ctrip/framework/apollo/util/ExceptionUtilTest.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;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ExceptionUtilTest {
@Test
public void testGetDetailMessageWithNoCause() throws Exception {
String someMessage = "some message";
Throwable ex = new Throwable(someMessage);
assertEquals(someMessage, ExceptionUtil.getDetailMessage(ex));
}
@Test
public void testGetDetailMessageWithCauses() throws Exception {
String causeMsg1 = "some cause";
String causeMsg2 = "another cause";
String someMessage = "some message";
Throwable cause2 = new Throwable(causeMsg2);
Throwable cause1 = new Throwable(causeMsg1, cause2);
Throwable ex = new Throwable(someMessage, cause1);
String expected = someMessage + " [Cause: " + causeMsg1 + " [Cause: " + causeMsg2 + "]]";
assertEquals(expected, ExceptionUtil.getDetailMessage(ex));
}
@Test
public void testGetDetailMessageWithCauseMessageNull() throws Exception {
String someMessage = "some message";
Throwable cause = new Throwable();
Throwable ex = new Throwable(someMessage, cause);
assertEquals(someMessage, ExceptionUtil.getDetailMessage(ex));
}
@Test
public void testGetDetailMessageWithNullMessage() throws Exception {
Throwable ex = new Throwable();
assertEquals("", ExceptionUtil.getDetailMessage(ex));
assertEquals("", ExceptionUtil.getDetailMessage(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.util;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ExceptionUtilTest {
@Test
public void testGetDetailMessageWithNoCause() throws Exception {
String someMessage = "some message";
Throwable ex = new Throwable(someMessage);
assertEquals(someMessage, ExceptionUtil.getDetailMessage(ex));
}
@Test
public void testGetDetailMessageWithCauses() throws Exception {
String causeMsg1 = "some cause";
String causeMsg2 = "another cause";
String someMessage = "some message";
Throwable cause2 = new Throwable(causeMsg2);
Throwable cause1 = new Throwable(causeMsg1, cause2);
Throwable ex = new Throwable(someMessage, cause1);
String expected = someMessage + " [Cause: " + causeMsg1 + " [Cause: " + causeMsg2 + "]]";
assertEquals(expected, ExceptionUtil.getDetailMessage(ex));
}
@Test
public void testGetDetailMessageWithCauseMessageNull() throws Exception {
String someMessage = "some message";
Throwable cause = new Throwable();
Throwable ex = new Throwable(someMessage, cause);
assertEquals(someMessage, ExceptionUtil.getDetailMessage(ex));
}
@Test
public void testGetDetailMessageWithNullMessage() throws Exception {
Throwable ex = new Throwable();
assertEquals("", ExceptionUtil.getDetailMessage(ex));
assertEquals("", ExceptionUtil.getDetailMessage(null));
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/auth/ConsumerPermissionValidator.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.auth;
import com.ctrip.framework.apollo.openapi.service.ConsumerRolePermissionService;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import com.ctrip.framework.apollo.portal.constant.PermissionType;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
@Component
public class ConsumerPermissionValidator {
private final ConsumerRolePermissionService permissionService;
private final ConsumerAuthUtil consumerAuthUtil;
public ConsumerPermissionValidator(final ConsumerRolePermissionService permissionService,
final ConsumerAuthUtil consumerAuthUtil) {
this.permissionService = permissionService;
this.consumerAuthUtil = consumerAuthUtil;
}
public boolean hasModifyNamespacePermission(HttpServletRequest request, String appId,
String namespaceName, String env) {
if (hasCreateNamespacePermission(request, appId)) {
return true;
}
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.MODIFY_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName))
|| permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.MODIFY_NAMESPACE,
RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
}
public boolean hasReleaseNamespacePermission(HttpServletRequest request, String appId,
String namespaceName, String env) {
if (hasCreateNamespacePermission(request, appId)) {
return true;
}
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.RELEASE_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName))
|| permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.RELEASE_NAMESPACE,
RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
}
public boolean hasCreateNamespacePermission(HttpServletRequest request, String appId) {
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.CREATE_NAMESPACE, appId);
}
public boolean hasCreateClusterPermission(HttpServletRequest request, String appId) {
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.CREATE_CLUSTER, appId);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.auth;
import com.ctrip.framework.apollo.openapi.service.ConsumerRolePermissionService;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import com.ctrip.framework.apollo.portal.constant.PermissionType;
import com.ctrip.framework.apollo.portal.util.RoleUtils;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
@Component
public class ConsumerPermissionValidator {
private final ConsumerRolePermissionService permissionService;
private final ConsumerAuthUtil consumerAuthUtil;
public ConsumerPermissionValidator(final ConsumerRolePermissionService permissionService,
final ConsumerAuthUtil consumerAuthUtil) {
this.permissionService = permissionService;
this.consumerAuthUtil = consumerAuthUtil;
}
public boolean hasModifyNamespacePermission(HttpServletRequest request, String appId,
String namespaceName, String env) {
if (hasCreateNamespacePermission(request, appId)) {
return true;
}
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.MODIFY_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName))
|| permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.MODIFY_NAMESPACE,
RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
}
public boolean hasReleaseNamespacePermission(HttpServletRequest request, String appId,
String namespaceName, String env) {
if (hasCreateNamespacePermission(request, appId)) {
return true;
}
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.RELEASE_NAMESPACE, RoleUtils.buildNamespaceTargetId(appId, namespaceName))
|| permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.RELEASE_NAMESPACE,
RoleUtils.buildNamespaceTargetId(appId, namespaceName, env));
}
public boolean hasCreateNamespacePermission(HttpServletRequest request, String appId) {
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.CREATE_NAMESPACE, appId);
}
public boolean hasCreateClusterPermission(HttpServletRequest request, String appId) {
return permissionService.consumerHasPermission(consumerAuthUtil.retrieveConsumerId(request),
PermissionType.CREATE_CLUSTER, appId);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-demo/src/main/resources/spring.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:context="http://www.springframework.org/schema/context"
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.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config order="10"/>
<apollo:config namespaces="TEST1.apollo,application.yaml" order="11"/>
<bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
<property name="timeout" value="${timeout:200}"/>
<property name="batch" value="${batch:100}"/>
</bean>
<context:annotation-config />
</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:context="http://www.springframework.org/schema/context"
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.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config order="10"/>
<apollo:config namespaces="TEST1.apollo,application.yaml" order="11"/>
<bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
<property name="timeout" value="${timeout:200}"/>
<property name="batch" value="${batch:100}"/>
</bean>
<context:annotation-config />
</beans>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./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.accesskey.secret",
"AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESSKEY_SECRET",
"AccessKey.Tips.3.3": "Configure apollo.accesskey.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.accesskey.secret",
"AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESSKEY_SECRET",
"AccessKey.Tips.3.3": "Configure apollo.accesskey.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"
} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./.git/refs/heads/master | 6657a58831a544606f78177b61d92bb959ccce94
| 6657a58831a544606f78177b61d92bb959ccce94
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-configservice/src/test/resources/logback-test.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.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| <?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.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/BizLoggingCustomizer.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.customize;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
@Component
@Profile("ctrip")
public class BizLoggingCustomizer extends LoggingCustomizer{
private final BizConfig bizConfig;
public BizLoggingCustomizer(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Override
protected String cloggingUrl() {
return bizConfig.cloggingUrl();
}
@Override
protected String cloggingPort() {
return bizConfig.cloggingPort();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.customize;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.common.customize.LoggingCustomizer;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
@Component
@Profile("ctrip")
public class BizLoggingCustomizer extends LoggingCustomizer{
private final BizConfig bizConfig;
public BizLoggingCustomizer(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Override
protected String cloggingUrl() {
return bizConfig.cloggingUrl();
}
@Override
protected String cloggingPort() {
return bizConfig.cloggingPort();
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/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.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.ReleaseDTO;
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.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseBO;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceGrayDelReleaseModel;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Objects;
import com.google.gson.Gson;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@Service
public class ReleaseService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
public ReleaseService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ReleaseAPI releaseAPI) {
this.userInfoHolder = userInfoHolder;
this.releaseAPI = releaseAPI;
}
public ReleaseDTO publish(NamespaceReleaseModel model) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
String releaseBy = StringUtils.isEmpty(model.getReleasedBy()) ?
userInfoHolder.getUser().getUserId() : model.getReleasedBy();
ReleaseDTO releaseDTO = releaseAPI.createRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish);
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
//gray deletion release
public ReleaseDTO publish(NamespaceGrayDelReleaseModel model, String releaseBy) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
ReleaseDTO releaseDTO = releaseAPI.createGrayDeletionRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish, model.getGrayDelKeys());
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespaceName,
String releaseTitle, String releaseComment, String branchName,
boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) {
return releaseAPI.updateAndPublish(appId, env, clusterName, namespaceName, releaseTitle, releaseComment, branchName,
isEmergencyPublish, deleteBranch, changeSets);
}
public List<ReleaseBO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
List<ReleaseDTO> releaseDTOs = releaseAPI.findAllReleases(appId, env, clusterName, namespaceName, page, size);
if (CollectionUtils.isEmpty(releaseDTOs)) {
return Collections.emptyList();
}
List<ReleaseBO> releases = new LinkedList<>();
for (ReleaseDTO releaseDTO : releaseDTOs) {
ReleaseBO release = new ReleaseBO();
release.setBaseInfo(releaseDTO);
Set<KVEntity> kvEntities = new LinkedHashSet<>();
Map<String, String> configurations = GSON.fromJson(releaseDTO.getConfigurations(), GsonType.CONFIG);
Set<Map.Entry<String, String>> entries = configurations.entrySet();
for (Map.Entry<String, String> entry : entries) {
kvEntities.add(new KVEntity(entry.getKey(), entry.getValue()));
}
release.setItems(kvEntities);
//为了减少数据量
releaseDTO.setConfigurations("");
releases.add(release);
}
return releases;
}
public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
return releaseAPI.findActiveReleases(appId, env, clusterName, namespaceName, page, size);
}
public ReleaseDTO findReleaseById(Env env, long releaseId) {
Set<Long> releaseIds = new HashSet<>(1);
releaseIds.add(releaseId);
List<ReleaseDTO> releases = findReleaseByIds(env, releaseIds);
if (CollectionUtils.isEmpty(releases)) {
return null;
}
return releases.get(0);
}
public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) {
return releaseAPI.findReleaseByIds(env, releaseIds);
}
public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName, String namespaceName) {
return releaseAPI.loadLatestRelease(appId, env, clusterName, namespaceName);
}
public void rollback(Env env, long releaseId, String operator) {
releaseAPI.rollback(env, releaseId, operator);
}
public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) {
releaseAPI.rollbackTo(env, releaseId, toReleaseId, operator);
}
public ReleaseCompareResult compare(Env env, long baseReleaseId, long toCompareReleaseId) {
ReleaseDTO baseRelease = null;
ReleaseDTO toCompareRelease = null;
if (baseReleaseId != 0) {
baseRelease = releaseAPI.loadRelease(env, baseReleaseId);
}
if (toCompareReleaseId != 0) {
toCompareRelease = releaseAPI.loadRelease(env, toCompareReleaseId);
}
return compare(baseRelease, toCompareRelease);
}
public ReleaseCompareResult compare(ReleaseDTO baseRelease, ReleaseDTO toCompareRelease) {
Map<String, String> baseReleaseConfiguration = baseRelease == null ? new HashMap<>() :
GSON.fromJson(baseRelease.getConfigurations(), GsonType.CONFIG);
Map<String, String> toCompareReleaseConfiguration = toCompareRelease == null ? new HashMap<>() :
GSON.fromJson(toCompareRelease.getConfigurations(),
GsonType.CONFIG);
ReleaseCompareResult compareResult = new ReleaseCompareResult();
//added and modified in firstRelease
for (Map.Entry<String, String> entry : baseReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String firstValue = entry.getValue();
String secondValue = toCompareReleaseConfiguration.get(key);
//added
if (secondValue == null) {
compareResult.addEntityPair(ChangeType.DELETED, new KVEntity(key, firstValue),
new KVEntity(key, null));
} else if (!Objects.equal(firstValue, secondValue)) {
compareResult.addEntityPair(ChangeType.MODIFIED, new KVEntity(key, firstValue),
new KVEntity(key, secondValue));
}
}
//deleted in firstRelease
for (Map.Entry<String, String> entry : toCompareReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if (baseReleaseConfiguration.get(key) == null) {
compareResult
.addEntityPair(ChangeType.ADDED, new KVEntity(key, ""), new KVEntity(key, value));
}
}
return compareResult;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.ReleaseDTO;
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.constant.TracerEventType;
import com.ctrip.framework.apollo.portal.entity.bo.KVEntity;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseBO;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceGrayDelReleaseModel;
import com.ctrip.framework.apollo.portal.entity.model.NamespaceReleaseModel;
import com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult;
import com.ctrip.framework.apollo.portal.enums.ChangeType;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.common.base.Objects;
import com.google.gson.Gson;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@Service
public class ReleaseService {
private static final Gson GSON = new Gson();
private final UserInfoHolder userInfoHolder;
private final AdminServiceAPI.ReleaseAPI releaseAPI;
public ReleaseService(final UserInfoHolder userInfoHolder, final AdminServiceAPI.ReleaseAPI releaseAPI) {
this.userInfoHolder = userInfoHolder;
this.releaseAPI = releaseAPI;
}
public ReleaseDTO publish(NamespaceReleaseModel model) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
String releaseBy = StringUtils.isEmpty(model.getReleasedBy()) ?
userInfoHolder.getUser().getUserId() : model.getReleasedBy();
ReleaseDTO releaseDTO = releaseAPI.createRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish);
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
//gray deletion release
public ReleaseDTO publish(NamespaceGrayDelReleaseModel model, String releaseBy) {
Env env = model.getEnv();
boolean isEmergencyPublish = model.isEmergencyPublish();
String appId = model.getAppId();
String clusterName = model.getClusterName();
String namespaceName = model.getNamespaceName();
ReleaseDTO releaseDTO = releaseAPI.createGrayDeletionRelease(appId, env, clusterName, namespaceName,
model.getReleaseTitle(), model.getReleaseComment(),
releaseBy, isEmergencyPublish, model.getGrayDelKeys());
Tracer.logEvent(TracerEventType.RELEASE_NAMESPACE,
String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName));
return releaseDTO;
}
public ReleaseDTO updateAndPublish(String appId, Env env, String clusterName, String namespaceName,
String releaseTitle, String releaseComment, String branchName,
boolean isEmergencyPublish, boolean deleteBranch, ItemChangeSets changeSets) {
return releaseAPI.updateAndPublish(appId, env, clusterName, namespaceName, releaseTitle, releaseComment, branchName,
isEmergencyPublish, deleteBranch, changeSets);
}
public List<ReleaseBO> findAllReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
List<ReleaseDTO> releaseDTOs = releaseAPI.findAllReleases(appId, env, clusterName, namespaceName, page, size);
if (CollectionUtils.isEmpty(releaseDTOs)) {
return Collections.emptyList();
}
List<ReleaseBO> releases = new LinkedList<>();
for (ReleaseDTO releaseDTO : releaseDTOs) {
ReleaseBO release = new ReleaseBO();
release.setBaseInfo(releaseDTO);
Set<KVEntity> kvEntities = new LinkedHashSet<>();
Map<String, String> configurations = GSON.fromJson(releaseDTO.getConfigurations(), GsonType.CONFIG);
Set<Map.Entry<String, String>> entries = configurations.entrySet();
for (Map.Entry<String, String> entry : entries) {
kvEntities.add(new KVEntity(entry.getKey(), entry.getValue()));
}
release.setItems(kvEntities);
//为了减少数据量
releaseDTO.setConfigurations("");
releases.add(release);
}
return releases;
}
public List<ReleaseDTO> findActiveReleases(String appId, Env env, String clusterName, String namespaceName, int page,
int size) {
return releaseAPI.findActiveReleases(appId, env, clusterName, namespaceName, page, size);
}
public ReleaseDTO findReleaseById(Env env, long releaseId) {
Set<Long> releaseIds = new HashSet<>(1);
releaseIds.add(releaseId);
List<ReleaseDTO> releases = findReleaseByIds(env, releaseIds);
if (CollectionUtils.isEmpty(releases)) {
return null;
}
return releases.get(0);
}
public List<ReleaseDTO> findReleaseByIds(Env env, Set<Long> releaseIds) {
return releaseAPI.findReleaseByIds(env, releaseIds);
}
public ReleaseDTO loadLatestRelease(String appId, Env env, String clusterName, String namespaceName) {
return releaseAPI.loadLatestRelease(appId, env, clusterName, namespaceName);
}
public void rollback(Env env, long releaseId, String operator) {
releaseAPI.rollback(env, releaseId, operator);
}
public void rollbackTo(Env env, long releaseId, long toReleaseId, String operator) {
releaseAPI.rollbackTo(env, releaseId, toReleaseId, operator);
}
public ReleaseCompareResult compare(Env env, long baseReleaseId, long toCompareReleaseId) {
ReleaseDTO baseRelease = null;
ReleaseDTO toCompareRelease = null;
if (baseReleaseId != 0) {
baseRelease = releaseAPI.loadRelease(env, baseReleaseId);
}
if (toCompareReleaseId != 0) {
toCompareRelease = releaseAPI.loadRelease(env, toCompareReleaseId);
}
return compare(baseRelease, toCompareRelease);
}
public ReleaseCompareResult compare(ReleaseDTO baseRelease, ReleaseDTO toCompareRelease) {
Map<String, String> baseReleaseConfiguration = baseRelease == null ? new HashMap<>() :
GSON.fromJson(baseRelease.getConfigurations(), GsonType.CONFIG);
Map<String, String> toCompareReleaseConfiguration = toCompareRelease == null ? new HashMap<>() :
GSON.fromJson(toCompareRelease.getConfigurations(),
GsonType.CONFIG);
ReleaseCompareResult compareResult = new ReleaseCompareResult();
//added and modified in firstRelease
for (Map.Entry<String, String> entry : baseReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String firstValue = entry.getValue();
String secondValue = toCompareReleaseConfiguration.get(key);
//added
if (secondValue == null) {
compareResult.addEntityPair(ChangeType.DELETED, new KVEntity(key, firstValue),
new KVEntity(key, null));
} else if (!Objects.equal(firstValue, secondValue)) {
compareResult.addEntityPair(ChangeType.MODIFIED, new KVEntity(key, firstValue),
new KVEntity(key, secondValue));
}
}
//deleted in firstRelease
for (Map.Entry<String, String> entry : toCompareReleaseConfiguration.entrySet()) {
String key = entry.getKey();
String value = entry.getValue();
if (baseReleaseConfiguration.get(key) == null) {
compareResult
.addEntityPair(ChangeType.ADDED, new KVEntity(key, ""), new KVEntity(key, value));
}
}
return compareResult;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/spi/ApolloConfigRegistrarHelperTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigRegistrar;
import java.lang.reflect.Field;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
public class ApolloConfigRegistrarHelperTest {
@Test
public void testHelperLoadingOrder() {
ApolloConfigRegistrar apolloConfigRegistrar = new ApolloConfigRegistrar();
Field field = ReflectionUtils.findField(ApolloConfigRegistrar.class, "helper");
ReflectionUtils.makeAccessible(field);
Object helper = ReflectionUtils.getField(field, apolloConfigRegistrar);
assertEquals("helper is not TestRegistrarHelper instance", TestRegistrarHelper.class, helper.getClass());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigRegistrar;
import java.lang.reflect.Field;
import org.junit.Test;
import org.springframework.util.ReflectionUtils;
public class ApolloConfigRegistrarHelperTest {
@Test
public void testHelperLoadingOrder() {
ApolloConfigRegistrar apolloConfigRegistrar = new ApolloConfigRegistrar();
Field field = ReflectionUtils.findField(ApolloConfigRegistrar.class, "helper");
ReflectionUtils.makeAccessible(field);
Object helper = ReflectionUtils.getField(field, apolloConfigRegistrar);
assertEquals("helper is not TestRegistrarHelper instance", TestRegistrarHelper.class, helper.getClass());
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/package-info.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.biz.customize;
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.biz.customize;
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/PermissionCondition.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
public class PermissionCondition {
private boolean hasPermission;
public boolean hasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.entity.vo;
public class PermissionCondition {
private boolean hasPermission;
public boolean hasPermission() {
return hasPermission;
}
public void setHasPermission(boolean hasPermission) {
this.hasPermission = hasPermission;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2 | wOF2 Fl \ F M ?FFTM ` r
$e6$t 0 "Q?webfe5옏@?
t,3+2q
FYO&>bm5ZH$Y{H jd Չ %٧y"+@]e{vNc)n?~?萤h _&i ѝ?>^K v-cۍ12Ky,'n (3EwiB& Tlh0M҆dYrﲬnti]yurVXsjgMnәHW r2>iT`V7R(+o6'cB4ι㿚T ]a[Qd<3wq8,rTI8 0>E?*E痦#7'S ocʷ_7&#*+)+4aA6cy٣f(bF$;{ YA1vP-tG"Cf- WԙuKְK#*K< (Z`٫ [%YT{%Ɋ$s{oջvt"p4`ߩϤ}o `'ne>
G 5s z_N
PKӦvmU ɾ{z"3`l
W#Ԑ^@+,ckoAOpnuzzJ)Υ 1}O=xR`J`qUs/+kv1xljlEl\nDƶVjg{Zdz7 5!xm5o[ u&1ڂHBkAqrR
(\gh7Ҋy=HZUPh$8RgzgͭN: 1u$܅>R]"f7 K^'3+E/^YU5]NB.ʋ8+͏8,|{M|Aua|a˅՝%
lKGP,Nukc8mX@d̘?Y&{?P(G]Or-\LF9,&y8r3 ܟ?p>~sDz1?\U5q=tzԒ&Znj%mM"}tkDwh-=m B76&:һqt" 1:Еu;"K_/Jdc0l 0 '^B8VCzg[ ;d
Ybȃu u;@*}y| .'C>\g=9VŐ[o|g^ >d
9
*E|A*M[[*mOQz ?Pn?R)YoT&[U*5S MB [
oYDh{,}1<f&6h'ʥU#V ED"TީAD9eB:%O Fun 7?%RG4"fgF꺁 a=-Qy+B,2օ5xnΪf*!l|GXQ ރUp
Eu @- Do.6YZ-&a>f? NN ]O/^;\J
BEsJrĚ'g/B% o Cn7:|yKt&$s|wP\i]$Z@+ Հ90x]r%+RUEm+ܰ;wu9/I77զQlu\yWN)8ܰvY*umm( fEG8 j#IRz #q߷ )Y$ Лc_%m-{!0-` ;公hyV]Hv! t a\K [1{"j 6@3T0%Θ"ԙZIGS.ΣpӬS1eٓ؛ Y v8d\BlSR)ӆ {Iӆ%>0Ўڦ\'cg2%4QD
0͒3B"MՎ&ۊhIڧRgME
I(5UD] } b8$8>X h"l j .%ۀHH- Iݸ#1 C4Y7YݖV o>P]6O47f
~ AJdYF.oy) 8l 22e 1H[t@!ȅ 2\@5ٓ%Zkޒa@.`n3OFR(ZkLkF HWjY
I5*6eSbk.5F,.N0ԙ|V||~N( 4],Jp|~xeA 5/ڻSvy?'_v|rXHQēB@= XB94TBBcHP+_YH#$`FB;+BPR4̼ t:t"ZEJ^!XǓq4_dTW(5܀ IUŇAz@U6n.WGXHRK&'swMjʎ<3)`#F@ F Ԣvob$x +u&}|X&[٪8F-E&/>/G.az^/})'x$O=<zoA9M ؝& ~3r3g'8ң\-MDzk5A
G9|1-! 87[,mRu|57
=X,aJ^tN4\fЄ]AzH^7F &k"LU>}>rBX(ۂT% JdhK PK TFaA3HHC[r;ad54 lLkjG{8h~
fR@ 9wB0 zS'a7@@Nƹlbj3hNXF/es'DsQ<k^ ZASOidSJx N4DK! !٫vhA`EX -
P
:ѤC:WzSsdO :_`:taηБ س
IY4 # * +<q no u
Ucwwx$dƿ}ρ949p*T:%GQ^a'e bl-*XL%*ź.ڊ\@pR$T*Khpm-/oS3Eto}жVoeJ `<$t ]g*Z6ql~E
S/iTtkǮWþ =?j GUUAJ `bˑGQAϫÖcWWSmgF&^ؘԡ6;C1:=ۈP`ڜVV E5"hOX~N3_5Ӂ]z-CWtԥӈe]\ Vc# m[kuޗ_ʱ"sH<}xm0bxHqb a3tfMT*]I
}( ,M= @JAd?§6PV[
dVv4jߛlH\{MȘ\Y܁ `9M`Db<;a#z<x",dgCi`c:I>jw}Jz^:V. :ڋ{ͼ(ȲB ɦx< Db#"S{PHuN/{r6;wUsPО<XYsMxu\b s$x(/^|^*0j~m;#%JM4pQM::b\C2gf]zP8T UQbt C T>
p8+6g_2lΡ6H džH:
d<C6ؤ/6E:K"`kJ<Ƣ=v7N5`Jt\j6ͅ%˞7*'U4:X+
\b E
afx }1+pB063rA$N~#d}פP7hH7bF§8
P>Bt GNmx@j |{s9=wR/oDJs5z>;'xEq^r^=G?9AA_K%Dɮ:uikjkIeG՝#*)jm|t}`JZ؈H=4{g߁)qXMA,H71V"o,Y#hݨS_;a_ԗZ^cn4HE?}
ȝ٤=}BWvުUeh G F;@2S@f n2# fY:]JyH]-Gwgv'|0e
_7Ґn+f ٸY<(
?y%wm+j&&!c^u'b&hm6¤*2 ? AI Ʋ5FWؙ[ƜBUzIE!m:xheǮnz|]% mrUFگ1 };!n F&gP;&$$F).tBQ3(C=Xes;iي@~NΡE SRh\BeobTnΒju g@'qQ딎nx.u6bVU& ];!C_ 5*z ɺmRQuqPZ0}mn^nOrT:U'h0nZp^R|DF_b\@mDE8 {o GMq}Sd C,iܚE /Ë[d8],MCI_u,]Vc"pg @`"y),;B^el2'.(Ęy>-|hw;j ՍiԽ_o|!@)ɢ =̌SPz *!z})|ƧT}jEtCZný*՞4ۆ[ 9Юݓz`Wmeo|j8j59@.EV/ZW@|f_\"$ {v/;a :Sei3TG*]ơ/h2 C32$1}DNXt?Fϝ~n,Pj9.>ף{
9EN-v|3hCиE XT;P$=J-gݕigz~q(A<:h193N̽Q}CLWߧ~
b"|4u}cy62[ \d,ҎճbkD%0Tx{=;Է(i LS13Nh/6?'E^~P{sZZKĞB{Dt&z)Uoa5Q3ȗr~
F]$<tm(} MB@[GxFh8 #},#u Laz(Qh4%xm`Uչ.Ev1a4_'/[d{FxI59 D<&8VEFg 芘#I䟍2S_]QqAn_Q>bޘ4g-0&E#ci8 vR/4rP7KsOWN3Տ vE\bqQ5ZڽVy5]h/ i)-/kNю #e)"P {KSQx>a&<a,릌HEH
]%,eDU~Wlڛ;cᘓ`? pM
l.PW7٣./W#;Wd*:z;E2j9yASS8u;fY8m KѯԄԶ͡>,
_g-mc<n]Ч-52cz
7d PzVO PvfR Rఓ9Z
- dC`,at=k?v4#P
Bإ/[s.<a0e{&va~ e8)f nyfBP LuIyH=S2 "[(¼O@z*I@0#, I$Qy
cўF
aߞv"|Rܘ 'WF x?+aNMK`D/nf:XI8:H IRm]K6i @UH*NoF;ᇏ"Wqd\Ѝ*C=#26x7<T
7yrU>-bH)ɺz '}w!rXZ .:Vn;->:
6r Ucs4kVW{#5ߑ0B`ܝ0u".Q dB0 Cr ]#Q9lqN^ֳh~NU\ 16
~ SnTl\THҲڛ-~G~)$oQ7 -C}q%/ avO|[q4~Bc-$N7<VHE i-RF GNM{"3 49[j< Wӭ hln QҨډGcq@w/e qg <: a钷u_P` b{E I(OWG fEyABa_;O^DQ's `D#њi:Ѵ+Y{{p&\RagϞ0 gTLi<'7?X1C
an0or1 /U o/?♯a_pHֱ
G촠8ݣ?3F0`%ϑ<
G]Խ8bl͏%-,)}%J:YjT;Ыȶ5Œ>6 w{V餃.&(o*n<n9J
"a Д+ a/;7zDZη{tM Mp iؚkNPwؑͺH`T
$23f 0z ;"]*Y,QWlSOrW$5]KVٻBܚIk|=&[58ER0ދGksSnnnuExKr}~m `G4u{=]6f ר
Bo &<
ñc;2P$ǃ{mW_cª'B6Њ?$^z[C YݭjN~ ۮ0t6/)-1:p$Dꥅȗ
,'yv nFTс['aMbJ]%&îlc6&IpF
oi5'rr(qz6(5Eɢ՟l\ Lk71Y4^)bٗ¦8yƏ
N=9zT^[T$dk
QiK%6qfO|c8$ji^vr.QQR"YrĊ
krK<QI"@R9
/\&7Y}mgҊ7 z6-Mu=,N3O\6aDAޮLd^r/.>
NeRi4!3R"4nbm-y[X."!QKE\N4gՠםaNp
>k)90BZBs
yrer)vDtrv\v[>rJm
a̼~uՏ>rMZcB<`)\yt|ۍr'<>[Îh7Z8caI!
p⢟̮ ,G k5@`iw
nО 8pv *'O
A[.rhT
pR?+;\*HsLqUf:ql-ć *6!h+ˬ {h- jgkMMP#:}{/VŶC]옙&[W$ګ^#4f Wa\
5躺M[6 )T3~
:. Z`si(RQ|/`
il^L# f-;-C;_*{@EMCooÂ_7TrqzF%ׯ|U<Zo[TA='DPJ];,U9Qpk4~ _C^qEŮb
SGsY2NAu %SD hj
y;9$ߴIAhEO}
g/+ Ճ5JY @Gf2Y/e߷|v/ "p~刋T8 OKr**
4hi@Q3g" j :$; :f,dzȚԌ꺳u%ˣ}O&i2U, @kj%u?4NKmd?5ݓ;0Ye}sZ>EƫUs^ݜv{fQ<ĐVPTfͦ?mpP* &QG{cJEPe2)xP0AMɪZHj""AC+zqmVzᖞU%C :@1W [y)J@ob% jA>)Nǀi$At`>?f0g H36p6D|M 4N
4JJڃ
jƇ\
p3 8Я6pV?:$sDNƹ2n,HO\[ոK-)W~im?T:UeY-#dJe)Z5?$\dW<,Ɇ;ط5SոTT̄f(PYv=Q
~DX*8辩s- ˨55
XRl QC l|5{ӦT\t꼕+en۸Ps l3UO[ZS3*,:ÛZ LS'̵**@ ı~xgno2-
WV ;pZ9?~$6<QrbQ8&seEbQ,^|B碘VdV-(] .ˎ8 /qhVnRQD*U(*1h1`؝QL{Uj `"o 3 ܻVl:
jaFaE̞Zg1z2֠:AuZIf62tw+fD CL-}gZ0>҄xJ>\QA_Cihbl]
6 4 *A˯ɰqX7YX.-ոaɇVhiKgqNRĆN(r']%٘@3̀jZJ. ;nm,S0x ͻOF33ҧ<$'GE+}'1f3y5/&Z\RB7dm]8\3߂Ȫ@oT3eu^ W@e7l !B,s1$Z&?dC (YЦSm>J"&pt܈P㇄BF4G5 t^ Ć$j-a㠍g^ʐCAsT=kTS,|r9IBϘЬ'vG A@thQNj&T=xt;2]P|T- LÞe1ݽWZŚ*MrH5?= o"9K5='k-*AE| qҔ_?\7% |M6f++S*}W _]3fmܮ˳m w!.R#鬪; qq71$ݙկ_iK&JάMemV5P0> Q5WHIh&4ҍIlE7}sm[cȾ|d^ %Uv1D>.T7*=tZ_㟾1Х:=0pZ6ҋNt (u Ɲ; B]$kڌ.{F*/U Z N砦|oqKG;^侞9Ne xK \wh~ZpHb䉸 [k8k.bX.QXpxYa^"#Bwnbum5F~>8 bN:p4 [gv^
BFUz)?60F8 /2C8>N8G%l% 5FH{46h 4%#
7 x oN t\'Ȩ
E0#jNãVӹd?WlcW
žֵu-}22EN}#䵵2H^a3rqs-S3&f퇣fwl.=W8,cHjcTWנs90ZDMC2ZMdjt"8:g{.Ʊ1Fb618"yԦ> W9 V `jT<IMԱW'%f&\yZdkʹRyjw}Ѐ[8ԍbB 'd'mo'<|E5:ڋo>r,ni
<TS>d qN .g+ S
Q
KaB?_QE rjh>Eӛ;C7 ^q
`Ue#-;oJċԝ>) ;Jg9R;Og iI7}8K ہqjeؓ+ٗ'nϷk3eFρ0V#pMAzb^PVu~1uғw n ^.II_ vdW[Q,+Lbćq
9V } ΏVw4qU3&jıHYb ttT7ρarBwP9?)uT/aA19kM
\Ps<Ta@<?M (.,'%?,%a ~eU0/zQ(Ѹap:.6jdF@\V4{Ri 8ɪnuFM_=Z8Hlsy5k%|(i9 "6}ԋ~WK۟hYk\lRm&
0b]g"ހD^ތjJ*)6-Ybh
Z=ޑA,(K#
OfJ:;I!6Yi&d%m86#QW_Av}?+G cc*mg`>q+ =[5͔?9W+^o^E8s)f 2aQxi& NE>"^Naa;f9]NE& t^CLz'e8ZRs&67_ ãcyJ1
@TZ?S D2
|POӌ\dR7zH9i Q#zrc.4GR4qx<2~Xhnੳ2auBNC +kX0
aj5n>މe3vާ<>_ uH:XR%~9!4oѼ 38? 1d# A&{A!i6 /Xa=W;|) g~
?*悽 }ڧKt>5|E.A Q6
(6
6є7 <9_C f1Ўi8,
V4$uti,.`v6r P
gFBɎ
t
C3; ,oÂx|
/KMp1S_X.fV#U>Ȓ#B]
A IVoІϵGTV1nr+OXS% ³fOZ[_9P߰ {Gln%#hdwH= ye/W>,IP,*MV~ºK&eċM콣=)qFS"GTF*LX,h[wweWQEx ?{^چExhiׂJH|^͓e*^Я.uxEb#;ԝ<]z]\wNhochqE= 4Q1 7W̓lÕ6᧿HE_̣qy YR۫<x=cSXy!=08Ǘx ? {}F_Ǡzktɱ7ڂ|t+am<xe$eɍ<[ TX[ s V̋ާU*hSK=Fesw uYoٯnQ=NE:[(t]
k|@ٿuZ\9{hvܕӆ.ڡsa$u+qw:# ?eT3=л!pPL`:R; gʮ Fhaΐ;5Ie+ bt06AW40ThJcc<&mJcc
O CnW?Nio](XЄ{Lz;g|Ǐ>9~l4sVy`Uߛ,#_u+DeM~hq벇#Yz$; 5ͯ9$ z >
*jO$$O/xRtf-}*oɦ|3M;xިUl/.~XǎY4x3&x";$KI5dڭ ~w[M 9O%4Q }S^t@w[Y;-s;bwH-* imI- 1e/~TNN.p)H$W~ƦO
(9,
]gM6r +#%/swA$q4O>
d9}+$s?0a,>yڈs<=,c_*\D}2MT8/4g'ڦ8'}"C*\9#Y >z$7c[s|"$} ymzQx 5%o$jkp)x-:И|?ofgFr2SZq}q o ,wyOgCF1l'L5T33yM92"s5uD6-JUbs
O)wR
-2/5f<BQ4kꐭG )%<d ĪĞ32 ` a]S{K%\]3&pڸCո 놶,
^T7h5ulDxڷ L'Dr6 v շfc\gA@ ? GFVAl,:i#~NUDV~7kK`!P MXR$#Tiihom<.8Um<3ES4 ܫV 9'bv{?VV3;U'֬1RV{Bi 4C Rhr6~ ӖJ P͎M 7G -,NLo<ѣz2H&|$<{
ڜK_mmS)>rϛf@ =BFCB &'F}@&yubC?' S49+ÓCIî +f/RU
C Fu:C*} T: }{ݽⲷue[!>? ڸ"M
8gz0\HkZ:h~@+ #N fjyio!B R'5>`[!T`m C Iѝ}n
>W!M}Uav43)!kcȂm? dwv!ה;Xϡۨ} 8vt"Ӽ# kvXJ[l[ZݙMÀXC3l[
TaVjʻѬ"œ t:(<cZveQTqHi{銀Q埓'ÖiP￭mKAIBF
=Tᅽ(&TS?/A:ַ ОV(@wFa^]o]*99Ri_2vM`Pf{QYH#V7v7Ұq>@~uɘ׆Ax/xB3Ġty b0nG` EDٍA: PwI 7nW2ED<hD&Z Π73& )LD4;7Ѵ?$k@""L&~1 ʺf14ʱ|7Os }L1;?{1$w)1}0~7# E5` q&o
ow _鴊8Q1GɊ08hWe+\ԉRU?weOSxAU̞3| =WAR
PtO%Q"1Yה !so%%^z_hn,{? "L 5_D6+Sb<gfJ0b_x- ;HW:GMiEeIuvJ]~mQHLKkhbA>}.(h"U]9Ih_V@GZ0C
pb
:L 3tN*N 2!3
Cayn.ɋW`̳}QBCi 8*{57O#aT BUoi0
_^
ChrU}~rL 1z>..= %GG o EuPPsؘ8Pu&;*|i&Pbțh;[|y*cVhҼ(~_AqU2GIQ3`^v=@K'ЇZ#4sJ=:sY sڥbyj S _E܃"@~>86#y[cSŬ#SJGZyvvSя扝pwaT/,
9'Jkv%%.~o[ 衧 RBjSȀ*$'腁pçSu +9\_f+8u\,tpэ kخJ0h(]NQvW 7 86:ݣ WcY_i>"R(e]6RA%U6&F]7@̳k3X
h?K Q2Bk[<o-[
s~ 0]T2hJqKv(32J//W,z d$2cAkP K+Ec [QiEdV xR8B5a=:KQ \@V^;Kr M{{#Cw}{^,$0Rc\oQѼץP$Yvp>?. .KKAb6 5ke+]F<He";{wNyx/&f檄/XZ[7c%ŀ5dY_y"Ыߞ2\37
k\띲|FO 68nKzR"?/732:а>eWHU0Oק5
e3Hco>l]02cH9{Z
{sO!A,7?ŷ3 w俎A
Fj8B&8U$G $Y5FL5n1> q2.6e
+@/kb{(7i={l͍݂濦81g(%h/EfMҍt 5 ̼vgo ~ਜ਼WKi父UأݖwRSEFT %
`=|*=1* SX ^w)l fQH(YSSˌK1W]f7ך^&p@T'.%3
5zaTf6A5LX̡|L-ηTg{A)F."hjA;.~o% G#}&]c`ChH9xnNY lc\+v\EƧ1D9KX)2b.NWQש$/|6tð32ԛ7 2иyu0e)Nuh'd ~xY ># b"k3 :9v$ПC:)H> զz ;ed\jmfOa%9cKxۥ!k%HDn{Y"{n_}
)9=
_/ Z(>lYVgQ#߭:Qbw$zwٮ#U?|Gh z{o$wϜ )|Vh?
ZV7%Go/׆E"KӲlp76 -z
!l4n>$\zV?szqejQ]m^=^
!lHB4sL i9} 2^K5OB)O
v^~݀xrm\ K&G^5CL}&FB]Kn3|sGjykObsܽaW?R6Jfh2 lBS \=jV * Y^˺^E)*\
rr(a @6nԌ?}dL gI vqNcaƮkmLcA!hdVwc=憖s_:җsL g>1*4-%&0Ub)Eܬ*b51 ++;<`!qfM*,[/GK+{,>CLR%%c~'EGAG=h䟔8 :IDN)W̻AF)ucw'qhX èL@a~6Pc2L"A2bU & 9A#QLO:E9kfKFb93tL$cˬpLz5dp۰>$`. ~X= ?NͰ /LPNo0p b8AR4r Jj}
Ӳ 04ˋquۏAFP 'HfXDIVTM7Lv\(N,/ʪnڮ i^m?~ QU
Ӳ 04ˋquۏ b$tV&gϖr><y?f{紷 %~ZazW2 sv eW @DDDD$""""bffff}X O0cDDDDDZ6W08BI .HW
߈9 u*R*J^} :M$I$IFyџ_W<G< | wOF2 Fl \ F M ?FFTM ` r
$e6$t 0 "Q?webfe5옏@?
t,3+2q
FYO&>bm5ZH$Y{H jd Չ %٧y"+@]e{vNc)n?~?萤h _&i ѝ?>^K v-cۍ12Ky,'n (3EwiB& Tlh0M҆dYrﲬnti]yurVXsjgMnәHW r2>iT`V7R(+o6'cB4ι㿚T ]a[Qd<3wq8,rTI8 0>E?*E痦#7'S ocʷ_7&#*+)+4aA6cy٣f(bF$;{ YA1vP-tG"Cf- WԙuKְK#*K< (Z`٫ [%YT{%Ɋ$s{oջvt"p4`ߩϤ}o `'ne>
G 5s z_N
PKӦvmU ɾ{z"3`l
W#Ԑ^@+,ckoAOpnuzzJ)Υ 1}O=xR`J`qUs/+kv1xljlEl\nDƶVjg{Zdz7 5!xm5o[ u&1ڂHBkAqrR
(\gh7Ҋy=HZUPh$8RgzgͭN: 1u$܅>R]"f7 K^'3+E/^YU5]NB.ʋ8+͏8,|{M|Aua|a˅՝%
lKGP,Nukc8mX@d̘?Y&{?P(G]Or-\LF9,&y8r3 ܟ?p>~sDz1?\U5q=tzԒ&Znj%mM"}tkDwh-=m B76&:һqt" 1:Еu;"K_/Jdc0l 0 '^B8VCzg[ ;d
Ybȃu u;@*}y| .'C>\g=9VŐ[o|g^ >d
9
*E|A*M[[*mOQz ?Pn?R)YoT&[U*5S MB [
oYDh{,}1<f&6h'ʥU#V ED"TީAD9eB:%O Fun 7?%RG4"fgF꺁 a=-Qy+B,2օ5xnΪf*!l|GXQ ރUp
Eu @- Do.6YZ-&a>f? NN ]O/^;\J
BEsJrĚ'g/B% o Cn7:|yKt&$s|wP\i]$Z@+ Հ90x]r%+RUEm+ܰ;wu9/I77զQlu\yWN)8ܰvY*umm( fEG8 j#IRz #q߷ )Y$ Лc_%m-{!0-` ;公hyV]Hv! t a\K [1{"j 6@3T0%Θ"ԙZIGS.ΣpӬS1eٓ؛ Y v8d\BlSR)ӆ {Iӆ%>0Ўڦ\'cg2%4QD
0͒3B"MՎ&ۊhIڧRgME
I(5UD] } b8$8>X h"l j .%ۀHH- Iݸ#1 C4Y7YݖV o>P]6O47f
~ AJdYF.oy) 8l 22e 1H[t@!ȅ 2\@5ٓ%Zkޒa@.`n3OFR(ZkLkF HWjY
I5*6eSbk.5F,.N0ԙ|V||~N( 4],Jp|~xeA 5/ڻSvy?'_v|rXHQēB@= XB94TBBcHP+_YH#$`FB;+BPR4̼ t:t"ZEJ^!XǓq4_dTW(5܀ IUŇAz@U6n.WGXHRK&'swMjʎ<3)`#F@ F Ԣvob$x +u&}|X&[٪8F-E&/>/G.az^/})'x$O=<zoA9M ؝& ~3r3g'8ң\-MDzk5A
G9|1-! 87[,mRu|57
=X,aJ^tN4\fЄ]AzH^7F &k"LU>}>rBX(ۂT% JdhK PK TFaA3HHC[r;ad54 lLkjG{8h~
fR@ 9wB0 zS'a7@@Nƹlbj3hNXF/es'DsQ<k^ ZASOidSJx N4DK! !٫vhA`EX -
P
:ѤC:WzSsdO :_`:taηБ س
IY4 # * +<q no u
Ucwwx$dƿ}ρ949p*T:%GQ^a'e bl-*XL%*ź.ڊ\@pR$T*Khpm-/oS3Eto}жVoeJ `<$t ]g*Z6ql~E
S/iTtkǮWþ =?j GUUAJ `bˑGQAϫÖcWWSmgF&^ؘԡ6;C1:=ۈP`ڜVV E5"hOX~N3_5Ӂ]z-CWtԥӈe]\ Vc# m[kuޗ_ʱ"sH<}xm0bxHqb a3tfMT*]I
}( ,M= @JAd?§6PV[
dVv4jߛlH\{MȘ\Y܁ `9M`Db<;a#z<x",dgCi`c:I>jw}Jz^:V. :ڋ{ͼ(ȲB ɦx< Db#"S{PHuN/{r6;wUsPО<XYsMxu\b s$x(/^|^*0j~m;#%JM4pQM::b\C2gf]zP8T UQbt C T>
p8+6g_2lΡ6H džH:
d<C6ؤ/6E:K"`kJ<Ƣ=v7N5`Jt\j6ͅ%˞7*'U4:X+
\b E
afx }1+pB063rA$N~#d}פP7hH7bF§8
P>Bt GNmx@j |{s9=wR/oDJs5z>;'xEq^r^=G?9AA_K%Dɮ:uikjkIeG՝#*)jm|t}`JZ؈H=4{g߁)qXMA,H71V"o,Y#hݨS_;a_ԗZ^cn4HE?}
ȝ٤=}BWvުUeh G F;@2S@f n2# fY:]JyH]-Gwgv'|0e
_7Ґn+f ٸY<(
?y%wm+j&&!c^u'b&hm6¤*2 ? AI Ʋ5FWؙ[ƜBUzIE!m:xheǮnz|]% mrUFگ1 };!n F&gP;&$$F).tBQ3(C=Xes;iي@~NΡE SRh\BeobTnΒju g@'qQ딎nx.u6bVU& ];!C_ 5*z ɺmRQuqPZ0}mn^nOrT:U'h0nZp^R|DF_b\@mDE8 {o GMq}Sd C,iܚE /Ë[d8],MCI_u,]Vc"pg @`"y),;B^el2'.(Ęy>-|hw;j ՍiԽ_o|!@)ɢ =̌SPz *!z})|ƧT}jEtCZný*՞4ۆ[ 9Юݓz`Wmeo|j8j59@.EV/ZW@|f_\"$ {v/;a :Sei3TG*]ơ/h2 C32$1}DNXt?Fϝ~n,Pj9.>ף{
9EN-v|3hCиE XT;P$=J-gݕigz~q(A<:h193N̽Q}CLWߧ~
b"|4u}cy62[ \d,ҎճbkD%0Tx{=;Է(i LS13Nh/6?'E^~P{sZZKĞB{Dt&z)Uoa5Q3ȗr~
F]$<tm(} MB@[GxFh8 #},#u Laz(Qh4%xm`Uչ.Ev1a4_'/[d{FxI59 D<&8VEFg 芘#I䟍2S_]QqAn_Q>bޘ4g-0&E#ci8 vR/4rP7KsOWN3Տ vE\bqQ5ZڽVy5]h/ i)-/kNю #e)"P {KSQx>a&<a,릌HEH
]%,eDU~Wlڛ;cᘓ`? pM
l.PW7٣./W#;Wd*:z;E2j9yASS8u;fY8m KѯԄԶ͡>,
_g-mc<n]Ч-52cz
7d PzVO PvfR Rఓ9Z
- dC`,at=k?v4#P
Bإ/[s.<a0e{&va~ e8)f nyfBP LuIyH=S2 "[(¼O@z*I@0#, I$Qy
cўF
aߞv"|Rܘ 'WF x?+aNMK`D/nf:XI8:H IRm]K6i @UH*NoF;ᇏ"Wqd\Ѝ*C=#26x7<T
7yrU>-bH)ɺz '}w!rXZ .:Vn;->:
6r Ucs4kVW{#5ߑ0B`ܝ0u".Q dB0 Cr ]#Q9lqN^ֳh~NU\ 16
~ SnTl\THҲڛ-~G~)$oQ7 -C}q%/ avO|[q4~Bc-$N7<VHE i-RF GNM{"3 49[j< Wӭ hln QҨډGcq@w/e qg <: a钷u_P` b{E I(OWG fEyABa_;O^DQ's `D#њi:Ѵ+Y{{p&\RagϞ0 gTLi<'7?X1C
an0or1 /U o/?♯a_pHֱ
G촠8ݣ?3F0`%ϑ<
G]Խ8bl͏%-,)}%J:YjT;Ыȶ5Œ>6 w{V餃.&(o*n<n9J
"a Д+ a/;7zDZη{tM Mp iؚkNPwؑͺH`T
$23f 0z ;"]*Y,QWlSOrW$5]KVٻBܚIk|=&[58ER0ދGksSnnnuExKr}~m `G4u{=]6f ר
Bo &<
ñc;2P$ǃ{mW_cª'B6Њ?$^z[C YݭjN~ ۮ0t6/)-1:p$Dꥅȗ
,'yv nFTс['aMbJ]%&îlc6&IpF
oi5'rr(qz6(5Eɢ՟l\ Lk71Y4^)bٗ¦8yƏ
N=9zT^[T$dk
QiK%6qfO|c8$ji^vr.QQR"YrĊ
krK<QI"@R9
/\&7Y}mgҊ7 z6-Mu=,N3O\6aDAޮLd^r/.>
NeRi4!3R"4nbm-y[X."!QKE\N4gՠםaNp
>k)90BZBs
yrer)vDtrv\v[>rJm
a̼~uՏ>rMZcB<`)\yt|ۍr'<>[Îh7Z8caI!
p⢟̮ ,G k5@`iw
nО 8pv *'O
A[.rhT
pR?+;\*HsLqUf:ql-ć *6!h+ˬ {h- jgkMMP#:}{/VŶC]옙&[W$ګ^#4f Wa\
5躺M[6 )T3~
:. Z`si(RQ|/`
il^L# f-;-C;_*{@EMCooÂ_7TrqzF%ׯ|U<Zo[TA='DPJ];,U9Qpk4~ _C^qEŮb
SGsY2NAu %SD hj
y;9$ߴIAhEO}
g/+ Ճ5JY @Gf2Y/e߷|v/ "p~刋T8 OKr**
4hi@Q3g" j :$; :f,dzȚԌ꺳u%ˣ}O&i2U, @kj%u?4NKmd?5ݓ;0Ye}sZ>EƫUs^ݜv{fQ<ĐVPTfͦ?mpP* &QG{cJEPe2)xP0AMɪZHj""AC+zqmVzᖞU%C :@1W [y)J@ob% jA>)Nǀi$At`>?f0g H36p6D|M 4N
4JJڃ
jƇ\
p3 8Я6pV?:$sDNƹ2n,HO\[ոK-)W~im?T:UeY-#dJe)Z5?$\dW<,Ɇ;ط5SոTT̄f(PYv=Q
~DX*8辩s- ˨55
XRl QC l|5{ӦT\t꼕+en۸Ps l3UO[ZS3*,:ÛZ LS'̵**@ ı~xgno2-
WV ;pZ9?~$6<QrbQ8&seEbQ,^|B碘VdV-(] .ˎ8 /qhVnRQD*U(*1h1`؝QL{Uj `"o 3 ܻVl:
jaFaE̞Zg1z2֠:AuZIf62tw+fD CL-}gZ0>҄xJ>\QA_Cihbl]
6 4 *A˯ɰqX7YX.-ոaɇVhiKgqNRĆN(r']%٘@3̀jZJ. ;nm,S0x ͻOF33ҧ<$'GE+}'1f3y5/&Z\RB7dm]8\3߂Ȫ@oT3eu^ W@e7l !B,s1$Z&?dC (YЦSm>J"&pt܈P㇄BF4G5 t^ Ć$j-a㠍g^ʐCAsT=kTS,|r9IBϘЬ'vG A@thQNj&T=xt;2]P|T- LÞe1ݽWZŚ*MrH5?= o"9K5='k-*AE| qҔ_?\7% |M6f++S*}W _]3fmܮ˳m w!.R#鬪; qq71$ݙկ_iK&JάMemV5P0> Q5WHIh&4ҍIlE7}sm[cȾ|d^ %Uv1D>.T7*=tZ_㟾1Х:=0pZ6ҋNt (u Ɲ; B]$kڌ.{F*/U Z N砦|oqKG;^侞9Ne xK \wh~ZpHb䉸 [k8k.bX.QXpxYa^"#Bwnbum5F~>8 bN:p4 [gv^
BFUz)?60F8 /2C8>N8G%l% 5FH{46h 4%#
7 x oN t\'Ȩ
E0#jNãVӹd?WlcW
žֵu-}22EN}#䵵2H^a3rqs-S3&f퇣fwl.=W8,cHjcTWנs90ZDMC2ZMdjt"8:g{.Ʊ1Fb618"yԦ> W9 V `jT<IMԱW'%f&\yZdkʹRyjw}Ѐ[8ԍbB 'd'mo'<|E5:ڋo>r,ni
<TS>d qN .g+ S
Q
KaB?_QE rjh>Eӛ;C7 ^q
`Ue#-;oJċԝ>) ;Jg9R;Og iI7}8K ہqjeؓ+ٗ'nϷk3eFρ0V#pMAzb^PVu~1uғw n ^.II_ vdW[Q,+Lbćq
9V } ΏVw4qU3&jıHYb ttT7ρarBwP9?)uT/aA19kM
\Ps<Ta@<?M (.,'%?,%a ~eU0/zQ(Ѹap:.6jdF@\V4{Ri 8ɪnuFM_=Z8Hlsy5k%|(i9 "6}ԋ~WK۟hYk\lRm&
0b]g"ހD^ތjJ*)6-Ybh
Z=ޑA,(K#
OfJ:;I!6Yi&d%m86#QW_Av}?+G cc*mg`>q+ =[5͔?9W+^o^E8s)f 2aQxi& NE>"^Naa;f9]NE& t^CLz'e8ZRs&67_ ãcyJ1
@TZ?S D2
|POӌ\dR7zH9i Q#zrc.4GR4qx<2~Xhnੳ2auBNC +kX0
aj5n>މe3vާ<>_ uH:XR%~9!4oѼ 38? 1d# A&{A!i6 /Xa=W;|) g~
?*悽 }ڧKt>5|E.A Q6
(6
6є7 <9_C f1Ўi8,
V4$uti,.`v6r P
gFBɎ
t
C3; ,oÂx|
/KMp1S_X.fV#U>Ȓ#B]
A IVoІϵGTV1nr+OXS% ³fOZ[_9P߰ {Gln%#hdwH= ye/W>,IP,*MV~ºK&eċM콣=)qFS"GTF*LX,h[wweWQEx ?{^چExhiׂJH|^͓e*^Я.uxEb#;ԝ<]z]\wNhochqE= 4Q1 7W̓lÕ6᧿HE_̣qy YR۫<x=cSXy!=08Ǘx ? {}F_Ǡzktɱ7ڂ|t+am<xe$eɍ<[ TX[ s V̋ާU*hSK=Fesw uYoٯnQ=NE:[(t]
k|@ٿuZ\9{hvܕӆ.ڡsa$u+qw:# ?eT3=л!pPL`:R; gʮ Fhaΐ;5Ie+ bt06AW40ThJcc<&mJcc
O CnW?Nio](XЄ{Lz;g|Ǐ>9~l4sVy`Uߛ,#_u+DeM~hq벇#Yz$; 5ͯ9$ z >
*jO$$O/xRtf-}*oɦ|3M;xިUl/.~XǎY4x3&x";$KI5dڭ ~w[M 9O%4Q }S^t@w[Y;-s;bwH-* imI- 1e/~TNN.p)H$W~ƦO
(9,
]gM6r +#%/swA$q4O>
d9}+$s?0a,>yڈs<=,c_*\D}2MT8/4g'ڦ8'}"C*\9#Y >z$7c[s|"$} ymzQx 5%o$jkp)x-:И|?ofgFr2SZq}q o ,wyOgCF1l'L5T33yM92"s5uD6-JUbs
O)wR
-2/5f<BQ4kꐭG )%<d ĪĞ32 ` a]S{K%\]3&pڸCո 놶,
^T7h5ulDxڷ L'Dr6 v շfc\gA@ ? GFVAl,:i#~NUDV~7kK`!P MXR$#Tiihom<.8Um<3ES4 ܫV 9'bv{?VV3;U'֬1RV{Bi 4C Rhr6~ ӖJ P͎M 7G -,NLo<ѣz2H&|$<{
ڜK_mmS)>rϛf@ =BFCB &'F}@&yubC?' S49+ÓCIî +f/RU
C Fu:C*} T: }{ݽⲷue[!>? ڸ"M
8gz0\HkZ:h~@+ #N fjyio!B R'5>`[!T`m C Iѝ}n
>W!M}Uav43)!kcȂm? dwv!ה;Xϡۨ} 8vt"Ӽ# kvXJ[l[ZݙMÀXC3l[
TaVjʻѬ"œ t:(<cZveQTqHi{銀Q埓'ÖiP￭mKAIBF
=Tᅽ(&TS?/A:ַ ОV(@wFa^]o]*99Ri_2vM`Pf{QYH#V7v7Ұq>@~uɘ׆Ax/xB3Ġty b0nG` EDٍA: PwI 7nW2ED<hD&Z Π73& )LD4;7Ѵ?$k@""L&~1 ʺf14ʱ|7Os }L1;?{1$w)1}0~7# E5` q&o
ow _鴊8Q1GɊ08hWe+\ԉRU?weOSxAU̞3| =WAR
PtO%Q"1Yה !so%%^z_hn,{? "L 5_D6+Sb<gfJ0b_x- ;HW:GMiEeIuvJ]~mQHLKkhbA>}.(h"U]9Ih_V@GZ0C
pb
:L 3tN*N 2!3
Cayn.ɋW`̳}QBCi 8*{57O#aT BUoi0
_^
ChrU}~rL 1z>..= %GG o EuPPsؘ8Pu&;*|i&Pbțh;[|y*cVhҼ(~_AqU2GIQ3`^v=@K'ЇZ#4sJ=:sY sڥbyj S _E܃"@~>86#y[cSŬ#SJGZyvvSя扝pwaT/,
9'Jkv%%.~o[ 衧 RBjSȀ*$'腁pçSu +9\_f+8u\,tpэ kخJ0h(]NQvW 7 86:ݣ WcY_i>"R(e]6RA%U6&F]7@̳k3X
h?K Q2Bk[<o-[
s~ 0]T2hJqKv(32J//W,z d$2cAkP K+Ec [QiEdV xR8B5a=:KQ \@V^;Kr M{{#Cw}{^,$0Rc\oQѼץP$Yvp>?. .KKAb6 5ke+]F<He";{wNyx/&f檄/XZ[7c%ŀ5dY_y"Ыߞ2\37
k\띲|FO 68nKzR"?/732:а>eWHU0Oק5
e3Hco>l]02cH9{Z
{sO!A,7?ŷ3 w俎A
Fj8B&8U$G $Y5FL5n1> q2.6e
+@/kb{(7i={l͍݂濦81g(%h/EfMҍt 5 ̼vgo ~ਜ਼WKi父UأݖwRSEFT %
`=|*=1* SX ^w)l fQH(YSSˌK1W]f7ך^&p@T'.%3
5zaTf6A5LX̡|L-ηTg{A)F."hjA;.~o% G#}&]c`ChH9xnNY lc\+v\EƧ1D9KX)2b.NWQש$/|6tð32ԛ7 2иyu0e)Nuh'd ~xY ># b"k3 :9v$ПC:)H> զz ;ed\jmfOa%9cKxۥ!k%HDn{Y"{n_}
)9=
_/ Z(>lYVgQ#߭:Qbw$zwٮ#U?|Gh z{o$wϜ )|Vh?
ZV7%Go/׆E"KӲlp76 -z
!l4n>$\zV?szqejQ]m^=^
!lHB4sL i9} 2^K5OB)O
v^~݀xrm\ K&G^5CL}&FB]Kn3|sGjykObsܽaW?R6Jfh2 lBS \=jV * Y^˺^E)*\
rr(a @6nԌ?}dL gI vqNcaƮkmLcA!hdVwc=憖s_:җsL g>1*4-%&0Ub)Eܬ*b51 ++;<`!qfM*,[/GK+{,>CLR%%c~'EGAG=h䟔8 :IDN)W̻AF)ucw'qhX èL@a~6Pc2L"A2bU & 9A#QLO:E9kfKFb93tL$cˬpLz5dp۰>$`. ~X= ?NͰ /LPNo0p b8AR4r Jj}
Ӳ 04ˋquۏAFP 'HfXDIVTM7Lv\(N,/ʪnڮ i^m?~ QU
Ӳ 04ˋquۏ b$tV&gϖr><y?f{紷 %~ZazW2 sv eW @DDDD$""""bffff}X O0cDDDDDZ6W08BI .HW
߈9 u*R*J^} :M$I$IFyџ_W<G< | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-biz</artifactId>
<name>Apollo Biz</name>
<packaging>jar</packaging>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-biz</artifactId>
<name>Apollo Biz</name>
<packaging>jar</packaging>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/sql/delta/v170-v180/apolloportaldb-v170-v180.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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./.github/PULL_REQUEST_TEMPLATE.md | ## What's the purpose of this PR
XXXXX
## Which issue(s) this PR fixes:
Fixes #
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ## What's the purpose of this PR
XXXXX
## Which issue(s) this PR fixes:
Fixes #
## Brief changelog
XXXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Write necessary unit tests to verify the code.
- [ ] Run `mvn clean test` to make sure this pull request doesn't break anything.
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultLogoutHandler.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.portal.spi.LogoutHandler;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class DefaultLogoutHandler implements LogoutHandler {
@Override
public void logout(HttpServletRequest request, HttpServletResponse response) {
try {
response.sendRedirect("/");
} catch (IOException e) {
throw new RuntimeException(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.defaultimpl;
import com.ctrip.framework.apollo.portal.spi.LogoutHandler;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class DefaultLogoutHandler implements LogoutHandler {
@Override
public void logout(HttpServletRequest request, HttpServletResponse response) {
try {
response.sendRedirect("/");
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.metaservice.controller;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.metaservice.service.DiscoveryService;
import java.util.Collections;
import java.util.List;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/services")
public class ServiceController {
private final DiscoveryService discoveryService;
public ServiceController(final DiscoveryService discoveryService) {
this.discoveryService = discoveryService;
}
/**
* This method always return an empty list as meta service is not used at all
*/
@Deprecated
@RequestMapping("/meta")
public List<ServiceDTO> getMetaService() {
return Collections.emptyList();
}
@RequestMapping("/config")
public List<ServiceDTO> getConfigService(
@RequestParam(value = "appId", defaultValue = "") String appId,
@RequestParam(value = "ip", required = false) String clientIp) {
return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE);
}
@RequestMapping("/admin")
public List<ServiceDTO> getAdminService() {
return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_ADMINSERVICE);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.metaservice.controller;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.metaservice.service.DiscoveryService;
import java.util.Collections;
import java.util.List;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/services")
public class ServiceController {
private final DiscoveryService discoveryService;
public ServiceController(final DiscoveryService discoveryService) {
this.discoveryService = discoveryService;
}
/**
* This method always return an empty list as meta service is not used at all
*/
@Deprecated
@RequestMapping("/meta")
public List<ServiceDTO> getMetaService() {
return Collections.emptyList();
}
@RequestMapping("/config")
public List<ServiceDTO> getConfigService(
@RequestParam(value = "appId", defaultValue = "") String appId,
@RequestParam(value = "ip", required = false) String clientIp) {
return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE);
}
@RequestMapping("/admin")
public List<ServiceDTO> getAdminService() {
return discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_ADMINSERVICE);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/AbstractIntegrationTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.SkipAuthorizationConfiguration;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = {
PortalApplication.class,
SkipAuthorizationConfiguration.class
}, webEnvironment = WebEnvironment.RANDOM_PORT)
public abstract class AbstractIntegrationTest {
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
@PostConstruct
private void postConstruct() {
System.setProperty("spring.profiles.active", "test");
restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
}
@Value("${local.server.port}")
int port;
protected String url(String path) {
return "http://localhost:" + port + path;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.SkipAuthorizationConfiguration;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = {
PortalApplication.class,
SkipAuthorizationConfiguration.class
}, webEnvironment = WebEnvironment.RANDOM_PORT)
public abstract class AbstractIntegrationTest {
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
@PostConstruct
private void postConstruct() {
System.setProperty("spring.profiles.active", "test");
restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
}
@Value("${local.server.port}")
int port;
protected String url(String path) {
return "http://localhost:" + port + path;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapExtendProperties.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.
*
*/
/*
* Copyright (c) 2019 www.ceair.com Inc. All rights reserved.
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the LdapExtendProperties description.
*
* @author wuzishu
*/
@ConfigurationProperties(prefix = "ldap")
public class LdapExtendProperties {
private LdapMappingProperties mapping;
private LdapGroupProperties group;
public LdapMappingProperties getMapping() {
return mapping;
}
public void setMapping(LdapMappingProperties mapping) {
this.mapping = mapping;
}
public LdapGroupProperties getGroup() {
return group;
}
public void setGroup(LdapGroupProperties group) {
this.group = group;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/*
* Copyright (c) 2019 www.ceair.com Inc. All rights reserved.
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the LdapExtendProperties description.
*
* @author wuzishu
*/
@ConfigurationProperties(prefix = "ldap")
public class LdapExtendProperties {
private LdapMappingProperties mapping;
private LdapGroupProperties group;
public LdapMappingProperties getMapping() {
return mapping;
}
public void setMapping(LdapMappingProperties mapping) {
this.mapping = mapping;
}
public LdapGroupProperties getGroup() {
return group;
}
public void setGroup(LdapGroupProperties group) {
this.group = group;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/TestWebSecurityConfig.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 org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@Configuration
@Order(99)
public class TestWebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.httpBasic();
http.csrf().disable();
http.authorizeRequests().antMatchers("/").permitAll().and()
.authorizeRequests().antMatchers("/console/**").permitAll();
http.headers().frameOptions().disable();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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 org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@Configuration
@Order(99)
public class TestWebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.httpBasic();
http.csrf().disable();
http.authorizeRequests().antMatchers("/").permitAll().and()
.authorizeRequests().antMatchers("/console/**").permitAll();
http.headers().frameOptions().disable();
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/ConfigConsts.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;
public interface ConfigConsts {
String NAMESPACE_APPLICATION = "application";
String CLUSTER_NAME_DEFAULT = "default";
String CLUSTER_NAMESPACE_SEPARATOR = "+";
String APOLLO_CLUSTER_KEY = "apollo.cluster";
String APOLLO_META_KEY = "apollo.meta";
String CONFIG_FILE_CONTENT_KEY = "content";
String NO_APPID_PLACEHOLDER = "ApolloNoAppIdPlaceHolder";
long NOTIFICATION_ID_PLACEHOLDER = -1;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core;
public interface ConfigConsts {
String NAMESPACE_APPLICATION = "application";
String CLUSTER_NAME_DEFAULT = "default";
String CLUSTER_NAMESPACE_SEPARATOR = "+";
String APOLLO_CLUSTER_KEY = "apollo.cluster";
String APOLLO_META_KEY = "apollo.meta";
String CONFIG_FILE_CONTENT_KEY = "content";
String NO_APPID_PLACEHOLDER = "ApolloNoAppIdPlaceHolder";
long NOTIFICATION_ID_PLACEHOLDER = -1;
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/EnvController.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.component.PortalSettings;
import com.ctrip.framework.apollo.portal.environment.Env;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("/envs")
public class EnvController {
private final PortalSettings portalSettings;
public EnvController(final PortalSettings portalSettings) {
this.portalSettings = portalSettings;
}
@GetMapping
public List<String> envs() {
List<String> environments = new ArrayList<>();
for(Env env : portalSettings.getActiveEnvs()) {
environments.add(env.toString());
}
return environments;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.component.PortalSettings;
import com.ctrip.framework.apollo.portal.environment.Env;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("/envs")
public class EnvController {
private final PortalSettings portalSettings;
public EnvController(final PortalSettings portalSettings) {
this.portalSettings = portalSettings;
}
@GetMapping
public List<String> envs() {
List<String> environments = new ArrayList<>();
for(Env env : portalSettings.getActiveEnvs()) {
environments.add(env.toString());
}
return environments;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/InstanceConfigRepositoryTest.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.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import java.util.Date;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.annotation.Rollback;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat;
/**
* Created by kezhenxu94 at 2019/1/18 15:33.
*
* @author kezhenxu94 (kezhenxu94 at 163 dot com)
*/
public class InstanceConfigRepositoryTest extends AbstractIntegrationTest {
@Autowired
private InstanceConfigRepository instanceConfigRepository;
@Autowired
private InstanceRepository instanceRepository;
@Rollback
@Test
public void shouldPaginated() {
for (int i = 0; i < 25; i++) {
Instance instance = new Instance();
instance.setAppId("appId");
instanceRepository.save(instance);
final InstanceConfig instanceConfig = new InstanceConfig();
instanceConfig.setConfigAppId("appId");
instanceConfig.setInstanceId(instance.getId());
instanceConfig.setConfigClusterName("cluster");
instanceConfig.setConfigNamespaceName("namespace");
instanceConfigRepository.save(instanceConfig);
}
Page<Object> ids = instanceConfigRepository.findInstanceIdsByNamespaceAndInstanceAppId(
"appId", "appId", "cluster", "namespace", new Date(0), PageRequest.of(0, 10)
);
assertThat(ids.getContent(), hasSize(10));
ids = instanceConfigRepository.findInstanceIdsByNamespaceAndInstanceAppId(
"appId", "appId", "cluster", "namespace", new Date(0), PageRequest.of(1, 10)
);
assertThat(ids.getContent(), hasSize(10));
ids = instanceConfigRepository.findInstanceIdsByNamespaceAndInstanceAppId(
"appId", "appId", "cluster", "namespace", new Date(0), PageRequest.of(2, 10)
);
assertThat(ids.getContent(), hasSize(5));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import java.util.Date;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.annotation.Rollback;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat;
/**
* Created by kezhenxu94 at 2019/1/18 15:33.
*
* @author kezhenxu94 (kezhenxu94 at 163 dot com)
*/
public class InstanceConfigRepositoryTest extends AbstractIntegrationTest {
@Autowired
private InstanceConfigRepository instanceConfigRepository;
@Autowired
private InstanceRepository instanceRepository;
@Rollback
@Test
public void shouldPaginated() {
for (int i = 0; i < 25; i++) {
Instance instance = new Instance();
instance.setAppId("appId");
instanceRepository.save(instance);
final InstanceConfig instanceConfig = new InstanceConfig();
instanceConfig.setConfigAppId("appId");
instanceConfig.setInstanceId(instance.getId());
instanceConfig.setConfigClusterName("cluster");
instanceConfig.setConfigNamespaceName("namespace");
instanceConfigRepository.save(instanceConfig);
}
Page<Object> ids = instanceConfigRepository.findInstanceIdsByNamespaceAndInstanceAppId(
"appId", "appId", "cluster", "namespace", new Date(0), PageRequest.of(0, 10)
);
assertThat(ids.getContent(), hasSize(10));
ids = instanceConfigRepository.findInstanceIdsByNamespaceAndInstanceAppId(
"appId", "appId", "cluster", "namespace", new Date(0), PageRequest.of(1, 10)
);
assertThat(ids.getContent(), hasSize(10));
ids = instanceConfigRepository.findInstanceIdsByNamespaceAndInstanceAppId(
"appId", "appId", "cluster", "namespace", new Date(0), PageRequest.of(2, 10)
);
assertThat(ids.getContent(), hasSize(5));
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRuleCache.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.grayReleaseRule;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRuleCache implements Comparable<GrayReleaseRuleCache> {
private long ruleId;
private String branchName;
private String namespaceName;
private long releaseId;
private long loadVersion;
private int branchStatus;
private Set<GrayReleaseRuleItemDTO> ruleItems;
public GrayReleaseRuleCache(long ruleId, String branchName, String namespaceName, long
releaseId, int branchStatus, long loadVersion, Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleId = ruleId;
this.branchName = branchName;
this.namespaceName = namespaceName;
this.releaseId = releaseId;
this.branchStatus = branchStatus;
this.loadVersion = loadVersion;
this.ruleItems = ruleItems;
}
public long getRuleId() {
return ruleId;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public String getBranchName() {
return branchName;
}
public int getBranchStatus() {
return branchStatus;
}
public long getReleaseId() {
return releaseId;
}
public long getLoadVersion() {
return loadVersion;
}
public void setLoadVersion(long loadVersion) {
this.loadVersion = loadVersion;
}
public String getNamespaceName() {
return namespaceName;
}
public boolean matches(String clientAppId, String clientIp) {
for (GrayReleaseRuleItemDTO ruleItem : ruleItems) {
if (ruleItem.matches(clientAppId, clientIp)) {
return true;
}
}
return false;
}
@Override
public int compareTo(GrayReleaseRuleCache that) {
return Long.compare(this.ruleId, that.ruleId);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.grayReleaseRule;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRuleCache implements Comparable<GrayReleaseRuleCache> {
private long ruleId;
private String branchName;
private String namespaceName;
private long releaseId;
private long loadVersion;
private int branchStatus;
private Set<GrayReleaseRuleItemDTO> ruleItems;
public GrayReleaseRuleCache(long ruleId, String branchName, String namespaceName, long
releaseId, int branchStatus, long loadVersion, Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleId = ruleId;
this.branchName = branchName;
this.namespaceName = namespaceName;
this.releaseId = releaseId;
this.branchStatus = branchStatus;
this.loadVersion = loadVersion;
this.ruleItems = ruleItems;
}
public long getRuleId() {
return ruleId;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public String getBranchName() {
return branchName;
}
public int getBranchStatus() {
return branchStatus;
}
public long getReleaseId() {
return releaseId;
}
public long getLoadVersion() {
return loadVersion;
}
public void setLoadVersion(long loadVersion) {
this.loadVersion = loadVersion;
}
public String getNamespaceName() {
return namespaceName;
}
public boolean matches(String clientAppId, String clientIp) {
for (GrayReleaseRuleItemDTO ruleItem : ruleItems) {
if (ruleItem.matches(clientAppId, clientIp)) {
return true;
}
}
return false;
}
@Override
public int compareTo(GrayReleaseRuleCache that) {
return Long.compare(this.ruleId, that.ruleId);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./doc/images/release-message-notification-design.png | PNG
IHDR * t iCCPICC Profile HWXS[R -)wH
H! JbG\ *]Qp-@Eee],Pyo9sNΝ lFU |IL#2 Fl('** @.nB[(l$u*' DAqr > @zYy<Kp kJp [Kmb f@t $tGIN 'ͅ>99+!6OO|dǰ,l3 [rţkFGKby
`*GA|ϕK qp~#9 PeA1C#lt.G#!r*̍G r?2x!'
I@ +
=T ㉞)G@q(+&L>aQ_ĨP -l 4a`ƅrҵ`-``\,'J 8`\ N
-[ %ǪyAѲ<cE1s{. *V
GA8 İ\ -l$ kFg$HGhlt
˘ViB, \=pd总nʣ`b bΆMF{ NE07n#
BO^V3 3dʣK>GmpS =! g#alNP=Coq= ,,R~1 }#.~Ėa)"vkL֊u`$xH+ath),?jc`o%fH^ܼ9B~zF<fcktw@˶7 鞍0.} *ӿF y
7kX8 e:v 3ԁF `
"A,H3`3@< A)(zl;A pen{. 0ށaAH
#Z>bX!+ H4 #%H9RlFv ȯrF H?b(UGuQStah,: MG"]nDkнh3z
@{0E`6+EbX&`eX%V5bmw`Gq&nk39x> _of ~
A`Ep' YRB%a70,|oD"hFte18D<I&>&H$-ɓIb
HM>"Y@$'br%y8*yXAED]!R0Ga.6+
}
UœKɤ,l4RRS(***)NQ+.Rܨ_bGՒGFSWRk'woh4)EKViii JJ!J\JUJJW^*+(((P.RT>|Ey@EATO@J-!Ujj
=ULԸj%j;N=ct# C_BE?KS'gST PӘ1[JFc2BٌUOt[>qq5k4yeM74?i1hh=Ƶ-hҮ>=0^}xAu,uu
ݤ{Zw@[w\__BӇ< 416046433,6l2|`D1r5J3Zgn4ho<xq]W
&Mޛ&.5m1}nibVd`vߜfmo^c~݂hjeբt̰bZ9[Zu[ݬ5ַl6>66
6 pbۗ'$OX3vNvv٫ه۷ٿvt8T9\w9:.tlu|5j"obNtNKڝ88 ]]R\rUwr]zGwgyxdyx>loҮI=
=ٞ;<{^)^۽z
5ޏXF,.k7뙏O^vBþ;6< 4 Ll r
t2 &Vn'>d0%t~0jXLGk'ߏ0DDȐȵ̢~B5jhyc13cļ]{/<N ?->}BEBOIɤCS7iZ鴛ͦϞ~qf*d<BHIHٓ ɮanI q6p^pYu~',3"yg ʌ 3UfpYYY# M9䜔#5AL^<Ҽ|0n".j-Pǜ'qoWaUYV-1r9ϊ~mg0o>w,@.h_hdaߢEu)^lW\QvIݒE%
TTXzkmee oZ[vܮ
ΊK?瑕i+;W9^M\-X}s
Պk'm^\W/VNܶAgcMƛVo9c*ߪ-:[oyj5qmƴr'qgΧwڻwEםwߣgU n;mo>}6;M~?~M恰]6 290pY3<y%5H6ÿV{h1cS 9QtbdɁS lw:3St
;{\}ΟyEG.^j|éN tlr˭{RWO]vz7"ntߌyִ[=ɾn{=PyPPa?,sQ̣{9_<=WϏw1y/JTsKb18Jj7ZojN|>5]λe >}txS§gó>>obk#9##yl![z`C x] - (^RAdE) gRq@" 6 cY ut kr9:|Q
ad. 6 GF|d'"<o
Q k pHYs % %IR$ @ IDATx T} r].*DwIⵉ*@զFsƦFcj$kDMMXj&
`5D`.]| Ξ<0a9yuH @a@ @ @ @ @ p* E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E*ڞ1T]Z[[_ 4(PUUeVSScuuu6lذR<3hɟB(G+qy*EPS @E1Fxl.`
P466څ^hSL)Y.)Gr8%@9ZQ`K_0J6@ PGN k#PL\?<c
PK
)ғي@4͂ҙgY.\RI*FrbNuArl >Ϗ/??Fo*P@=SAK/ԦO^
2)/C=.#@9Z w@!(G Xy۠ܯs ~~/??F*y7(1)ݓZR(HqV@
,Z}_xrxBPBA_Y監-?)_v@ -!@ @ @ @ @ *S@Eew@ @ @ @ @ Xi T cTTy@ @ @ ׯ
0zeGڨёo6f@ PQIc,'!*z[# }(l2wcFv<x1 c3gδnՄ[ڠAlyr/~FavyMVF k_mذ.R;ssɦMK_Ըؔ)Sr^O+>v}U_o'Niر~.˿Kvk]fbŌ P+V t99s /ӱÚ5k;oۉΘ1 |A{m۶m.1uT>X7?}ߵ7|3O>^r%EOdj* ꖼu@1,O2Q '?IG>bsk8o8裻 +@ (ʕ+{x//8 ׇ?a{ꩧo{^U#|s9}ty2Xn]wu]6~d T}oUVu)[T@T>.hr"(_#Pq[_rcW^'O ФL.*C -tR۸qۿ)|ʜFzG}UzIT S{)E/~ [pQG eg TЃ@W\qg?Kjq]w^
:L!pkO?͛7>۵^XX<<P< Z(dfϞmկY%euCx) 6&&+@%r祗^y} 8p`yeEsNFfKO _ C]zW EW_5 X~}xrQ>PFwҤI}o|)̨s= 8X @j= ^R)k* qz ѧtq) _F>묳LEjM r L@O/q 7u7"`;O!~O%$(3u9 z(XN3f!SŐ*To&6 ?J3ws-QO_|7/̲2d-V#TdܭΝ;_jxX|V}'=X{;Z-?S{*^~{v
" {W+}[??r].dL*IǾpouK @-t-M@ Pvk F/SK
TnkkkݻM{>Շa Sͷm y"Lt*V3xmoȐ!mmZ gyUE Ƨ?eOx={,Pʡt'Ub,S1z.ʷfWOCT)Zi9=-"=a'Բ)]I]e7.{PJ-UZ4^uWAmӕ8^-"=p>z*:!= g(ʗﲱ.Ĵ>T~,\e RykT]J
T7} '=ܣ۴<T#[Zw7i|EWb|moKLo15?~-1xI~xLv6zJ7ZJI}رc3r)/G k8ج/(8ǟٟ%;?yЇ>w/Ӳ_;k*ג -4ݯ;8{hQQs@@ ^P%Y4fqڴi]V W_}A0a nZ]|_4 DRe^w}n4.2DUJP7'[O 9ҭ}nuMUX@ TI;Sv{Uȫ QY
z],
k_ S~Sst_i)vG?+T^L>(4ȶ
:餓\em+?4'ZY ~ꯒ* q ץ WbAe/O8^T_=ZN~~9Wt~8ub0HtR6Ǘl}!@k8mMp@aܹV9>ΣFVrKא*u䥗^*_|٥2W^qZ_
6_)QZ:&=a .ϔp9T //mCK+j~Z?MRkOʵPлc'?~_h8WVӱ( t~')Z(Oo~IyS7ڟ/VZ$WLj'h< @ =N/ʌ4o$u z* t[^z"z1r5ʍp 'TFi?=OC '! }&\wOV>
+\?
vkF'Lp#ӱm۶r:/m$u^~: FӼd&e}> R.ަ_^U>R|R2-yn,|7`.T.ODun:.ˆAF<.` AJ"_ѲO /\OP!fi{*[?:.yK ~:.K^pCb}}`PX7?z<a9s jW.ǗX J[d&v _r/h?uW驮!|IUv'>ѡïr*h5(& n APN lvn{<)-Rx]ThWwsI,X2:A:X
FdCEzeM
Ѳ'z
XCﲟ} _+ M{, nܻ^rA;2G ] K' (WpsF=D3$u&zCy{(?ESps`N|F8zFt]w% O3G u9'3
'=ulPm=m1c Ss%= M⋻#~}m+:Ӡ$_UmS-âIOE .սGS٪2OĵzPhz;NOx:F=܆tY.ī"g$HсZOIcoD%Ƨ>)J @A 2NO**ߓ]CF/ep56Z6l.'o|KڗZՑZEH zK_RM>~z9:M-_$
KL >uPw6l`']U/"{~7[ߡp>[5ZVz]Wj}.S%M\5=UYZ-w'Z*^<Hw[m}i|. ٳg@Ԝ7͖OR%8)0ǝPN݀@75<TIw '|u
N?i UfW}ak[g_] dOEyG * |RU(jY
N瞳zW)
/Oŋਪ 'uI1
FW8^*Lڦnx3\QēueݎR%U +]#i~{bUU0\~ԍT*)xX
z{Wx4#X
Tf6]R;O<ո!''fyG |-Lѽp9rF3x
[Euu2}͚5]*Tk(ԵOZOc ]ݐQuͪ1-MIz9\O ] ZԩS]P7}R~nWݻ~3V^Wu3<)pWTLߞp^'wuɥTAĖtneߩߦ @ }T:2T6LQ [Vb )J\{+hkޠHb3^Vwr*{|#1E PQ4zv @/ u#n7 "OLic HuYi'
j&iĈ
=E.JtӥIUViRC˻'zRJfR
) Pe*ox;TkTI:gyFpR DR&UK]+oLZ$ۏS^W=]Z`ʴT4= ֺ:WɒΙ+ד]w]OiOMd5_- O#l
[|);u~ 8B @OL HWZ) NJcowB|+BIOenP ZcR}K4W%i
Õiɶ}l/^ M IPzGA7v'KSЅ "顄p=N /s'~n0:ڨBISI (pDB
(@.KZKzXIh[hj;ZWc℧E}/Pd qu+|@O#ڬS7-4O.[Doto"<_$*wn@'*BAQ
FT &(\!JL*B1u*bO*\MQɪW9ݨ<yVw ɞU:{}':8ko>۵w`>=#.| uS
l4m@L8z|mr5[elSOM,Ww]T-7~+R'Uꫬӧ
pP5<=KjYO k
2mo{oW>W|
T"o^cc_%>aSߢAR`@CN*;.7H,EҺZ~k{} Wx*}i{GRz?r?\\S``}>
}{TϞ=# .f:C !yMMk%K=M>jee~LudyA (zJz2T
HD IWKLR[ʯr}kU⨋#3Ux)8 y ~ _HdO-\gFG~z'T+4ZɄ$Qp)Ybt[OP~ = )xU$A$NWScz/SJp~Zv/Wwv+})`
yUlU@]/h7yuiʽ;.Q&R/ ӽ⨳ڶᱜ >t|:c|+߸pS^ pH@]C5o᪖UwѤZ3]-6cchz{彲TTh@$_7 >% 4$4n0](5&? >J-,TAGB x ;\d[
QSOm$Q7GI>إ"L[ӬZGrT8vպERu/*PXYIMZeǩu^5R8iu =EW *U哮%MZFH-Tѥ
18>|Kb=[F&U"hd~֍kٓN:i
~$Pp80R+'S {Ŵ_Ap~BʷQTpɷxA}+SR>oG*f̙3) Z) )c!!@uZr&pɟw^eBtt Uugﰒ +(U/|TϹH@ n&..R7隓oUa B7Pyfx{B,<-
T
uuo6ܭHm1
/
wHj;
iU@Z[ˏp,פV@TS^ * }B pJC.T9' JkV<y4mK4~^]:ͩnA2 %!@zvbCX~w[2D -+s=ץLwuߔ+j}A訫% S^/ݝƀ6E\Rk5 /4-
>VUV>G^^:OzxH-%uAk8%?ÿJt,͏v3
d;0 ~G=H #JSm>\W1շ]w3<?hDP[rDھ^ߦv}2\~=F (Q݀[_ !)IMy|VNuJI\%7} F{"CzBʿT pj!*14(*PW^>Iᤠ*TqG u`
*TQe.I7@
NgIOΥC\-2 R$ܢc
xb2<<=aǗ#P,Vwp>UWBc,+np//O+5S] k!%=]J4 R i}ʭn!+ݵZN(p Sn2QYg?]o~P-j&suCE~zy*SG Q2>Z_. tUV6jAsrg=%/d&IRkޕGo }}g}RXkT]UW]x~{g?sݦIR|T\@ѦO?i ==2]K.{t.lCMt3O|h%\!e͗_w(@[qU
ݐ**}jdUG`H.2D F<ª<S铯4TW
|V9ɯ]hғwt~oU|UHWS'm[ ZE
{p Y-ﳞ}:tͧ{ZV-I]Lx[|րဩjKR V*|pA]d}+_ vxMe|PPY-@Iׅ
KYۋQ!# ĉlt m>D,?O,ޅ x ԃ~.3U\SkOtMygwY'?TV8]~ZOemi8}ӟ,<?Ϫ!hݧ( {(mL =[ XOcG/.7% ܍&5ߘ@]ћ =Mh҅" :@8e ;URzPSn˪qth9jii=Oӧg; Pe{Tww}97W%])jm+Hٿ'Kz/\alMSw8T`:tP0B_]u_lZTzUahOS/t
-m_۪ ڕێ*4vƁ$Jl* .t.Il 4+Z
xS9|*.oĢ"dt>K_R~{#P)
>c *}JZ.C|X`A~
1rtM x r d% p
+SJ/YW6`^x
}
E4DcѤdn\4i)59
ߜ[,<΅&膉 }/v.O+JTބ+40IeAxL ""×/-tF}D|ۧgw=I8:"Vl]^}muryUQĂ TfG']u)s;a+^
xG PBO+,5ۻ~ى>PAdIe~;evE F竅O߀tʧW]}1h.+`gϞ.-Dzz׃;]}>rTR+Wv-nԅI@Sz
;9j,ڇošW}HQظqc>ߩo[N[b]M$^@-W7m\M8P`Z-)Zֆӕj1^ y*ovy.ed}Wi:-/.>?Z}5@ !}o?}3 b!~nUՍ.2[I}oٲmWm[7~nڴ |J;*/?.YU \K^d Lc[-Ǥ' ;ɼҾqVy*7qt* G!nee\CQk#<&tBX]aeR@>p96?6{kuJ?.{c<*=Jo c}{ m●^kO]Q[}z3)Ъ:}}VY[IK5uOeNoܷQ8>@ T
B^$@@+BOzb'%{J1_M~婔/Y@9
];hyq#I%k7&Ķm\N|644 ruPpZ *ߵ_^!S)C 7|=sۣqr]7hyX-O # 'Z S)< B1*R0@ @ @ w$i\l[ d]A @ TY@ @ @ @W4s=g^{oﲏO>ٍꫯ%! @ftK! NSO5H PZTƑ @*r@c@ @ @ @ @ ( 8@ @ @ @ @ A1*r@c]ʆ
f/!{m].o:σ
e>Tn߿jjjLeRq(GW{ +r8WR?OާRw)ڔq?C/ZY:knn z-ZX<\h7)wXeRq(GW{ +r8WR?OާRw)ڔq?C/@E~欍 Y
IF,71?EELOTWF}T ^)GJ8 -{r`S)Aʿ6_P~˥v @VB]?l0G`ŊV2s̱iӦq$'" hߛ )GR.,(GH_g0})\ _~~q_/g(RѢ"?sF ,T9eʔ,bRx]v8sK) -ӔW&)GceNrNiF _G+sfaE @ @ @ @ @
)@l @ @ @ @ @ P # @!TRm! @V*ba@ @ @ @ @ (@U!7ƶ@ *[ >@ @ R/3H@ Wʿ\w={n92@jjjWI Pf @ P$ _r = \h99;D 2 - =P l([ʿ=9 X 6+" hooV7E t# hH, ~Lˊ"f08 $ PB@ Pk|ˊ<2 IrH( ~-] v`؝2 .4/_` VWWWC@ "P]" E/">F
P?;'PB@ _hs9y( h5 P"K _,NC2A"V -A3 @ ;X(uR? rU|c= PSD@ @ @ @ @ (_{n92@ @ @ @ @ b/@" " P*< @ @ @ @ @ <h{ݻw[[[[^:X~\bvGؠA 2dUWW, $uuu hv^, ~A
P*Wέ
Ll۶֭[g6l7|ӽ6ol.x) СC]ܨQlvQGٸq裏Z\@ 555f3 @ ;X(uR? rU|@ZNm]eлZVرMWC*ԒBA
}ݹs[O˦`P ZX8*A 2BO. }"@9' ~lNA >c]e@Eq=s+֭[&
ZJ 9ԵS`
V()Xi&8pkmѿ;cmƌ6i$Pk P.OДtAWgcC
U Wr?熜!@
Po)nZT(q(A^{^}USN7x`a̘16aוjy
VTUUeRi[BѶR /V^J]D1mg@ @ @ @ @
-PQ-*Փ
Vgy41 c =:т^I$@
l
\(PwR
477
p ;&OlSNu)d{ @ T=.+rJb`8< @9Z
g<" /%[B +IcL(Hb
A- JB3M2N:$ׂ"SxG ydbUy ZcYuԝ ~܊J|@ @@>-_ ZՕQq @ P5{B @ @ @P>+"P Z<s|kE
*5Ƹq\WO'x]֍wSK' O A |q9!K()ђ:]d[r?oB6 %*@W']ց
IEhƠPLz+'
>|M7fƱӓ 6[Hy и=j$@ (Gbi@(K U/W]
Rlٲ^z%9s| E*B-8
ԋ/h/˗ZUЇ{21! T@*4.Ν;xkYqQGٴiNƏ 8
%jU/C-1H T@Y*POf鷿wE;p30xgm۶mn (Ǝ Khg # K,8[-֭[0ѓz)qF{]1b{Eo@ @ @ @ @ Y9 Z*%ƃЀ֓'O6+>}uNJ+쩧2u EB @ @ @ @ @ʪE]Oj*ך⤓N)Sذabsn5 nnnv|+nZZZ\@eРA+A Pg @vy4 P~?*@\WV
Knزe)p<{9UUU. Dپ} ZhouQE"6 @555g @vy4 P~?*@\WV
^sQF^qJwuK5~x7VZW qVWWgq.yA 2ЅFcc[^I Pf @ P$ _r^Y*Ԛ^s]"έG&dڵ'\82({`}9$@ (Gbi@(K U/W]V
LPſk%⚔7 vr-A] d$n"! &@9k! *@_g|#@
eػw@[jn<APwPʷ A hiie˖>@ @ R/3H@ Wʿ\wI-*mZ' 6̎<H7C\O]ˏC,z4(_~q:B
l߾ݞy7o.tA&" $ MD@l(r` Ѓ _@8ߺuܹӝJ
N
qM>~g (+:=q=
(|+ Pq9J@ P{ @(*|eUnTٯwUk%LsRB WIu$@T~.LB Nr4;/F J]r G \(r+*P
'ԊbĈ6dȐ*_Ky>clϞ=n|6oǑ! pH "q@ @ @ @ @ @ʪE}Rkݻwێ ;\
<oܸэMJ˪?@ @ @ @ @ (Ic;]c=( pXGWAYuuu5(C @ @ @ @ ()jQJ#<U+
פ< >֎ q5%_ %PV
U5ʵPصkmݺc{F纩RWU
5R ( PjΗLB Nr4;/F J]r G \(r+*P[Tl߾ݚ]q ۳6l I-)R1AƚRLB Nr4;/F J]r G \(r+*P:kmm_~ٵRhoohoٲѣ]f! =B-$@ (Gbi@(K U/W]C &ZTb^)IAعs L8ц /@G#G'g @vy4 P~?*@\M;U^ꭷ͛7Z,s\y@;v }ҤI*r,az@ r ͍@ R/3G@ _ʿ|k
Th|
2b7^fKB\N]~x
{Wܠj*r$yg @vy4 P~?*@\WV]?iꪪ*S g ]ui {kiSg 7>cƌ8d< 9 Bcn}uŧ , @ s̭X(r8 "@ZySV-*5jq6}tҫjw1)~ ʴi3t-@12 )/4g @vy4 P~?*@\WV-*iROƍ3\xvr],1 cÇm6Sdƍv:u wqES3({vՁ3 @ ;X(uR? rU|+.H
cǎ7 u:xgs/W @ IDATxj1~x-+$@ @ @ @ @ *M,[T$*XSL1
^[KKX <z;%͛jIw^;ꨣL }nG @ @ @ @ @ eA
6l0[j=.X}4]-/z;X ů~+۴i x≮'
2;r8 O @Y* `RIzB-)ԢB^zɵP cĈ.`pG}߾}n|
ڵk^3M4ik)
F@ ˧
~"- D[M[jjjL]$@ .G婗 ( ~a=_ r a{ޯ#HrCTۛoi+WիWM5F '`ӧOw̶~۷ۺu\b͚5c8pnsȐ!nZ-1=BA ]xZ[[]٧u'N lǯ*;/BxG (oyZrQz @
P֓!@-]/[eݢu@G iӦMs]B)xci̘1蛺R AOo:C/mK-3 8xi C[oV C(x
SB-54q g s -)<8 ] (H/rɜZ>(P|)ptgjl5|B@)O @a( @ { }-Tӣ DmmBXՃZX[W^y" j
Xk&e)pjD[[{mݺmC]JܹuեԩSf+P.H @ݓ
R\z饮Y /C=<@ P ?@dk ʽRaE*B
B-$dxi[lq+CAY+Pe}jVZO GQ10J?F
<SU-.ZMy$! q<" @a( @ {?GÊ
TDOZWvi. 6l0PPsM8)
VuVju>P?z =u&LڇZdh> @ @ @ @ @
TtB]`þ}l۶m.qFP MW 2jP u
Z7νom *:PYBB- A3)ؠԊBekP_~d'&>l2e F. ˂^w@ @ @ @ @ R lVK I
ۮ>ݠe@ @ @ @ @ 2, V@Ea= d!@" ,E @ @ @ @ @
('[C @ @ @ @ @ ,TdŢ PXdk ,X@ @ @ @ @
+@l
@ @ @ @ @ P" @aT֓! @*bQ@ @ @ @ @ ( z5@ @ @ @ @ B@EX, PQXO YE@ @ @ @ @ @*
@ @ @ @ @ @ Y`( V*ۭ5ߕZZZW_uن
lϞ=oQ,VUUe
ÇW @@?-_ܽrw^۽{{^x RFGGe@E T ]?U @ @ @ @ @ (@SN &9ctԵZ;m;s1sd, @@EuuչW OdWcQhǠtG駟n
?6 @Si@ @ @ @ @
I!K T J9 ' 1 PÓB@ @ @ @ @ r9N@ @ @ @ @ b(@"',! P)**Ls P@E O
YB @ @ @ @ @RTTʙ8@ @ @ @ @ @3q" C1<)d @ @ @ @ @ J PQ)gD @ @ @ @ @ *bxR "@R4lj @ T%@ @ @ @ @ *E@Ei@ @ @ @ @
I!K T J9 ' 1 PÓB@ @ @ @ @ r9N@ @ @ @ @ b(@"',! P)**Ls P@E O
YB @ @ @ @ @RTTʙ8@ @ @ @ @ @3q" C1<)d[[=)Blͭ v @$Ә } Җ5M;FWwWkٶm5hfG;W-έ- ~oYi+&tİVSL$e_m&ZjeؔrLgT5XCV@ @ @ @ @ /h`^ce\`l
w/k5)4j;*Hi q e-6FJu)̚nP$-lUK2[FnsNJC'^c]Km'[oeРAVUEq^'@ @ @ @ *P
< r ZŇj91sjg ]gi53Xa6Zj=XѼz$֩ݖqߺך ;`[S.F PO,=V f mqgOMCfیA.
TKNx زeQl֯_e=# @* 7j o9qɜDˆ+̷W&KTWOXUAP 5gZ=6+mqMN:z;m[: ,ڴCyN{Û}CYSwZӰ?dP괬\d̽-2#ٟڻA Pq]Pa'mSed]A=ʴݻwڵkmΝ6b9rֺC ʡO@ @ @ @
PQ84/{|{k/;?XSgMdfգۗ{v
Rh$-)"OTwh7wY0W*`\Jav#=g]P?8LifלtYܱc?g =z͘1N<D0a \sl #Sub )G@V|Q"7 n0ɛ'/Vk 7غE] Rh f |i[$}ŋ,!tj Z7,xϜP f]W-#:ko]7`$? ubʁӂ2B9VlxE5<jk&rVIҚ'=.tYtkH ReNYx
{饗lƍ6l0Sbn1 ZX > eq9@ @ @ @<Ty, =E :
T(K-\>65j_̲97 /u?,6uisO Hڵ|y mvgK \T3S=u{=V}:G=*T86s-uؒ 7̋Jqx;4v{djiiq7|Ӗ/_nƍs-+رcM q PdzB[`S U%,ԚaN}ZA }Ү&ZeU4&[hpi ƌ8=hq
=ڡsno)qnRhm(h1=]wt_ĚliRk*.XuVkӦM~zknnN8㬾>#E)LB @ @ @ (@V"ĹֵCuU=87(C[oY͟~(rAWMBUЅSorMM3Cm-c, }J6Emw˷љv*ο:9uz6e-[--V$?` ?:M
6 mv[qvk<4-hej$ա~ـ>K(,B]Bw[CCvivG M PtUE(Un߾U@vE
nH:.tI ٬b=3bKs)+꺺-n;}ZF0~]TkW'$>EnbL<y>ԭUmpk~v͜{x܍%j]{ ݞB[ bB kV0w]M6 Sv nݺ*%)0V>;(
ƫrja,ve J V jjaAB @ @ @ @X*%_mmmu^+H / |Xb4ԧ]^3^fW7 O=qӻ !15IlZ֯ݶ:8*4S+zR%R q5!fK)xu`̠eF]/~d+Դ
6ڵkMý{̻
X믿n<M4ɦMfz[QF\ .E,%!~XxyO,t~Z_\l6'E,])U[[vu47 նƮ,' }VbĂ;n'|KgOj
TݔфՉ4-ӆw<vkҵFY 0ܢ"z7vΪ%ҠnƢo@ @ @ @
(@Ӌ@߲/ϖ1#!<c8}^bB}M
'n贈6f<:dmu}"P1onSϚ~IR2;ljhlA|I0hzW5X,Ni[ CS0tF z ZOC62Bf!@ @ @ @ 2ȱ0íXY T' ?-Labkv~hu <|t=3_a><-|4/<isWۃ_\nסo\jiE1'Zo;mi\kynZiz<ҢKaASvw5qn+
rO{BcR;1*N<D3f
2
ʝj}# XmYgPw1i)v ngN. y{U
\TԿ _ $_|sSp]?;ˇuRWdM.ѥIFEcv0kmOي`kvLlm=(Sj:5HlΔM6 {iƬիW'{\+H1(4Ō3'Ov]> y6l0Nt@ @ @ @ > P'ZTw^ۗ/7 Tmv{jRbλf< hI=%AԳ 6gb]aPێ a.nM618 ˂Όۻm! ТbϞ=6rHdP
& }6~x:u Tp v1CrdE@ @ @ @ P k#e6ĺM7<9FD&ki z]POgO|zwuh&s%/*RW>sXmixٚX`Wvfɲǚ@&PB&;餓Lc=MWb @LTD
l 5#4|{ThmOcK Kd>8( W?am[_6;yM6_ 1UڷΪ2+ynqҥe?_/ =5uzX\f5ƫPpB:%PWOBA ! Gq<+䩌Zmܮp5zv[b[*>r5MI]R7tuC%6ond`ηI)bk^Xjڪ4r(mǝ"M{Ē翭>9K*+#KXNׯ[A#F.4f]pbܸqnlӀ$@ @ @ @ *PUyqe'_*Z2Zl+lV{˯ Z
Dӵy[mPZ|5ηks.>RVu*uImAԪ# eEłeνx[l7ݼfQ/)5x$vknn
[V%f`0tP, 9v)ۦV8Z| ,b:V 7
@ŴiLeo3H ]@E++Wmv
Yw<n} ACdw.^hW_t(Pиfd-MvMx `@k.-KS*mΏW،-ԧ :X ѳm`FA>g=:tŷ_Oeȡ}y<wax䛻MN3!p+O #͆b;K-%4رcI M 6lA؞92 {5Q\d6' b%wZ0"Egj[Z-k}sN&kXۦ-
64j6XS0PuԺ:Aq& w,;lqR۴~צ ߝ.
h >Bk JqT010zX= ƞ8NSN9&L @ТT,jUM-ily
V 䨫lӖj䒪δ[~b'la06ŦF$8U+l^kU_E:]-6I >ކ,˂uS]*_ynG]?3:::L56]= EJ(yb@o]MlQWXӻvU|M u
Pa͔Gx~p Y6t0H 0` d;C @ @ @ (~*SEF@ @ @ @ @ (?wN9"@ @ @ @ @ JF@Eɜ*2 @ (s! P2*JTQ@ @ @ @ @ O@ES@ @ @ @ @ PQ2" P~*rD 9Ud@ @ @ @ @ P9=pݻ[oe `MA @ @ @ @ @ tUf2}|M۲e
64 oj7ov#GE@ @ @ @ @ I@EOB|ؾ} RlڴjkkM?@ @ @ @ @ @ ?ƨO
PO
Xرöm*@A @ @ @ @ @ 0i֭.8~koo_֯_/g@ @ @ @ @ \@E.czĠALXv; TQ`B<ܹ' `^vڕf B @ @ @ @ @ t Fwq)8ꨣ\*7jkkKf! @:itشiH[-)&OjEnx
7^EM0 @ @ @ @ @ HA7nh---V[[kcƌ#F}jmmuV@ @ @ @ @ @ cT-*|O3f '`t> 8p TQ
u&M2XuV۶mi< d'@"W4P1n8Ԑ!C#pS UVƭ ! @v*x;'uÞ={Æ RTWWuW^!PđI $@"qRN;vp-'F iCu=߽kpA]kwN%&! @:Itӛoi.@1zh<x
0gjQq*jjj\@cÆ
FM1 @ @ @ @ @ H 'b .X.l` w@ @ @ @ @ P+YB-*|x M8э_sN۷o; D-Gg-N[ւl*Ｐ@ @ @ J*+daشiOh#FI'ZR?u) <X!: & ms+m躠EeW?`
W?f߳}}nkl]ۢOni5?zp[fVG:v WZ{ Jb jjuK I>Ud
Sji~qm;.Sm
VU\7_& IΛZTlܸRBfGG q3ƽ͛7q-4@ He6>k[6ش2^tC^)O^`^xZkݫ;WLjn>0k?p(rv] [k\bб'ؿ-$a-m{Ě&=l n<^ 7&q-*tᮟ?{ E}Q"&\$A@E (Vh% [ ւVizjUJN55ZPDT /f7w`^ug>< VPbݶyf0`˴8YxG @ _X:ܯMqA
RcbܘPJI̞_|Kyj|R#lUf-ԽVds7Jru3R5롥,tT9\i9V0Ilq^`gʆI2vJqenΤA:og ۿI uQ.h̀ )M.;e]t%dG=U׳gO7][nuŵUd@E (}0sl~Behʛ>unJ>];Ҿb
Gظ:&E|(iFFzaJmQO/ PMX\ƪr&SLW#y`OkҞUVip7Y^͎jPd@Kh71V;K~i4u ~h;w**zUPw`߂# @ @ H` [ojScqOź8Յ.do^۶m?F@ H$gn
}Vjs,1NF%a$Y֘</c0<Hf:W{[&d[Ƶm+=2ꍋF儸V|sM`7mki
Ԋ|&0"|mӦMVZZ꺀:Sm @)4@ @ @ 'UWV
M&POӴN8Z
@ ^j C~-A)klm-v))9[#XIeNk秺5MgE.܈^Q/̷~` 0Rhc^=~,:M^A-o\Ɩ?F .շ;vE`K\-"Y^[mXVSaEk*wL*j2\ PF{mܸu]vL e7~*ϰVY@ @ @ (@" hT) Yq[N@ HDJ{
'M7HY
+mnCANzP H m3ƇȊ|_W_Y'BaVv`:~NDUz[&_;&G[EU@E|sw^GV*ҧXx/0CVv >QP/[FevCv' K +A @ @ L@EEPa4 Tf@.^x
[~ƅ2#(@ fuVrߒ ScvV+V - yx߲s&u55}͛595uؼLŮuάyam
Z_jV~{&bf"U56hA~cJμJ7tYc F^j@+**<eÇ }-Z̜ @4eTTVV̈ѣGũ h)<u "Pe@ $ٌ_ZuuT*Kl(}
Zmn_}( вiȽrT3B=6ZSR+hj-1ӊsoZҭ
TdY^BǑbI?[;20QecNJͶYi^WX{ŸS x eZy 9@mm0MeTXy9wm<7qD7n3=ܢ- wւ )=!% zzNmfT=Q LQF zۨ:*!-9h@%ݶm٫f}PMZ6?Br&[d@DhB@F gM6 "[,;bvpLڙr(rlkfckjQWL`hX_4\T?[<7MߨyFZ5a>ڌ3}hmD;i۔76T
K]BmݺeXh ;vߍÆ
s
vT-
@ @ @*<3?_;wnbw[bU7OG }
dʶPE @tp˖-m:C+hy5mق̇,mA M\aeف˽LqA*'0-2T6uDX˼: Ŷ01!箜'|28mPA^{5JEa
ͻg U( 3ϴȑ#X`< @t3uzzZNA
eJ艸> 6W^y\n p
i]G`+mliQ;WmE7[^"9na} ](
ߟbn^Gł-Ŷf9"ʫK\wPю$B[Y/3#qM:
-0c\hǺCsz]Yy%Ul'溑rM?}~=Ȍȵ!4^o{PE!piO8
n|)RRR_~D+,IZP
u EC <eE"*lqnKKJmJ0л_8˻Ʀ68<Hqim23M}E6cl˪M^Kzߝ84[9~ƑCktm5tTpwpL˜ |чmw iiѧ6l 1F VmiaGo.2 Tx8XD[jSD~+T8[+PIױ
k@ :G#t5u
7yyM[U6ف ۭK |-8ayU2_c~kI/
-Tj^D/ȠO)Bkj wc[nCURxv/]S`sKa у$1"6(;Bie} wqߤ߿mæ@ @ @A@*){Q6գP* / [ C .гgOlVVV_;J,FcOXen \8.Lz N:[5;Yk,wtC"+M/̳: o\ӧ"KͶVu rlmCDw^e-_2&z7*pymIƵB@(l_|1
Rw:\76|pWBoB4h m Py~:]B9۶m_u֫z! _ϨпxOku4\ThK&wY-/' 2%bP"<0ec}OEڽlJwB[xm%UlNpA6mo>uݩ@C0BۣAQFĉ]⤓NrA
Gm̍ b^:gʨPADSےQy ^UO;wti]ݚC e lZ5"ϰU6(tmKחX@t~UNŶdJWoɱͳqe ϚͶiR@=pĄ l~) W)Ya[ ]%{\?T]v .:
d{n>;G mZ * F[ (3" g۟XbY8*ƝL m GRBgN.@Pg%YudZ&P1CӗZeQ%YxE/sG\lV?a1
HUG*r3-o#GکI uGGEF@ @ H\f/;ʦx\WM/LuES6/l*Ꞻk:@ (P mI({xŨM0?3+ ZhygZr{`l/`3Le^ #^
lVDٖd7-hyGF[_<|n-lqƹjQ HDe!@ @ @Yruˉ*x{qu$zmOQ }뭷\F֭[mҤIYF @ 43p\l3[v[NOn&{Vd3/^ڜY@J?5yj!r5[r[ㄜXw7. [ <(u-˱$VFz Jܨn oM
;ckʖڔ~Zgyy핶}Gꐻ<45F /--o_XWOx
d@ @ @ @B*"
V);Hӣ .fSUUUVVԱV@ D`h-n6զȱǽB}+,o´@a_/]lϱ@Vv-xnXFE7ϵ,+Hg˲1^ @o7lu[@wWh^Y DWnsSY|b/ 12H*D-Jk N8 `Ovy'. lS"~38f@ @ 8 h_D[AC C{)t4
,֭.>Cy> A
n-k* iKn˼B~˜ / )4/py {domcL(k' LR#j<ni}KCօ}^nU6,tVi[^W^"X͒3lM)8fVlʼY%SPB]<~vgرc9ѣ(T ЍȨ >cNr]?> @wH;V!,K(7<8
&d?VͰ/YiMeWJMq{]o#z DVqL/f^wJ-5umސeh$[$]̪{`
_#aZ& PW =kP]2eN|G.(.! :v8twpuϤ@СCݓs ɨPcذav 'B}]4LC @
4\mlɣ3-g8+xǶ0jg4
PRn:Жy÷SR2&UAC @ @ 8| ~
uԑ
]䪘ߵjV
@ @ @ @ @ 2P~Վx\ |R?
*>U߿^{5۶m) PuTSScVL
.DgtϤgJ@A^zm+O . @ IDAT
eSڵeS&P<c\6 mZA\㭷W_}< @].Ȣz"))) . I:*έZ{۷U@ @ @ @ @ @ \ !
hpRsFaÆ{vAC @ @ @ @ @ p T(BjKNN6*e:I.Ǝ kcƌq5/=֦! @@B*QiȐ!.
T&28Ȭ @ @ @ @ @ 2PgT zsej(0RQQa{@ @ @ @ @ $TB/)H`o }VCg#<Ҵ>eV(Xq۶mf= F vIY{q#D8裭wަ,n
VX^_w C @ @ @ @ @
$T>wyv p={#8O
t <emܹx
b tQ
TVDee˪PCgю([c.X$Q P ԵԘ1c,==թPS;Xc t9
Toʨ2d{Վ;8?~edd:ʦPAo $T"ZO3BE?xtş PFjTTWW[rrAQzeT(P /͛M@@ @ @ @ @ HtT.YԸ=Xׯ uQ;miڞ֭[^rrP7@ @ @ @ @ PKoTzРA.@nzG m۷om۶7@ @ @ @ @ {T%L "Ho"*ܝ⺝Ҿhh $@*"kS "ڑ_*eR1N8Ԯ]? $@B*"ʨPVCZZ%%% Fe'x `C $ ڹs iݲF^ꫯ? @ @ ^ !fI+PB't =HT3C>(ῄ Й>UTTXMMMh7p@{|ٲe< s1v뭷DزeM:նnZ>8yfҗdwq.+_I # >PeT.i'''[jj!ͨiFzKC @ @pҤIlȑ
(7eXk nxy6sL
i&ѓO>iz=sn9?Z+{ ~a+..' {̽+zua4|@ @ @zvg)҅o.RP1CoܣGWX[O/{K2
@ @ :. H|s3WSF-ڰa쩧s=}M>`՛>}]l8}c s
]0C#o uw^O;-//
SVVf/laG q{JXєaÆuɍ7;c;ϔuy t M.+V;/vuYzzzpV@ @ : ++ET{.$zuäю:(S&P҅'|8vm" -ԕl =ݍV`,v9Xyyeddqʆ;w-_[ 4r7O?tPn\_s5v+b., V={TwuYr]uU=|?KM> ܷ v C<e('v^N"(0 1n. yjz~+P`uvm@ @ DP7t>6 P
cǺI?tPwq}+_GkM&)H᷏n'> -ZȎ<HӸ` =TVPP:ں\G }tn9*% (@ @ @ΨSJof.<AAr퓊)X& t\୷2e)ᦛnrVko.X̖x?YwuM2u~r
F(C?M0MjH꒶kY!,]C7 [L)y<a3!@ȣ>
)g(3_]~@ @ @TD˨PMí4ꯖ lzX#GϺ믻4bҥQSDd /խor]tB
("VSE]E/ˮ?'ŭ?Wp: <myoTC=jrjzI]*E(#=2 &mOuEkƍ +㏇Yسgsƴ
|Eֽܧ cZNۑ S}4jn+誌 m_-vg@ H ؿ+B?TZ?̇ rX3*S(~k?i݀C@ @ @ >wÑO/*ݬvK5.P} կډ'&ggg 4_vefAgm)R3f{
8T\\%mmY_Si}еn <T'")r)6-ѯ ."fWp鳟lضܙg
ܻp7ZW^Ӄ~p
.2zhweV^ \=ǫk[tmoG~Pp*!T%-z֭6ydMmgpsz p v?npfT'],'=Yp{ 0 @' G?r^ʰצtU^
&)(1i$w-z)MW]hMrjoF-qoaǤ>~w nG |ewk[{?MܖL;<
?)w-SVVVرkJȦi
Vw}h;B~SE,}?~ 6EA}
>֞Uvgajj7+ |(H}ܖ4=x= m@ O[*J?Tˎ ;E4hP I,+CA ='t _@R@aݺuvi!!]#zܹ3|h~ ⷿˎPwOKFfW0濫DrJ*'U7[o
SSH7?ߔl^zi?ڳ>ݰwܜ 0 L[l . ܻM"]~;l>UW]K GeD6]{.X t5]Ϛ5+lVa)=^~ӧwi2 619 Z~_Wcm އxD 2P VPB?^?CSڶҌ{ut =ŏ)z"^hU:aqv @ @ .$uoF]X/݈
>edЍMn+{'} O~.@]K͛7/lS!~uqAֺO۲eBt; M w}B~ 7ժf&+'Y!ƺSf^g6y!̄s9'Ե
W@"[-аY𛊱!`WFzMA.eD6E{C:,w<wuGxUEx *E nkBF9 GH 6}}Ygf Xb< $@,F#XA
ՂSgO%ʪؾ}{RG?TLC @ @ P&T|kתLȦnhe醾28٠w@~sF_OB7U7M e #5=~
}eNMOf塛A +^[oG'ɯP&t}aȑÜ9s\ ĢEL&|x, =:g
.%ul
?>4J稼M6-j6f~vmb
& T?QA ĉC +/&L`,Tޞ`]N:>1C;0 S! 2P צPP@xi>ڵuDOrv@ @ z=teZ%= wfՍ]fw>+P.x D.^z%;ceHOG6ukDPO
Rnˠ)H
Ֆk e( St, g0{p/eTo;Dd~*أL&=Q@'u?p~)*6_o_jȐ!(ޖ`oq999Ql0 $@ T([ #PA
Hl
}t M6=
@ @ :GG N_ nxdwS6SQE~SAb=կmz Ի?o}6sL5׃uaJ
"*4ܑCР
&;*.c^:fu G0y'
|e+ )]S#;0W0"X=ǫl(+F'K]Wiz> 6}#[df#r@Χ(u |n3*@V
SRcX?f=sO?[@ @ @ /ˡS7G*Dtun6mWOҧ>);s*uD-~nj8>4pgq>I]!$&n wqCKꖨlO"~Dv׆ @
UV-O
{WPz_)z3ʊif2!d X)SbiKA!=ddO~S=ѣG2vM]j 5Z[?
|} _0e) ^[*"m= L ~t~GcExD=PZWe8!X MA @ t@~Ј@~0뇓~C?UOG@ @ @IUű?ϙk!u֛ڞW-F<Et>??\~)?յo]LׇKT/C7zTG@ŷu TԺ_~n=/O\p`
>TsA/esEE8~&29u~ @l2/ nZF{?Sv.dșl
pګju9\{WSVbA[?O.oo
~!nM5Y gxȰpDNf|Z\4m;~, Nֵ抖Q T~H~jVO<˾ t%B{.FCwSrرaOn Voĺ
M7 Rض RSw=PXRʴXfޚƱj'I?3 M~M~S6Wf\fϞ 滖i"o 린k}Uyg]v~u̘1|eaO<9Q7ՕQ+W GǪUA '*)8_#8.8U) FS} ?e{(á=ǫD@r%@mҤI.{FJ{·Q͔d̑2sg!ί XT G])J['Qo
<ut X @ /ЭZpؽ{ 艚&ԹK)]AOtS=='m"kC @ @ &nmҥtt3<ZܼO ݬo*]ZZnk >kM(??8Z(ؔEtCZ_n*f"Qațe;k}2я~[`Ӎe]Ý}.3@!
X|~ӟM^v
<)կ~&LvF&4|O~M&)L)x5\c
Rbמ͚5++
軦.tl>]iSFګ5C0t~t= }W HQLA+
Re1T]A_|]+C￣ [[1 "FI]()`Ҭ@ v.V^5 ^MC @ @3)ݙ9\Rp x./~nw{[uts>V Bz
^M
MOg?n= Z 'g̘~jͻO~bšnyQ==Q_
PG%K?>ZhMkQA
믿TO>n"+ 2{ƻ4hleiVt_d*dXǫ|@?>sT:_-{ͯL QZ. Zlږ kP7i,2\G{?Ee~(X{Z[z)E;wNqOFC @ #Э2*صkKU`RiYuӭjcJOo}Qԉ1 4'7w힘M|ݸ R~:솽nr!]G|[߲g}6Y43PBQSI=ݾxbS0@ ^z[Yzjݯ٠`S=hM&ؔ١ZjAnn} Χ'7 j'# [['G }4,0K
NM TR!mގ֔s0gΜ:&%"t\TTvL T=
` vi~pаK
Lsv~_|?{N- 0s2@ Xjxe( 1~xMSF SɴP@C(BȴhY`^@ / 눛%o:B?BL)CjȐ! MTP"^ z\A e8 |\zj>H7UX7mn:ݻfΜOK%V& z4jh[mi^unt_7Zxu25`u]u}DPf=}]A-Xǩ@0F5? :Zp{G%`_^)ڹғ6ywЈ5M3PJm_O7wMڞvT_DHܹ3TwCǩx>=
HQX)?tlY*3ʚ~v]=0;gY6B>F:c Y 4
t@Xi F3w۶ms?uDC @ @ nIoj?wWz ϟﺅq#\p˾xꩧ\<z_7wΝMgeh(hqNGM Wֲ]V؊( >Vkmqnhjf=[zڻ͖`Ы-=ǫ 1miQ@ p&W]uvm. hގV_c
T(#Dʰ5ƩN/*aռPfߵ,%G @Q[*TM?$R
ӓ zFzCu6h 6)~7WLs+,gPZMn"xY]KӺtRŪR
N|M Gu3
& (*)PW.T@δ*~" *P דJSPQ}~Io0χC @ 룏>r$qwi DgpU&E[[Z 2j e:"
ЫIsﾬnߦ`օ2%t=L
]B*Bj$S}IհPwdz0RÚ_u֜#@ @[*D2)cԨQ.TOKkӏ"eU Kx @ @kԘ
+XqnU-Xk
P= ~?ի]j or%L`?Ow ]H(( =H;UBEutsPQz@E{Y@ nS8)TP[xmzD? U,++ R @g
h=jg 7B (#颋.rmKnݺm PBUx[ر=XUF)` #Э2*CSNq'O
RtV*jv~lP%, " P@7Ӹ
O,@7w|8@ V
e'̮E @ ou 1b?U@]~=6|zJC!.yR'D4nH~ mftߦ`OI/eS]?PoP
ʢvMtkA @ 1U"1O!G @}uEĉj~"E@ߟ|3VRRݼys@
Qn(uޛկedd
-_fΜٺzs&unn=s~jjNuuE*bޯ^s+u梁y:lȐ!/6mw]G0? J@šf; &2*|7۬
++H@ۍllʕ[y6ofWV эc?zrMwy}٦]~-´ U[v%2sBYʞؽ{UWW
Rki%Ramei2+TwR;*r&@ p |B @ @ P7wؓN:ɦM1GGukۑ֚B=}_tY~} !*tرc3v4RgnhZP`AYʞPw_>pu.ƌc'nv1Ǹz&wA 8*?[G @ @ ^'p"iGunt't7~ $zMM]|ŦZTog6[o5jB7,X`M]X).
u2'y _kKʢPO~ք ]ळ ]Z@E>}< ppTB]2) O|
K/.sT.wZhn=>ȑ#M.-Zd[ Z@gdN({̉{ : @Hs͑" mP79~mO}S.Xњ(KpnfϞ
DC>}"G>K/~ Zvꩧ3cWkBY:7gM5 s2 ]C@E8O% hƍCǧl
=a~jaT o.Pt
-aA< (Hn:?yPh5')|^ 6 @ PN; :M0!4܀*Jݯ_?kKLK_r˨>_ p
qw6b
KOOwWVV5uYL;47"M
" =:4r_uUM @&S&5'洰# Z@E@ @ H,~A+B͵&+@1`V*TX-z)W#b@c=f+W Xt?裏^͵.E"IMMqƹ\QIIIͭiq !CLʤP+5a?sqp@ "TD@ @ @^>
o߾
c=ͫI'!1cth֓ZϞ=-%%MRQmu!qG[Æ
CwePО @G^ +E @ @ 86Ѝ{38z>{NoD<;~ܹ3zw7 0Nִ7xeBho4Op
koZVǛAZPĉ'h#F0}RtǮ" Q @ @ @Srrr\𠬬T2VFkF ekڵmwƲҴɓ'R=zmv5*<j(=? իWr
Nc {,
tM] AP թPS>۰ںu+tyU_+[,8.䒰>H_Yh'x*bͯ{oۮq "S7ߌ g@ @ (@OU# ]Y@]#K _|u _1cmذsα+2rM>q .H ԧk2?B 2,
: /@FE盲F@ @ @[˦:TTZ]5TO{UUUh)k"ӯz{GmӦMnܩ+0sLW[B#ԕԪUZ $<䓦M_Ŏ ;d5g< @Ttܐ5 V3tǦB[lҶml1
ڵk<ݯik?suСCC
<36uФ6f̘hJ[)i jD[q m Pv3@ @ @ FN kII]pM`{C ?O6n eQ(kbر5oX^B]Ei?N?4
FMMwo{G.|+aDOF+ pT |c tYe (l.\h zB5 ?,>l Ф&{]Na+ |PwS줓N2Ȧ.T[B * ̾ǖMBjek43 @ @ @ @ ^{_֭[쑨}s ػwoh=?RSDE RSOٳ-333,H~?Y>}Zڄ3gNX@Ņ@ @dT@ @ @ ?Wv wo=z;wy {1 9r]|š P0B
uo?ﾨ+#8"ݨc=681 *:ߔ5" J@]/};߱o|[YYEoPPv踏?Vg2jf43Gn;/G0ǽRɰaZX %@O%z@ @ @ n,0sL7n;BeM[kuWBsε-[Xzz>Tv24bet(B)MY`4@ @ C'@FšfK @PjV un : ղo~㺄R떚> x <MO~b/i[*譬Ç{X3߿.r?1 ! :Κ-! ]Z@222bMj2^O?&vOӾ u{X@ H ~J͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" XuuxYVAھֿ_>4ǷϬγ<\
Sg<,
@ @ @ @ T?/l [dU|sCug<6ueva,+L+e.<cEvİ5ϳ-3*;bL~oʽ,w"mۼlR[tIz T[HJJ^fٸEn-lhoPb,9ٛ q) )@ @ @ @ :Sٕ2i[e2{dulƶm-R+ d%^BJLn}mmV;MZ%o~4IOPWbh}a [smݦ-dk_hs&Fۗ&;8b_Ϟ[z-5x>
g{gZ֥U$5/t9VZeV[|Gw^;p y֣G~Gtພ wc@ @ @ @ ,<z-np6Tlc6cl^VDp7z iʚf~@h1<0o[ZZhJ@J_ퟛ,oaFPtsKXM^vIEmUcuI
;̽ce\am}}lM m,j̊}3,nf]ucwUQ1
y(G)Hg ۿ;R@< ć@rP\e鳽L(Z~F KRA[!/`ޝgy
OϚcknɳq7*ro
/nG %aݚr8[9y^:/$Q>۷dĻPJ nYIkKϵic
.-m̸k*X:̪B3 \և
,DRNg#BJ?Ъl]{QG e
[~\BdX$З"N5{n! Imjfdqw VMŚU@A
,azݴ L,i#WMg߿Ȳ,h~/mBĸZ82szyVYl/T]^f^/L
{
RKoaƺ
eMiۇ`@"7)
N;*oo4-u/K'<ZVq\&*y {guv ?222w\|=@ @ @ @ XUi[}%6c|mb-}Xn''[dȳ-szU<̖2lεߍj.\X'i-\^/)V[Wei^PWki(x+ZyU
ՔPq_uSe04mLK}6Wr9VX2m ;Y6u1hCE
EIؖyKsqF۽{UWWΝ;Oz_d;cC݅?3@ @ @ @ xjJC{RƖ?yu fʱs-ݍUߜPDۛGl9VqhT]:ǫ7ZVU75t;11oLk ,2+f5Z*b?qK tdDeX0!4Oh 2l H 4xHqmeX;QWSafi)uTjs͆tU.OQQmeW[V[[k_F iʰ8Slر[(կ +#T9a@ @ @ @ SW]e $xs<gVAC7Lry^j[
iuپj
29h] k.꧄i62\sXQӚQX^cKe_`kh
[T/V֍Yf\72˚\9RX_fUM a1G> 8puTSSczVQQao˰P
eY(bvqY߾}W^-ۗ!N@Ev @ @ @ @0 ԕ[^qMo{ ة [x
ueV*g+jB/
"xs [ivLUVn6rl܈V#e ܳȦ^eYUmW뻣ncڅ5QW1r{{1<{w%Ω+>dzyF Kܔ)MC%rLm6+rr}V |`oj˖-n:5jM8ƍgcƌqB r C%Pq, Й*յK}gs۶mtuif!~ئ dYv&FIy¼EuקBAb35a2KزU i U ťm%u7c5l5ƛ.]_e3&&G_oԱE6mXD@&|4T ͦ䓆X7a#ڲ_yY2noComػwoC
eY(wulݺeXh ;vqÆ
s
?"d @ @ @ @ !*WUUc]) (IDAT6];
7KqYEVzh Zx)7^QMbބZUR̆(76 6z1s§ OކԵSUy
%
NB-ͨ,]<a uXznO>O
:kꫯ v
Tmnݳg= ѣG>10ag\_w:C c C@ =9}PpBIvZf\7/Pn l*D;g\Xp\0ͱ96mAL9%RկrmqX"szN}JNDnMͶuTnJ_i^dIFaLͳ쩓-cLYR_/h [tKvhk>#1۪3H=1Ҽtnڎ:SW%dVM̲`«1bɩ\̔Aݛ2&* )B/6RP{vA?N8:th@? ^= |9ݻΞ"lQQa 8eTغBq 2ro}r+{~0Ӎɹk=2+#0lcyaV_Uٺ'sgZds&%eJn\6hK;"m[v//biTܗg#/o r-ϷZBVq7"
+[@f !PDjj{Y<bĈCDDͿi l|ˋr9u&^ie^=PAЂ]Ua5'I^
Ϸ-{r%7
fͳ^`Ċؖv ihzufu,5~Gpr /.MLuouGd%߆# QG LŲ{a}d߿+-'
+L@*:* @ ĉ]/O=#}>묳`.wݞ_[ dZ>"t*QSfKnVXbY}͵g/D]I`dLL+^sb͛gN
SYklÅAF~w:ihZc7JvJM<yrxNޝE?\㭷S=-R/ UT#7(Yg?b vR[sN]l{|C-%W`
wycG.//w' )H x:Sm6vXSE߾}M
C@Pe ! ZCk,Cw[QLsUhk.ﺩ⾙^E
1vE ?79*7kOj{jf^>Җxekl
oe+U,ܕ?'\ U_L(p4̼/x?zzǫviea?5o"dT(Cb].̈P#tsUbԨQvi@' E#:Y@E':@ @ @ @ n&Pp<ET* Rڊ2ӖmՍuuT*rOׯxiIܟeʀ8fف Ƣ;M
IW&7f{FETZTyEc'323#j$KeQN^
wP_,SVo](g)]Pb WdA
,J ڡ$A @ @ @ @+Y,@X؊^!jIxuVPԊWsQAXo+`j%M*5˳\vη'YNr}G^GH^eZ۸| `GUvDF`θ0h&Ql̯K`OYmں[+eX՜PN#G u4n8ٳ'EeN3idE ty?ɳi7JYޘ)qy6odKOʰ9/*KO+L]f+R+M&[ح e6sД`ʴ.c(,[a}2n+!ճXЊD,f2$EjuMXfh xȲI9z>:XDHP bjP'}W
d))).A"u*|7 q P%6e ȴwX^-畕^75gHtsشVn2/H I/ G>6,ĎHv+6Xvj㨤Vz2Zmˮa>RC
β#f77GkYw%+f(xӉmhythřγ9_ȳ O%1jjbL3v
< }іf'N?0'W
uDCp
8l@ @ @ 8 8kMUzŧO :%6oj͙nS\X}c-^mk6vo)V8Px 3-j3-K-ռn4nZf۸R&
U=-~wX[N[HJK͊
3LaɁT5r
_2H{$XSB6fU7V
e'ؗ"N@Ev @ @ @ @0 LEVI^K>ړ9VZ[i%X_JdCml>Nk-d3x*^oZ zZSjT4z_eiyn})utxcnɮb ^.D)*u\[1&l]ZE} =UlFsw.#jxoLIOQڲV6qX[J
%Twޡ2-hē x: @\Q`Uҭ"5;|R-9&xAV5 P!7 }li ubYMgE8s4yT pWq K?'ߒ;./RpWczM9u˴[EZn,v.#C 6ƛN*.cBA
eY{'zC@' 7Ɏ pHg[fK[lݵ`uvɖ_k qYF {dr
<dmyc3[>-Ρ2)hĻ UR tcrh Ļ x?C X@E7> .@" @7 PэO. @ 3! ЍTtˡ! * tcrh Ļ x?C X@E7> .@" @7 PэO. ;Xm vB@Zdޚ $" !A@@zӮs5\n/N1S @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ *Wk @ @ @wOH} @ @ @ @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ *Wk @ @ @wOH} @ @ @ @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ *Wk @ @ @wOH} @ @ @ @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ O{OOO7|3~ W +v J.. O{ 0ܟ_@?_}NNQ`Z
} ?믿WC:Vjt @wyG yF@rEAEɩ 3
/vrX_5 i~;|My_T*(r"@@9%O%M yF@{swٸ?]qW9!P&E K ~iO?4-IikQy*z7Ow+y.o+ 67;^?qgr&P Y~])~Y%"0G(V's_y_." @ @ Q*>J @ @ @/*7@ @ @ |/*> @ @ @ 8 @ @ @ 'q[ۙ a ǩr"@ :9ZiD'~Z_\u*VgX\`~ڷܻ @N@yy ~ V*w(?hvir"@ :9ZiD'~Z_\uoWtF K
\rL[n6aZ- ^@ P% <L@"h3⋊ n7 p Rdf0ycN4B .p:0).u^&@@t }'@U@]狊(˴05ؐ h驝 r
rȿ s _T̩]y:(E ur. OP
ȿV|Qw:#@a ir"@ :9ZiD'~Z_\u;[ @ @ @ Tt?" @ @ @ *Vg @ @ @{ݏH @ @ @ @ @ ^
H a0Tow @@ 4 T?U.:yg3,.n~?[] P' G<M r?O@k˻AE 4vݴow @@ 4 T?U.ﺇ+o{:#@ %p\-7ͰZ^/ GÏPU\ &@ K4̙ZEL^C _n
C@ށg)
CS2ȿYӼ1M'!@ 8Np{ :/O @ >A * ZEE eyqlH r4N z_of9_9م/*.|r< TÊr"@ :9ZiD'~Z_\u;[ @`q˰ow @@ 4 T?U.:_T䝭 @ @ @@* @ @ @@^yg3 @ @ нG@ @ @ WAE @ @ t/}
$@ 0zqܻ @N@yy ~ V*wn~-.u^&@@t }'@U@]"luF nڷܻ @N@yy ~ V*wە= @u\.ӖfXVKno/GT *. H@%Lb&H!@ /
! G ~) Y,i^ @ Np8Lʽ h ]@G hry"luF ?2<x
6$@@d9yzj'@@ܯ7 / sjz>|*aEw @@ 4 T?U.:_T䝭 @eXqڷܻ @N@yy ~ V*w/*Vg @ @ @{ݏH @ @ @ @ @ ^AE#R @ @ +"luF @ @ xB @@z=8[] P' G<M r?O@k˻AE laO{ :/O @ >A * ZsPw:#@n7[] P' G<M r?O@k˻۞ @`I:\.if3V% # ~ H$
sV|Q1 @톂 wYJ r?ДL,o4/yLӉF @Np8 ?E ur. OP
ȿV|Qw:#@}zyy}~~ q\ @ <= @^@כYA@csvዊ95 \|>O尢ܻ @N@yy ~ V*w/*VgX\28[] P' G<M r?O@k˻yg3 @ @ нG@ @ @ WAE @ @ t/ࠢ) @ @ pPw:#@ @ @ <u_ @ z q-.u^&@@t }'@U@]"luF }˽ h ]@G hry9;[ @`qn-.u^&@@t }'@U@]vmOg z .˴fVՒۋ hj Ur$9S+ k @vCA w;,%@@@ phJ&@`7 c<D# i8 ӟr"@ :9ZiD'~Z_\u;[ @`q>L>??8.^
Y@F P/ ͬ @ 19EŜE O.p>rXQ] P' G<M r?O@k˻yg3,.P~x-.u^&@@t }'@U@]狊 @ @ ^AE#R @ @ +"luF @ @ pPH @ @
8;[ @ @ @ P F`^8N{ :/O @ >A * ZsPw:#@vӾE ur. OP
ȿV T䝭 @AcM{ :/O @ >A * Z{x}3XRzer jE r45@ *_a ȿDÜ_T5 Ev @ ; x @ 84% 01K tp4 Ow @@ 4 T?U.:_T䝭 @g^^^}q , G#OOfV C@]bNM"@'8AE9(.u^&@@t }'@U@]狊( x<N{ :/O @ >A * ZEE @ @ t/ࠢ) @ @ pPw:#@ @ @ 8~D
$@ @ @ y T䝭 @ @ @@OW@#^q z˽ h ]@G hry9;[ @`qv;ir"@ :9ZiD'~Z_\u*VgX\}˽ h ]@G hry=]y,)p^2mlj"@@x9~ @@ܯ0_aԊ/*f"pP @ r<K P@ E@%i:|tܻ @N@yy ~ V*w/*VgX\ow @@ 4 T?U.:yg3,.0|WӾE ur. OP
ȿV T䝭 @8NEڋې r4@
_QR ȿT㜥k7y |z:\.a +> ` '@@p |'@Y@5ӥ]"h5F @ @ xD @ @ @ Y Td @ @ @@ D @ @ UAE @ @ pP`HJ$@ @ @ Y Td @ @ @@ ]M5v IENDB` | PNG
IHDR * t iCCPICC Profile HWXS[R -)wH
H! JbG\ *]Qp-@Eee],Pyo9sNΝ lFU |IL#2 Fl('** @.nB[(l$u*' DAqr > @zYy<Kp kJp [Kmb f@t $tGIN 'ͅ>99+!6OO|dǰ,l3 [rţkFGKby
`*GA|ϕK qp~#9 PeA1C#lt.G#!r*̍G r?2x!'
I@ +
=T ㉞)G@q(+&L>aQ_ĨP -l 4a`ƅrҵ`-``\,'J 8`\ N
-[ %ǪyAѲ<cE1s{. *V
GA8 İ\ -l$ kFg$HGhlt
˘ViB, \=pd总nʣ`b bΆMF{ NE07n#
BO^V3 3dʣK>GmpS =! g#alNP=Coq= ,,R~1 }#.~Ėa)"vkL֊u`$xH+ath),?jc`o%fH^ܼ9B~zF<fcktw@˶7 鞍0.} *ӿF y
7kX8 e:v 3ԁF `
"A,H3`3@< A)(zl;A pen{. 0ށaAH
#Z>bX!+ H4 #%H9RlFv ȯrF H?b(UGuQStah,: MG"]nDkнh3z
@{0E`6+EbX&`eX%V5bmw`Gq&nk39x> _of ~
A`Ep' YRB%a70,|oD"hFte18D<I&>&H$-ɓIb
HM>"Y@$'br%y8*yXAED]!R0Ga.6+
}
UœKɤ,l4RRS(***)NQ+.Rܨ_bGՒGFSWRk'woh4)EKViii JJ!J\JUJJW^*+(((P.RT>|Ey@EATO@J-!Ujj
=ULԸj%j;N=ct# C_BE?KS'gST PӘ1[JFc2BٌUOt[>qq5k4yeM74?i1hh=Ƶ-hҮ>=0^}xAu,uu
ݤ{Zw@[w\__BӇ< 416046433,6l2|`D1r5J3Zgn4ho<xq]W
&Mޛ&.5m1}nibVd`vߜfmo^c~݂hjeբt̰bZ9[Zu[ݬ5ַl6>66
6 pbۗ'$OX3vNvv٫ه۷ٿvt8T9\w9:.tlu|5j"obNtNKڝ88 ]]R\rUwr]zGwgyxdyx>loҮI=
=ٞ;<{^)^۽z
5ޏXF,.k7뙏O^vBþ;6< 4 Ll r
t2 &Vn'>d0%t~0jXLGk'ߏ0DDȐȵ̢~B5jhyc13cļ]{/<N ?->}BEBOIɤCS7iZ鴛ͦϞ~qf*d<BHIHٓ ɮanI q6p^pYu~',3"yg ʌ 3UfpYYY# M9䜔#5AL^<Ҽ|0n".j-Pǜ'qoWaUYV-1r9ϊ~mg0o>w,@.h_hdaߢEu)^lW\QvIݒE%
TTXzkmee oZ[vܮ
ΊK?瑕i+;W9^M\-X}s
Պk'm^\W/VNܶAgcMƛVo9c*ߪ-:[oyj5qmƴr'qgΧwڻwEםwߣgU n;mo>}6;M~?~M恰]6 290pY3<y%5H6ÿV{h1cS 9QtbdɁS lw:3St
;{\}ΟyEG.^j|éN tlr˭{RWO]vz7"ntߌyִ[=ɾn{=PyPPa?,sQ̣{9_<=WϏw1y/JTsKb18Jj7ZojN|>5]λe >}txS§gó>>obk#9##yl![z`C x] - (^RAdE) gRq@" 6 cY ut kr9:|Q
ad. 6 GF|d'"<o
Q k pHYs % %IR$ @ IDATx T} r].*DwIⵉ*@զFsƦFcj$kDMMXj&
`5D`.]| Ξ<0a9yuH @a@ @ @ @ @ p* E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E PQ4zv *? E*ڞ1T]Z[[_ 4(PUUeVSScuuu6lذR<3hɟB(G+qy*EPS @E1Fxl.`
P466څ^hSL)Y.)Gr8%@9ZQ`K_0J6@ PGN k#PL\?<c
PK
)ғي@4͂ҙgY.\RI*FrbNuArl >Ϗ/??Fo*P@=SAK/ԦO^
2)/C=.#@9Z w@!(G Xy۠ܯs ~~/??F*y7(1)ݓZR(HqV@
,Z}_xrxBPBA_Y監-?)_v@ -!@ @ @ @ @ *S@Eew@ @ @ @ @ Xi T cTTy@ @ @ ׯ
0zeGڨёo6f@ PQIc,'!*z[# }(l2wcFv<x1 c3gδnՄ[ڠAlyr/~FavyMVF k_mذ.R;ssɦMK_Ըؔ)Sr^O+>v}U_o'Niر~.˿Kvk]fbŌ P+V t99s /ӱÚ5k;oۉΘ1 |A{m۶m.1uT>X7?}ߵ7|3O>^r%EOdj* ꖼu@1,O2Q '?IG>bsk8o8裻 +@ (ʕ+{x//8 ׇ?a{ꩧo{^U#|s9}ty2Xn]wu]6~d T}oUVu)[T@T>.hr"(_#Pq[_rcW^'O ФL.*C -tR۸qۿ)|ʜFzG}UzIT S{)E/~ [pQG eg TЃ@W\qg?Kjq]w^
:L!pkO?͛7>۵^XX<<P< Z(dfϞmկY%euCx) 6&&+@%r祗^y} 8p`yeEsNFfKO _ C]zW EW_5 X~}xrQ>PFwҤI}o|)̨s= 8X @j= ^R)k* qz ѧtq) _F>묳LEjM r L@O/q 7u7"`;O!~O%$(3u9 z(XN3f!SŐ*To&6 ?J3ws-QO_|7/̲2d-V#TdܭΝ;_jxX|V}'=X{;Z-?S{*^~{v
" {W+}[??r].dL*IǾpouK @-t-M@ Pvk F/SK
TnkkkݻM{>Շa Sͷm y"Lt*V3xmoȐ!mmZ gyUE Ƨ?eOx={,Pʡt'Ub,S1z.ʷfWOCT)Zi9=-"=a'Բ)]I]e7.{PJ-UZ4^uWAmӕ8^-"=p>z*:!= g(ʗﲱ.Ĵ>T~,\e RykT]J
T7} '=ܣ۴<T#[Zw7i|EWb|moKLo15?~-1xI~xLv6zJ7ZJI}رc3r)/G k8ج/(8ǟٟ%;?yЇ>w/Ӳ_;k*ג -4ݯ;8{hQQs@@ ^P%Y4fqڴi]V W_}A0a nZ]|_4 DRe^w}n4.2DUJP7'[O 9ҭ}nuMUX@ TI;Sv{Uȫ QY
z],
k_ S~Sst_i)vG?+T^L>(4ȶ
:餓\em+?4'ZY ~ꯒ* q ץ WbAe/O8^T_=ZN~~9Wt~8ub0HtR6Ǘl}!@k8mMp@aܹV9>ΣFVrKא*u䥗^*_|٥2W^qZ_
6_)QZ:&=a .ϔp9T //mCK+j~Z?MRkOʵPлc'?~_h8WVӱ( t~')Z(Oo~IyS7ڟ/VZ$WLj'h< @ =N/ʌ4o$u z* t[^z"z1r5ʍp 'TFi?=OC '! }&\wOV>
+\?
vkF'Lp#ӱm۶r:/m$u^~: FӼd&e}> R.ަ_^U>R|R2-yn,|7`.T.ODun:.ˆAF<.` AJ"_ѲO /\OP!fi{*[?:.yK ~:.K^pCb}}`PX7?z<a9s jW.ǗX J[d&v _r/h?uW驮!|IUv'>ѡïr*h5(& n APN lvn{<)-Rx]ThWwsI,X2:A:X
FdCEzeM
Ѳ'z
XCﲟ} _+ M{, nܻ^rA;2G ] K' (WpsF=D3$u&zCy{(?ESps`N|F8zFt]w% O3G u9'3
'=ulPm=m1c Ss%= M⋻#~}m+:Ӡ$_UmS-âIOE .սGS٪2OĵzPhz;NOx:F=܆tY.ī"g$HсZOIcoD%Ƨ>)J @A 2NO**ߓ]CF/ep56Z6l.'o|KڗZՑZEH zK_RM>~z9:M-_$
KL >uPw6l`']U/"{~7[ߡp>[5ZVz]Wj}.S%M\5=UYZ-w'Z*^<Hw[m}i|. ٳg@Ԝ7͖OR%8)0ǝPN݀@75<TIw '|u
N?i UfW}ak[g_] dOEyG * |RU(jY
N瞳zW)
/Oŋਪ 'uI1
FW8^*Lڦnx3\QēueݎR%U +]#i~{bUU0\~ԍT*)xX
z{Wx4#X
Tf6]R;O<ո!''fyG |-Lѽp9rF3x
[Euu2}͚5]*Tk(ԵOZOc ]ݐQuͪ1-MIz9\O ] ZԩS]P7}R~nWݻ~3V^Wu3<)pWTLߞp^'wuɥTAĖtneߩߦ @ }T:2T6LQ [Vb )J\{+hkޠHb3^Vwr*{|#1E PQ4zv @/ u#n7 "OLic HuYi'
j&iĈ
=E.JtӥIUViRC˻'zRJfR
) Pe*ox;TkTI:gyFpR DR&UK]+oLZ$ۏS^W=]Z`ʴT4= ֺ:WɒΙ+ד]w]OiOMd5_- O#l
[|);u~ 8B @OL HWZ) NJcowB|+BIOenP ZcR}K4W%i
Õiɶ}l/^ M IPzGA7v'KSЅ "顄p=N /s'~n0:ڨBISI (pDB
(@.KZKzXIh[hj;ZWc℧E}/Pd qu+|@O#ڬS7-4O.[Doto"<_$*wn@'*BAQ
FT &(\!JL*B1u*bO*\MQɪW9ݨ<yVw ɞU:{}':8ko>۵w`>=#.| uS
l4m@L8z|mr5[elSOM,Ww]T-7~+R'Uꫬӧ
pP5<=KjYO k
2mo{oW>W|
T"o^cc_%>aSߢAR`@CN*;.7H,EҺZ~k{} Wx*}i{GRz?r?\\S``}>
}{TϞ=# .f:C !yMMk%K=M>jee~LudyA (zJz2T
HD IWKLR[ʯr}kU⨋#3Ux)8 y ~ _HdO-\gFG~z'T+4ZɄ$Qp)Ybt[OP~ = )xU$A$NWScz/SJp~Zv/Wwv+})`
yUlU@]/h7yuiʽ;.Q&R/ ӽ⨳ڶᱜ >t|:c|+߸pS^ pH@]C5o᪖UwѤZ3]-6cchz{彲TTh@$_7 >% 4$4n0](5&? >J-,TAGB x ;\d[
QSOm$Q7GI>إ"L[ӬZGrT8vպERu/*PXYIMZeǩu^5R8iu =EW *U哮%MZFH-Tѥ
18>|Kb=[F&U"hd~֍kٓN:i
~$Pp80R+'S {Ŵ_Ap~BʷQTpɷxA}+SR>oG*f̙3) Z) )c!!@uZr&pɟw^eBtt Uugﰒ +(U/|TϹH@ n&..R7隓oUa B7Pyfx{B,<-
T
uuo6ܭHm1
/
wHj;
iU@Z[ˏp,פV@TS^ * }B pJC.T9' JkV<y4mK4~^]:ͩnA2 %!@zvbCX~w[2D -+s=ץLwuߔ+j}A訫% S^/ݝƀ6E\Rk5 /4-
>VUV>G^^:OzxH-%uAk8%?ÿJt,͏v3
d;0 ~G=H #JSm>\W1շ]w3<?hDP[rDھ^ߦv}2\~=F (Q݀[_ !)IMy|VNuJI\%7} F{"CzBʿT pj!*14(*PW^>Iᤠ*TqG u`
*TQe.I7@
NgIOΥC\-2 R$ܢc
xb2<<=aǗ#P,Vwp>UWBc,+np//O+5S] k!%=]J4 R i}ʭn!+ݵZN(p Sn2QYg?]o~P-j&suCE~zy*SG Q2>Z_. tUV6jAsrg=%/d&IRkޕGo }}g}RXkT]UW]x~{g?sݦIR|T\@ѦO?i ==2]K.{t.lCMt3O|h%\!e͗_w(@[qU
ݐ**}jdUG`H.2D F<ª<S铯4TW
|V9ɯ]hғwt~oU|UHWS'm[ ZE
{p Y-ﳞ}:tͧ{ZV-I]Lx[|րဩjKR V*|pA]d}+_ vxMe|PPY-@Iׅ
KYۋQ!# ĉlt m>D,?O,ޅ x ԃ~.3U\SkOtMygwY'?TV8]~ZOemi8}ӟ,<?Ϫ!hݧ( {(mL =[ XOcG/.7% ܍&5ߘ@]ћ =Mh҅" :@8e ;URzPSn˪qth9jii=Oӧg; Pe{Tww}97W%])jm+Hٿ'Kz/\alMSw8T`:tP0B_]u_lZTzUahOS/t
-m_۪ ڕێ*4vƁ$Jl* .t.Il 4+Z
xS9|*.oĢ"dt>K_R~{#P)
>c *}JZ.C|X`A~
1rtM x r d% p
+SJ/YW6`^x
}
E4DcѤdn\4i)59
ߜ[,<΅&膉 }/v.O+JTބ+40IeAxL ""×/-tF}D|ۧgw=I8:"Vl]^}muryUQĂ TfG']u)s;a+^
xG PBO+,5ۻ~ى>PAdIe~;evE F竅O߀tʧW]}1h.+`gϞ.-Dzz׃;]}>rTR+Wv-nԅI@Sz
;9j,ڇošW}HQظqc>ߩo[N[b]M$^@-W7m\M8P`Z-)Zֆӕj1^ y*ovy.ed}Wi:-/.>?Z}5@ !}o?}3 b!~nUՍ.2[I}oٲmWm[7~nڴ |J;*/?.YU \K^d Lc[-Ǥ' ;ɼҾqVy*7qt* G!nee\CQk#<&tBX]aeR@>p96?6{kuJ?.{c<*=Jo c}{ m●^kO]Q[}z3)Ъ:}}VY[IK5uOeNoܷQ8>@ T
B^$@@+BOzb'%{J1_M~婔/Y@9
];hyq#I%k7&Ķm\N|644 ruPpZ *ߵ_^!S)C 7|=sۣqr]7hyX-O # 'Z S)< B1*R0@ @ @ w$i\l[ d]A @ TY@ @ @ @W4s=g^{oﲏO>ٍꫯ%! @ftK! NSO5H PZTƑ @*r@c@ @ @ @ @ ( 8@ @ @ @ @ A1*r@c]ʆ
f/!{m].o:σ
e>Tn߿jjjLeRq(GW{ +r8WR?OާRw)ڔq?C/ZY:knn z-ZX<\h7)wXeRq(GW{ +r8WR?OާRw)ڔq?C/@E~欍 Y
IF,71?EELOTWF}T ^)GJ8 -{r`S)Aʿ6_P~˥v @VB]?l0G`ŊV2s̱iӦq$'" hߛ )GR.,(GH_g0})\ _~~q_/g(RѢ"?sF ,T9eʔ,bRx]v8sK) -ӔW&)GceNrNiF _G+sfaE @ @ @ @ @
)@l @ @ @ @ @ P # @!TRm! @V*ba@ @ @ @ @ (@U!7ƶ@ *[ >@ @ R/3H@ Wʿ\w={n92@jjjWI Pf @ P$ _r = \h99;D 2 - =P l([ʿ=9 X 6+" hooV7E t# hH, ~Lˊ"f08 $ PB@ Pk|ˊ<2 IrH( ~-] v`؝2 .4/_` VWWWC@ "P]" E/">F
P?;'PB@ _hs9y( h5 P"K _,NC2A"V -A3 @ ;X(uR? rU|c= PSD@ @ @ @ @ (_{n92@ @ @ @ @ b/@" " P*< @ @ @ @ @ <h{ݻw[[[[^:X~\bvGؠA 2dUWW, $uuu hv^, ~A
P*Wέ
Ll۶֭[g6l7|ӽ6ol.x) СC]ܨQlvQGٸq裏Z\@ 555f3 @ ;X(uR? rU|@ZNm]eлZVرMWC*ԒBA
}ݹs[O˦`P ZX8*A 2BO. }"@9' ~lNA >c]e@Eq=s+֭[&
ZJ 9ԵS`
V()Xi&8pkmѿ;cmƌ6i$Pk P.OДtAWgcC
U Wr?熜!@
Po)nZT(q(A^{^}USN7x`a̘16aוjy
VTUUeRi[BѶR /V^J]D1mg@ @ @ @ @
-PQ-*Փ
Vgy41 c =:т^I$@
l
\(PwR
477
p ;&OlSNu)d{ @ T=.+rJb`8< @9Z
g<" /%[B +IcL(Hb
A- JB3M2N:$ׂ"SxG ydbUy ZcYuԝ ~܊J|@ @@>-_ ZՕQq @ P5{B @ @ @P>+"P Z<s|kE
*5Ƹq\WO'x]֍wSK' O A |q9!K()ђ:]d[r?oB6 %*@W']ց
IEhƠPLz+'
>|M7fƱӓ 6[Hy и=j$@ (Gbi@(K U/W]
Rlٲ^z%9s| E*B-8
ԋ/h/˗ZUЇ{21! T@*4.Ν;xkYqQGٴiNƏ 8
%jU/C-1H T@Y*POf鷿wE;p30xgm۶mn (Ǝ Khg # K,8[-֭[0ѓz)qF{]1b{Eo@ @ @ @ @ Y9 Z*%ƃЀ֓'O6+>}uNJ+쩧2u EB @ @ @ @ @ʪE]Oj*ך⤓N)Sذabsn5 nnnv|+nZZZ\@eРA+A Pg @vy4 P~?*@\WV
Knزe)p<{9UUU. Dپ} ZhouQE"6 @555g @vy4 P~?*@\WV
^sQF^qJwuK5~x7VZW qVWWgq.yA 2ЅFcc[^I Pf @ P$ _r^Y*Ԛ^s]"έG&dڵ'\82({`}9$@ (Gbi@(K U/W]V
LPſk%⚔7 vr-A] d$n"! &@9k! *@_g|#@
eػw@[jn<APwPʷ A hiie˖>@ @ R/3H@ Wʿ\wI-*mZ' 6̎<H7C\O]ˏC,z4(_~q:B
l߾ݞy7o.tA&" $ MD@l(r` Ѓ _@8ߺuܹӝJ
N
qM>~g (+:=q=
(|+ Pq9J@ P{ @(*|eUnTٯwUk%LsRB WIu$@T~.LB Nr4;/F J]r G \(r+*P
'ԊbĈ6dȐ*_Ky>clϞ=n|6oǑ! pH "q@ @ @ @ @ @ʪE}Rkݻwێ ;\
<oܸэMJ˪?@ @ @ @ @ (Ic;]c=( pXGWAYuuu5(C @ @ @ @ ()jQJ#<U+
פ< >֎ q5%_ %PV
U5ʵPصkmݺc{F纩RWU
5R ( PjΗLB Nr4;/F J]r G \(r+*P[Tl߾ݚ]q ۳6l I-)R1AƚRLB Nr4;/F J]r G \(r+*P:kmm_~ٵRhoohoٲѣ]f! =B-$@ (Gbi@(K U/W]C &ZTb^)IAعs L8ц /@G#G'g @vy4 P~?*@\M;U^ꭷ͛7Z,s\y@;v }ҤI*r,az@ r ͍@ R/3G@ _ʿ|k
Th|
2b7^fKB\N]~x
{Wܠj*r$yg @vy4 P~?*@\WV]?iꪪ*S g ]ui {kiSg 7>cƌ8d< 9 Bcn}uŧ , @ s̭X(r8 "@ZySV-*5jq6}tҫjw1)~ ʴi3t-@12 )/4g @vy4 P~?*@\WV-*iROƍ3\xvr],1 cÇm6Sdƍv:u wqES3({vՁ3 @ ;X(uR? rU|+.H
cǎ7 u:xgs/W @ IDATxj1~x-+$@ @ @ @ @ *M,[T$*XSL1
^[KKX <z;%͛jIw^;ꨣL }nG @ @ @ @ @ eA
6l0[j=.X}4]-/z;X ů~+۴i x≮'
2;r8 O @Y* `RIzB-)ԢB^zɵP cĈ.`pG}߾}n|
ڵk^3M4ik)
F@ ˧
~"- D[M[jjjL]$@ .G婗 ( ~a=_ r a{ޯ#HrCTۛoi+WիWM5F '`ӧOw̶~۷ۺu\b͚5c8pnsȐ!nZ-1=BA ]xZ[[]٧u'N lǯ*;/BxG (oyZrQz @
P֓!@-]/[eݢu@G iӦMs]B)xci̘1蛺R AOo:C/mK-3 8xi C[oV C(x
SB-54q g s -)<8 ] (H/rɜZ>(P|)ptgjl5|B@)O @a( @ { }-Tӣ DmmBXՃZX[W^y" j
Xk&e)pjD[[{mݺmC]JܹuեԩSf+P.H @ݓ
R\z饮Y /C=<@ P ?@dk ʽRaE*B
B-$dxi[lq+CAY+Pe}jVZO GQ10J?F
<SU-.ZMy$! q<" @a( @ {?GÊ
TDOZWvi. 6l0PPsM8)
VuVju>P?z =u&LڇZdh> @ @ @ @ @
TtB]`þ}l۶m.qFP MW 2jP u
Z7νom *:PYBB- A3)ؠԊBekP_~d'&>l2e F. ˂^w@ @ @ @ @ R lVK I
ۮ>ݠe@ @ @ @ @ 2, V@Ea= d!@" ,E @ @ @ @ @
('[C @ @ @ @ @ ,TdŢ PXdk ,X@ @ @ @ @
+@l
@ @ @ @ @ P" @aT֓! @*bQ@ @ @ @ @ ( z5@ @ @ @ @ B@EX, PQXO YE@ @ @ @ @ @*
@ @ @ @ @ @ Y`( V*ۭ5ߕZZZW_uن
lϞ=oQ,VUUe
ÇW @@?-_ܽrw^۽{{^x RFGGe@E T ]?U @ @ @ @ @ (@SN &9ctԵZ;m;s1sd, @@EuuչW OdWcQhǠtG駟n
?6 @Si@ @ @ @ @
I!K T J9 ' 1 PÓB@ @ @ @ @ r9N@ @ @ @ @ b(@"',! P)**Ls P@E O
YB @ @ @ @ @RTTʙ8@ @ @ @ @ @3q" C1<)d @ @ @ @ @ J PQ)gD @ @ @ @ @ *bxR "@R4lj @ T%@ @ @ @ @ *E@Ei@ @ @ @ @
I!K T J9 ' 1 PÓB@ @ @ @ @ r9N@ @ @ @ @ b(@"',! P)**Ls P@E O
YB @ @ @ @ @RTTʙ8@ @ @ @ @ @3q" C1<)d[[=)Blͭ v @$Ә } Җ5M;FWwWkٶm5hfG;W-έ- ~oYi+&tİVSL$e_m&ZjeؔrLgT5XCV@ @ @ @ @ /h`^ce\`l
w/k5)4j;*Hi q e-6FJu)̚nP$-lUK2[FnsNJC'^c]Km'[oeРAVUEq^'@ @ @ @ *P
< r ZŇj91sjg ]gi53Xa6Zj=XѼz$֩ݖqߺך ;`[S.F PO,=V f mqgOMCfیA.
TKNx زeQl֯_e=# @* 7j o9qɜDˆ+̷W&KTWOXUAP 5gZ=6+mqMN:z;m[: ,ڴCyN{Û}CYSwZӰ?dP괬\d̽-2#ٟڻA Pq]Pa'mSed]A=ʴݻwڵkmΝ6b9rֺC ʡO@ @ @ @
PQ84/{|{k/;?XSgMdfգۗ{v
Rh$-)"OTwh7wY0W*`\Jav#=g]P?8LifלtYܱc?g =z͘1N<D0a \sl #Sub )G@V|Q"7 n0ɛ'/Vk 7غE] Rh f |i[$}ŋ,!tj Z7,xϜP f]W-#:ko]7`$? ubʁӂ2B9VlxE5<jk&rVIҚ'=.tYtkH ReNYx
{饗lƍ6l0Sbn1 ZX > eq9@ @ @ @<Ty, =E :
T(K-\>65j_̲97 /u?,6uisO Hڵ|y mvgK \T3S=u{=V}:G=*T86s-uؒ 7̋Jqx;4v{djiiq7|Ӗ/_nƍs-+رcM q PdzB[`S U%,ԚaN}ZA }Ү&ZeU4&[hpi ƌ8=hq
=ڡsno)qnRhm(h1=]wt_ĚliRk*.XuVkӦM~zknnN8㬾>#E)LB @ @ @ (@V"ĹֵCuU=87(C[oY͟~(rAWMBUЅSorMM3Cm-c, }J6Emw˷љv*ο:9uz6e-[--V$?` ?:M
6 mv[qvk<4-hej$ա~ـ>K(,B]Bw[CCvivG M PtUE(Un߾U@vE
nH:.tI ٬b=3bKs)+꺺-n;}ZF0~]TkW'$>EnbL<y>ԭUmpk~v͜{x܍%j]{ ݞB[ bB kV0w]M6 Sv nݺ*%)0V>;(
ƫrja,ve J V jjaAB @ @ @ @X*%_mmmu^+H / |Xb4ԧ]^3^fW7 O=qӻ !15IlZ֯ݶ:8*4S+zR%R q5!fK)xu`̠eF]/~d+Դ
6ڵkMý{̻
X믿n<M4ɦMfz[QF\ .E,%!~XxyO,t~Z_\l6'E,])U[[vu47 նƮ,' }VbĂ;n'|KgOj
TݔфՉ4-ӆw<vkҵFY 0ܢ"z7vΪ%ҠnƢo@ @ @ @
(@Ӌ@߲/ϖ1#!<c8}^bB}M
'n贈6f<:dmu}"P1onSϚ~IR2;ljhlA|I0hzW5X,Ni[ CS0tF z ZOC62Bf!@ @ @ @ 2ȱ0íXY T' ?-Labkv~hu <|t=3_a><-|4/<isWۃ_\nסo\jiE1'Zo;mi\kynZiz<ҢKaASvw5qn+
rO{BcR;1*N<D3f
2
ʝj}# XmYgPw1i)v ngN. y{U
\TԿ _ $_|sSp]?;ˇuRWdM.ѥIFEcv0kmOي`kvLlm=(Sj:5HlΔM6 {iƬիW'{\+H1(4Ō3'Ov]> y6l0Nt@ @ @ @ > P'ZTw^ۗ/7 Tmv{jRbλf< hI=%AԳ 6gb]aPێ a.nM618 ˂Όۻm! ТbϞ=6rHdP
& }6~x:u Tp v1CrdE@ @ @ @ P k#e6ĺM7<9FD&ki z]POgO|zwuh&s%/*RW>sXmixٚX`Wvfɲǚ@&PB&;餓Lc=MWb @LTD
l 5#4|{ThmOcK Kd>8( W?am[_6;yM6_ 1UڷΪ2+ynqҥe?_/ =5uzX\f5ƫPpB:%PWOBA ! Gq<+䩌Zmܮp5zv[b[*>r5MI]R7tuC%6ond`ηI)bk^Xjڪ4r(mǝ"M{Ē翭>9K*+#KXNׯ[A#F.4f]pbܸqnlӀ$@ @ @ @ *PUyqe'_*Z2Zl+lV{˯ Z
Dӵy[mPZ|5ηks.>RVu*uImAԪ# eEłeνx[l7ݼfQ/)5x$vknn
[V%f`0tP, 9v)ۦV8Z| ,b:V 7
@ŴiLeo3H ]@E++Wmv
Yw<n} ACdw.^hW_t(Pиfd-MvMx `@k.-KS*mΏW،-ԧ :X ѳm`FA>g=:tŷ_Oeȡ}y<wax䛻MN3!p+O #͆b;K-%4رcI M 6lA؞92 {5Q\d6' b%wZ0"Egj[Z-k}sN&kXۦ-
64j6XS0PuԺ:Aq& w,;lqR۴~צ ߝ.
h >Bk JqT010zX= ƞ8NSN9&L @ТT,jUM-ily
V 䨫lӖj䒪δ[~b'la06ŦF$8U+l^kU_E:]-6I >ކ,˂uS]*_ynG]?3:::L56]= EJ(yb@o]MlQWXӻvU|M u
Pa͔Gx~p Y6t0H 0` d;C @ @ @ (~*SEF@ @ @ @ @ (?wN9"@ @ @ @ @ JF@Eɜ*2 @ (s! P2*JTQ@ @ @ @ @ O@ES@ @ @ @ @ PQ2" P~*rD 9Ud@ @ @ @ @ P9=pݻ[oe `MA @ @ @ @ @ tUf2}|M۲e
64 oj7ov#GE@ @ @ @ @ I@EOB|ؾ} RlڴjkkM?@ @ @ @ @ @ ?ƨO
PO
Xرöm*@A @ @ @ @ @ 0i֭.8~koo_֯_/g@ @ @ @ @ \@E.czĠALXv; TQ`B<ܹ' `^vڕf B @ @ @ @ @ t Fwq)8ꨣ\*7jkkKf! @:itشiH[-)&OjEnx
7^EM0 @ @ @ @ @ HA7nh---V[[kcƌ#F}jmmuV@ @ @ @ @ @ cT-*|O3f '`t> 8p TQ
u&M2XuV۶mi< d'@"W4P1n8Ԑ!C#pS UVƭ ! @v*x;'uÞ={Æ RTWWuW^!PđI $@"qRN;vp-'F iCu=߽kpA]kwN%&! @:Itӛoi.@1zh<x
0gjQq*jjj\@cÆ
FM1 @ @ @ @ @ H 'b .X.l` w@ @ @ @ @ P+YB-*|x M8э_sN۷o; D-Gg-N[ւl*Ｐ@ @ @ J*+daشiOh#FI'ZR?u) <X!: & ms+m躠EeW?`
W?f߳}}nkl]ۢOni5?zp[fVG:v WZ{ Jb jjuK I>Ud
Sji~qm;.Sm
VU\7_& IΛZTlܸRBfGG q3ƽ͛7q-4@ He6>k[6ش2^tC^)O^`^xZkݫ;WLjn>0k?p(rv] [k\bб'ؿ-$a-m{Ě&=l n<^ 7&q-*tᮟ?{ E}Q"&\$A@E (Vh% [ ւVizjUJN55ZPDT /f7w`^ug>< VPbݶyf0`˴8YxG @ _X:ܯMqA
RcbܘPJI̞_|Kyj|R#lUf-ԽVds7Jru3R5롥,tT9\i9V0Ilq^`gʆI2vJqenΤA:og ۿI uQ.h̀ )M.;e]t%dG=U׳gO7][nuŵUd@E (}0sl~Behʛ>unJ>];Ҿb
Gظ:&E|(iFFzaJmQO/ PMX\ƪr&SLW#y`OkҞUVip7Y^͎jPd@Kh71V;K~i4u ~h;w**zUPw`߂# @ @ H` [ojScqOź8Յ.do^۶m?F@ H$gn
}Vjs,1NF%a$Y֘</c0<Hf:W{[&d[Ƶm+=2ꍋF儸V|sM`7mki
Ԋ|&0"|mӦMVZZ꺀:Sm @)4@ @ @ 'UWV
M&POӴN8Z
@ ^j C~-A)klm-v))9[#XIeNk秺5MgE.܈^Q/̷~` 0Rhc^=~,:M^A-o\Ɩ?F .շ;vE`K\-"Y^[mXVSaEk*wL*j2\ PF{mܸu]vL e7~*ϰVY@ @ @ (@" hT) Yq[N@ HDJ{
'M7HY
+mnCANzP H m3ƇȊ|_W_Y'BaVv`:~NDUz[&_;&G[EU@E|sw^GV*ҧXx/0CVv >QP/[FevCv' K +A @ @ L@EEPa4 Tf@.^x
[~ƅ2#(@ fuVrߒ ScvV+V - yx߲s&u55}͛595uؼLŮuάyam
Z_jV~{&bf"U56hA~cJμJ7tYc F^j@+**<eÇ }-Z̜ @4eTTVV̈ѣGũ h)<u "Pe@ $ٌ_ZuuT*Kl(}
Zmn_}( вiȽrT3B=6ZSR+hj-1ӊsoZҭ
TdY^BǑbI?[;20QecNJͶYi^WX{ŸS x eZy 9@mm0MeTXy9wm<7qD7n3=ܢ- wւ )=!% zzNmfT=Q LQF zۨ:*!-9h@%ݶm٫f}PMZ6?Br&[d@DhB@F gM6 "[,;bvpLڙr(rlkfckjQWL`hX_4\T?[<7MߨyFZ5a>ڌ3}hmD;i۔76T
K]BmݺeXh ;vߍÆ
s
vT-
@ @ @*<3?_;wnbw[bU7OG }
dʶPE @tp˖-m:C+hy5mق̇,mA M\aeف˽LqA*'0-2T6uDX˼: Ŷ01!箜'|28mPA^{5JEa
ͻg U( 3ϴȑ#X`< @t3uzzZNA
eJ艸> 6W^y\n p
i]G`+mliQ;WmE7[^"9na} ](
ߟbn^Gł-Ŷf9"ʫK\wPю$B[Y/3#qM:
-0c\hǺCsz]Yy%Ul'溑rM?}~=Ȍȵ!4^o{PE!piO8
n|)RRR_~D+,IZP
u EC <eE"*lqnKKJmJ0л_8˻Ʀ68<Hqim23M}E6cl˪M^Kzߝ84[9~ƑCktm5tTpwpL˜ |чmw iiѧ6l 1F VmiaGo.2 Tx8XD[jSD~+T8[+PIױ
k@ :G#t5u
7yyM[U6ف ۭK |-8ayU2_c~kI/
-Tj^D/ȠO)Bkj wc[nCURxv/]S`sKa у$1"6(;Bie} wqߤ߿mæ@ @ @A@*){Q6գP* / [ C .гgOlVVV_;J,FcOXen \8.Lz N:[5;Yk,wtC"+M/̳: o\ӧ"KͶVu rlmCDw^e-_2&z7*pymIƵB@(l_|1
Rw:\76|pWBoB4h m Py~:]B9۶m_u֫z! _ϨпxOku4\ThK&wY-/' 2%bP"<0ec}OEڽlJwB[xm%UlNpA6mo>uݩ@C0BۣAQFĉ]⤓NrA
Gm̍ b^:gʨPADSےQy ^UO;wti]ݚC e lZ5"ϰU6(tmKחX@t~UNŶdJWoɱͳqe ϚͶiR@=pĄ l~) W)Ya[ ]%{\?T]v .:
d{n>;G mZ * F[ (3" g۟XbY8*ƝL m GRBgN.@Pg%YudZ&P1CӗZeQ%YxE/sG\lV?a1
HUG*r3-o#GکI uGGEF@ @ H\f/;ʦx\WM/LuES6/l*Ꞻk:@ (P mI({xŨM0?3+ ZhygZr{`l/`3Le^ #^
lVDٖd7-hyGF[_<|n-lqƹjQ HDe!@ @ @Yruˉ*x{qu$zmOQ }뭷\F֭[mҤIYF @ 43p\l3[v[NOn&{Vd3/^ڜY@J?5yj!r5[r[ㄜXw7. [ <(u-˱$VFz Jܨn oM
;ckʖڔ~Zgyy핶}Gꐻ<45F /--o_XWOx
d@ @ @ @B*"
V);Hӣ .fSUUUVVԱV@ D`h-n6զȱǽB}+,o´@a_/]lϱ@Vv-xnXFE7ϵ,+Hg˲1^ @o7lu[@wWh^Y DWnsSY|b/ 12H*D-Jk N8 `Ovy'. lS"~38f@ @ 8 h_D[AC C{)t4
,֭.>Cy> A
n-k* iKn˼B~˜ / )4/py {domcL(k' LR#j<ni}KCօ}^nU6,tVi[^W^"X͒3lM)8fVlʼY%SPB]<~vgرc9ѣ(T ЍȨ >cNr]?> @wH;V!,K(7<8
&d?VͰ/YiMeWJMq{]o#z DVqL/f^wJ-5umސeh$[$]̪{`
_#aZ& PW =kP]2eN|G.(.! :v8twpuϤ@СCݓs ɨPcذav 'B}]4LC @
4\mlɣ3-g8+xǶ0jg4
PRn:Жy÷SR2&UAC @ @ 8| ~
uԑ
]䪘ߵjV
@ @ @ @ @ 2P~Վx\ |R?
*>U߿^{5۶m) PuTSScVL
.DgtϤgJ@A^zm+O . @ IDAT
eSڵeS&P<c\6 mZA\㭷W_}< @].Ȣz"))) . I:*έZ{۷U@ @ @ @ @ @ \ !
hpRsFaÆ{vAC @ @ @ @ @ p T(BjKNN6*e:I.Ǝ kcƌq5/=֦! @@B*QiȐ!.
T&28Ȭ @ @ @ @ @ 2PgT zsej(0RQQa{@ @ @ @ @ $TB/)H`o }VCg#<Ҵ>eV(Xq۶mf= F vIY{q#D8裭wަ,n
VX^_w C @ @ @ @ @
$T>wyv p={#8O
t <emܹx
b tQ
TVDee˪PCgю([c.X$Q P ԵԘ1c,==թPS;Xc t9
Toʨ2d{Վ;8?~edd:ʦPAo $T"ZO3BE?xtş PFjTTWW[rrAQzeT(P /͛M@@ @ @ @ @ HtT.YԸ=Xׯ uQ;miڞ֭[^rrP7@ @ @ @ @ PKoTzРA.@nzG m۷om۶7@ @ @ @ @ {T%L "Ho"*ܝ⺝Ҿhh $@*"kS "ڑ_*eR1N8Ԯ]? $@B*"ʨPVCZZ%%% Fe'x `C $ ڹs iݲF^ꫯ? @ @ ^ !fI+PB't =HT3C>(ῄ Й>UTTXMMMh7p@{|ٲe< s1v뭷DزeM:նnZ>8yfҗdwq.+_I # >PeT.i'''[jj!ͨiFzKC @ @pҤIlȑ
(7eXk nxy6sL
i&ѓO>iz=sn9?Z+{ ~a+..' {̽+zua4|@ @ @zvg)҅o.RP1CoܣGWX[O/{K2
@ @ :. H|s3WSF-ڰa쩧s=}M>`՛>}]l8}c s
]0C#o uw^O;-//
SVVf/laG q{JXєaÆuɍ7;c;ϔuy t M.+V;/vuYzzzpV@ @ : ++ET{.$zuäю:(S&P҅'|8vm" -ԕl =ݍV`,v9Xyyeddqʆ;w-_[ 4r7O?tPn\_s5v+b., V={TwuYr]uU=|?KM> ܷ v C<e('v^N"(0 1n. yjz~+P`uvm@ @ DP7t>6 P
cǺI?tPwq}+_GkM&)H᷏n'> -ZȎ<HӸ` =TVPP:ں\G }tn9*% (@ @ @ΨSJof.<AAr퓊)X& t\୷2e)ᦛnrVko.X̖x?YwuM2u~r
F(C?M0MjH꒶kY!,]C7 [L)y<a3!@ȣ>
)g(3_]~@ @ @TD˨PMí4ꯖ lzX#GϺ믻4bҥQSDd /խor]tB
("VSE]E/ˮ?'ŭ?Wp: <myoTC=jrjzI]*E(#=2 &mOuEkƍ +㏇Yسgsƴ
|Eֽܧ cZNۑ S}4jn+誌 m_-vg@ H ؿ+B?TZ?̇ rX3*S(~k?i݀C@ @ @ >wÑO/*ݬvK5.P} կډ'&ggg 4_vefAgm)R3f{
8T\\%mmY_Si}еn <T'")r)6-ѯ ."fWp鳟lضܙg
ܻp7ZW^Ӄ~p
.2zhweV^ \=ǫk[tmoG~Pp*!T%-z֭6ydMmgpsz p v?npfT'],'=Yp{ 0 @' G?r^ʰצtU^
&)(1i$w-z)MW]hMrjoF-qoaǤ>~w nG |ewk[{?MܖL;<
?)w-SVVVرkJȦi
Vw}h;B~SE,}?~ 6EA}
>֞Uvgajj7+ |(H}ܖ4=x= m@ O[*J?Tˎ ;E4hP I,+CA ='t _@R@aݺuvi!!]#zܹ3|h~ ⷿˎPwOKFfW0濫DrJ*'U7[o
SSH7?ߔl^zi?ڳ>ݰwܜ 0 L[l . ܻM"]~;l>UW]K GeD6]{.X t5]Ϛ5+lVa)=^~ӧwi2 619 Z~_Wcm އxD 2P VPB?^?CSڶҌ{ut =ŏ)z"^hU:aqv @ @ .$uoF]X/݈
>edЍMn+{'} O~.@]K͛7/lS!~uqAֺO۲eBt; M w}B~ 7ժf&+'Y!ƺSf^g6y!̄s9'Ե
W@"[-аY𛊱!`WFzMA.eD6E{C:,w<wuGxUEx *E nkBF9 GH 6}}Ygf Xb< $@,F#XA
ՂSgO%ʪؾ}{RG?TLC @ @ P&T|kתLȦnhe醾28٠w@~sF_OB7U7M e #5=~
}eNMOf塛A +^[oG'ɯP&t}aȑÜ9s\ ĢEL&|x, =:g
.%ul
?>4J稼M6-j6f~vmb
& T?QA ĉC +/&L`,Tޞ`]N:>1C;0 S! 2P צPP@xi>ڵuDOrv@ @ z=teZ%= wfՍ]fw>+P.x D.^z%;ceHOG6ukDPO
Rnˠ)H
Ֆk e( St, g0{p/eTo;Dd~*أL&=Q@'u?p~)*6_o_jȐ!(ޖ`oq999Ql0 $@ T([ #PA
Hl
}t M6=
@ @ :GG N_ nxdwS6SQE~SAb=կmz Ի?o}6sL5׃uaJ
"*4ܑCР
&;*.c^:fu G0y'
|e+ )]S#;0W0"X=ǫl(+F'K]Wiz> 6}#[df#r@Χ(u |n3*@V
SRcX?f=sO?[@ @ @ /ˡS7G*Dtun6mWOҧ>);s*uD-~nj8>4pgq>I]!$&n wqCKꖨlO"~Dv׆ @
UV-O
{WPz_)z3ʊif2!d X)SbiKA!=ddO~S=ѣG2vM]j 5Z[?
|} _0e) ^[*"m= L ~t~GcExD=PZWe8!X MA @ t@~Ј@~0뇓~C?UOG@ @ @IUű?ϙk!u֛ڞW-F<Et>??\~)?յo]LׇKT/C7zTG@ŷu TԺ_~n=/O\p`
>TsA/esEE8~&29u~ @l2/ nZF{?Sv.dșl
pګju9\{WSVbA[?O.oo
~!nM5Y gxȰpDNf|Z\4m;~, Nֵ抖Q T~H~jVO<˾ t%B{.FCwSrرaOn Voĺ
M7 Rض RSw=PXRʴXfޚƱj'I?3 M~M~S6Wf\fϞ 滖i"o 린k}Uyg]v~u̘1|eaO<9Q7ՕQ+W GǪUA '*)8_#8.8U) FS} ?e{(á=ǫD@r%@mҤI.{FJ{·Q͔d̑2sg!ί XT G])J['Qo
<ut X @ /ЭZpؽ{ 艚&ԹK)]AOtS=='m"kC @ @ &nmҥtt3<ZܼO ݬo*]ZZnk >kM(??8Z(ؔEtCZ_n*f"Qațe;k}2я~[`Ӎe]Ý}.3@!
X|~ӟM^v
<)կ~&LvF&4|O~M&)L)x5\c
Rbמ͚5++
軦.tl>]iSFګ5C0t~t= }W HQLA+
Re1T]A_|]+C￣ [[1 "FI]()`Ҭ@ v.V^5 ^MC @ @3)ݙ9\Rp x./~nw{[uts>V Bz
^M
MOg?n= Z 'g̘~jͻO~bšnyQ==Q_
PG%K?>ZhMkQA
믿TO>n"+ 2{ƻ4hleiVt_d*dXǫ|@?>sT:_-{ͯL QZ. Zlږ kP7i,2\G{?Ee~(X{Z[z)E;wNqOFC @ #Э2*صkKU`RiYuӭjcJOo}Qԉ1 4'7w힘M|ݸ R~:솽nr!]G|[߲g}6Y43PBQSI=ݾxbS0@ ^z[Yzjݯ٠`S=hM&ؔ١ZjAnn} Χ'7 j'# [['G }4,0K
NM TR!mގ֔s0gΜ:&%"t\TTvL T=
` vi~pаK
Lsv~_|?{N- 0s2@ Xjxe( 1~xMSF SɴP@C(BȴhY`^@ / 눛%o:B?BL)CjȐ! MTP"^ z\A e8 |\zj>H7UX7mn:ݻfΜOK%V& z4jh[mi^unt_7Zxu25`u]u}DPf=}]A-Xǩ@0F5? :Zp{G%`_^)ڹғ6ywЈ5M3PJm_O7wMڞvT_DHܹ3TwCǩx>=
HQX)?tlY*3ʚ~v]=0;gY6B>F:c Y 4
t@Xi F3w۶ms?uDC @ @ nIoj?wWz ϟﺅq#\p˾xꩧ\<z_7wΝMgeh(hqNGM Wֲ]V؊( >Vkmqnhjf=[zڻ͖`Ы-=ǫ 1miQ@ p&W]uvm. hގV_c
T(#Dʰ5ƩN/*aռPfߵ,%G @Q[*TM?$R
ӓ zFzCu6h 6)~7WLs+,gPZMn"xY]KӺtRŪR
N|M Gu3
& (*)PW.T@δ*~" *P דJSPQ}~Io0χC @ 룏>r$qwi DgpU&E[[Z 2j e:"
ЫIsﾬnߦ`օ2%t=L
]B*Bj$S}IհPwdz0RÚ_u֜#@ @[*D2)cԨQ.TOKkӏ"eU Kx @ @kԘ
+XqnU-Xk
P= ~?ի]j or%L`?Ow ]H(( =H;UBEutsPQz@E{Y@ nS8)TP[xmzD? U,++ R @g
h=jg 7B (#颋.rmKnݺm PBUx[ر=XUF)` #Э2*CSNq'O
RtV*jv~lP%, " P@7Ӹ
O,@7w|8@ V
e'̮E @ ou 1b?U@]~=6|zJC!.yR'D4nH~ mftߦ`OI/eS]?PoP
ʢvMtkA @ 1U"1O!G @}uEĉj~"E@ߟ|3VRRݼys@
Qn(uޛկedd
-_fΜٺzs&unn=s~jjNuuE*bޯ^s+u梁y:lȐ!/6mw]G0? J@šf; &2*|7۬
++H@ۍllʕ[y6ofWV эc?zrMwy}٦]~-´ U[v%2sBYʞؽ{UWW
Rki%Ramei2+TwR;*r&@ p |B @ @ P7wؓN:ɦM1GGukۑ֚B=}_tY~} !*tرc3v4RgnhZP`AYʞPw_>pu.ƌc'nv1Ǹz&wA 8*?[G @ @ ^'p"iGunt't7~ $zMM]|ŦZTog6[o5jB7,X`M]X).
u2'y _kKʢPO~ք ]ळ ]Z@E>}< ppTB]2) O|
K/.sT.wZhn=>ȑ#M.-Zd[ Z@gdN({̉{ : @Hs͑" mP79~mO}S.Xњ(KpnfϞ
DC>}"G>K/~ Zvꩧ3cWkBY:7gM5 s2 ]C@E8O% hƍCǧl
=a~jaT o.Pt
-aA< (Hn:?yPh5')|^ 6 @ PN; :M0!4܀*Jݯ_?kKLK_r˨>_ p
qw6b
KOOwWVV5uYL;47"M
" =:4r_uUM @&S&5'洰# Z@E@ @ H,~A+B͵&+@1`V*TX-z)W#b@c=f+W Xt?裏^͵.E"IMMqƹ\QIIIͭiq !CLʤP+5a?sqp@ "TD@ @ @^>
o߾
c=ͫI'!1cth֓ZϞ=-%%MRQmu!qG[Æ
CwePО @G^ +E @ @ 86Ѝ{38z>{NoD<;~ܹ3zw7 0Nִ7xeBho4Op
koZVǛAZPĉ'h#F0}RtǮ" Q @ @ @Srrr\𠬬T2VFkF ekڵmwƲҴɓ'R=zmv5*<j(=? իWr
Nc {,
tM] AP թPS>۰ںu+tyU_+[,8.䒰>H_Yh'x*bͯ{oۮq "S7ߌ g@ @ (@OU# ]Y@]#K _|u _1cmذsα+2rM>q .H ԧk2?B 2,
: /@FE盲F@ @ @[˦:TTZ]5TO{UUUh)k"ӯz{GmӦMnܩ+0sLW[B#ԕԪUZ $<䓦M_Ŏ ;d5g< @Ttܐ5 V3tǦB[lҶml1
ڵk<ݯik?suСCC
<36uФ6f̘hJ[)i jD[q m Pv3@ @ @ FN kII]pM`{C ?O6n eQ(kbر5oX^B]Ei?N?4
FMMwo{G.|+aDOF+ pT |c tYe (l.\h zB5 ?,>l Ф&{]Na+ |PwS줓N2Ȧ.T[B * ̾ǖMBjek43 @ @ @ @ ^{_֭[쑨}s ػwoh=?RSDE RSOٳ-333,H~?Y>}Zڄ3gNX@Ņ@ @dT@ @ @ ?Wv wo=z;wy {1 9r]|š P0B
uo?ﾨ+#8"ݨc=681 *:ߔ5" J@]/};߱o|[YYEoPPv踏?Vg2jf43Gn;/G0ǽRɰaZX %@O%z@ @ @ n,0sL7n;BeM[kuWBsε-[Xzz>Tv24bet(B)MY`4@ @ C'@FšfK @PjV un : ղo~㺄R떚> x <MO~b/i[*譬Ç{X3߿.r?1 ! :Κ-! ]Z@222bMj2^O?&vOӾ u{X@ H ~J͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" @ H͡" o*팰? $ : * &@" XuuxYVAھֿ_>4ǷϬγ<\
Sg<,
@ @ @ @ T?/l [dU|sCug<6ueva,+L+e.<cEvİ5ϳ-3*;bL~oʽ,w"mۼlR[tIz T[HJJ^fٸEn-lhoPb,9ٛ q) )@ @ @ @ :Sٕ2i[e2{dulƶm-R+ d%^BJLn}mmV;MZ%o~4IOPWbh}a [smݦ-dk_hs&Fۗ&;8b_Ϟ[z-5x>
g{gZ֥U$5/t9VZeV[|Gw^;p y֣G~Gtພ wc@ @ @ @ ,<z-np6Tlc6cl^VDp7z iʚf~@h1<0o[ZZhJ@J_ퟛ,oaFPtsKXM^vIEmUcuI
;̽ce\am}}lM m,j̊}3,nf]ucwUQ1
y(G)Hg ۿ;R@< ć@rP\e鳽L(Z~F KRA[!/`ޝgy
OϚcknɳq7*ro
/nG %aݚr8[9y^:/$Q>۷dĻPJ nYIkKϵic
.-m̸k*X:̪B3 \և
,DRNg#BJ?Ъl]{QG e
[~\BdX$З"N5{n! Imjfdqw VMŚU@A
,azݴ L,i#WMg߿Ȳ,h~/mBĸZ82szyVYl/T]^f^/L
{
RKoaƺ
eMiۇ`@"7)
N;*oo4-u/K'<ZVq\&*y {guv ?222w\|=@ @ @ @ XUi[}%6c|mb-}Xn''[dȳ-szU<̖2lεߍj.\X'i-\^/)V[Wei^PWki(x+ZyU
ՔPq_uSe04mLK}6Wr9VX2m ;Y6u1hCE
EIؖyKsqF۽{UWWΝ;Oz_d;cC݅?3@ @ @ @ xjJC{RƖ?yu fʱs-ݍUߜPDۛGl9VqhT]:ǫ7ZVU75t;11oLk ,2+f5Z*b?qK tdDeX0!4Oh 2l H 4xHqmeX;QWSafi)uTjs͆tU.OQQmeW[V[[k_F iʰ8Slر[(կ +#T9a@ @ @ @ SW]e $xs<gVAC7Lry^j[
iuپj
29h] k.꧄i62\sXQӚQX^cKe_`kh
[T/V֍Yf\72˚\9RX_fUM a1G> 8puTSSczVQQao˰P
eY(bvqY߾}W^-ۗ!N@Ev @ @ @ @0 ԕ[^qMo{ ة [x
ueV*g+jB/
"xs [ivLUVn6rl܈V#e ܳȦ^eYUmW뻣ncڅ5QW1r{{1<{w%Ω+>dzyF Kܔ)MC%rLm6+rr}V |`oj˖-n:5jM8ƍgcƌqB r C%Pq, Й*յK}gs۶mtuif!~ئ dYv&FIy¼EuקBAb35a2KزU i U ťm%u7c5l5ƛ.]_e3&&G_oԱE6mXD@&|4T ͦ䓆X7a#ڲ_yY2noComػwoC
eY(wulݺeXh ;vqÆ
s
?"d @ @ @ @ !*WUUc]) (IDAT6];
7KqYEVzh Zx)7^QMbބZUR̆(76 6z1s§ OކԵSUy
%
NB-ͨ,]<a uXznO>O
:kꫯ v
Tmnݳg= ѣG>10ag\_w:C c C@ =9}PpBIvZf\7/Pn l*D;g\Xp\0ͱ96mAL9%RկrmqX"szN}JNDnMͶuTnJ_i^dIFaLͳ쩓-cLYR_/h [tKvhk>#1۪3H=1Ҽtnڎ:SW%dVM̲`«1bɩ\̔Aݛ2&* )B/6RP{vA?N8:th@? ^= |9ݻΞ"lQQa 8eTغBq 2ro}r+{~0Ӎɹk=2+#0lcyaV_Uٺ'sgZds&%eJn\6hK;"m[v//biTܗg#/o r-ϷZBVq7"
+[@f !PDjj{Y<bĈCDDͿi l|ˋr9u&^ie^=PAЂ]Ua5'I^
Ϸ-{r%7
fͳ^`Ċؖv ihzufu,5~Gpr /.MLuouGd%߆# QG LŲ{a}d߿+-'
+L@*:* @ ĉ]/O=#}>묳`.wݞ_[ dZ>"t*QSfKnVXbY}͵g/D]I`dLL+^sb͛gN
SYklÅAF~w:ihZc7JvJM<yrxNޝE?\㭷S=-R/ UT#7(Yg?b vR[sN]l{|C-%W`
wycG.//w' )H x:Sm6vXSE߾}M
C@Pe ! ZCk,Cw[QLsUhk.ﺩ⾙^E
1vE ?79*7kOj{jf^>Җxekl
oe+U,ܕ?'\ U_L(p4̼/x?zzǫviea?5o"dT(Cb].̈P#tsUbԨQvi@' E#:Y@E':@ @ @ @ n&Pp<ET* Rڊ2ӖmՍuuT*rOׯxiIܟeʀ8fف Ƣ;M
IW&7f{FETZTyEc'323#j$KeQN^
wP_,SVo](g)]Pb WdA
,J ڡ$A @ @ @ @+Y,@X؊^!jIxuVPԊWsQAXo+`j%M*5˳\vη'YNr}G^GH^eZ۸| `GUvDF`θ0h&Ql̯K`OYmں[+eX՜PN#G u4n8ٳ'EeN3idE ty?ɳi7JYޘ)qy6odKOʰ9/*KO+L]f+R+M&[ح e6sД`ʴ.c(,[a}2n+!ճXЊD,f2$EjuMXfh xȲI9z>:XDHP bjP'}W
d))).A"u*|7 q P%6e ȴwX^-畕^75gHtsشVn2/H I/ G>6,ĎHv+6Xvj㨤Vz2Zmˮa>RC
β#f77GkYw%+f(xӉmhythřγ9_ȳ O%1jjbL3v
< }іf'N?0'W
uDCp
8l@ @ @ 8 8kMUzŧO :%6oj͙nS\X}c-^mk6vo)V8Px 3-j3-K-ռn4nZf۸R&
U=-~wX[N[HJK͊
3LaɁT5r
_2H{$XSB6fU7V
e'ؗ"N@Ev @ @ @ @0 LEVI^K>ړ9VZ[i%X_JdCml>Nk-d3x*^oZ zZSjT4z_eiyn})utxcnɮb ^.D)*u\[1&l]ZE} =UlFsw.#jxoLIOQڲV6qX[J
%Twޡ2-hē x: @\Q`Uҭ"5;|R-9&xAV5 P!7 }li ubYMgE8s4yT pWq K?'ߒ;./RpWczM9u˴[EZn,v.#C 6ƛN*.cBA
eY{'zC@' 7Ɏ pHg[fK[lݵ`uvɖ_k qYF {dr
<dmyc3[>-Ρ2)hĻ UR tcrh Ļ x?C X@E7> .@" @7 PэO. @ 3! ЍTtˡ! * tcrh Ļ x?C X@E7> .@" @7 PэO. ;Xm vB@Zdޚ $" !A@@zӮs5\n/N1S @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ *Wk @ @ @wOH} @ @ @ @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ *Wk @ @ @wOH} @ @ @ @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ *Wk @ @ @wOH} @ @ @ @ @ ]AER @ @ H,"pF @ @ zpPG @ @ 8H<\ @ @ @ T>! @ @ @ O{OOO7|3~ W +v J.. O{ 0ܟ_@?_}NNQ`Z
} ?믿WC:Vjt @wyG yF@rEAEɩ 3
/vrX_5 i~;|My_T*(r"@@9%O%M yF@{swٸ?]qW9!P&E K ~iO?4-IikQy*z7Ow+y.o+ 67;^?qgr&P Y~])~Y%"0G(V's_y_." @ @ Q*>J @ @ @/*7@ @ @ |/*> @ @ @ 8 @ @ @ 'q[ۙ a ǩr"@ :9ZiD'~Z_\u*VgX\`~ڷܻ @N@yy ~ V*w(?hvir"@ :9ZiD'~Z_\uoWtF K
\rL[n6aZ- ^@ P% <L@"h3⋊ n7 p Rdf0ycN4B .p:0).u^&@@t }'@U@]狊(˴05ؐ h驝 r
rȿ s _T̩]y:(E ur. OP
ȿV|Qw:#@a ir"@ :9ZiD'~Z_\u;[ @ @ @ Tt?" @ @ @ *Vg @ @ @{ݏH @ @ @ @ @ ^
H a0Tow @@ 4 T?U.:yg3,.n~?[] P' G<M r?O@k˻AE 4vݴow @@ 4 T?U.ﺇ+o{:#@ %p\-7ͰZ^/ GÏPU\ &@ K4̙ZEL^C _n
C@ށg)
CS2ȿYӼ1M'!@ 8Np{ :/O @ >A * ZEE eyqlH r4N z_of9_9م/*.|r< TÊr"@ :9ZiD'~Z_\u;[ @`q˰ow @@ 4 T?U.:_T䝭 @ @ @@* @ @ @@^yg3 @ @ нG@ @ @ WAE @ @ t/}
$@ 0zqܻ @N@yy ~ V*wn~-.u^&@@t }'@U@]"luF nڷܻ @N@yy ~ V*wە= @u\.ӖfXVKno/GT *. H@%Lb&H!@ /
! G ~) Y,i^ @ Np8Lʽ h ]@G hry"luF ?2<x
6$@@d9yzj'@@ܯ7 / sjz>|*aEw @@ 4 T?U.:_T䝭 @eXqڷܻ @N@yy ~ V*w/*Vg @ @ @{ݏH @ @ @ @ @ ^AE#R @ @ +"luF @ @ xB @@z=8[] P' G<M r?O@k˻AE laO{ :/O @ >A * ZsPw:#@n7[] P' G<M r?O@k˻۞ @`I:\.if3V% # ~ H$
sV|Q1 @톂 wYJ r?ДL,o4/yLӉF @Np8 ?E ur. OP
ȿV|Qw:#@}zyy}~~ q\ @ <= @^@כYA@csvዊ95 \|>O尢ܻ @N@yy ~ V*w/*VgX\28[] P' G<M r?O@k˻yg3 @ @ нG@ @ @ WAE @ @ t/ࠢ) @ @ pPw:#@ @ @ <u_ @ z q-.u^&@@t }'@U@]"luF }˽ h ]@G hry9;[ @`qn-.u^&@@t }'@U@]vmOg z .˴fVՒۋ hj Ur$9S+ k @vCA w;,%@@@ phJ&@`7 c<D# i8 ӟr"@ :9ZiD'~Z_\u;[ @`q>L>??8.^
Y@F P/ ͬ @ 19EŜE O.p>rXQ] P' G<M r?O@k˻yg3,.P~x-.u^&@@t }'@U@]狊 @ @ ^AE#R @ @ +"luF @ @ pPH @ @
8;[ @ @ @ P F`^8N{ :/O @ >A * ZsPw:#@vӾE ur. OP
ȿV T䝭 @AcM{ :/O @ >A * Z{x}3XRzer jE r45@ *_a ȿDÜ_T5 Ev @ ; x @ 84% 01K tp4 Ow @@ 4 T?U.:_T䝭 @g^^^}q , G#OOfV C@]bNM"@'8AE9(.u^&@@t }'@U@]狊( x<N{ :/O @ >A * ZEE @ @ t/ࠢ) @ @ pPw:#@ @ @ 8~D
$@ @ @ y T䝭 @ @ @@OW@#^q z˽ h ]@G hry9;[ @`qv;ir"@ :9ZiD'~Z_\u*VgX\}˽ h ]@G hry=]y,)p^2mlj"@@x9~ @@ܯ0_aԊ/*f"pP @ r<K P@ E@%i:|tܻ @N@yy ~ V*w/*VgX\ow @@ 4 T?U.:yg3,.0|WӾE ur. OP
ȿV T䝭 @8NEڋې r4@
_QR ȿT㜥k7y |z:\.a +> ` '@@p |'@Y@5ӥ]"h5F @ @ xD @ @ @ Y Td @ @ @@ D @ @ UAE @ @ pP`HJ$@ @ @ Y Td @ @ @@ ]M5v IENDB` | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/service/AppNamespaceServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import java.util.List;
public class AppNamespaceServiceTest extends AbstractIntegrationTest {
@Autowired
private AppNamespaceService appNamespaceService;
private final String APP = "app-test";
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespace() {
List<AppNamespace> appNamespaceList = appNamespaceService.findPublicAppNamespaces();
Assert.assertNotNull(appNamespaceList);
Assert.assertEquals(5, appNamespaceList.size());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByName() {
Assert.assertNotNull(appNamespaceService.findPublicAppNamespace("datasourcexml"));
Assert.assertNull(appNamespaceService.findPublicAppNamespace("TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByAppAndName() {
Assert.assertNotNull(appNamespaceService.findByAppIdAndName("100003173", "datasourcexml"));
Assert.assertNull(appNamespaceService.findByAppIdAndName("100003173", "TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateDefaultAppNamespace() {
appNamespaceService.createDefaultAppNamespace(APP);
AppNamespace appNamespace = appNamespaceService.findByAppIdAndName(APP, ConfigConsts.NAMESPACE_APPLICATION);
Assert.assertNotNull(appNamespace);
Assert.assertEquals(ConfigFileFormat.Properties.getValue(), appNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedAsPrivateAppNamespace() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("private-01");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
AppNamespace createdAppNamespace = appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("datasource");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceWithWrongFormatNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setFormat(ConfigFileFormat.YAML.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
Assert.assertEquals(ConfigFileFormat.Properties.getValue(), createdAppNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("100003173");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppId() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("song0711-01");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppIdAsPublic() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("SCC.song0711-03");
appNamespace.setAppId("100003173");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
private AppNamespace assembleBaseAppNamespace() {
AppNamespace appNamespace = new AppNamespace();
appNamespace.setName("appNamespace");
appNamespace.setAppId("1000");
appNamespace.setFormat(ConfigFileFormat.XML.getValue());
return appNamespace;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import java.util.List;
public class AppNamespaceServiceTest extends AbstractIntegrationTest {
@Autowired
private AppNamespaceService appNamespaceService;
private final String APP = "app-test";
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespace() {
List<AppNamespace> appNamespaceList = appNamespaceService.findPublicAppNamespaces();
Assert.assertNotNull(appNamespaceList);
Assert.assertEquals(5, appNamespaceList.size());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByName() {
Assert.assertNotNull(appNamespaceService.findPublicAppNamespace("datasourcexml"));
Assert.assertNull(appNamespaceService.findPublicAppNamespace("TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testFindPublicAppNamespaceByAppAndName() {
Assert.assertNotNull(appNamespaceService.findByAppIdAndName("100003173", "datasourcexml"));
Assert.assertNull(appNamespaceService.findByAppIdAndName("100003173", "TFF.song0711-02"));
}
@Test
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateDefaultAppNamespace() {
appNamespaceService.createDefaultAppNamespace(APP);
AppNamespace appNamespace = appNamespaceService.findByAppIdAndName(APP, ConfigConsts.NAMESPACE_APPLICATION);
Assert.assertNotNull(appNamespace);
Assert.assertEquals(ConfigFileFormat.Properties.getValue(), appNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedAsPrivateAppNamespace() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("private-01");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("old");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
AppNamespace createdAppNamespace = appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceExistedWithNoAppendnamespacePrefix() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setName("datasource");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace, false);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePublicAppNamespaceWithWrongFormatNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(true);
appNamespace.setFormat(ConfigFileFormat.YAML.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace = appNamespaceService.findPublicAppNamespace(appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
Assert.assertEquals(ConfigFileFormat.Properties.getValue(), createdAppNamespace.getFormat());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("100003173");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppId() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("datasource");
appNamespace.setAppId("song0711-01");
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
@Test(expected = BadRequestException.class)
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceExistedInAnotherAppIdAsPublic() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespace.setName("SCC.song0711-03");
appNamespace.setAppId("100003173");
appNamespace.setFormat(ConfigFileFormat.Properties.getValue());
appNamespaceService.createAppNamespaceInLocal(appNamespace);
}
@Test
@Sql(scripts = "/sql/appnamespaceservice/init-appnamespace.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testCreatePrivateAppNamespaceNotExisted() {
AppNamespace appNamespace = assembleBaseAppNamespace();
appNamespace.setPublic(false);
appNamespaceService.createAppNamespaceInLocal(appNamespace);
AppNamespace createdAppNamespace =
appNamespaceService.findByAppIdAndName(appNamespace.getAppId(), appNamespace.getName());
Assert.assertNotNull(createdAppNamespace);
Assert.assertEquals(appNamespace.getName(), createdAppNamespace.getName());
}
private AppNamespace assembleBaseAppNamespace() {
AppNamespace appNamespace = new AppNamespace();
appNamespace.setName("appNamespace");
appNamespace.setAppId("1000");
appNamespace.setFormat(ConfigFileFormat.XML.getValue());
return appNamespace;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js | /*!
* angular-translate - v2.18.1 - 2018-05-19
*
* Copyright (c) 2018 The angular-translate team, Pascal Precht; Licensed MIT
*/
!function(e,i){"function"==typeof define&&define.amd?define([],function(){return i()}):"object"==typeof module&&module.exports?module.exports=i():i()}(0,function(){function e(n,a){"use strict";return function(r){if(!(r&&(angular.isArray(r.files)||angular.isString(r.prefix)&&angular.isString(r.suffix))))throw new Error("Couldn't load static files, no files and prefix or suffix specified!");r.files||(r.files=[{prefix:r.prefix,suffix:r.suffix}]);for(var e=function(e){if(!e||!angular.isString(e.prefix)||!angular.isString(e.suffix))throw new Error("Couldn't load static file, no prefix or suffix specified!");var i=[e.prefix,r.key,e.suffix].join("");return angular.isObject(r.fileMap)&&r.fileMap[i]&&(i=r.fileMap[i]),a(angular.extend({url:i,method:"GET"},r.$http)).then(function(e){return e.data},function(){return n.reject(r.key)})},i=[],t=r.files.length,f=0;f<t;f++)i.push(e({prefix:r.files[f].prefix,key:r.key,suffix:r.files[f].suffix}));return n.all(i).then(function(e){for(var i=e.length,r={},t=0;t<i;t++)for(var f in e[t])r[f]=e[t][f];return r})}}return e.$inject=["$q","$http"],angular.module("pascalprecht.translate").factory("$translateStaticFilesLoader",e),e.displayName="$translateStaticFilesLoader","pascalprecht.translate"}); | /*!
* angular-translate - v2.18.1 - 2018-05-19
*
* Copyright (c) 2018 The angular-translate team, Pascal Precht; Licensed MIT
*/
!function(e,i){"function"==typeof define&&define.amd?define([],function(){return i()}):"object"==typeof module&&module.exports?module.exports=i():i()}(0,function(){function e(n,a){"use strict";return function(r){if(!(r&&(angular.isArray(r.files)||angular.isString(r.prefix)&&angular.isString(r.suffix))))throw new Error("Couldn't load static files, no files and prefix or suffix specified!");r.files||(r.files=[{prefix:r.prefix,suffix:r.suffix}]);for(var e=function(e){if(!e||!angular.isString(e.prefix)||!angular.isString(e.suffix))throw new Error("Couldn't load static file, no prefix or suffix specified!");var i=[e.prefix,r.key,e.suffix].join("");return angular.isObject(r.fileMap)&&r.fileMap[i]&&(i=r.fileMap[i]),a(angular.extend({url:i,method:"GET"},r.$http)).then(function(e){return e.data},function(){return n.reject(r.key)})},i=[],t=r.files.length,f=0;f<t;f++)i.push(e({prefix:r.files[f].prefix,key:r.key,suffix:r.files[f].suffix}));return n.all(i).then(function(e){for(var i=e.length,r={},t=0;t<i;t++)for(var f in e[t])r[f]=e[t][f];return r})}}return e.$inject=["$q","$http"],angular.module("pascalprecht.translate").factory("$translateStaticFilesLoader",e),e.displayName="$translateStaticFilesLoader","pascalprecht.translate"}); | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-configservice/src/main/config/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,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseHistoryController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.service.ReleaseHistoryService;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseHistoryDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RestController
public class ReleaseHistoryController {
private static final Gson GSON = new Gson();
private Type configurationTypeReference = new TypeToken<Map<String, Object>>() {
}.getType();
private final ReleaseHistoryService releaseHistoryService;
public ReleaseHistoryController(final ReleaseHistoryService releaseHistoryService) {
this.releaseHistoryService = releaseHistoryService;
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(
@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findReleaseHistoriesByNamespace(appId, clusterName,
namespaceName, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByReleaseIdAndOperation(
@RequestParam("releaseId") long releaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByReleaseIdAndOperation(releaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_previous_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByPreviousReleaseIdAndOperation(
@RequestParam("previousReleaseId") long previousReleaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByPreviousReleaseIdAndOperation(previousReleaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
private PageDTO<ReleaseHistoryDTO> transform2PageDTO(Page<ReleaseHistory> releaseHistoriesPage, Pageable pageable){
if (!releaseHistoriesPage.hasContent()) {
return null;
}
List<ReleaseHistory> releaseHistories = releaseHistoriesPage.getContent();
List<ReleaseHistoryDTO> releaseHistoryDTOs = new ArrayList<>(releaseHistories.size());
for (ReleaseHistory releaseHistory : releaseHistories) {
releaseHistoryDTOs.add(transformReleaseHistory2DTO(releaseHistory));
}
return new PageDTO<>(releaseHistoryDTOs, pageable, releaseHistoriesPage.getTotalElements());
}
private ReleaseHistoryDTO transformReleaseHistory2DTO(ReleaseHistory releaseHistory) {
ReleaseHistoryDTO dto = new ReleaseHistoryDTO();
BeanUtils.copyProperties(releaseHistory, dto, "operationContext");
dto.setOperationContext(GSON.fromJson(releaseHistory.getOperationContext(),
configurationTypeReference));
return dto;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.service.ReleaseHistoryService;
import com.ctrip.framework.apollo.common.dto.PageDTO;
import com.ctrip.framework.apollo.common.dto.ReleaseHistoryDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RestController
public class ReleaseHistoryController {
private static final Gson GSON = new Gson();
private Type configurationTypeReference = new TypeToken<Map<String, Object>>() {
}.getType();
private final ReleaseHistoryService releaseHistoryService;
public ReleaseHistoryController(final ReleaseHistoryService releaseHistoryService) {
this.releaseHistoryService = releaseHistoryService;
}
@GetMapping("/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoriesByNamespace(
@PathVariable String appId, @PathVariable String clusterName,
@PathVariable String namespaceName,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findReleaseHistoriesByNamespace(appId, clusterName,
namespaceName, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByReleaseIdAndOperation(
@RequestParam("releaseId") long releaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByReleaseIdAndOperation(releaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
@GetMapping("/releases/histories/by_previous_release_id_and_operation")
public PageDTO<ReleaseHistoryDTO> findReleaseHistoryByPreviousReleaseIdAndOperation(
@RequestParam("previousReleaseId") long previousReleaseId,
@RequestParam("operation") int operation,
Pageable pageable) {
Page<ReleaseHistory> result = releaseHistoryService.findByPreviousReleaseIdAndOperation(previousReleaseId, operation, pageable);
return transform2PageDTO(result, pageable);
}
private PageDTO<ReleaseHistoryDTO> transform2PageDTO(Page<ReleaseHistory> releaseHistoriesPage, Pageable pageable){
if (!releaseHistoriesPage.hasContent()) {
return null;
}
List<ReleaseHistory> releaseHistories = releaseHistoriesPage.getContent();
List<ReleaseHistoryDTO> releaseHistoryDTOs = new ArrayList<>(releaseHistories.size());
for (ReleaseHistory releaseHistory : releaseHistories) {
releaseHistoryDTOs.add(transformReleaseHistory2DTO(releaseHistory));
}
return new PageDTO<>(releaseHistoryDTOs, pageable, releaseHistoriesPage.getTotalElements());
}
private ReleaseHistoryDTO transformReleaseHistory2DTO(ReleaseHistory releaseHistory) {
ReleaseHistoryDTO dto = new ReleaseHistoryDTO();
BeanUtils.copyProperties(releaseHistory, dto, "operationContext");
dto.setOperationContext(GSON.fromJson(releaseHistory.getOperationContext(),
configurationTypeReference));
return dto;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./docs/css/buble.css | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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 url("fonts.css");*{-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-text-size-adjust:none;-webkit-touch-callout:none;box-sizing:border-box}body:not(.ready){overflow:hidden}body:not(.ready) .app-nav,body:not(.ready)>nav,body:not(.ready) [data-cloak]{display:none}div#app{font-size:30px;font-weight:lighter;margin:40vh auto;text-align:center}div#app:empty:before{content:"Loading..."}.emoji{height:1.2rem;vertical-align:middle}.progress{background-color:var(--theme-color,#0074d9);height:2px;left:0;position:fixed;right:0;top:0;transition:width .2s,opacity .4s;width:0;z-index:999999}.search .search-keyword,.search a:hover{color:var(--theme-color,#0074d9)}.search .search-keyword{font-style:normal;font-weight:700}body,html{height:100%}body{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;color:#34495e;font-family:Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:15px;letter-spacing:0;margin:0;overflow-x:hidden}img{max-width:100%}a[disabled]{cursor:not-allowed;opacity:.6}kbd{border:1px solid #ccc;border-radius:3px;display:inline-block;font-size:12px!important;line-height:12px;margin-bottom:3px;padding:3px 5px;vertical-align:middle}li input[type=checkbox]{margin:0 .2em .25em 0;vertical-align:middle}.app-nav{margin:25px 60px 0 0;position:absolute;right:0;text-align:right;z-index:10}.app-nav.no-badge{margin-right:25px}.app-nav p{margin:0}.app-nav>a{margin:0 1rem;padding:5px 0}.app-nav li,.app-nav ul{display:inline-block;list-style:none;margin:0}.app-nav a{color:inherit;font-size:16px;text-decoration:none;transition:color .3s}.app-nav a.active,.app-nav a:hover{color:var(--theme-color,#0074d9)}.app-nav a.active{border-bottom:2px solid var(--theme-color,#0074d9)}.app-nav li{display:inline-block;margin:0 1rem;padding:5px 0;position:relative;cursor:pointer}.app-nav li ul{background-color:#fff;border:1px solid;border-color:#ddd #ddd #ccc;border-radius:4px;box-sizing:border-box;display:none;max-height:calc(100vh - 61px);overflow-y:auto;padding:10px 0;position:absolute;right:-15px;text-align:left;top:100%;white-space:nowrap}.app-nav li ul li{display:block;font-size:14px;line-height:1rem;margin:8px 14px;white-space:nowrap}.app-nav li ul a{display:block;font-size:inherit;margin:0;padding:0}.app-nav li ul a.active{border-bottom:0}.app-nav li:hover ul{display:block}.github-corner{border-bottom:0;position:fixed;right:0;text-decoration:none;top:0;z-index:1}.github-corner:hover .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}.github-corner svg{color:#fff;fill:var(--theme-color,#0074d9);height:80px;width:80px}main{display:block;position:relative;width:100vw;height:100%;z-index:0}main.hidden{display:none}.anchor{display:inline-block;text-decoration:none;transition:all .3s}.anchor span{color:#34495e}.anchor:hover{text-decoration:underline}.sidebar{border-right:1px solid rgba(0,0,0,.07);overflow-y:auto;padding:40px 0 0;position:absolute;top:0;bottom:0;left:0;transition:transform .25s ease-out;width:16rem;z-index:20}.sidebar>h1{margin:0 auto 1rem;font-size:1.5rem;font-weight:300;text-align:center}.sidebar>h1 a{color:inherit;text-decoration:none}.sidebar>h1 .app-nav{display:block;position:static}.sidebar .sidebar-nav{line-height:2em;padding-bottom:40px}.sidebar li.collapse .app-sub-sidebar{display:none}.sidebar ul{margin:0 0 0 15px;padding:0}.sidebar li>p{font-weight:700;margin:0}.sidebar ul,.sidebar ul li{list-style:none}.sidebar ul li a{border-bottom:none;display:block}.sidebar ul li ul{padding-left:20px}.sidebar::-webkit-scrollbar{width:4px}.sidebar::-webkit-scrollbar-thumb{background:transparent;border-radius:4px}.sidebar:hover::-webkit-scrollbar-thumb{background:hsla(0,0%,53.3%,.4)}.sidebar:hover::-webkit-scrollbar-track{background:hsla(0,0%,53.3%,.1)}.sidebar-toggle{background-color:transparent;background-color:hsla(0,0%,100%,.8);border:0;outline:none;padding:10px;position:absolute;bottom:0;left:0;text-align:center;transition:opacity .3s;width:0;z-index:30;cursor:pointer}.sidebar-toggle:hover .sidebar-toggle-button{opacity:.4}.sidebar-toggle span{background-color:var(--theme-color,#0074d9);display:block;margin-bottom:4px;width:16px;height:2px}body.sticky .sidebar,body.sticky .sidebar-toggle{position:fixed}.content{padding-top:60px;position:absolute;top:0;right:0;bottom:0;left:16rem;transition:left .25s ease}.markdown-section{margin:0 auto;max-width:80%;padding:30px 15px 40px;position:relative}.markdown-section>*{box-sizing:border-box;font-size:inherit}.markdown-section>:first-child{margin-top:0!important}.markdown-section hr{border:none;border-bottom:1px solid #eee;margin:2em 0}.markdown-section iframe{border:1px solid #eee;width:1px;min-width:100%}.markdown-section table{border-collapse:collapse;border-spacing:0;display:block;margin-bottom:1rem;overflow:auto;width:100%}.markdown-section th{font-weight:700}.markdown-section td,.markdown-section th{border:1px solid #ddd;padding:6px 13px}.markdown-section tr{border-top:1px solid #ccc}.markdown-section p.tip,.markdown-section tr:nth-child(2n){background-color:#f8f8f8}.markdown-section p.tip{border-bottom-right-radius:2px;border-left:4px solid #f66;border-top-right-radius:2px;margin:2em 0;padding:12px 24px 12px 30px;position:relative}.markdown-section p.tip:before{background-color:#f66;border-radius:100%;color:#fff;content:"!";font-family:Dosis,Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:14px;font-weight:700;left:-12px;line-height:20px;position:absolute;height:20px;width:20px;text-align:center;top:14px}.markdown-section p.tip code{background-color:#efefef}.markdown-section p.tip em{color:#34495e}.markdown-section p.warn{background:rgba(0,116,217,.1);border-radius:2px;padding:1rem}.markdown-section ul.task-list>li{list-style-type:none}body.close .sidebar{transform:translateX(-16rem)}body.close .sidebar-toggle{width:auto}body.close .content{left:0}@media print{.app-nav,.github-corner,.sidebar,.sidebar-toggle{display:none}}@media screen and (max-width:768px){.github-corner,.sidebar,.sidebar-toggle{position:fixed}.app-nav{margin-top:16px}.app-nav li ul{top:30px}main{height:auto;overflow-x:hidden}.sidebar{left:-16rem;transition:transform .25s ease-out}.content{left:0;max-width:100vw;position:static;padding-top:20px;transition:transform .25s ease}.app-nav,.github-corner{transition:transform .25s ease-out}.sidebar-toggle{background-color:transparent;width:auto;padding:30px 30px 10px 10px}body.close .sidebar{transform:translateX(16rem)}body.close .sidebar-toggle{background-color:hsla(0,0%,100%,.8);transition:background-color 1s;width:0;padding:10px}body.close .content{transform:translateX(16rem)}body.close .app-nav,body.close .github-corner{display:none}.github-corner:hover .octo-arm{-webkit-animation:none;animation:none}.github-corner .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}}@-webkit-keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}section.cover{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:cover;height:100vh;width:100vw;display:none}section.cover.show{display:flex}section.cover.has-mask .mask{background-color:#fff;opacity:.8;position:absolute;top:0;height:100%;width:100%}section.cover .cover-main{flex:1;margin:-20px 16px 0;text-align:center;position:relative}section.cover a{color:inherit}section.cover a,section.cover a:hover{text-decoration:none}section.cover p{line-height:1.5rem;margin:1em 0}section.cover h1{color:inherit;font-size:2.5rem;font-weight:300;margin:.625rem 0 2.5rem;position:relative;text-align:center}section.cover h1 a{display:block}section.cover h1 small{bottom:-.4375rem;font-size:1rem;position:absolute}section.cover blockquote{font-size:1.5rem;text-align:center}section.cover ul{line-height:1.8;list-style-type:none;margin:1em auto;max-width:500px;padding:0}section.cover .cover-main>p:last-child a{border-radius:2rem;border:1px solid var(--theme-color,#0074d9);box-sizing:border-box;color:var(--theme-color,#0074d9);display:inline-block;font-size:1.05rem;letter-spacing:.1rem;margin:.5rem 1rem;padding:.75em 2rem;text-decoration:none;transition:all .15s ease}section.cover .cover-main>p:last-child a:last-child{background-color:var(--theme-color,#0074d9);color:#fff}section.cover .cover-main>p:last-child a:last-child:hover{color:inherit;opacity:.8}section.cover .cover-main>p:last-child a:hover{color:inherit}section.cover blockquote>p>a{border-bottom:2px solid var(--theme-color,#0074d9);transition:color .3s}section.cover blockquote>p>a:hover{color:var(--theme-color,#0074d9)}.sidebar{color:#364149;background-color:#fff}.sidebar a{color:#666;text-decoration:none}.sidebar li{list-style:none;margin:0;padding:.2em 0}.sidebar ul li ul{padding:0}.sidebar li.active{background-color:#eee}.sidebar li.active a{color:#333}.markdown-section h1,.markdown-section h2,.markdown-section h3,.markdown-section h4,.markdown-section strong{color:#333;font-weight:400}.markdown-section strong{color:#333;font-weight:600}.markdown-section a{color:var(--theme-color,#0074d9)}.markdown-section ol,.markdown-section p,.markdown-section ul{line-height:1.6rem;margin:0 0 1em;word-spacing:.05rem}.markdown-section h1{font-size:2rem;font-weight:500;margin:0 0 1rem}.markdown-section h2{font-size:1.8rem;font-weight:400;margin:0 0 1rem;padding:1rem 0 0}.markdown-section h3{font-size:1.5rem;margin:52px 0 1.2rem}.markdown-section h4{font-size:1.25rem}.markdown-section h5{font-size:1rem}.markdown-section h6{color:#777;font-size:1rem}.markdown-section figure,.markdown-section ol,.markdown-section p,.markdown-section ul{margin:1.2em 0}.markdown-section ol,.markdown-section ul{padding-left:1.5rem}.markdown-section li{line-height:1.5;margin:0}.markdown-section blockquote{border-left:4px solid var(--theme-color,#0074d9);color:#858585;margin:2em 0;padding-left:20px}.markdown-section blockquote p{font-weight:600;margin-left:0}.markdown-section iframe{margin:1em 0}.markdown-section em{color:#7f8c8d}.markdown-section code{border-radius:3px;padding:.2em .4rem;white-space:nowrap}.markdown-section code,.markdown-section pre{background-color:#f9f9f9;font-family:Inconsolata}.markdown-section pre{border-left:2px solid #eee;font-size:16px;margin:0 0 1em;padding:0 10px 12px 0;overflow:auto;word-wrap:normal;position:relative}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#93a1a1}.token.punctuation{color:#586e75}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#268bd2}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string,.token.url{color:#2aa198}.token.entity{color:#657b83;background:#eee8d5}.token.atrule,.token.attr-value,.token.keyword{color:#a11}.token.function{color:#b58900}.token.important,.token.regex,.token.variable{color:#cb4b16}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.markdown-section pre>code{background-color:#f8f8f8;border-radius:2px;display:block;font-family:Inconsolata;line-height:1.1rem;max-width:inherit;overflow:inherit;padding:20px .8em;position:relative;white-space:inherit}.markdown-section code:after,.markdown-section code:before{letter-spacing:.05rem}code .token{-webkit-font-smoothing:initial;-moz-osx-font-smoothing:initial;min-height:1.5rem;position:relative;left:auto} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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 url("fonts.css");*{-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-text-size-adjust:none;-webkit-touch-callout:none;box-sizing:border-box}body:not(.ready){overflow:hidden}body:not(.ready) .app-nav,body:not(.ready)>nav,body:not(.ready) [data-cloak]{display:none}div#app{font-size:30px;font-weight:lighter;margin:40vh auto;text-align:center}div#app:empty:before{content:"Loading..."}.emoji{height:1.2rem;vertical-align:middle}.progress{background-color:var(--theme-color,#0074d9);height:2px;left:0;position:fixed;right:0;top:0;transition:width .2s,opacity .4s;width:0;z-index:999999}.search .search-keyword,.search a:hover{color:var(--theme-color,#0074d9)}.search .search-keyword{font-style:normal;font-weight:700}body,html{height:100%}body{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;color:#34495e;font-family:Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:15px;letter-spacing:0;margin:0;overflow-x:hidden}img{max-width:100%}a[disabled]{cursor:not-allowed;opacity:.6}kbd{border:1px solid #ccc;border-radius:3px;display:inline-block;font-size:12px!important;line-height:12px;margin-bottom:3px;padding:3px 5px;vertical-align:middle}li input[type=checkbox]{margin:0 .2em .25em 0;vertical-align:middle}.app-nav{margin:25px 60px 0 0;position:absolute;right:0;text-align:right;z-index:10}.app-nav.no-badge{margin-right:25px}.app-nav p{margin:0}.app-nav>a{margin:0 1rem;padding:5px 0}.app-nav li,.app-nav ul{display:inline-block;list-style:none;margin:0}.app-nav a{color:inherit;font-size:16px;text-decoration:none;transition:color .3s}.app-nav a.active,.app-nav a:hover{color:var(--theme-color,#0074d9)}.app-nav a.active{border-bottom:2px solid var(--theme-color,#0074d9)}.app-nav li{display:inline-block;margin:0 1rem;padding:5px 0;position:relative;cursor:pointer}.app-nav li ul{background-color:#fff;border:1px solid;border-color:#ddd #ddd #ccc;border-radius:4px;box-sizing:border-box;display:none;max-height:calc(100vh - 61px);overflow-y:auto;padding:10px 0;position:absolute;right:-15px;text-align:left;top:100%;white-space:nowrap}.app-nav li ul li{display:block;font-size:14px;line-height:1rem;margin:8px 14px;white-space:nowrap}.app-nav li ul a{display:block;font-size:inherit;margin:0;padding:0}.app-nav li ul a.active{border-bottom:0}.app-nav li:hover ul{display:block}.github-corner{border-bottom:0;position:fixed;right:0;text-decoration:none;top:0;z-index:1}.github-corner:hover .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}.github-corner svg{color:#fff;fill:var(--theme-color,#0074d9);height:80px;width:80px}main{display:block;position:relative;width:100vw;height:100%;z-index:0}main.hidden{display:none}.anchor{display:inline-block;text-decoration:none;transition:all .3s}.anchor span{color:#34495e}.anchor:hover{text-decoration:underline}.sidebar{border-right:1px solid rgba(0,0,0,.07);overflow-y:auto;padding:40px 0 0;position:absolute;top:0;bottom:0;left:0;transition:transform .25s ease-out;width:16rem;z-index:20}.sidebar>h1{margin:0 auto 1rem;font-size:1.5rem;font-weight:300;text-align:center}.sidebar>h1 a{color:inherit;text-decoration:none}.sidebar>h1 .app-nav{display:block;position:static}.sidebar .sidebar-nav{line-height:2em;padding-bottom:40px}.sidebar li.collapse .app-sub-sidebar{display:none}.sidebar ul{margin:0 0 0 15px;padding:0}.sidebar li>p{font-weight:700;margin:0}.sidebar ul,.sidebar ul li{list-style:none}.sidebar ul li a{border-bottom:none;display:block}.sidebar ul li ul{padding-left:20px}.sidebar::-webkit-scrollbar{width:4px}.sidebar::-webkit-scrollbar-thumb{background:transparent;border-radius:4px}.sidebar:hover::-webkit-scrollbar-thumb{background:hsla(0,0%,53.3%,.4)}.sidebar:hover::-webkit-scrollbar-track{background:hsla(0,0%,53.3%,.1)}.sidebar-toggle{background-color:transparent;background-color:hsla(0,0%,100%,.8);border:0;outline:none;padding:10px;position:absolute;bottom:0;left:0;text-align:center;transition:opacity .3s;width:0;z-index:30;cursor:pointer}.sidebar-toggle:hover .sidebar-toggle-button{opacity:.4}.sidebar-toggle span{background-color:var(--theme-color,#0074d9);display:block;margin-bottom:4px;width:16px;height:2px}body.sticky .sidebar,body.sticky .sidebar-toggle{position:fixed}.content{padding-top:60px;position:absolute;top:0;right:0;bottom:0;left:16rem;transition:left .25s ease}.markdown-section{margin:0 auto;max-width:80%;padding:30px 15px 40px;position:relative}.markdown-section>*{box-sizing:border-box;font-size:inherit}.markdown-section>:first-child{margin-top:0!important}.markdown-section hr{border:none;border-bottom:1px solid #eee;margin:2em 0}.markdown-section iframe{border:1px solid #eee;width:1px;min-width:100%}.markdown-section table{border-collapse:collapse;border-spacing:0;display:block;margin-bottom:1rem;overflow:auto;width:100%}.markdown-section th{font-weight:700}.markdown-section td,.markdown-section th{border:1px solid #ddd;padding:6px 13px}.markdown-section tr{border-top:1px solid #ccc}.markdown-section p.tip,.markdown-section tr:nth-child(2n){background-color:#f8f8f8}.markdown-section p.tip{border-bottom-right-radius:2px;border-left:4px solid #f66;border-top-right-radius:2px;margin:2em 0;padding:12px 24px 12px 30px;position:relative}.markdown-section p.tip:before{background-color:#f66;border-radius:100%;color:#fff;content:"!";font-family:Dosis,Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:14px;font-weight:700;left:-12px;line-height:20px;position:absolute;height:20px;width:20px;text-align:center;top:14px}.markdown-section p.tip code{background-color:#efefef}.markdown-section p.tip em{color:#34495e}.markdown-section p.warn{background:rgba(0,116,217,.1);border-radius:2px;padding:1rem}.markdown-section ul.task-list>li{list-style-type:none}body.close .sidebar{transform:translateX(-16rem)}body.close .sidebar-toggle{width:auto}body.close .content{left:0}@media print{.app-nav,.github-corner,.sidebar,.sidebar-toggle{display:none}}@media screen and (max-width:768px){.github-corner,.sidebar,.sidebar-toggle{position:fixed}.app-nav{margin-top:16px}.app-nav li ul{top:30px}main{height:auto;overflow-x:hidden}.sidebar{left:-16rem;transition:transform .25s ease-out}.content{left:0;max-width:100vw;position:static;padding-top:20px;transition:transform .25s ease}.app-nav,.github-corner{transition:transform .25s ease-out}.sidebar-toggle{background-color:transparent;width:auto;padding:30px 30px 10px 10px}body.close .sidebar{transform:translateX(16rem)}body.close .sidebar-toggle{background-color:hsla(0,0%,100%,.8);transition:background-color 1s;width:0;padding:10px}body.close .content{transform:translateX(16rem)}body.close .app-nav,body.close .github-corner{display:none}.github-corner:hover .octo-arm{-webkit-animation:none;animation:none}.github-corner .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}}@-webkit-keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}section.cover{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:cover;height:100vh;width:100vw;display:none}section.cover.show{display:flex}section.cover.has-mask .mask{background-color:#fff;opacity:.8;position:absolute;top:0;height:100%;width:100%}section.cover .cover-main{flex:1;margin:-20px 16px 0;text-align:center;position:relative}section.cover a{color:inherit}section.cover a,section.cover a:hover{text-decoration:none}section.cover p{line-height:1.5rem;margin:1em 0}section.cover h1{color:inherit;font-size:2.5rem;font-weight:300;margin:.625rem 0 2.5rem;position:relative;text-align:center}section.cover h1 a{display:block}section.cover h1 small{bottom:-.4375rem;font-size:1rem;position:absolute}section.cover blockquote{font-size:1.5rem;text-align:center}section.cover ul{line-height:1.8;list-style-type:none;margin:1em auto;max-width:500px;padding:0}section.cover .cover-main>p:last-child a{border-radius:2rem;border:1px solid var(--theme-color,#0074d9);box-sizing:border-box;color:var(--theme-color,#0074d9);display:inline-block;font-size:1.05rem;letter-spacing:.1rem;margin:.5rem 1rem;padding:.75em 2rem;text-decoration:none;transition:all .15s ease}section.cover .cover-main>p:last-child a:last-child{background-color:var(--theme-color,#0074d9);color:#fff}section.cover .cover-main>p:last-child a:last-child:hover{color:inherit;opacity:.8}section.cover .cover-main>p:last-child a:hover{color:inherit}section.cover blockquote>p>a{border-bottom:2px solid var(--theme-color,#0074d9);transition:color .3s}section.cover blockquote>p>a:hover{color:var(--theme-color,#0074d9)}.sidebar{color:#364149;background-color:#fff}.sidebar a{color:#666;text-decoration:none}.sidebar li{list-style:none;margin:0;padding:.2em 0}.sidebar ul li ul{padding:0}.sidebar li.active{background-color:#eee}.sidebar li.active a{color:#333}.markdown-section h1,.markdown-section h2,.markdown-section h3,.markdown-section h4,.markdown-section strong{color:#333;font-weight:400}.markdown-section strong{color:#333;font-weight:600}.markdown-section a{color:var(--theme-color,#0074d9)}.markdown-section ol,.markdown-section p,.markdown-section ul{line-height:1.6rem;margin:0 0 1em;word-spacing:.05rem}.markdown-section h1{font-size:2rem;font-weight:500;margin:0 0 1rem}.markdown-section h2{font-size:1.8rem;font-weight:400;margin:0 0 1rem;padding:1rem 0 0}.markdown-section h3{font-size:1.5rem;margin:52px 0 1.2rem}.markdown-section h4{font-size:1.25rem}.markdown-section h5{font-size:1rem}.markdown-section h6{color:#777;font-size:1rem}.markdown-section figure,.markdown-section ol,.markdown-section p,.markdown-section ul{margin:1.2em 0}.markdown-section ol,.markdown-section ul{padding-left:1.5rem}.markdown-section li{line-height:1.5;margin:0}.markdown-section blockquote{border-left:4px solid var(--theme-color,#0074d9);color:#858585;margin:2em 0;padding-left:20px}.markdown-section blockquote p{font-weight:600;margin-left:0}.markdown-section iframe{margin:1em 0}.markdown-section em{color:#7f8c8d}.markdown-section code{border-radius:3px;padding:.2em .4rem;white-space:nowrap}.markdown-section code,.markdown-section pre{background-color:#f9f9f9;font-family:Inconsolata}.markdown-section pre{border-left:2px solid #eee;font-size:16px;margin:0 0 1em;padding:0 10px 12px 0;overflow:auto;word-wrap:normal;position:relative}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#93a1a1}.token.punctuation{color:#586e75}.namespace{opacity:.7}.token.boolean,.token.constant,.token.deleted,.token.number,.token.property,.token.symbol,.token.tag{color:#268bd2}.token.attr-name,.token.builtin,.token.char,.token.inserted,.token.selector,.token.string,.token.url{color:#2aa198}.token.entity{color:#657b83;background:#eee8d5}.token.atrule,.token.attr-value,.token.keyword{color:#a11}.token.function{color:#b58900}.token.important,.token.regex,.token.variable{color:#cb4b16}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.markdown-section pre>code{background-color:#f8f8f8;border-radius:2px;display:block;font-family:Inconsolata;line-height:1.1rem;max-width:inherit;overflow:inherit;padding:20px .8em;position:relative;white-space:inherit}.markdown-section code:after,.markdown-section code:before{letter-spacing:.05rem}code .token{-webkit-font-smoothing:initial;-moz-osx-font-smoothing:initial;min-height:1.5rem;position:relative;left:auto} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/scripts/directive/release-modal-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('releasemodal', releaseModalDirective);
function releaseModalDirective($translate, toastr, AppUtil, EventManager, ReleaseService, NamespaceBranchService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/release-modal.html',
transclude: true,
replace: true,
scope: {
appId: '=',
env: '=',
cluster: '='
},
link: function (scope) {
scope.switchReleaseChangeViewType = switchReleaseChangeViewType;
scope.release = release;
scope.releaseBtnDisabled = false;
scope.releaseChangeViewType = 'change';
scope.releaseComment = '';
scope.isEmergencyPublish = false;
EventManager.subscribe(EventManager.EventType.PUBLISH_NAMESPACE,
function (context) {
var namespace = context.namespace;
scope.toReleaseNamespace = context.namespace;
scope.isEmergencyPublish = !!context.isEmergencyPublish;
var date = new Date().Format("yyyyMMddhhmmss");
if (namespace.mergeAndPublish) {
namespace.releaseTitle = date + "-gray-release-merge-to-master";
} else if (namespace.isBranch) {
namespace.releaseTitle = date + "-gray";
} else {
namespace.releaseTitle = date + "-release";
}
AppUtil.showModal('#releaseModal');
});
function release() {
if (scope.toReleaseNamespace.mergeAndPublish) {
mergeAndPublish();
} else if (scope.toReleaseNamespace.isBranch) {
grayPublish();
} else {
publish();
}
}
function publish() {
scope.releaseBtnDisabled = true;
ReleaseService.publish(scope.appId, scope.env,
scope.toReleaseNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.baseInfo.namespaceName,
scope.toReleaseNamespace.releaseTitle,
scope.releaseComment,
scope.isEmergencyPublish).then(
function (result) {
AppUtil.hideModal('#releaseModal');
toastr.success($translate.instant('ReleaseModal.Published'));
scope.releaseBtnDisabled = false;
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: scope.toReleaseNamespace
})
}, function (result) {
scope.releaseBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('ReleaseModal.PublishFailed'));
}
);
}
function grayPublish() {
scope.releaseBtnDisabled = true;
ReleaseService.grayPublish(scope.appId, scope.env,
scope.toReleaseNamespace.parentNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.baseInfo.namespaceName,
scope.toReleaseNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.releaseTitle,
scope.releaseComment,
scope.isEmergencyPublish).then(
function (result) {
AppUtil.hideModal('#releaseModal');
toastr.success($translate.instant('ReleaseModal.GrayscalePublished'));
scope.releaseBtnDisabled = false;
//refresh item status
scope.toReleaseNamespace.branchItems.forEach(function (item, index) {
if (item.isDeleted) {
scope.toReleaseNamespace.branchItems.splice(index, 1);
} else {
item.isModified = false;
}
});
//reset namespace status
scope.toReleaseNamespace.itemModifiedCnt = 0;
scope.toReleaseNamespace.lockOwner = undefined;
//check rules
if (!scope.toReleaseNamespace.rules
|| !scope.toReleaseNamespace.rules.ruleItems
|| !scope.toReleaseNamespace.rules.ruleItems.length) {
scope.toReleaseNamespace.viewType = 'rule';
AppUtil.showModal('#grayReleaseWithoutRulesTips');
}
}, function (result) {
scope.releaseBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('ReleaseModal.GrayscalePublishFailed'));
});
}
function mergeAndPublish() {
NamespaceBranchService.mergeAndReleaseBranch(scope.appId,
scope.env,
scope.cluster,
scope.toReleaseNamespace.baseInfo.namespaceName,
scope.toReleaseNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.releaseTitle,
scope.releaseComment,
scope.isEmergencyPublish,
scope.toReleaseNamespace.mergeAfterDeleteBranch)
.then(function (result) {
toastr.success($translate.instant('ReleaseModal.AllPublished'));
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: scope.toReleaseNamespace
})
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ReleaseModal.AllPublishFailed'));
});
AppUtil.hideModal('#releaseModal');
}
function switchReleaseChangeViewType(type) {
scope.releaseChangeViewType = 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.
*
*/
directive_module.directive('releasemodal', releaseModalDirective);
function releaseModalDirective($translate, toastr, AppUtil, EventManager, ReleaseService, NamespaceBranchService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/release-modal.html',
transclude: true,
replace: true,
scope: {
appId: '=',
env: '=',
cluster: '='
},
link: function (scope) {
scope.switchReleaseChangeViewType = switchReleaseChangeViewType;
scope.release = release;
scope.releaseBtnDisabled = false;
scope.releaseChangeViewType = 'change';
scope.releaseComment = '';
scope.isEmergencyPublish = false;
EventManager.subscribe(EventManager.EventType.PUBLISH_NAMESPACE,
function (context) {
var namespace = context.namespace;
scope.toReleaseNamespace = context.namespace;
scope.isEmergencyPublish = !!context.isEmergencyPublish;
var date = new Date().Format("yyyyMMddhhmmss");
if (namespace.mergeAndPublish) {
namespace.releaseTitle = date + "-gray-release-merge-to-master";
} else if (namespace.isBranch) {
namespace.releaseTitle = date + "-gray";
} else {
namespace.releaseTitle = date + "-release";
}
AppUtil.showModal('#releaseModal');
});
function release() {
if (scope.toReleaseNamespace.mergeAndPublish) {
mergeAndPublish();
} else if (scope.toReleaseNamespace.isBranch) {
grayPublish();
} else {
publish();
}
}
function publish() {
scope.releaseBtnDisabled = true;
ReleaseService.publish(scope.appId, scope.env,
scope.toReleaseNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.baseInfo.namespaceName,
scope.toReleaseNamespace.releaseTitle,
scope.releaseComment,
scope.isEmergencyPublish).then(
function (result) {
AppUtil.hideModal('#releaseModal');
toastr.success($translate.instant('ReleaseModal.Published'));
scope.releaseBtnDisabled = false;
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: scope.toReleaseNamespace
})
}, function (result) {
scope.releaseBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('ReleaseModal.PublishFailed'));
}
);
}
function grayPublish() {
scope.releaseBtnDisabled = true;
ReleaseService.grayPublish(scope.appId, scope.env,
scope.toReleaseNamespace.parentNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.baseInfo.namespaceName,
scope.toReleaseNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.releaseTitle,
scope.releaseComment,
scope.isEmergencyPublish).then(
function (result) {
AppUtil.hideModal('#releaseModal');
toastr.success($translate.instant('ReleaseModal.GrayscalePublished'));
scope.releaseBtnDisabled = false;
//refresh item status
scope.toReleaseNamespace.branchItems.forEach(function (item, index) {
if (item.isDeleted) {
scope.toReleaseNamespace.branchItems.splice(index, 1);
} else {
item.isModified = false;
}
});
//reset namespace status
scope.toReleaseNamespace.itemModifiedCnt = 0;
scope.toReleaseNamespace.lockOwner = undefined;
//check rules
if (!scope.toReleaseNamespace.rules
|| !scope.toReleaseNamespace.rules.ruleItems
|| !scope.toReleaseNamespace.rules.ruleItems.length) {
scope.toReleaseNamespace.viewType = 'rule';
AppUtil.showModal('#grayReleaseWithoutRulesTips');
}
}, function (result) {
scope.releaseBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('ReleaseModal.GrayscalePublishFailed'));
});
}
function mergeAndPublish() {
NamespaceBranchService.mergeAndReleaseBranch(scope.appId,
scope.env,
scope.cluster,
scope.toReleaseNamespace.baseInfo.namespaceName,
scope.toReleaseNamespace.baseInfo.clusterName,
scope.toReleaseNamespace.releaseTitle,
scope.releaseComment,
scope.isEmergencyPublish,
scope.toReleaseNamespace.mergeAfterDeleteBranch)
.then(function (result) {
toastr.success($translate.instant('ReleaseModal.AllPublished'));
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: scope.toReleaseNamespace
})
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ReleaseModal.AllPublishFailed'));
});
AppUtil.hideModal('#releaseModal');
}
function switchReleaseChangeViewType(type) {
scope.releaseChangeViewType = type;
}
}
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
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.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.core.schedule.ExponentialSchedulePolicy;
import com.ctrip.framework.apollo.core.schedule.SchedulePolicy;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com.google.common.reflect.TypeToken;
import com.google.common.util.concurrent.RateLimiter;
import com.google.gson.Gson;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class RemoteConfigLongPollService {
private static final Logger logger = LoggerFactory.getLogger(RemoteConfigLongPollService.class);
private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
private static final long INIT_NOTIFICATION_ID = ConfigConsts.NOTIFICATION_ID_PLACEHOLDER;
//90 seconds, should be longer than server side's long polling timeout, which is now 60 seconds
private static final int LONG_POLLING_READ_TIMEOUT = 90 * 1000;
private final ExecutorService m_longPollingService;
private final AtomicBoolean m_longPollingStopped;
private SchedulePolicy m_longPollFailSchedulePolicyInSecond;
private RateLimiter m_longPollRateLimiter;
private final AtomicBoolean m_longPollStarted;
private final Multimap<String, RemoteConfigRepository> m_longPollNamespaces;
private final ConcurrentMap<String, Long> m_notifications;
private final Map<String, ApolloNotificationMessages> m_remoteNotificationMessages;//namespaceName -> watchedKey -> notificationId
private Type m_responseType;
private static final Gson GSON = new Gson();
private ConfigUtil m_configUtil;
private HttpClient m_httpClient;
private ConfigServiceLocator m_serviceLocator;
/**
* Constructor.
*/
public RemoteConfigLongPollService() {
m_longPollFailSchedulePolicyInSecond = new ExponentialSchedulePolicy(1, 120); //in second
m_longPollingStopped = new AtomicBoolean(false);
m_longPollingService = Executors.newSingleThreadExecutor(
ApolloThreadFactory.create("RemoteConfigLongPollService", true));
m_longPollStarted = new AtomicBoolean(false);
m_longPollNamespaces =
Multimaps.synchronizedSetMultimap(HashMultimap.<String, RemoteConfigRepository>create());
m_notifications = Maps.newConcurrentMap();
m_remoteNotificationMessages = Maps.newConcurrentMap();
m_responseType = new TypeToken<List<ApolloConfigNotification>>() {
}.getType();
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
m_httpClient = ApolloInjector.getInstance(HttpClient.class);
m_serviceLocator = ApolloInjector.getInstance(ConfigServiceLocator.class);
m_longPollRateLimiter = RateLimiter.create(m_configUtil.getLongPollQPS());
}
public boolean submit(String namespace, RemoteConfigRepository remoteConfigRepository) {
boolean added = m_longPollNamespaces.put(namespace, remoteConfigRepository);
m_notifications.putIfAbsent(namespace, INIT_NOTIFICATION_ID);
if (!m_longPollStarted.get()) {
startLongPolling();
}
return added;
}
private void startLongPolling() {
if (!m_longPollStarted.compareAndSet(false, true)) {
//already started
return;
}
try {
final String appId = m_configUtil.getAppId();
final String cluster = m_configUtil.getCluster();
final String dataCenter = m_configUtil.getDataCenter();
final String secret = m_configUtil.getAccessKeySecret();
final long longPollingInitialDelayInMills = m_configUtil.getLongPollingInitialDelayInMills();
m_longPollingService.submit(new Runnable() {
@Override
public void run() {
if (longPollingInitialDelayInMills > 0) {
try {
logger.debug("Long polling will start in {} ms.", longPollingInitialDelayInMills);
TimeUnit.MILLISECONDS.sleep(longPollingInitialDelayInMills);
} catch (InterruptedException e) {
//ignore
}
}
doLongPollingRefresh(appId, cluster, dataCenter, secret);
}
});
} catch (Throwable ex) {
m_longPollStarted.set(false);
ApolloConfigException exception =
new ApolloConfigException("Schedule long polling refresh failed", ex);
Tracer.logError(exception);
logger.warn(ExceptionUtil.getDetailMessage(exception));
}
}
void stopLongPollingRefresh() {
this.m_longPollingStopped.compareAndSet(false, true);
}
private void doLongPollingRefresh(String appId, String cluster, String dataCenter, String secret) {
final Random random = new Random();
ServiceDTO lastServiceDto = null;
while (!m_longPollingStopped.get() && !Thread.currentThread().isInterrupted()) {
if (!m_longPollRateLimiter.tryAcquire(5, TimeUnit.SECONDS)) {
//wait at most 5 seconds
try {
TimeUnit.SECONDS.sleep(5);
} catch (InterruptedException e) {
}
}
Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "pollNotification");
String url = null;
try {
if (lastServiceDto == null) {
List<ServiceDTO> configServices = getConfigServices();
lastServiceDto = configServices.get(random.nextInt(configServices.size()));
}
url =
assembleLongPollRefreshUrl(lastServiceDto.getHomepageUrl(), appId, cluster, dataCenter,
m_notifications);
logger.debug("Long polling from {}", url);
HttpRequest request = new HttpRequest(url);
request.setReadTimeout(LONG_POLLING_READ_TIMEOUT);
if (!StringUtils.isBlank(secret)) {
Map<String, String> headers = Signature.buildHttpHeaders(url, appId, secret);
request.setHeaders(headers);
}
transaction.addData("Url", url);
final HttpResponse<List<ApolloConfigNotification>> response =
m_httpClient.doGet(request, m_responseType);
logger.debug("Long polling response: {}, url: {}", response.getStatusCode(), url);
if (response.getStatusCode() == 200 && response.getBody() != null) {
updateNotifications(response.getBody());
updateRemoteNotifications(response.getBody());
transaction.addData("Result", response.getBody().toString());
notify(lastServiceDto, response.getBody());
}
//try to load balance
if (response.getStatusCode() == 304 && random.nextBoolean()) {
lastServiceDto = null;
}
m_longPollFailSchedulePolicyInSecond.success();
transaction.addData("StatusCode", response.getStatusCode());
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
lastServiceDto = null;
Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
transaction.setStatus(ex);
long sleepTimeInSecond = m_longPollFailSchedulePolicyInSecond.fail();
logger.warn(
"Long polling failed, will retry in {} seconds. appId: {}, cluster: {}, namespaces: {}, long polling url: {}, reason: {}",
sleepTimeInSecond, appId, cluster, assembleNamespaces(), url, ExceptionUtil.getDetailMessage(ex));
try {
TimeUnit.SECONDS.sleep(sleepTimeInSecond);
} catch (InterruptedException ie) {
//ignore
}
} finally {
transaction.complete();
}
}
}
private void notify(ServiceDTO lastServiceDto, List<ApolloConfigNotification> notifications) {
if (notifications == null || notifications.isEmpty()) {
return;
}
for (ApolloConfigNotification notification : notifications) {
String namespaceName = notification.getNamespaceName();
//create a new list to avoid ConcurrentModificationException
List<RemoteConfigRepository> toBeNotified =
Lists.newArrayList(m_longPollNamespaces.get(namespaceName));
ApolloNotificationMessages originalMessages = m_remoteNotificationMessages.get(namespaceName);
ApolloNotificationMessages remoteMessages = originalMessages == null ? null : originalMessages.clone();
//since .properties are filtered out by default, so we need to check if there is any listener for it
toBeNotified.addAll(m_longPollNamespaces
.get(String.format("%s.%s", namespaceName, ConfigFileFormat.Properties.getValue())));
for (RemoteConfigRepository remoteConfigRepository : toBeNotified) {
try {
remoteConfigRepository.onLongPollNotified(lastServiceDto, remoteMessages);
} catch (Throwable ex) {
Tracer.logError(ex);
}
}
}
}
private void updateNotifications(List<ApolloConfigNotification> deltaNotifications) {
for (ApolloConfigNotification notification : deltaNotifications) {
if (Strings.isNullOrEmpty(notification.getNamespaceName())) {
continue;
}
String namespaceName = notification.getNamespaceName();
if (m_notifications.containsKey(namespaceName)) {
m_notifications.put(namespaceName, notification.getNotificationId());
}
//since .properties are filtered out by default, so we need to check if there is notification with .properties suffix
String namespaceNameWithPropertiesSuffix =
String.format("%s.%s", namespaceName, ConfigFileFormat.Properties.getValue());
if (m_notifications.containsKey(namespaceNameWithPropertiesSuffix)) {
m_notifications.put(namespaceNameWithPropertiesSuffix, notification.getNotificationId());
}
}
}
private void updateRemoteNotifications(List<ApolloConfigNotification> deltaNotifications) {
for (ApolloConfigNotification notification : deltaNotifications) {
if (Strings.isNullOrEmpty(notification.getNamespaceName())) {
continue;
}
if (notification.getMessages() == null || notification.getMessages().isEmpty()) {
continue;
}
ApolloNotificationMessages localRemoteMessages =
m_remoteNotificationMessages.get(notification.getNamespaceName());
if (localRemoteMessages == null) {
localRemoteMessages = new ApolloNotificationMessages();
m_remoteNotificationMessages.put(notification.getNamespaceName(), localRemoteMessages);
}
localRemoteMessages.mergeFrom(notification.getMessages());
}
}
private String assembleNamespaces() {
return STRING_JOINER.join(m_longPollNamespaces.keySet());
}
String assembleLongPollRefreshUrl(String uri, String appId, String cluster, String dataCenter,
Map<String, Long> notificationsMap) {
Map<String, String> queryParams = Maps.newHashMap();
queryParams.put("appId", queryParamEscaper.escape(appId));
queryParams.put("cluster", queryParamEscaper.escape(cluster));
queryParams
.put("notifications", queryParamEscaper.escape(assembleNotifications(notificationsMap)));
if (!Strings.isNullOrEmpty(dataCenter)) {
queryParams.put("dataCenter", queryParamEscaper.escape(dataCenter));
}
String localIp = m_configUtil.getLocalIp();
if (!Strings.isNullOrEmpty(localIp)) {
queryParams.put("ip", queryParamEscaper.escape(localIp));
}
String params = MAP_JOINER.join(queryParams);
if (!uri.endsWith("/")) {
uri += "/";
}
return uri + "notifications/v2?" + params;
}
String assembleNotifications(Map<String, Long> notificationsMap) {
List<ApolloConfigNotification> notifications = Lists.newArrayList();
for (Map.Entry<String, Long> entry : notificationsMap.entrySet()) {
ApolloConfigNotification notification = new ApolloConfigNotification(entry.getKey(), entry.getValue());
notifications.add(notification);
}
return GSON.toJson(notifications);
}
private List<ServiceDTO> getConfigServices() {
List<ServiceDTO> services = m_serviceLocator.getConfigServices();
if (services.size() == 0) {
throw new ApolloConfigException("No available config service");
}
return services;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
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.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.core.schedule.ExponentialSchedulePolicy;
import com.ctrip.framework.apollo.core.schedule.SchedulePolicy;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com.google.common.reflect.TypeToken;
import com.google.common.util.concurrent.RateLimiter;
import com.google.gson.Gson;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class RemoteConfigLongPollService {
private static final Logger logger = LoggerFactory.getLogger(RemoteConfigLongPollService.class);
private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
private static final Joiner.MapJoiner MAP_JOINER = Joiner.on("&").withKeyValueSeparator("=");
private static final Escaper queryParamEscaper = UrlEscapers.urlFormParameterEscaper();
private static final long INIT_NOTIFICATION_ID = ConfigConsts.NOTIFICATION_ID_PLACEHOLDER;
//90 seconds, should be longer than server side's long polling timeout, which is now 60 seconds
private static final int LONG_POLLING_READ_TIMEOUT = 90 * 1000;
private final ExecutorService m_longPollingService;
private final AtomicBoolean m_longPollingStopped;
private SchedulePolicy m_longPollFailSchedulePolicyInSecond;
private RateLimiter m_longPollRateLimiter;
private final AtomicBoolean m_longPollStarted;
private final Multimap<String, RemoteConfigRepository> m_longPollNamespaces;
private final ConcurrentMap<String, Long> m_notifications;
private final Map<String, ApolloNotificationMessages> m_remoteNotificationMessages;//namespaceName -> watchedKey -> notificationId
private Type m_responseType;
private static final Gson GSON = new Gson();
private ConfigUtil m_configUtil;
private HttpClient m_httpClient;
private ConfigServiceLocator m_serviceLocator;
/**
* Constructor.
*/
public RemoteConfigLongPollService() {
m_longPollFailSchedulePolicyInSecond = new ExponentialSchedulePolicy(1, 120); //in second
m_longPollingStopped = new AtomicBoolean(false);
m_longPollingService = Executors.newSingleThreadExecutor(
ApolloThreadFactory.create("RemoteConfigLongPollService", true));
m_longPollStarted = new AtomicBoolean(false);
m_longPollNamespaces =
Multimaps.synchronizedSetMultimap(HashMultimap.<String, RemoteConfigRepository>create());
m_notifications = Maps.newConcurrentMap();
m_remoteNotificationMessages = Maps.newConcurrentMap();
m_responseType = new TypeToken<List<ApolloConfigNotification>>() {
}.getType();
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
m_httpClient = ApolloInjector.getInstance(HttpClient.class);
m_serviceLocator = ApolloInjector.getInstance(ConfigServiceLocator.class);
m_longPollRateLimiter = RateLimiter.create(m_configUtil.getLongPollQPS());
}
public boolean submit(String namespace, RemoteConfigRepository remoteConfigRepository) {
boolean added = m_longPollNamespaces.put(namespace, remoteConfigRepository);
m_notifications.putIfAbsent(namespace, INIT_NOTIFICATION_ID);
if (!m_longPollStarted.get()) {
startLongPolling();
}
return added;
}
private void startLongPolling() {
if (!m_longPollStarted.compareAndSet(false, true)) {
//already started
return;
}
try {
final String appId = m_configUtil.getAppId();
final String cluster = m_configUtil.getCluster();
final String dataCenter = m_configUtil.getDataCenter();
final String secret = m_configUtil.getAccessKeySecret();
final long longPollingInitialDelayInMills = m_configUtil.getLongPollingInitialDelayInMills();
m_longPollingService.submit(new Runnable() {
@Override
public void run() {
if (longPollingInitialDelayInMills > 0) {
try {
logger.debug("Long polling will start in {} ms.", longPollingInitialDelayInMills);
TimeUnit.MILLISECONDS.sleep(longPollingInitialDelayInMills);
} catch (InterruptedException e) {
//ignore
}
}
doLongPollingRefresh(appId, cluster, dataCenter, secret);
}
});
} catch (Throwable ex) {
m_longPollStarted.set(false);
ApolloConfigException exception =
new ApolloConfigException("Schedule long polling refresh failed", ex);
Tracer.logError(exception);
logger.warn(ExceptionUtil.getDetailMessage(exception));
}
}
void stopLongPollingRefresh() {
this.m_longPollingStopped.compareAndSet(false, true);
}
private void doLongPollingRefresh(String appId, String cluster, String dataCenter, String secret) {
final Random random = new Random();
ServiceDTO lastServiceDto = null;
while (!m_longPollingStopped.get() && !Thread.currentThread().isInterrupted()) {
if (!m_longPollRateLimiter.tryAcquire(5, TimeUnit.SECONDS)) {
//wait at most 5 seconds
try {
TimeUnit.SECONDS.sleep(5);
} catch (InterruptedException e) {
}
}
Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "pollNotification");
String url = null;
try {
if (lastServiceDto == null) {
List<ServiceDTO> configServices = getConfigServices();
lastServiceDto = configServices.get(random.nextInt(configServices.size()));
}
url =
assembleLongPollRefreshUrl(lastServiceDto.getHomepageUrl(), appId, cluster, dataCenter,
m_notifications);
logger.debug("Long polling from {}", url);
HttpRequest request = new HttpRequest(url);
request.setReadTimeout(LONG_POLLING_READ_TIMEOUT);
if (!StringUtils.isBlank(secret)) {
Map<String, String> headers = Signature.buildHttpHeaders(url, appId, secret);
request.setHeaders(headers);
}
transaction.addData("Url", url);
final HttpResponse<List<ApolloConfigNotification>> response =
m_httpClient.doGet(request, m_responseType);
logger.debug("Long polling response: {}, url: {}", response.getStatusCode(), url);
if (response.getStatusCode() == 200 && response.getBody() != null) {
updateNotifications(response.getBody());
updateRemoteNotifications(response.getBody());
transaction.addData("Result", response.getBody().toString());
notify(lastServiceDto, response.getBody());
}
//try to load balance
if (response.getStatusCode() == 304 && random.nextBoolean()) {
lastServiceDto = null;
}
m_longPollFailSchedulePolicyInSecond.success();
transaction.addData("StatusCode", response.getStatusCode());
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
lastServiceDto = null;
Tracer.logEvent("ApolloConfigException", ExceptionUtil.getDetailMessage(ex));
transaction.setStatus(ex);
long sleepTimeInSecond = m_longPollFailSchedulePolicyInSecond.fail();
logger.warn(
"Long polling failed, will retry in {} seconds. appId: {}, cluster: {}, namespaces: {}, long polling url: {}, reason: {}",
sleepTimeInSecond, appId, cluster, assembleNamespaces(), url, ExceptionUtil.getDetailMessage(ex));
try {
TimeUnit.SECONDS.sleep(sleepTimeInSecond);
} catch (InterruptedException ie) {
//ignore
}
} finally {
transaction.complete();
}
}
}
private void notify(ServiceDTO lastServiceDto, List<ApolloConfigNotification> notifications) {
if (notifications == null || notifications.isEmpty()) {
return;
}
for (ApolloConfigNotification notification : notifications) {
String namespaceName = notification.getNamespaceName();
//create a new list to avoid ConcurrentModificationException
List<RemoteConfigRepository> toBeNotified =
Lists.newArrayList(m_longPollNamespaces.get(namespaceName));
ApolloNotificationMessages originalMessages = m_remoteNotificationMessages.get(namespaceName);
ApolloNotificationMessages remoteMessages = originalMessages == null ? null : originalMessages.clone();
//since .properties are filtered out by default, so we need to check if there is any listener for it
toBeNotified.addAll(m_longPollNamespaces
.get(String.format("%s.%s", namespaceName, ConfigFileFormat.Properties.getValue())));
for (RemoteConfigRepository remoteConfigRepository : toBeNotified) {
try {
remoteConfigRepository.onLongPollNotified(lastServiceDto, remoteMessages);
} catch (Throwable ex) {
Tracer.logError(ex);
}
}
}
}
private void updateNotifications(List<ApolloConfigNotification> deltaNotifications) {
for (ApolloConfigNotification notification : deltaNotifications) {
if (Strings.isNullOrEmpty(notification.getNamespaceName())) {
continue;
}
String namespaceName = notification.getNamespaceName();
if (m_notifications.containsKey(namespaceName)) {
m_notifications.put(namespaceName, notification.getNotificationId());
}
//since .properties are filtered out by default, so we need to check if there is notification with .properties suffix
String namespaceNameWithPropertiesSuffix =
String.format("%s.%s", namespaceName, ConfigFileFormat.Properties.getValue());
if (m_notifications.containsKey(namespaceNameWithPropertiesSuffix)) {
m_notifications.put(namespaceNameWithPropertiesSuffix, notification.getNotificationId());
}
}
}
private void updateRemoteNotifications(List<ApolloConfigNotification> deltaNotifications) {
for (ApolloConfigNotification notification : deltaNotifications) {
if (Strings.isNullOrEmpty(notification.getNamespaceName())) {
continue;
}
if (notification.getMessages() == null || notification.getMessages().isEmpty()) {
continue;
}
ApolloNotificationMessages localRemoteMessages =
m_remoteNotificationMessages.get(notification.getNamespaceName());
if (localRemoteMessages == null) {
localRemoteMessages = new ApolloNotificationMessages();
m_remoteNotificationMessages.put(notification.getNamespaceName(), localRemoteMessages);
}
localRemoteMessages.mergeFrom(notification.getMessages());
}
}
private String assembleNamespaces() {
return STRING_JOINER.join(m_longPollNamespaces.keySet());
}
String assembleLongPollRefreshUrl(String uri, String appId, String cluster, String dataCenter,
Map<String, Long> notificationsMap) {
Map<String, String> queryParams = Maps.newHashMap();
queryParams.put("appId", queryParamEscaper.escape(appId));
queryParams.put("cluster", queryParamEscaper.escape(cluster));
queryParams
.put("notifications", queryParamEscaper.escape(assembleNotifications(notificationsMap)));
if (!Strings.isNullOrEmpty(dataCenter)) {
queryParams.put("dataCenter", queryParamEscaper.escape(dataCenter));
}
String localIp = m_configUtil.getLocalIp();
if (!Strings.isNullOrEmpty(localIp)) {
queryParams.put("ip", queryParamEscaper.escape(localIp));
}
String params = MAP_JOINER.join(queryParams);
if (!uri.endsWith("/")) {
uri += "/";
}
return uri + "notifications/v2?" + params;
}
String assembleNotifications(Map<String, Long> notificationsMap) {
List<ApolloConfigNotification> notifications = Lists.newArrayList();
for (Map.Entry<String, Long> entry : notificationsMap.entrySet()) {
ApolloConfigNotification notification = new ApolloConfigNotification(entry.getKey(), entry.getValue());
notifications.add(notification);
}
return GSON.toJson(notifications);
}
private List<ServiceDTO> getConfigServices() {
List<ServiceDTO> services = m_serviceLocator.getConfigServices();
if (services.size() == 0) {
throw new ApolloConfigException("No available config service");
}
return services;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.springBootDemo.refresh;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.demo.spring.springBootDemo.config.SampleRedisConfig;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.stereotype.Component;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@ConditionalOnProperty("redis.cache.enabled")
@Component
public class SpringBootApolloRefreshConfig {
private static final Logger logger = LoggerFactory.getLogger(SpringBootApolloRefreshConfig.class);
private final SampleRedisConfig sampleRedisConfig;
private final RefreshScope refreshScope;
public SpringBootApolloRefreshConfig(
final SampleRedisConfig sampleRedisConfig,
final RefreshScope refreshScope) {
this.sampleRedisConfig = sampleRedisConfig;
this.refreshScope = refreshScope;
}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, "TEST1.apollo", "application.yaml"},
interestedKeyPrefixes = {"redis.cache."})
public void onChange(ConfigChangeEvent changeEvent) {
logger.info("before refresh {}", sampleRedisConfig.toString());
refreshScope.refresh("sampleRedisConfig");
logger.info("after refresh {}", sampleRedisConfig.toString());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.demo.spring.springBootDemo.refresh;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.demo.spring.springBootDemo.config.SampleRedisConfig;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.stereotype.Component;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@ConditionalOnProperty("redis.cache.enabled")
@Component
public class SpringBootApolloRefreshConfig {
private static final Logger logger = LoggerFactory.getLogger(SpringBootApolloRefreshConfig.class);
private final SampleRedisConfig sampleRedisConfig;
private final RefreshScope refreshScope;
public SpringBootApolloRefreshConfig(
final SampleRedisConfig sampleRedisConfig,
final RefreshScope refreshScope) {
this.sampleRedisConfig = sampleRedisConfig;
this.refreshScope = refreshScope;
}
@ApolloConfigChangeListener(value = {ConfigConsts.NAMESPACE_APPLICATION, "TEST1.apollo", "application.yaml"},
interestedKeyPrefixes = {"redis.cache."})
public void onChange(ConfigChangeEvent changeEvent) {
logger.info("before refresh {}", sampleRedisConfig.toString());
refreshScope.refresh("sampleRedisConfig");
logger.info("after refresh {}", sampleRedisConfig.toString());
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/TxtConfigFile.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
public class TxtConfigFile extends PlainTextConfigFile {
public TxtConfigFile(String namespace, ConfigRepository configRepository) {
super(namespace, configRepository);
}
@Override
public ConfigFileFormat getConfigFileFormat() {
return ConfigFileFormat.TXT;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
public class TxtConfigFile extends PlainTextConfigFile {
public TxtConfigFile(String namespace, ConfigRepository configRepository) {
super(namespace, configRepository);
}
@Override
public ConfigFileFormat getConfigFileFormat() {
return ConfigFileFormat.TXT;
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripMQService.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.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.MQService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.util.Arrays;
import javax.annotation.PostConstruct;
public class CtripMQService implements MQService {
private static final org.apache.commons.lang.time.FastDateFormat
TIMESTAMP_FORMAT = org.apache.commons.lang.time.FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss");
private static final String CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC = "ops.noc.record.created";
private static final Gson GSON = new Gson();
@Autowired
private AppService appService;
@Autowired
private ReleaseService releaseService;
@Autowired
private PortalConfig portalConfig;
private RestTemplate restTemplate;
@PostConstruct
public void init() {
restTemplate = new RestTemplate();
SimpleClientHttpRequestFactory rf = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
rf.setReadTimeout(portalConfig.readTimeout());
rf.setConnectTimeout(portalConfig.connectTimeout());
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(
Arrays.asList(MediaType.APPLICATION_JSON_UTF8, MediaType.APPLICATION_OCTET_STREAM));
restTemplate.setMessageConverters(Arrays.asList(converter, new FormHttpMessageConverter()));
}
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory == null) {
return;
}
PublishMsg msg = buildPublishMsg(env, releaseHistory);
sendMsg(portalConfig.hermesServerAddress(), CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC, msg);
}
private PublishMsg buildPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
PublishMsg msg = new PublishMsg();
msg.setPriority("中");
msg.setTool_origin("Apollo");
String appId = releaseHistory.getAppId();
App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setDesc(GSON.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
releaseHistory.getReleaseId())));
return msg;
}
private void sendMsg(String serverAddress, String topic, Object msg) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_OCTET_STREAM + ";charset=UTF-8"));
HttpEntity<Object> request = new HttpEntity<>(msg, headers);
try {
//send msg by hermes RestAPI
restTemplate.postForObject(serverAddress + "/topics/" + topic, request, Object.class);
} catch (Exception e) {
Tracer.logError("Send publish msg to hermes failed", e);
}
}
private static class PublishMsg {
private String assginee;
private String desc;
private String operation_time;
private String tool_origin;
private String priority;
private String influence_bu;
private String appid;
public String getAssginee() {
return assginee;
}
public void setAssginee(String assginee) {
this.assginee = assginee;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getOperation_time() {
return operation_time;
}
public void setOperation_time(String operation_time) {
this.operation_time = operation_time;
}
public String getTool_origin() {
return tool_origin;
}
public void setTool_origin(String tool_origin) {
this.tool_origin = tool_origin;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getInfluence_bu() {
return influence_bu;
}
public void setInfluence_bu(String influence_bu) {
this.influence_bu = influence_bu;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.ReleaseService;
import com.ctrip.framework.apollo.portal.spi.MQService;
import com.ctrip.framework.apollo.tracer.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import java.util.Arrays;
import javax.annotation.PostConstruct;
public class CtripMQService implements MQService {
private static final org.apache.commons.lang.time.FastDateFormat
TIMESTAMP_FORMAT = org.apache.commons.lang.time.FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss");
private static final String CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC = "ops.noc.record.created";
private static final Gson GSON = new Gson();
@Autowired
private AppService appService;
@Autowired
private ReleaseService releaseService;
@Autowired
private PortalConfig portalConfig;
private RestTemplate restTemplate;
@PostConstruct
public void init() {
restTemplate = new RestTemplate();
SimpleClientHttpRequestFactory rf = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
rf.setReadTimeout(portalConfig.readTimeout());
rf.setConnectTimeout(portalConfig.connectTimeout());
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(
Arrays.asList(MediaType.APPLICATION_JSON_UTF8, MediaType.APPLICATION_OCTET_STREAM));
restTemplate.setMessageConverters(Arrays.asList(converter, new FormHttpMessageConverter()));
}
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
if (releaseHistory == null) {
return;
}
PublishMsg msg = buildPublishMsg(env, releaseHistory);
sendMsg(portalConfig.hermesServerAddress(), CONFIG_PUBLISH_NOTIFY_TO_NOC_TOPIC, msg);
}
private PublishMsg buildPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
PublishMsg msg = new PublishMsg();
msg.setPriority("中");
msg.setTool_origin("Apollo");
String appId = releaseHistory.getAppId();
App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setDesc(GSON.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
releaseHistory.getReleaseId())));
return msg;
}
private void sendMsg(String serverAddress, String topic, Object msg) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType(MediaType.APPLICATION_OCTET_STREAM + ";charset=UTF-8"));
HttpEntity<Object> request = new HttpEntity<>(msg, headers);
try {
//send msg by hermes RestAPI
restTemplate.postForObject(serverAddress + "/topics/" + topic, request, Object.class);
} catch (Exception e) {
Tracer.logError("Send publish msg to hermes failed", e);
}
}
private static class PublishMsg {
private String assginee;
private String desc;
private String operation_time;
private String tool_origin;
private String priority;
private String influence_bu;
private String appid;
public String getAssginee() {
return assginee;
}
public void setAssginee(String assginee) {
this.assginee = assginee;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getOperation_time() {
return operation_time;
}
public void setOperation_time(String operation_time) {
this.operation_time = operation_time;
}
public String getTool_origin() {
return tool_origin;
}
public void setTool_origin(String tool_origin) {
this.tool_origin = tool_origin;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getInfluence_bu() {
return influence_bu;
}
public void setInfluence_bu(String influence_bu) {
this.influence_bu = influence_bu;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/scripts/services/ReleaseHistoryService.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('ReleaseHistoryService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
find_release_history_by_namespace: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/releases/histories',
isArray: true
}
});
function findReleaseHistoryByNamespace(appId, env, clusterName, namespaceName, page, size) {
var d = $q.defer();
resource.find_release_history_by_namespace({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName,
page: page,
size: size
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
return {
findReleaseHistoryByNamespace: findReleaseHistoryByNamespace
}
}]);
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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('ReleaseHistoryService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
find_release_history_by_namespace: {
method: 'GET',
url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/releases/histories',
isArray: true
}
});
function findReleaseHistoryByNamespace(appId, env, clusterName, namespaceName, page, size) {
var d = $q.defer();
resource.find_release_history_by_namespace({
appId: appId,
env: env,
clusterName: clusterName,
namespaceName: namespaceName,
page: page,
size: size
}, function (result) {
d.resolve(result);
}, function (result) {
d.reject(result);
});
return d.promise;
}
return {
findReleaseHistoryByNamespace: findReleaseHistoryByNamespace
}
}]);
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/eureka/ApolloEurekaClientConfig.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.eureka;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
import org.springframework.context.annotation.Primary;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.List;
@Component
@Primary
@ConditionalOnProperty(value = {"eureka.client.enabled"}, havingValue = "true", matchIfMissing = true)
public class ApolloEurekaClientConfig extends EurekaClientConfigBean {
private final BizConfig bizConfig;
private final RefreshScope refreshScope;
private static final String EUREKA_CLIENT_BEAN_NAME = "eurekaClient";
public ApolloEurekaClientConfig(final BizConfig bizConfig, final RefreshScope refreshScope) {
this.bizConfig = bizConfig;
this.refreshScope = refreshScope;
}
/**
* Assert only one zone: defaultZone, but multiple environments.
*/
public List<String> getEurekaServerServiceUrls(String myZone) {
List<String> urls = bizConfig.eurekaServiceUrls();
return CollectionUtils.isEmpty(urls) ? super.getEurekaServerServiceUrls(myZone) : urls;
}
@EventListener
public void listenApplicationReadyEvent(ApplicationReadyEvent event) {
this.refreshEurekaClient();
}
private void refreshEurekaClient() {
if (!super.isFetchRegistry()) {
super.setFetchRegistry(true);
super.setRegisterWithEureka(true);
refreshScope.refresh(EUREKA_CLIENT_BEAN_NAME);
}
}
@Override
public boolean equals(Object o) {
return super.equals(o);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.eureka;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.cloud.context.scope.refresh.RefreshScope;
import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
import org.springframework.context.annotation.Primary;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.List;
@Component
@Primary
@ConditionalOnProperty(value = {"eureka.client.enabled"}, havingValue = "true", matchIfMissing = true)
public class ApolloEurekaClientConfig extends EurekaClientConfigBean {
private final BizConfig bizConfig;
private final RefreshScope refreshScope;
private static final String EUREKA_CLIENT_BEAN_NAME = "eurekaClient";
public ApolloEurekaClientConfig(final BizConfig bizConfig, final RefreshScope refreshScope) {
this.bizConfig = bizConfig;
this.refreshScope = refreshScope;
}
/**
* Assert only one zone: defaultZone, but multiple environments.
*/
public List<String> getEurekaServerServiceUrls(String myZone) {
List<String> urls = bizConfig.eurekaServiceUrls();
return CollectionUtils.isEmpty(urls) ? super.getEurekaServerServiceUrls(myZone) : urls;
}
@EventListener
public void listenApplicationReadyEvent(ApplicationReadyEvent event) {
this.refreshEurekaClient();
}
private void refreshEurekaClient() {
if (!super.isFetchRegistry()) {
super.setFetchRegistry(true);
super.setRegisterWithEureka(true);
refreshScope.refresh(EUREKA_CLIENT_BEAN_NAME);
}
}
@Override
public boolean equals(Object o) {
return super.equals(o);
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/environment/EnvTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.environment;
import org.junit.Test;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import static org.junit.Assert.*;
public class EnvTest {
@Test
public void exist() {
assertFalse(Env.exists("xxxyyy234"));
assertTrue(Env.exists("local"));
assertTrue(Env.exists("dev"));
}
@Test
public void addEnv() {
String name = "someEEEE";
assertFalse(Env.exists(name));
Env.addEnvironment(name);
assertTrue(Env.exists(name));
}
@Test(expected = IllegalArgumentException.class)
public void valueOf() {
String name = "notexist";
assertFalse(Env.exists(name));
assertEquals(Env.valueOf(name), Env.UNKNOWN);
assertEquals(Env.valueOf("dev"), Env.DEV);
assertEquals(Env.valueOf("UAT"), Env.UAT);
}
@Test
public void testEquals() {
assertEquals(Env.DEV, Env.valueOf("dEv"));
String name = "someEEEE";
Env.addEnvironment(name);
assertFalse(Env.valueOf(name).equals(Env.DEV));
}
@Test(expected = RuntimeException.class)
public void testEqualsWithRuntimeException()
throws NoSuchMethodException,
IllegalAccessException,
InvocationTargetException,
InstantiationException {
// get private constructor
Constructor<Env> envConstructor = Env.class.getDeclaredConstructor(String.class);
// make private constructor accessible
envConstructor.setAccessible(true);
// make a fake Env
Env fakeDevEnv = envConstructor.newInstance(Env.DEV.toString());
// compare, then a RuntimeException will invoke
fakeDevEnv.equals(Env.DEV);
}
@Test
public void testEqualWithoutException() {
assertTrue(Env.DEV.equals(Env.DEV));
assertTrue(Env.DEV.equals(Env.valueOf("dEV")));
assertFalse(Env.PRO.equals(Env.DEV));
assertFalse(Env.DEV.equals(Env.valueOf("uaT")));
}
@Test
public void testToString() {
assertEquals("DEV", Env.DEV.toString());
}
@Test
public void name() {
assertEquals("DEV", Env.DEV.name());
}
@Test
public void getName() {
String name = "getName";
Env.addEnvironment(name);
assertEquals(name.trim().toUpperCase(), Env.valueOf(name).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.portal.environment;
import org.junit.Test;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import static org.junit.Assert.*;
public class EnvTest {
@Test
public void exist() {
assertFalse(Env.exists("xxxyyy234"));
assertTrue(Env.exists("local"));
assertTrue(Env.exists("dev"));
}
@Test
public void addEnv() {
String name = "someEEEE";
assertFalse(Env.exists(name));
Env.addEnvironment(name);
assertTrue(Env.exists(name));
}
@Test(expected = IllegalArgumentException.class)
public void valueOf() {
String name = "notexist";
assertFalse(Env.exists(name));
assertEquals(Env.valueOf(name), Env.UNKNOWN);
assertEquals(Env.valueOf("dev"), Env.DEV);
assertEquals(Env.valueOf("UAT"), Env.UAT);
}
@Test
public void testEquals() {
assertEquals(Env.DEV, Env.valueOf("dEv"));
String name = "someEEEE";
Env.addEnvironment(name);
assertFalse(Env.valueOf(name).equals(Env.DEV));
}
@Test(expected = RuntimeException.class)
public void testEqualsWithRuntimeException()
throws NoSuchMethodException,
IllegalAccessException,
InvocationTargetException,
InstantiationException {
// get private constructor
Constructor<Env> envConstructor = Env.class.getDeclaredConstructor(String.class);
// make private constructor accessible
envConstructor.setAccessible(true);
// make a fake Env
Env fakeDevEnv = envConstructor.newInstance(Env.DEV.toString());
// compare, then a RuntimeException will invoke
fakeDevEnv.equals(Env.DEV);
}
@Test
public void testEqualWithoutException() {
assertTrue(Env.DEV.equals(Env.DEV));
assertTrue(Env.DEV.equals(Env.valueOf("dEV")));
assertFalse(Env.PRO.equals(Env.DEV));
assertFalse(Env.DEV.equals(Env.valueOf("uaT")));
}
@Test
public void testToString() {
assertEquals("DEV", Env.DEV.toString());
}
@Test
public void name() {
assertEquals("DEV", Env.DEV.name());
}
@Test
public void getName() {
String name = "getName";
Env.addEnvironment(name);
assertEquals(name.trim().toUpperCase(), Env.valueOf(name).toString());
}
} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./.git/hooks/pre-commit.sample | #!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --
| #!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/repository/ConsumerRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerRepository extends PagingAndSortingRepository<Consumer, Long> {
Consumer findByAppId(String appId);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerRepository extends PagingAndSortingRepository<Consumer, Long> {
Consumer findByAppId(String appId);
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/sql/delta/v060-v062/apolloconfigdb-v060-v062.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 config db from v0.6.0 to v0.6.2
Use ApolloConfigDB;
ALTER TABLE `App` DROP INDEX `NAME`;
CREATE INDEX `IX_NAME` ON App (`Name`(191));
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT 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 config db from v0.6.0 to v0.6.2
Use ApolloConfigDB;
ALTER TABLE `App` DROP INDEX `NAME`;
CREATE INDEX `IX_NAME` ON App (`Name`(191));
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/parser/Parsers.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.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTANCE;
}
public static DurationParser forDuration() {
return DurationParser.INSTANCE;
}
public enum DateParser {
INSTANCE;
private static final String LONG_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String MEDIUM_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String SHORT_DATE_FORMAT = "yyyy-MM-dd";
/**
* Will try to parse the date with Locale.US and formats as follows:
* yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss and yyyy-MM-dd
*
* @param text the text to parse
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text) throws ParserException {
text = text.trim();
int length = text.length();
if (length == LONG_DATE_FORMAT.length()) {
return parse(text, LONG_DATE_FORMAT);
}
if (length == MEDIUM_DATE_FORMAT.length()) {
return parse(text, MEDIUM_DATE_FORMAT);
}
return parse(text, SHORT_DATE_FORMAT);
}
/**
* Parse the text with the format specified and Locale.US
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format) throws ParserException {
return parse(text, format, Locale.US);
}
/**
* Parse the text with the format and locale specified
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @param locale the locale
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format, Locale locale) throws ParserException {
SimpleDateFormat dateFormat = getDateFormat(format, locale);
try {
return dateFormat.parse(text.trim());
} catch (ParseException e) {
throw new ParserException("Error when parsing date(" + dateFormat.toPattern() + ") from " + text, e);
}
}
private SimpleDateFormat getDateFormat(String format, Locale locale) {
return new SimpleDateFormat(format, locale);
}
}
public enum DurationParser {
INSTANCE;
private static final Pattern PATTERN =
Pattern.compile("(?:([0-9]+)D)?(?:([0-9]+)H)?(?:([0-9]+)M)?(?:([0-9]+)S)?(?:([0-9]+)(?:MS)?)?",
Pattern.CASE_INSENSITIVE);
private static final int HOURS_PER_DAY = 24;
private static final int MINUTES_PER_HOUR = 60;
private static final int SECONDS_PER_MINUTE = 60;
private static final int MILLIS_PER_SECOND = 1000;
private static final int MILLIS_PER_MINUTE = MILLIS_PER_SECOND * SECONDS_PER_MINUTE;
private static final int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * MINUTES_PER_HOUR;
private static final int MILLIS_PER_DAY = MILLIS_PER_HOUR * HOURS_PER_DAY;
public long parseToMillis(String text) throws ParserException {
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
String dayMatch = matcher.group(1);
String hourMatch = matcher.group(2);
String minuteMatch = matcher.group(3);
String secondMatch = matcher.group(4);
String fractionMatch = matcher.group(5);
if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null || fractionMatch != null) {
int daysAsMilliSecs = parseNumber(dayMatch, MILLIS_PER_DAY);
int hoursAsMilliSecs = parseNumber(hourMatch, MILLIS_PER_HOUR);
int minutesAsMilliSecs = parseNumber(minuteMatch, MILLIS_PER_MINUTE);
int secondsAsMilliSecs = parseNumber(secondMatch, MILLIS_PER_SECOND);
int milliseconds = parseNumber(fractionMatch, 1);
return daysAsMilliSecs + hoursAsMilliSecs + minutesAsMilliSecs + secondsAsMilliSecs + milliseconds;
}
}
throw new ParserException(String.format("Text %s cannot be parsed to duration)", text));
}
private static int parseNumber(String parsed, int multiplier) {
// regex limits to [0-9]+
if (parsed == null || parsed.trim().isEmpty()) {
return 0;
}
return Integer.parseInt(parsed) * multiplier;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT 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.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTANCE;
}
public static DurationParser forDuration() {
return DurationParser.INSTANCE;
}
public enum DateParser {
INSTANCE;
private static final String LONG_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String MEDIUM_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
private static final String SHORT_DATE_FORMAT = "yyyy-MM-dd";
/**
* Will try to parse the date with Locale.US and formats as follows:
* yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss and yyyy-MM-dd
*
* @param text the text to parse
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text) throws ParserException {
text = text.trim();
int length = text.length();
if (length == LONG_DATE_FORMAT.length()) {
return parse(text, LONG_DATE_FORMAT);
}
if (length == MEDIUM_DATE_FORMAT.length()) {
return parse(text, MEDIUM_DATE_FORMAT);
}
return parse(text, SHORT_DATE_FORMAT);
}
/**
* Parse the text with the format specified and Locale.US
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format) throws ParserException {
return parse(text, format, Locale.US);
}
/**
* Parse the text with the format and locale specified
*
* @param text the text to parse
* @param format the date format, see {@link java.text.SimpleDateFormat} for more information
* @param locale the locale
* @return the parsed date
* @throws ParserException if the text cannot be parsed
*/
public Date parse(String text, String format, Locale locale) throws ParserException {
SimpleDateFormat dateFormat = getDateFormat(format, locale);
try {
return dateFormat.parse(text.trim());
} catch (ParseException e) {
throw new ParserException("Error when parsing date(" + dateFormat.toPattern() + ") from " + text, e);
}
}
private SimpleDateFormat getDateFormat(String format, Locale locale) {
return new SimpleDateFormat(format, locale);
}
}
public enum DurationParser {
INSTANCE;
private static final Pattern PATTERN =
Pattern.compile("(?:([0-9]+)D)?(?:([0-9]+)H)?(?:([0-9]+)M)?(?:([0-9]+)S)?(?:([0-9]+)(?:MS)?)?",
Pattern.CASE_INSENSITIVE);
private static final int HOURS_PER_DAY = 24;
private static final int MINUTES_PER_HOUR = 60;
private static final int SECONDS_PER_MINUTE = 60;
private static final int MILLIS_PER_SECOND = 1000;
private static final int MILLIS_PER_MINUTE = MILLIS_PER_SECOND * SECONDS_PER_MINUTE;
private static final int MILLIS_PER_HOUR = MILLIS_PER_MINUTE * MINUTES_PER_HOUR;
private static final int MILLIS_PER_DAY = MILLIS_PER_HOUR * HOURS_PER_DAY;
public long parseToMillis(String text) throws ParserException {
Matcher matcher = PATTERN.matcher(text);
if (matcher.matches()) {
String dayMatch = matcher.group(1);
String hourMatch = matcher.group(2);
String minuteMatch = matcher.group(3);
String secondMatch = matcher.group(4);
String fractionMatch = matcher.group(5);
if (dayMatch != null || hourMatch != null || minuteMatch != null || secondMatch != null || fractionMatch != null) {
int daysAsMilliSecs = parseNumber(dayMatch, MILLIS_PER_DAY);
int hoursAsMilliSecs = parseNumber(hourMatch, MILLIS_PER_HOUR);
int minutesAsMilliSecs = parseNumber(minuteMatch, MILLIS_PER_MINUTE);
int secondsAsMilliSecs = parseNumber(secondMatch, MILLIS_PER_SECOND);
int milliseconds = parseNumber(fractionMatch, 1);
return daysAsMilliSecs + hoursAsMilliSecs + minutesAsMilliSecs + secondsAsMilliSecs + milliseconds;
}
}
throw new ParserException(String.format("Text %s cannot be parsed to duration)", text));
}
private static int parseNumber(String parsed, int multiplier) {
// regex limits to [0-9]+
if (parsed == null || parsed.trim().isEmpty()) {
return 0;
}
return Integer.parseInt(parsed) * multiplier;
}
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./.git/hooks/pre-push.sample | #!/bin/sh
# An example hook script to verify what is about to be pushed. Called by "git
# push" after it has checked the remote status, but before anything has been
# pushed. If this script exits with a non-zero status nothing will be pushed.
#
# This hook is called with the following parameters:
#
# $1 -- Name of the remote to which the push is being done
# $2 -- URL to which the push is being done
#
# If pushing without using a named remote those arguments will be equal.
#
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
# <local ref> <local sha1> <remote ref> <remote sha1>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
remote="$1"
url="$2"
z40=0000000000000000000000000000000000000000
while read local_ref local_sha remote_ref remote_sha
do
if [ "$local_sha" = $z40 ]
then
# Handle delete
:
else
if [ "$remote_sha" = $z40 ]
then
# New branch, examine all commits
range="$local_sha"
else
# Update to existing branch, examine new commits
range="$remote_sha..$local_sha"
fi
# Check for WIP commit
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
if [ -n "$commit" ]
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done
exit 0
| #!/bin/sh
# An example hook script to verify what is about to be pushed. Called by "git
# push" after it has checked the remote status, but before anything has been
# pushed. If this script exits with a non-zero status nothing will be pushed.
#
# This hook is called with the following parameters:
#
# $1 -- Name of the remote to which the push is being done
# $2 -- URL to which the push is being done
#
# If pushing without using a named remote those arguments will be equal.
#
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
# <local ref> <local sha1> <remote ref> <remote sha1>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
remote="$1"
url="$2"
z40=0000000000000000000000000000000000000000
while read local_ref local_sha remote_ref remote_sha
do
if [ "$local_sha" = $z40 ]
then
# Handle delete
:
else
if [ "$remote_sha" = $z40 ]
then
# New branch, examine all commits
range="$local_sha"
else
# Update to existing branch, examine new commits
range="$remote_sha..$local_sha"
fi
# Check for WIP commit
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
if [ -n "$commit" ]
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done
exit 0
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./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)
# Contribution
Please make sure to read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making a pull request.
Thanks for all the people who contributed to Apollo!
<a href="https://github.com/ctripcorp/apollo/graphs/contributors"><img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /></a>
# 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>
</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>
</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,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/en/README.md | <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
# Introduction
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](zh/design/apollo-introduction).
For local demo purpose, please refer [Quick Start](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](zh/usage/apollo-user-guide)
2. [Java SDK User Guide](zh/usage/java-sdk-user-guide)
3. [.Net SDK user Guide](zh/usage/dotnet-sdk-user-guide)
4. [Third Party SDK User Guide](zh/usage/third-party-sdks-user-guide)
5. [Other Language Client User Guide](zh/usage/other-language-client-user-guide)
6. [Apollo Open APIs](zh/usage/apollo-open-api-platform)
7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases)
8. [Apollo User Practices](zh/usage/apollo-user-practices)
9. [Apollo Security Best Practices](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
# Design
* [Apollo Design](zh/design/apollo-design)
* [Apollo Core Concept - Namespace](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](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](zh/deployment/quick-start)
* [Distributed Deployment Guide](zh/deployment/distributed-deployment-guide)
# Release Notes
* [Releases](https://github.com/ctripcorp/apollo/releases)
# FAQ
* [FAQ](zh/faq/faq)
* [Common Issues in Deployment & Development Phase](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)
# Contribution
Please make sure to read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making a pull request.
Thanks for all the people who contributed to Apollo!
<a href="https://github.com/ctripcorp/apollo/graphs/contributors"><img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /></a>
# License
The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE).
| <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
# Introduction
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](zh/design/apollo-introduction).
For local demo purpose, please refer [Quick Start](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](zh/usage/apollo-user-guide)
2. [Java SDK User Guide](zh/usage/java-sdk-user-guide)
3. [.Net SDK user Guide](zh/usage/dotnet-sdk-user-guide)
4. [Third Party SDK User Guide](zh/usage/third-party-sdks-user-guide)
5. [Other Language Client User Guide](zh/usage/other-language-client-user-guide)
6. [Apollo Open APIs](zh/usage/apollo-open-api-platform)
7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases)
8. [Apollo User Practices](zh/usage/apollo-user-practices)
9. [Apollo Security Best Practices](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
# Design
* [Apollo Design](zh/design/apollo-design)
* [Apollo Core Concept - Namespace](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](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](zh/deployment/quick-start)
* [Distributed Deployment Guide](zh/deployment/distributed-deployment-guide)
# Release Notes
* [Releases](https://github.com/ctripcorp/apollo/releases)
# FAQ
* [FAQ](zh/faq/faq)
* [Common Issues in Deployment & Development Phase](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](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).
| 1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/en/_sidebar.md | - [**Home**](en/README.md)
- [Releases](https://github.com/ctripcorp/apollo/releases) | - [**Home**](en/README.md)
- [Releases](https://github.com/ctripcorp/apollo/releases)
- Community
- [Team](en/community/team.md)
- [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
- [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
| 1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/README.md | <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
# Introduction
Apollo（阿波罗）是携程框架部门研发的分布式配置中心，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性，适用于微服务配置管理场景。
服务端基于Spring Boot和Spring Cloud开发，打包后可以直接运行，不需要额外安装Tomcat等应用容器。
Java客户端不依赖任何框架，能够运行于所有Java运行时环境，同时对Spring/Spring Boot环境也有较好的支持。
.Net客户端不依赖任何框架，能够运行于所有.Net运行时环境。
更多产品介绍参见[Apollo配置中心介绍](zh/design/apollo-introduction)
本地快速部署请参见[Quick Start](zh/deployment/quick-start)
演示环境（Demo）:
- [http://106.54.227.205](http://106.54.227.205/)
- 账号/密码:apollo/admin
> 如访问github速度缓慢，可以访问[gitee镜像](https://gitee.com/nobodyiam/apollo)，不定期同步
# Screenshots
# Features
* **统一管理不同环境、不同集群的配置**
* Apollo提供了一个统一界面集中式管理不同环境（environment）、不同集群（cluster）、不同命名空间（namespace）的配置。
* 同一份代码部署在不同的集群，可以有不同的配置，比如zk的地址等
* 通过命名空间（namespace）可以很方便的支持多个不同应用共享同一份配置，同时还允许应用对共享的配置进行覆盖
* 配置界面支持多语言（中文，English）
* **配置修改实时生效（热发布）**
* 用户在Apollo修改完配置并发布后，客户端能实时（1秒）接收到最新的配置，并通知到应用程序。
* **版本发布管理**
* 所有的配置发布都有版本概念，从而可以方便的支持配置的回滚。
* **灰度发布**
* 支持配置的灰度发布，比如点了发布后，只对部分应用实例生效，等观察一段时间没问题后再推给所有应用实例。
* **权限管理、发布审核、操作审计**
* 应用和配置的管理都有完善的权限管理机制，对配置的管理还分为了编辑和发布两个环节，从而减少人为的错误。
* 所有的操作都有审计日志，可以方便的追踪问题。
* **客户端配置信息监控**
* 可以方便的看到配置在被哪些实例使用
* **提供Java和.Net原生客户端**
* 提供了Java和.Net的原生客户端，方便应用集成
* 支持Spring Placeholder，Annotation和Spring Boot的ConfigurationProperties，方便应用使用（需要Spring 3.1.1+）
* 同时提供了Http接口，非Java和.Net应用也可以方便的使用
* **提供开放平台API**
* Apollo自身提供了比较完善的统一配置管理界面，支持多环境、多数据中心配置管理、权限、流程治理等特性。
* 不过Apollo出于通用性考虑，对配置的修改不会做过多限制，只要符合基本的格式就能够保存。
* 在我们的调研中发现，对于有些使用方，它们的配置可能会有比较复杂的格式，如xml, json，需要对格式做校验。
* 还有一些使用方如DAL，不仅有特定的格式，而且对输入的值也需要进行校验后方可保存，如检查数据库、用户名和密码是否匹配。
* 对于这类应用，Apollo支持应用方通过开放接口在Apollo进行配置的修改和发布，并且具备完善的授权和权限控制
* **部署简单**
* 配置中心作为基础服务，可用性要求非常高，这就要求Apollo对外部依赖尽可能地少
* 目前唯一的外部依赖是MySQL，所以部署非常简单，只要安装好Java和MySQL就可以让Apollo跑起来
* Apollo还提供了打包脚本，一键就可以生成所有需要的安装包，并且支持自定义运行时参数
# Usage
1. [应用接入指南](zh/usage/apollo-user-guide)
2. [Java客户端使用指南](zh/usage/java-sdk-user-guide)
3. [.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide)
4. [Go、Python、NodeJS、PHP等客户端使用指南](zh/usage/third-party-sdks-user-guide)
5. [其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
6. [Apollo开放平台接入指南](zh/usage/apollo-open-api-platform)
7. [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)
8. [Apollo实践案例](zh/usage/apollo-user-practices)
9. [Apollo安全相关最佳实践](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
# Design
- [Apollo配置中心设计](zh/design/apollo-design.md)
- [Apollo配置中心介绍](zh/design/apollo-introduction.md)
- [Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace.md)
- [Apollo源码解析](http://www.iocoder.cn/categories/Apollo/)（据说Apollo非常适合作为初学者第一个通读源码学习的分布式中间件产品）
# Development
- [Apollo开发指南](zh/development/apollo-development-guide.md)
- 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)
- [Portal实现用户登录功能](zh/development/portal-how-to-implement-user-login-function.md)
- [Portal接入邮件服务](zh/development/portal-how-to-enable-email-service.md)
- [Portal启用webhook通知](zh/development/portal-how-to-enable-webhook-notification.md)
# Deployment
- [Quick Start](zh/deployment/quick-start.md)
- [Docker方式部署Quick Start](zh/deployment/quick-start-docker.md)
- [分布式部署指南](zh/deployment/distributed-deployment-guide.md)
# Release Notes
* [版本发布历史](https://github.com/ctripcorp/apollo/releases)
# FAQ
* [常见问题回答](zh/faq/faq.md)
* [部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase.md)
# Presentation
* [携程开源配置中心Apollo的设计与实现](http://www.itdks.com/dakalive/detail/3420)
* [Slides](https://myslide.cn/slides/10168)
* [配置中心，让微服务更『智能』](https://2018.qconshanghai.com/presentation/799)
* [Slides](https://myslide.cn/slides/10035)
# Publication
* [开源配置中心Apollo的设计与实现](https://www.infoq.cn/article/open-source-configuration-center-apollo)
* [配置中心，让微服务更『智能』](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ)
# Support
<table>
<thead>
<th>Apollo技术支持②群<br />群号：904287263（未满）</th>
<th>Apollo技术支持⑤群<br />群号：914839843（已满）</th>
<th>Apollo技术支持④群<br />群号：516773934（已满）</th>
<th>Apollo技术支持③群<br />群号：742035428（已满）</th>
<th>Apollo技术支持①群<br />群号：375526581（已满）</th>
</thead>
<tbody>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-2.png" alt="tech-support-qq-2"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-5.png" alt="tech-support-qq-5"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-4.png" alt="tech-support-qq-4"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-3.png" alt="tech-support-qq-3"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-1.png" alt="tech-support-qq-1"></td>
</tr>
</tbody>
</table>
# Contribution
Please make sure to read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making a pull request.
Thanks for all the people who contributed to Apollo!
<a href="https://github.com/ctripcorp/apollo/graphs/contributors"><img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /></a>
# License
The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE).
| <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="40%">
# Introduction
Apollo（阿波罗）是携程框架部门研发的分布式配置中心，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性，适用于微服务配置管理场景。
服务端基于Spring Boot和Spring Cloud开发，打包后可以直接运行，不需要额外安装Tomcat等应用容器。
Java客户端不依赖任何框架，能够运行于所有Java运行时环境，同时对Spring/Spring Boot环境也有较好的支持。
.Net客户端不依赖任何框架，能够运行于所有.Net运行时环境。
更多产品介绍参见[Apollo配置中心介绍](zh/design/apollo-introduction)
本地快速部署请参见[Quick Start](zh/deployment/quick-start)
演示环境（Demo）:
- [http://106.54.227.205](http://106.54.227.205/)
- 账号/密码:apollo/admin
> 如访问github速度缓慢，可以访问[gitee镜像](https://gitee.com/nobodyiam/apollo)，不定期同步
# Screenshots
# Features
* **统一管理不同环境、不同集群的配置**
* Apollo提供了一个统一界面集中式管理不同环境（environment）、不同集群（cluster）、不同命名空间（namespace）的配置。
* 同一份代码部署在不同的集群，可以有不同的配置，比如zk的地址等
* 通过命名空间（namespace）可以很方便的支持多个不同应用共享同一份配置，同时还允许应用对共享的配置进行覆盖
* 配置界面支持多语言（中文，English）
* **配置修改实时生效（热发布）**
* 用户在Apollo修改完配置并发布后，客户端能实时（1秒）接收到最新的配置，并通知到应用程序。
* **版本发布管理**
* 所有的配置发布都有版本概念，从而可以方便的支持配置的回滚。
* **灰度发布**
* 支持配置的灰度发布，比如点了发布后，只对部分应用实例生效，等观察一段时间没问题后再推给所有应用实例。
* **权限管理、发布审核、操作审计**
* 应用和配置的管理都有完善的权限管理机制，对配置的管理还分为了编辑和发布两个环节，从而减少人为的错误。
* 所有的操作都有审计日志，可以方便的追踪问题。
* **客户端配置信息监控**
* 可以方便的看到配置在被哪些实例使用
* **提供Java和.Net原生客户端**
* 提供了Java和.Net的原生客户端，方便应用集成
* 支持Spring Placeholder，Annotation和Spring Boot的ConfigurationProperties，方便应用使用（需要Spring 3.1.1+）
* 同时提供了Http接口，非Java和.Net应用也可以方便的使用
* **提供开放平台API**
* Apollo自身提供了比较完善的统一配置管理界面，支持多环境、多数据中心配置管理、权限、流程治理等特性。
* 不过Apollo出于通用性考虑，对配置的修改不会做过多限制，只要符合基本的格式就能够保存。
* 在我们的调研中发现，对于有些使用方，它们的配置可能会有比较复杂的格式，如xml, json，需要对格式做校验。
* 还有一些使用方如DAL，不仅有特定的格式，而且对输入的值也需要进行校验后方可保存，如检查数据库、用户名和密码是否匹配。
* 对于这类应用，Apollo支持应用方通过开放接口在Apollo进行配置的修改和发布，并且具备完善的授权和权限控制
* **部署简单**
* 配置中心作为基础服务，可用性要求非常高，这就要求Apollo对外部依赖尽可能地少
* 目前唯一的外部依赖是MySQL，所以部署非常简单，只要安装好Java和MySQL就可以让Apollo跑起来
* Apollo还提供了打包脚本，一键就可以生成所有需要的安装包，并且支持自定义运行时参数
# Usage
1. [应用接入指南](zh/usage/apollo-user-guide)
2. [Java客户端使用指南](zh/usage/java-sdk-user-guide)
3. [.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide)
4. [Go、Python、NodeJS、PHP等客户端使用指南](zh/usage/third-party-sdks-user-guide)
5. [其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
6. [Apollo开放平台接入指南](zh/usage/apollo-open-api-platform)
7. [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)
8. [Apollo实践案例](zh/usage/apollo-user-practices)
9. [Apollo安全相关最佳实践](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
# Design
- [Apollo配置中心设计](zh/design/apollo-design.md)
- [Apollo配置中心介绍](zh/design/apollo-introduction.md)
- [Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace.md)
- [Apollo源码解析](http://www.iocoder.cn/categories/Apollo/)（据说Apollo非常适合作为初学者第一个通读源码学习的分布式中间件产品）
# Development
- [Apollo开发指南](zh/development/apollo-development-guide.md)
- 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)
- [Portal实现用户登录功能](zh/development/portal-how-to-implement-user-login-function.md)
- [Portal接入邮件服务](zh/development/portal-how-to-enable-email-service.md)
- [Portal启用webhook通知](zh/development/portal-how-to-enable-webhook-notification.md)
# Deployment
- [Quick Start](zh/deployment/quick-start.md)
- [Docker方式部署Quick Start](zh/deployment/quick-start-docker.md)
- [分布式部署指南](zh/deployment/distributed-deployment-guide.md)
# Release Notes
* [版本发布历史](https://github.com/ctripcorp/apollo/releases)
# FAQ
* [常见问题回答](zh/faq/faq.md)
* [部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase.md)
# Presentation
* [携程开源配置中心Apollo的设计与实现](http://www.itdks.com/dakalive/detail/3420)
* [Slides](https://myslide.cn/slides/10168)
* [配置中心，让微服务更『智能』](https://2018.qconshanghai.com/presentation/799)
* [Slides](https://myslide.cn/slides/10035)
# Publication
* [开源配置中心Apollo的设计与实现](https://www.infoq.cn/article/open-source-configuration-center-apollo)
* [配置中心，让微服务更『智能』](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ)
# Support
<table>
<thead>
<th>Apollo技术支持②群<br />群号：904287263（未满）</th>
<th>Apollo技术支持⑤群<br />群号：914839843（已满）</th>
<th>Apollo技术支持④群<br />群号：516773934（已满）</th>
<th>Apollo技术支持③群<br />群号：742035428（已满）</th>
<th>Apollo技术支持①群<br />群号：375526581（已满）</th>
</thead>
<tbody>
<tr>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-2.png" alt="tech-support-qq-2"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-5.png" alt="tech-support-qq-5"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-4.png" alt="tech-support-qq-4"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-3.png" alt="tech-support-qq-3"></td>
<td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/tech-support/tech-support-qq-1.png" alt="tech-support-qq-1"></td>
</tr>
</tbody>
</table>
# 社区
* [团队](zh/community/team)
* [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
* [贡献指南](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).
| 1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/_sidebar.md | - [**首页**](zh/README.md)
- 设计文档
- [Apollo配置中心设计](zh/design/apollo-design.md)
- [Apollo配置中心介绍](zh/design/apollo-introduction.md)
- [Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace.md)
- [Apollo源码解析（全）](http://www.iocoder.cn/categories/Apollo/)
- 部署文档
- [Quick Start](zh/deployment/quick-start.md)
- [Docker方式部署Quick Start](zh/deployment/quick-start-docker.md)
- [分布式部署指南](zh/deployment/distributed-deployment-guide.md)
- 开发文档
- [Apollo开发指南](zh/development/apollo-development-guide.md)
- 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)
- [Portal实现用户登录功能](zh/development/portal-how-to-implement-user-login-function.md)
- [Portal接入邮件服务](zh/development/portal-how-to-enable-email-service.md)
- [Portal启用webhook通知](zh/development/portal-how-to-enable-webhook-notification.md)
- 使用文档
- [Apollo使用指南](zh/usage/apollo-user-guide.md)
- [Java客户端使用指南](zh/usage/java-sdk-user-guide.md)
- [.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide.md)
- [Go、Python、NodeJS、PHP等客户端使用指南](zh/usage/third-party-sdks-user-guide.md)
- [其它语言客户端接入指南](zh/usage/other-language-client-user-guide.md)
- [Apollo开放平台接入指南](zh/usage/apollo-open-api-platform.md)
- [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)
- [Apollo实践案例](zh/usage/apollo-user-practices.md)
- [Apollo安全相关最佳实践](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
- FAQ
- [常见问题回答](zh/faq/faq.md)
- [部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase.md)
- 其它
- [版本历史](https://github.com/ctripcorp/apollo/releases)
- [Apollo性能测试报告](zh/misc/apollo-benchmark.md) | - [**首页**](zh/README.md)
- 设计文档
- [Apollo配置中心设计](zh/design/apollo-design.md)
- [Apollo配置中心介绍](zh/design/apollo-introduction.md)
- [Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace.md)
- [Apollo源码解析（全）](http://www.iocoder.cn/categories/Apollo/)
- 部署文档
- [Quick Start](zh/deployment/quick-start.md)
- [Docker方式部署Quick Start](zh/deployment/quick-start-docker.md)
- [分布式部署指南](zh/deployment/distributed-deployment-guide.md)
- 开发文档
- [Apollo开发指南](zh/development/apollo-development-guide.md)
- 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)
- [Portal实现用户登录功能](zh/development/portal-how-to-implement-user-login-function.md)
- [Portal接入邮件服务](zh/development/portal-how-to-enable-email-service.md)
- [Portal启用webhook通知](zh/development/portal-how-to-enable-webhook-notification.md)
- 使用文档
- [Apollo使用指南](zh/usage/apollo-user-guide.md)
- [Java客户端使用指南](zh/usage/java-sdk-user-guide.md)
- [.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide.md)
- [Go、Python、NodeJS、PHP等客户端使用指南](zh/usage/third-party-sdks-user-guide.md)
- [其它语言客户端接入指南](zh/usage/other-language-client-user-guide.md)
- [Apollo开放平台接入指南](zh/usage/apollo-open-api-platform.md)
- [Apollo使用场景和示例代码](https://github.com/ctripcorp/apollo-use-cases)
- [Apollo实践案例](zh/usage/apollo-user-practices.md)
- [Apollo安全相关最佳实践](zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3)
- FAQ
- [常见问题回答](zh/faq/faq.md)
- [部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase.md)
- 其它
- [版本历史](https://github.com/ctripcorp/apollo/releases)
- [Apollo性能测试报告](zh/misc/apollo-benchmark.md)
- 社区
- [团队](zh/community/team.md)
- [社区治理](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md)
- [贡献指南](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md)
| 1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<name>Apollo</name>
<packaging>pom</packaging>
<description>Ctrip Configuration Center</description>
<url>https://github.com/ctripcorp/apollo</url>
<organization>
<name>Ctrip, Inc.</name>
<url>http://www.ctrip.com</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<scm>
<url>https://github.com/ctripcorp/apollo</url>
<connection>scm:git:git://github.com/ctripcorp/apollo.git</connection>
<developerConnection>scm:git:ssh://git@github.com/ctripcorp/apollo.git</developerConnection>
</scm>
<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/ctripcorp/apollo/actions</url>
</ciManagement>
<issueManagement>
<system>github</system>
<url>https://github.com/ctripcorp/apollo/issues</url>
</issueManagement>
<developers>
<developer>
<id>nobodyiam</id>
<name>Jason(Shun) Song</name>
<email>nobodyiam at gmail.com</email>
<organization>Ctrip, Inc.</organization>
<organizationUrl>http://www.ctrip.com</organizationUrl>
<roles>
<role>Project Management Committee Member</role>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>lepdou</id>
<name>Le Zhang</name>
<email>lepdou at gmail.com</email>
<organization>Ctrip, Inc.</organization>
<organizationUrl>http://www.ctrip.com</organizationUrl>
<roles>
<role>Developer</role>
</roles>
</developer>
<developer>
<id>yiming187</id>
<name>Billy(Yiming) Liu</name>
<email>liuyiming.vip at gmail.com</email>
<organization>Ctrip, Inc.</organization>
<organizationUrl>http://www.ctrip.com</organizationUrl>
<roles>
<role>Developer(Inactive)</role>
</roles>
</developer>
<developer>
<id>kezhenxu94</id>
<url>https://github.com/kezhenxu94</url>
<name>Zhenxu Ke</name>
<email>kezhenxu94 at apache.org</email>
<organization>Tetrate.io</organization>
<organizationUrl>http://tetrate.io</organizationUrl>
<roles>
<role>Project Management Committee Member</role>
<role>Developer</role>
</roles>
</developer>
</developers>
<properties>
<revision>1.9.0-SNAPSHOT</revision>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.4.2</spring-boot.version>
<spring-cloud.version>2020.0.1</spring-cloud.version>
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
<javax.mail.version>1.6.2</javax.mail.version>
<javassist.version>3.23.1-GA</javassist.version>
<nacos-discovery-api.version>1.4.0</nacos-discovery-api.version>
<!-- Plugins Version -->
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<!-- for travis usage -->
<github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties>
<modules>
<module>apollo-buildtools</module>
<module>apollo-core</module>
<module>apollo-client</module>
<module>apollo-common</module>
<module>apollo-biz</module>
<module>apollo-configservice</module>
<module>apollo-adminservice</module>
<module>apollo-portal</module>
<module>apollo-assembly</module>
<module>apollo-demo</module>
<module>apollo-mockserver</module>
<module>apollo-openapi</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-buildtools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>${project.version}</version>
</dependency>
<!-- ctrip internal dependencies, only used when ctrip profiles are enabled -->
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
<version>1.0.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with bcpkix-jdk15on -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</exclusion>
<!-- duplicated with hibernate-jpa-2.1-api -->
<exclusion>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
<version>3.5.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.credis</groupId>
<artifactId>credis</artifactId>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework</groupId>
<artifactId>vi</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
<version>1.1.0</version>
<exclusions>
<!-- partially duplicated with org.ow2.asm:asm -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
<version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--third party -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<!-- for jdk 7 compatibility -->
<version>29.0-android</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<!-- to fix CVE-2020-26217 -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.17</version>
</dependency>
<!--for test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.191</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<!-- declare Spring BOMs in order -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- required by eureka -->
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
<version>1.19.4</version>
</dependency>
<!-- ctrip modified -->
<!-- removed duplicated javax/persistence classes -->
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.37</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<!-- for junit 4 -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
<configuration>
<show>public</show>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<links>
<link>http://docs.oracle.com/javase/7/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<executable>true</executable>
<attach>false</attach>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.7</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/apollo-git.properties</generateGitPropertiesFilename>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Need to set releases.repo and snapshots.repo properties in your .m2/settings.xml -->
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.yml</include>
<include>**/*.yaml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>true</filtering>
<includes>
<include>application-github.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>false</filtering>
<excludes>
<exclude>application-github.properties</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>
<profile>
<!-- for travis usage -->
<id>travis</id>
<activation>
<property>
<name>env.TRAVIS</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Site for ${project.artifactId}, ${project.version}</message>
<path>${github.path}</path>
<merge>true</merge>
</configuration>
<executions>
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>site</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.2.0</version>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- for open source usage -->
<id>github</id>
<properties>
<package.environment>github</package.environment>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!-- for ctrip development -->
<id>ctrip-dev</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>nacos-discovery</id>
<properties>
<nacos.discovery.version>0.2.7</nacos.discovery.version>
<fastjson.version>1.2.75</fastjson.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
<version>${nacos.discovery.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<!-- for ctrip development with logging capability -->
<id>ctrip-logging</id>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<!-- for ctrip production -->
<id>ctrip</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>configdb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-configdb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>portaldb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-portaldb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>summary</report>
<report>dependency-info</report>
<report>project-team</report>
<report>scm</report>
<report>issue-tracking</report>
<report>mailing-list</report>
<!-- <report>dependency-management</report> -->
<!-- <report>dependencies</report> -->
<!-- <report>dependency-convergence</report> -->
<report>cim</report>
<report>plugin-management</report>
<report>plugins</report>
<report>distribution-management</report>
<report>license</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<configuration>
<configLocation>google_checks.xml</configLocation>
<headerLocation>LICENSE-2.0.txt</headerLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.6</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
</plugin>
</plugins>
</reporting>
<distributionManagement>
<repository>
<id>releases</id>
<url>${releases.repo}</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>${snapshots.repo}</url>
</snapshotRepository>
</distributionManagement>
</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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<name>Apollo</name>
<packaging>pom</packaging>
<description>Ctrip Configuration Center</description>
<url>https://github.com/ctripcorp/apollo</url>
<organization>
<name>Ctrip, Inc.</name>
<url>http://www.ctrip.com</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<scm>
<url>https://github.com/ctripcorp/apollo</url>
<connection>scm:git:git://github.com/ctripcorp/apollo.git</connection>
<developerConnection>scm:git:ssh://git@github.com/ctripcorp/apollo.git</developerConnection>
</scm>
<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/ctripcorp/apollo/actions</url>
</ciManagement>
<issueManagement>
<system>github</system>
<url>https://github.com/ctripcorp/apollo/issues</url>
</issueManagement>
<properties>
<revision>1.9.0-SNAPSHOT</revision>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>2.4.2</spring-boot.version>
<spring-cloud.version>2020.0.1</spring-cloud.version>
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
<javax.mail.version>1.6.2</javax.mail.version>
<javassist.version>3.23.1-GA</javassist.version>
<nacos-discovery-api.version>1.4.0</nacos-discovery-api.version>
<!-- Plugins Version -->
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<!-- for travis usage -->
<github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties>
<modules>
<module>apollo-buildtools</module>
<module>apollo-core</module>
<module>apollo-client</module>
<module>apollo-common</module>
<module>apollo-biz</module>
<module>apollo-configservice</module>
<module>apollo-adminservice</module>
<module>apollo-portal</module>
<module>apollo-assembly</module>
<module>apollo-demo</module>
<module>apollo-mockserver</module>
<module>apollo-openapi</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-buildtools</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>${project.version}</version>
</dependency>
<!-- ctrip internal dependencies, only used when ctrip profiles are enabled -->
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
<version>1.0.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with bcpkix-jdk15on -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</exclusion>
<!-- duplicated with hibernate-jpa-2.1-api -->
<exclusion>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
<version>3.5.2</version>
<exclusions>
<exclusion>
<artifactId>logback-core</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.credis</groupId>
<artifactId>credis</artifactId>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework</groupId>
<artifactId>vi</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId>
<version>1.1.0</version>
<exclusions>
<!-- partially duplicated with org.ow2.asm:asm -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId>
<version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--third party -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<!-- for jdk 7 compatibility -->
<version>29.0-android</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<!-- to fix CVE-2020-26217 -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.17</version>
</dependency>
<!--for test -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.191</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<!-- declare Spring BOMs in order -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- required by eureka -->
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
<version>1.19.4</version>
</dependency>
<!-- ctrip modified -->
<!-- removed duplicated javax/persistence classes -->
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.37</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<!-- for junit 4 -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<doclint>none</doclint>
</configuration>
</execution>
</executions>
<configuration>
<show>public</show>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
<links>
<link>http://docs.oracle.com/javase/7/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<executable>true</executable>
<attach>false</attach>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
<configuration>
<xmlOutput>true</xmlOutput>
<effort>Max</effort>
<threshold>Low</threshold>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.7</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/apollo-git.properties</generateGitPropertiesFilename>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Need to set releases.repo and snapshots.repo properties in your .m2/settings.xml -->
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.yml</include>
<include>**/*.yaml</include>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/*.yml</exclude>
<exclude>**/*.yaml</exclude>
<exclude>**/*.properties</exclude>
<exclude>**/*.xml</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>true</filtering>
<includes>
<include>application-github.properties</include>
</includes>
</resource>
<resource>
<directory>src/main/config</directory>
<filtering>false</filtering>
<excludes>
<exclude>application-github.properties</exclude>
</excludes>
</resource>
</resources>
</build>
<profiles>
<profile>
<!-- for travis usage -->
<id>travis</id>
<activation>
<property>
<name>env.TRAVIS</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<configuration>
<message>Site for ${project.artifactId}, ${project.version}</message>
<path>${github.path}</path>
<merge>true</merge>
</configuration>
<executions>
<execution>
<goals>
<goal>site</goal>
</goals>
<phase>site</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.2.0</version>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- for open source usage -->
<id>github</id>
<properties>
<package.environment>github</package.environment>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!-- for ctrip development -->
<id>ctrip-dev</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>nacos-discovery</id>
<properties>
<nacos.discovery.version>0.2.7</nacos.discovery.version>
<fastjson.version>1.2.75</fastjson.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
<version>${nacos.discovery.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<!-- for ctrip development with logging capability -->
<id>ctrip-logging</id>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<!-- for ctrip production -->
<id>ctrip</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
<!-- duplicated with spring-aop -->
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.platform</groupId>
<artifactId>ctrip-dal-client</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>configdb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-configdb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>portaldb</id>
<build>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>5.2.4</version>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.16</version>
</dependency>
</dependencies>
<configuration>
<configFile>scripts/flyway/flyway-portaldb.properties</configFile>
</configuration>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>summary</report>
<report>dependency-info</report>
<report>project-team</report>
<report>scm</report>
<report>issue-tracking</report>
<report>mailing-list</report>
<!-- <report>dependency-management</report> -->
<!-- <report>dependencies</report> -->
<!-- <report>dependency-convergence</report> -->
<report>cim</report>
<report>plugin-management</report>
<report>plugins</report>
<report>distribution-management</report>
<report>license</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<configuration>
<configLocation>google_checks.xml</configLocation>
<headerLocation>LICENSE-2.0.txt</headerLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.6</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
</plugin>
</plugins>
</reporting>
<distributionManagement>
<repository>
<id>releases</id>
<url>${releases.repo}</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>${snapshots.repo}</url>
</snapshotRepository>
</distributionManagement>
</project>
| 1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/resources/spring/XmlConfigAnnotationTest1.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.XMLConfigAnnotationTest.TestApolloConfigBean1"/>
</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.XMLConfigAnnotationTest.TestApolloConfigBean1"/>
</beans>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/development/apollo-development-guide.md | 本文档介绍了如何在本地使用IDE编译、运行Apollo，从而可以帮助大家了解Apollo的内在运行机制，同时也为自定义开发做好准备。
#
# 一、准备工作
## 1.1 本地运行时环境
Apollo本地开发需要以下组件：
1. Java: 1.8+
2. MySQL: 5.6.5+
3. IDE: 没有特殊要求
其中MySQL需要创建Apollo数据库并导入基础数据。
具体步骤请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)中的以下部分：
1. [一、准备工作](zh/deployment/distributed-deployment-guide#一、准备工作)
2. [2.1 创建数据库](zh/deployment/distributed-deployment-guide#_21-创建数据库)
## 1.2 Apollo总体设计
具体请参考[Apollo配置中心设计](zh/design/apollo-design)
# 二、本地启动
## 2.1 Apollo Config Service和Apollo Admin Service
我们在本地开发时，一般会在IDE中同时启动`apollo-configservice`和`apollo-adminservice`。
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-configservice`和`apollo-adminservice`。
### 2.1.1 新建运行配置
### 2.1.2 Main class配置
`com.ctrip.framework.apollo.assembly.ApolloApplication`
> 注：如果希望独立启动`apollo-configservice`和`apollo-adminservice`，可以把Main Class分别换成
> `com.ctrip.framework.apollo.configservice.ConfigServiceApplication`和
> `com.ctrip.framework.apollo.adminservice.AdminServiceApplication`
### 2.1.3 VM options配置
-Dapollo_profile=github
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloConfigDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloConfigDB`
>
>注2：程序默认日志输出为/opt/logs/100003171/apollo-assembly.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-assembly.log
### 2.1.4 Program arguments配置
`--configservice --adminservice`
### 2.1.5 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8080](http://localhost:8080)可以看到`apollo-configservice`和`apollo-adminservice`都已经启动完成并注册到Eureka。
> 注：除了在Eureka确认服务状态外，还可以通过健康检查接口确认服务健康状况：
>
> apollo-adminservice： [http://localhost:8090/health](http://localhost:8090/health)
> apollo-configservice： [http://localhost:8080/health](http://localhost:8080/health)
>
> 如果服务健康，返回内容中的status.code应当为`UP`：
>
> {
> "status": {
> "code": "UP",
> ...
> },
> ...
> }
## 2.2 Apollo-Portal
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-portal`。
### 2.2.1 新建运行配置
### 2.2.2 Main class配置
`com.ctrip.framework.apollo.portal.PortalApplication`
### 2.2.3 VM options配置
-Dapollo_profile=github,auth
-Ddev_meta=http://localhost:8080/
-Dserver.port=8070
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloPortalDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：这里指定了apollo_profile是`github`和`auth`，其中`github`是Apollo必须的一个profile，用于数据库的配置，`auth`是从0.9.0新增的，用来支持使用apollo提供的Spring Security简单认证，更多信息可以参考[Portal-实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
>
>注2：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloPortalDB `。
>
>注3：默认ApolloPortalDB中导入的配置只会展示DEV环境的配置，所以这里配置了dev\_meta属性，如果你希望在本地展示其它环境的配置，需要在这里增加其它环境的meta服务器地址，如fat\_meta。
>
>注4：这里指定了server.port=8070是因为`apollo-configservice`启动在8080端口，所以这里配置`apollo-portal`启动在8070端口。
>
>注5：程序默认日志输出为/opt/logs/100003173/apollo-portal.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-portal.log
### 2.2.4 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8070](http://localhost:8070)就可以看到Apollo配置中心界面了。
>注：如果启用了`auth` profile的话，默认的用户名是apollo，密码是admin
### 2.2.5 Demo应用接入
为了更好的开发和调试，一般我们都会自己创建一个demo项目给自己使用。
可以参考[一、普通应用接入指南](zh/usage/apollo-user-guide#一、普通应用接入指南)创建自己的demo项目。
## 2.3 Java样例客户端启动
项目中有一个样例客户端的项目：`apollo-demo`，下面以Intellij Community 2016.2版本为例来说明如何在本地启动。
### 2.3.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`apollo-demo`项目的app.properties文件中：`apollo-demo/src/main/resources/META-INF/app.properties`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
app.id=100004458
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
> 更多配置AppId的方式可以参考[1.2.1 AppId](zh/usage/java-sdk-user-guide#_121-appid)
### 2.3.2 新建运行配置
### 2.3.3 Main class配置
`SimpleApolloConfigDemo`
### 2.3.4 VM options配置
-Dapollo.meta=http://localhost:8080
> 注：这里当前环境的meta server地址为`http://localhost:8080`，也就是`apollo-configservice`的地址。
> 更多配置Apollo Meta Server的方式可以参考[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)
### 2.3.5 概览
### 2.3.6 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> [SimpleApolloConfigDemo] Loading key : timeout with value: 100
> 客户端日志级别默认是`DEBUG`，如果需要调整，可以通过修改`apollo-demo/src/main/resources/log4j2.xml`中的level配置
> ```xml
> <logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
> <AppenderRef ref="Async" level="DEBUG"/>
> </logger>
> ```
## 2.4 .Net样例客户端启动
[apollo.net](https://github.com/ctripcorp/apollo.net)项目中有一个样例客户端的项目：`ApolloDemo`，下面就以VS 2010为例来说明如何在本地启动。
### 2.4.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`ApolloDemo`项目的APP.config文件中：`apollo.net\ApolloDemo\App.config`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
```xml
<add key="AppID" value="100004458"/>
```
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
### 2.4.2 配置服务地址
Apollo客户端针对不同的环境会从不同的服务器获取配置，所以我们需要在app.config或web.config配置服务器地址(Apollo.{ENV}.Meta)。假设DEV环境的配置服务(apollo-configservice)地址是11.22.33.44，那么我们就做如下配置：
### 2.4.3 运行
运行`ApolloConfigDemo.cs`即可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> Loading key: timeout with value: 100
>注：Apollo .Net客户端开源版目前默认会把日志直接输出到Console，大家可以自己实现Logging相关功能。
>
> 详见[https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi](https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi)
# 三、开发
## 模块依赖图
## 3.1 Portal 实现用户登录功能
请参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
## 3.2 Portal 接入邮件服务
请参考[Portal 接入邮件服务](zh/development/portal-how-to-enable-email-service)
| 本文档介绍了如何在本地使用IDE编译、运行Apollo，从而可以帮助大家了解Apollo的内在运行机制，同时也为自定义开发做好准备。
#
# 一、准备工作
## 1.1 本地运行时环境
Apollo本地开发需要以下组件：
1. Java: 1.8+
2. MySQL: 5.6.5+
3. IDE: 没有特殊要求
其中MySQL需要创建Apollo数据库并导入基础数据。
具体步骤请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)中的以下部分：
1. [一、准备工作](zh/deployment/distributed-deployment-guide#一、准备工作)
2. [2.1 创建数据库](zh/deployment/distributed-deployment-guide#_21-创建数据库)
## 1.2 Apollo总体设计
具体请参考[Apollo配置中心设计](zh/design/apollo-design)
# 二、本地启动
## 2.1 Apollo Config Service和Apollo Admin Service
我们在本地开发时，一般会在IDE中同时启动`apollo-configservice`和`apollo-adminservice`。
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-configservice`和`apollo-adminservice`。
### 2.1.1 新建运行配置
### 2.1.2 Main class配置
`com.ctrip.framework.apollo.assembly.ApolloApplication`
> 注：如果希望独立启动`apollo-configservice`和`apollo-adminservice`，可以把Main Class分别换成
> `com.ctrip.framework.apollo.configservice.ConfigServiceApplication`和
> `com.ctrip.framework.apollo.adminservice.AdminServiceApplication`
### 2.1.3 VM options配置
-Dapollo_profile=github
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloConfigDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloConfigDB`
>
>注2：程序默认日志输出为/opt/logs/100003171/apollo-assembly.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-assembly.log
### 2.1.4 Program arguments配置
`--configservice --adminservice`
### 2.1.5 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8080](http://localhost:8080)可以看到`apollo-configservice`和`apollo-adminservice`都已经启动完成并注册到Eureka。
> 注：除了在Eureka确认服务状态外，还可以通过健康检查接口确认服务健康状况：
>
> apollo-adminservice： [http://localhost:8090/health](http://localhost:8090/health)
> apollo-configservice： [http://localhost:8080/health](http://localhost:8080/health)
>
> 如果服务健康，返回内容中的status.code应当为`UP`：
>
> {
> "status": {
> "code": "UP",
> ...
> },
> ...
> }
## 2.2 Apollo-Portal
下面以Intellij Community 2016.2版本为例来说明如何在本地启动`apollo-portal`。
### 2.2.1 新建运行配置
### 2.2.2 Main class配置
`com.ctrip.framework.apollo.portal.PortalApplication`
### 2.2.3 VM options配置
-Dapollo_profile=github,auth
-Ddev_meta=http://localhost:8080/
-Dserver.port=8070
-Dspring.datasource.url=jdbc:mysql://localhost:3306/ApolloPortalDB?characterEncoding=utf8
-Dspring.datasource.username=root
-Dspring.datasource.password=
>注1：这里指定了apollo_profile是`github`和`auth`，其中`github`是Apollo必须的一个profile，用于数据库的配置，`auth`是从0.9.0新增的，用来支持使用apollo提供的Spring Security简单认证，更多信息可以参考[Portal-实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
>
>注2：spring.datasource相关配置替换成你自己的数据库连接信息，注意数据库是`ApolloPortalDB `。
>
>注3：默认ApolloPortalDB中导入的配置只会展示DEV环境的配置，所以这里配置了dev\_meta属性，如果你希望在本地展示其它环境的配置，需要在这里增加其它环境的meta服务器地址，如fat\_meta。
>
>注4：这里指定了server.port=8070是因为`apollo-configservice`启动在8080端口，所以这里配置`apollo-portal`启动在8070端口。
>
>注5：程序默认日志输出为/opt/logs/100003173/apollo-portal.log，如果需要修改日志文件路径，可以增加`logging.file.name`参数，如下：
>
>-Dlogging.file.name=/your-path/apollo-portal.log
### 2.2.4 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，打开[http://localhost:8070](http://localhost:8070)就可以看到Apollo配置中心界面了。
>注：如果启用了`auth` profile的话，默认的用户名是apollo，密码是admin
### 2.2.5 Demo应用接入
为了更好的开发和调试，一般我们都会自己创建一个demo项目给自己使用。
可以参考[一、普通应用接入指南](zh/usage/apollo-user-guide#一、普通应用接入指南)创建自己的demo项目。
## 2.3 Java样例客户端启动
项目中有一个样例客户端的项目：`apollo-demo`，下面以Intellij Community 2016.2版本为例来说明如何在本地启动。
### 2.3.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`apollo-demo`项目的app.properties文件中：`apollo-demo/src/main/resources/META-INF/app.properties`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
app.id=100004458
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
> 更多配置AppId的方式可以参考[1.2.1 AppId](zh/usage/java-sdk-user-guide#_121-appid)
### 2.3.2 新建运行配置
### 2.3.3 Main class配置
`SimpleApolloConfigDemo`
### 2.3.4 VM options配置
-Dapollo.meta=http://localhost:8080
> 注：这里当前环境的meta server地址为`http://localhost:8080`，也就是`apollo-configservice`的地址。
> 更多配置Apollo Meta Server的方式可以参考[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)
### 2.3.5 概览
### 2.3.6 运行
对新建的运行配置点击Run或Debug皆可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> [SimpleApolloConfigDemo] Loading key : timeout with value: 100
> 客户端日志级别默认是`DEBUG`，如果需要调整，可以通过修改`apollo-demo/src/main/resources/log4j2.xml`中的level配置
> ```xml
> <logger name="com.ctrip.framework.apollo" additivity="false" level="trace">
> <AppenderRef ref="Async" level="DEBUG"/>
> </logger>
> ```
## 2.4 .Net样例客户端启动
[apollo.net](https://github.com/ctripcorp/apollo.net)项目中有一个样例客户端的项目：`ApolloDemo`，下面就以VS 2010为例来说明如何在本地启动。
### 2.4.1 配置项目AppId
在`2.2.5 Demo应用接入`中创建Demo项目时，系统会要求填入一个全局唯一的AppId，我们需要把这个AppId配置到`ApolloDemo`项目的APP.config文件中：`apollo.net\ApolloDemo\App.config`。
如我们自己的demo项目使用的AppId是100004458，那么文件内容就是：
```xml
<add key="AppID" value="100004458"/>
```
>注：AppId是应用的唯一身份标识，Apollo客户端使用这个标识来获取应用自己的私有Namespace配置。
> 对于公共Namespace的配置，没有AppId也可以获取到配置，但是就失去了应用覆盖公共Namespace配置的能力。
### 2.4.2 配置服务地址
Apollo客户端针对不同的环境会从不同的服务器获取配置，所以我们需要在app.config或web.config配置服务器地址(Apollo.{ENV}.Meta)。假设DEV环境的配置服务(apollo-configservice)地址是11.22.33.44，那么我们就做如下配置：
### 2.4.3 运行
运行`ApolloConfigDemo.cs`即可。
启动完后，忽略前面的调试信息，可以看到如下提示：
Apollo Config Demo. Please input key to get the value. Input quit to exit.
>
输入你之前在Portal上配置的值，如我们的Demo项目中配置了`timeout`，会看到如下信息：
> timeout
> Loading key: timeout with value: 100
>注：Apollo .Net客户端开源版目前默认会把日志直接输出到Console，大家可以自己实现Logging相关功能。
>
> 详见[https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi](https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi)
# 三、开发
## 模块依赖图
## 3.1 Portal 实现用户登录功能
请参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
## 3.2 Portal 接入邮件服务
请参考[Portal 接入邮件服务](zh/development/portal-how-to-enable-email-service)
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/en/quick-start.md |
# Prepare
Wait for content...
```bash
content for copy
``` |
# Prepare
Wait for content...
```bash
content for copy
``` | -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/usage/apollo-user-guide.md | #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
3. 输入项目信息
* 部门：选择应用所在的部门
* 应用AppId：用来标识应用身份的唯一id，格式为string，需要和客户端app.properties中配置的app.id对应
* 应用名称：应用名，仅用于界面展示
* 应用负责人：选择的人默认会成为该项目的管理员，具备项目权限管理、集群创建、Namespace创建等权限
4. 点击提交
创建成功后，会自动跳转到项目首页
## 1.2 项目权限分配
### 1.2.1 项目管理员权限
项目管理员拥有以下权限：
1. 可以管理项目的权限分配
2. 可以创建集群
3. 可以创建Namespace
创建项目时填写的应用负责人默认会成为项目的管理员之一，如果还需要其他人也成为项目管理员，可以按照下面步骤操作：
1. 点击页面左侧的“管理项目”
* 
2. 搜索需要添加的成员并点击添加
* 
* 
### 1.2.2 配置编辑、发布权限
配置权限分为编辑和发布：
* 编辑权限允许用户在Apollo界面上创建、修改、删除配置
* 配置修改后只在Apollo界面上变化，不会影响到应用实际使用的配置
* 发布权限允许用户在Apollo界面上发布、回滚配置
* 配置只有在发布、回滚动作后才会被应用实际使用到
* Apollo在用户操作发布、回滚动作后实时通知到应用，并使最新配置生效
项目创建完，默认没有分配配置的编辑和发布权限，需要项目管理员进行授权。
1. 点击application这个namespace的授权按钮
* 
2. 分配修改权限
* 
3. 分配发布权限
* 
## 1.3 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
### 1.3.1 通过表格模式添加配置
1. 点击新增配置
* 
2. 输入配置项
* 
3. 点击提交
* 
### 1.3.2 通过文本模式编辑
Apollo除了支持表格模式，逐个添加、修改配置外，还提供文本模式批量添加、修改。
这个对于从已有的properties文件迁移尤其有用。
1. 切换到文本编辑模式
2. 点击右侧的修改配置按钮
3. 输入配置项，并点击提交修改
## 1.4 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
## 1.5 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
## 1.6 回滚已发布配置
如果发现已发布的配置有问题，可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。
这里的回滚机制类似于发布系统，发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本，但代码仓库中的代码是不会回滚的，从而开发可以在修复代码后重新发布。
Apollo中的回滚也是类似的机制，点击回滚后是将发布到客户端的配置回滚到上一个已发布版本，也就是说客户端读取到的配置会恢复到上一个版本，但页面上编辑状态的配置是不会回滚的，从而开发可以在修复配置后重新发布。
# 二、公共组件接入指南
## 2.1 公共组件和普通应用的区别
公共组件是指那些发布给其它应用使用的客户端代码，比如CAT客户端、Hermes Producer客户端等。
虽然这类组件是由其他团队开发、维护，但是运行时是在业务实际应用内的，所以本质上可以认为是应用的一部分。
通常情况下，这类组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
## 2.2 公共组件接入步骤
公共组件的接入步骤，和普通应用几乎一致，唯一的区别是公共组件需要创建自己唯一的Namespace。
所以，首先执行普通应用接入文档中的以下几个步骤，然后再按照本章节后面的步骤操作。
1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE)
2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90)
### 2.2.1 创建Namespace
创建Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权。
1. 点击页面左侧的添加Namespace
* 
2. 点击“创建新的Namespace”
* 
3. 输入公共组件的Namespace名称，需要注意的是Namespace名称全局唯一
* Apollo会默认把部门代号添加在最前面
* 
4. 点击提交后，页面会自动跳转到关联Namespace页面
* 首先，选中所有需要有这个Namespace的环境和集群，一般建议全选
* 其次，选中刚刚创建的namespace
* 最后，点击提交
* 
5. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
* 
2. 分配发布权限
* 
6. 点击“返回”回到项目页面
### 2.2.2 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
#### 2.2.2.1 通过表格模式添加配置
1. 点击新增配置
2. 输入配置项
3. 点击提交
#### 2.2.2.2 通过文本模式编辑
这部分和普通应用一致，具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。
### 2.2.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
### 2.2.4 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
对于公共组件的配置读取，可以参考上述文档中的“获取公共Namespace的配置”部分。
## 2.3 应用覆盖公用组件配置步骤
前面提到，通常情况下，公共组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
这里就讲一下应用如何覆盖公用组件的配置，简单起见，假设apollo-portal应用使用了hermes producer客户端，并且希望调整hermes的批量发送大小。
### 2.3.1 关联公共组件Namespace
1. 进入使用公共组件的应用项目首页，点击左侧的添加Namespace按钮
* 所以，在这个例子中，我们需要进入apollo-portal的首页。
* （添加Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权）
* 
2. 找到hermes producer的namespace，并选择需要关联到哪些环境和集群
3. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
2. 分配发布权限
4. 点击“返回”回到项目页面
### 2.3.2 覆盖公用组件配置
1. 点击新增配置
2. 输入要覆盖的配置项
3. 点击提交
### 2.3.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
3. 配置发布成功后，hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。
# 三、集群独立配置说明
在有些特殊情况下，应用有需求对不同的集群做不同的配置，比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。
在这种情况下，可以通过在Apollo创建不同的集群来解决。
## 3.1 创建集群
创建集群需要项目管理员权限，如果发现没有添加集群按钮，可以找项目管理员授权。
1. 点击页面左侧的“添加集群”按钮
* 
2. 输入集群名称，选择环境并提交
* 
3. 切换到对应的集群，修改配置并发布即可
* 
4. 通过上述配置，部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置
5. 如果应用还在其它机房部署了应用，那么在上述的配置下，会读到default集群下的配置。
# 四、多个AppId使用同一份配置
在一些情况下，尽管应用本身不是公共组件，但还是需要在多个AppId之间共用同一份配置，比如同一个产品的不同项目：XX-Web, XX-Service, XX-Job等。
这种情况下如果希望实现多个AppId使用同一份配置的话，基本概念和公共组件的配置是一致的。
具体来说，就是在其中一个AppId下创建一个namespace，写入公共的配置信息，然后在各个项目中读取该namespace的配置即可。
如果某个AppId需要覆盖公共的配置信息，那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。
具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。
# 五、灰度发布使用指南
通过灰度发布功能，可以实现：
1. 对于一些对程序有比较大影响的配置，可以先在一个或者多个实例生效，观察一段时间没问题后再全量发布配置。
2. 对于一些需要调优的配置参数，可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置，不断调整、测评一段时间后找出较优的配置再全量发布配置。
下面将结合一个实际例子来描述如何使用灰度发布功能。
## 5.1 场景介绍
100004458(apollo-demo)项目有两个客户端：
1. 10.32.21.19
2. 10.32.21.22
**灰度目标：**
* 当前有一个配置timeout=2000，我们希望对10.32.21.22灰度发布timeout=3000，对10.32.21.19仍然是timeout=2000。
## 5.2 创建灰度
首先点击application namespace右上角的`创建灰度`按钮。
点击确定后，灰度版本就创建成功了，页面会自动切换到`灰度版本`Tab。
## 5.3 灰度配置
点击`主版本的配置`中，timeout配置最右侧的`对此配置灰度`按钮
在弹出框中填入要灰度的值：3000，点击提交。
## 5.4 配置灰度规则
切换到`灰度规则`Tab，点击`新增规则`按钮
在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表，选择我们要灰度的IP，点击完成。
如果下拉框中没找到需要的IP，说明机器还没从Apollo取过配置，可以点击手动输入IP来输入，输入完后点击添加按钮
>注：对于公共Namespace的灰度规则，需要先指定要灰度的appId，然后再选择IP。
## 5.5 灰度发布
配置规则已经生效，不过灰度配置还没有发布。切换到`配置`Tab。
再次检查灰度的配置部分，如果没有问题，点击`灰度发布`。
在弹出框中可以看到主版本的值是2000，灰度版本即将发布的值是3000。填入其它信息后，点击发布。
发布后，切换到`灰度实例列表`Tab，就能看到10.32.21.22已经使用了灰度发布的值。
切换到`主版本`的`实例列表`，会看到主版本配置只有10.32.21.19在使用了。
后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效，规则的修改在规则点击完成后就会实时生效。
## 5.6 全量发布
如果灰度的配置测试下来比较理想，符合预期，那么就可以操作`全量发布`。
全量发布的效果是：
1. 灰度版本的配置会合并回主版本，在这个例子中，就是主版本的timeout会被更新成3000
2. 主版本的配置会自动进行一次发布
3. 在全量发布页面，可以选择是否保留当前灰度版本，默认为不保留。
我选择了不保留灰度版本，所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表，可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。
## 5.7 放弃灰度
如果灰度版本不理想或者不需要了，可以点击`放弃灰度`。
## 5.8 发布历史
点击主版本的`发布历史`按钮，可以看到当前namespace的主版本以及灰度版本的发布历史。
# 六、其它功能配置
## 6.1 配置查看权限
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
## 6.2 配置访问密钥
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
1. 项目管理员打开管理密钥页面
2. 为项目的每个环境生成访问密钥，注意默认是禁用的，建议在客户端都配置完成后再开启
3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥)
# 七、最佳实践
## 7.1 安全相关
配置中心作为基础服务，存储着公司非常重要的配置信息，所以安全因素需要大家重点关注，下面列举了一些注意事项供大家参考，也欢迎大家分享自己的实践案例。
### 7.1.1 认证
建议接入公司统一的身份认证系统，如 SSO、LDAP 等，接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
> 如果使用Apollo提供的Spring Security简单认证，务必记得要修改超级管理员apollo的密码
### 7.1.2 授权
Apollo 支持细粒度的权限控制，请务必根据实际情况做好权限控制：
1. [项目管理员权限](#_121-项目管理员权限)
* Apollo 默认允许所有登录用户创建项目，如果只允许部分用户创建项目，可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制)
2. [配置编辑、发布权限](#_122-配置编辑、发布权限)
* 配置编辑、发布权限支持按环境配置，比如开发环境开发人员可以自行完成配置编辑和发布的过程，但是生产环境发布权限交由测试或运维人员
* 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关，用于发布审核)，从而控制一次配置发布只能由一个人修改，另一个人发布，确保配置修改得到充分检查
3. [配置查看权限](#_61-配置查看权限)
* 可以指定某个环境只允许项目成员查看私有Namespace的配置，从而避免敏感配置泄露，如生产环境
### 7.1.3 系统访问
除了用户权限，在系统访问上也需要加以考虑：
1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的，所以出于安全考虑，禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网
2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5)，从而只有经过身份验证的客户端才能访问敏感配置
3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口，增强安全性
| #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
3. 输入项目信息
* 部门：选择应用所在的部门
* 应用AppId：用来标识应用身份的唯一id，格式为string，需要和客户端app.properties中配置的app.id对应
* 应用名称：应用名，仅用于界面展示
* 应用负责人：选择的人默认会成为该项目的管理员，具备项目权限管理、集群创建、Namespace创建等权限
4. 点击提交
创建成功后，会自动跳转到项目首页
## 1.2 项目权限分配
### 1.2.1 项目管理员权限
项目管理员拥有以下权限：
1. 可以管理项目的权限分配
2. 可以创建集群
3. 可以创建Namespace
创建项目时填写的应用负责人默认会成为项目的管理员之一，如果还需要其他人也成为项目管理员，可以按照下面步骤操作：
1. 点击页面左侧的“管理项目”
* 
2. 搜索需要添加的成员并点击添加
* 
* 
### 1.2.2 配置编辑、发布权限
配置权限分为编辑和发布：
* 编辑权限允许用户在Apollo界面上创建、修改、删除配置
* 配置修改后只在Apollo界面上变化，不会影响到应用实际使用的配置
* 发布权限允许用户在Apollo界面上发布、回滚配置
* 配置只有在发布、回滚动作后才会被应用实际使用到
* Apollo在用户操作发布、回滚动作后实时通知到应用，并使最新配置生效
项目创建完，默认没有分配配置的编辑和发布权限，需要项目管理员进行授权。
1. 点击application这个namespace的授权按钮
* 
2. 分配修改权限
* 
3. 分配发布权限
* 
## 1.3 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
### 1.3.1 通过表格模式添加配置
1. 点击新增配置
* 
2. 输入配置项
* 
3. 点击提交
* 
### 1.3.2 通过文本模式编辑
Apollo除了支持表格模式，逐个添加、修改配置外，还提供文本模式批量添加、修改。
这个对于从已有的properties文件迁移尤其有用。
1. 切换到文本编辑模式
2. 点击右侧的修改配置按钮
3. 输入配置项，并点击提交修改
## 1.4 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
## 1.5 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
## 1.6 回滚已发布配置
如果发现已发布的配置有问题，可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。
这里的回滚机制类似于发布系统，发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本，但代码仓库中的代码是不会回滚的，从而开发可以在修复代码后重新发布。
Apollo中的回滚也是类似的机制，点击回滚后是将发布到客户端的配置回滚到上一个已发布版本，也就是说客户端读取到的配置会恢复到上一个版本，但页面上编辑状态的配置是不会回滚的，从而开发可以在修复配置后重新发布。
# 二、公共组件接入指南
## 2.1 公共组件和普通应用的区别
公共组件是指那些发布给其它应用使用的客户端代码，比如CAT客户端、Hermes Producer客户端等。
虽然这类组件是由其他团队开发、维护，但是运行时是在业务实际应用内的，所以本质上可以认为是应用的一部分。
通常情况下，这类组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
## 2.2 公共组件接入步骤
公共组件的接入步骤，和普通应用几乎一致，唯一的区别是公共组件需要创建自己唯一的Namespace。
所以，首先执行普通应用接入文档中的以下几个步骤，然后再按照本章节后面的步骤操作。
1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE)
2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90)
### 2.2.1 创建Namespace
创建Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权。
1. 点击页面左侧的添加Namespace
* 
2. 点击“创建新的Namespace”
* 
3. 输入公共组件的Namespace名称，需要注意的是Namespace名称全局唯一
* Apollo会默认把部门代号添加在最前面
* 
4. 点击提交后，页面会自动跳转到关联Namespace页面
* 首先，选中所有需要有这个Namespace的环境和集群，一般建议全选
* 其次，选中刚刚创建的namespace
* 最后，点击提交
* 
5. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
* 
2. 分配发布权限
* 
6. 点击“返回”回到项目页面
### 2.2.2 添加配置项
编辑配置需要拥有这个Namespace的编辑权限，如果发现没有新增配置按钮，可以找项目管理员授权。
#### 2.2.2.1 通过表格模式添加配置
1. 点击新增配置
2. 输入配置项
3. 点击提交
#### 2.2.2.2 通过文本模式编辑
这部分和普通应用一致，具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。
### 2.2.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
### 2.2.4 应用读取配置
配置发布成功后，应用就可以通过Apollo客户端读取到配置了。
Apollo目前提供Java客户端，具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide)：
如果应用使用了其它语言，也可以通过直接访问Http接口获取配置，具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide)
对于公共组件的配置读取，可以参考上述文档中的“获取公共Namespace的配置”部分。
## 2.3 应用覆盖公用组件配置步骤
前面提到，通常情况下，公共组件所用到的配置由原始开发团队维护，不过由于实际应用的运行时、环境各不一样，所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。
这里就讲一下应用如何覆盖公用组件的配置，简单起见，假设apollo-portal应用使用了hermes producer客户端，并且希望调整hermes的批量发送大小。
### 2.3.1 关联公共组件Namespace
1. 进入使用公共组件的应用项目首页，点击左侧的添加Namespace按钮
* 所以，在这个例子中，我们需要进入apollo-portal的首页。
* （添加Namespace需要项目管理员权限，如果发现没有添加Namespace按钮，可以找项目管理员授权）
* 
2. 找到hermes producer的namespace，并选择需要关联到哪些环境和集群
3. 关联成功后，页面会自动跳转到Namespace权限管理页面
1. 分配修改权限
2. 分配发布权限
4. 点击“返回”回到项目页面
### 2.3.2 覆盖公用组件配置
1. 点击新增配置
2. 输入要覆盖的配置项
3. 点击提交
### 2.3.3 发布配置
配置只有在发布后才会真的被应用使用到，所以在编辑完配置后，需要发布配置。
发布配置需要拥有这个Namespace的发布权限，如果发现没有发布按钮，可以找项目管理员授权。
1. 点击“发布按钮”
2. 填写发布相关信息，点击发布
3. 配置发布成功后，hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。
# 三、集群独立配置说明
在有些特殊情况下，应用有需求对不同的集群做不同的配置，比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。
在这种情况下，可以通过在Apollo创建不同的集群来解决。
## 3.1 创建集群
创建集群需要项目管理员权限，如果发现没有添加集群按钮，可以找项目管理员授权。
1. 点击页面左侧的“添加集群”按钮
* 
2. 输入集群名称，选择环境并提交
* 
3. 切换到对应的集群，修改配置并发布即可
* 
4. 通过上述配置，部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置
5. 如果应用还在其它机房部署了应用，那么在上述的配置下，会读到default集群下的配置。
# 四、多个AppId使用同一份配置
在一些情况下，尽管应用本身不是公共组件，但还是需要在多个AppId之间共用同一份配置，比如同一个产品的不同项目：XX-Web, XX-Service, XX-Job等。
这种情况下如果希望实现多个AppId使用同一份配置的话，基本概念和公共组件的配置是一致的。
具体来说，就是在其中一个AppId下创建一个namespace，写入公共的配置信息，然后在各个项目中读取该namespace的配置即可。
如果某个AppId需要覆盖公共的配置信息，那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。
具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。
# 五、灰度发布使用指南
通过灰度发布功能，可以实现：
1. 对于一些对程序有比较大影响的配置，可以先在一个或者多个实例生效，观察一段时间没问题后再全量发布配置。
2. 对于一些需要调优的配置参数，可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置，不断调整、测评一段时间后找出较优的配置再全量发布配置。
下面将结合一个实际例子来描述如何使用灰度发布功能。
## 5.1 场景介绍
100004458(apollo-demo)项目有两个客户端：
1. 10.32.21.19
2. 10.32.21.22
**灰度目标：**
* 当前有一个配置timeout=2000，我们希望对10.32.21.22灰度发布timeout=3000，对10.32.21.19仍然是timeout=2000。
## 5.2 创建灰度
首先点击application namespace右上角的`创建灰度`按钮。
点击确定后，灰度版本就创建成功了，页面会自动切换到`灰度版本`Tab。
## 5.3 灰度配置
点击`主版本的配置`中，timeout配置最右侧的`对此配置灰度`按钮
在弹出框中填入要灰度的值：3000，点击提交。
## 5.4 配置灰度规则
切换到`灰度规则`Tab，点击`新增规则`按钮
在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表，选择我们要灰度的IP，点击完成。
如果下拉框中没找到需要的IP，说明机器还没从Apollo取过配置，可以点击手动输入IP来输入，输入完后点击添加按钮
>注：对于公共Namespace的灰度规则，需要先指定要灰度的appId，然后再选择IP。
## 5.5 灰度发布
配置规则已经生效，不过灰度配置还没有发布。切换到`配置`Tab。
再次检查灰度的配置部分，如果没有问题，点击`灰度发布`。
在弹出框中可以看到主版本的值是2000，灰度版本即将发布的值是3000。填入其它信息后，点击发布。
发布后，切换到`灰度实例列表`Tab，就能看到10.32.21.22已经使用了灰度发布的值。
切换到`主版本`的`实例列表`，会看到主版本配置只有10.32.21.19在使用了。
后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效，规则的修改在规则点击完成后就会实时生效。
## 5.6 全量发布
如果灰度的配置测试下来比较理想，符合预期，那么就可以操作`全量发布`。
全量发布的效果是：
1. 灰度版本的配置会合并回主版本，在这个例子中，就是主版本的timeout会被更新成3000
2. 主版本的配置会自动进行一次发布
3. 在全量发布页面，可以选择是否保留当前灰度版本，默认为不保留。
我选择了不保留灰度版本，所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表，可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。
## 5.7 放弃灰度
如果灰度版本不理想或者不需要了，可以点击`放弃灰度`。
## 5.8 发布历史
点击主版本的`发布历史`按钮，可以看到当前namespace的主版本以及灰度版本的发布历史。
# 六、其它功能配置
## 6.1 配置查看权限
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
## 6.2 配置访问密钥
Apollo从1.6.0版本开始增加访问密钥机制，从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥，客户端需要配置密钥，否则无法获取配置。
1. 项目管理员打开管理密钥页面
2. 为项目的每个环境生成访问密钥，注意默认是禁用的，建议在客户端都配置完成后再开启
3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥)
# 七、最佳实践
## 7.1 安全相关
配置中心作为基础服务，存储着公司非常重要的配置信息，所以安全因素需要大家重点关注，下面列举了一些注意事项供大家参考，也欢迎大家分享自己的实践案例。
### 7.1.1 认证
建议接入公司统一的身份认证系统，如 SSO、LDAP 等，接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function)
> 如果使用Apollo提供的Spring Security简单认证，务必记得要修改超级管理员apollo的密码
### 7.1.2 授权
Apollo 支持细粒度的权限控制，请务必根据实际情况做好权限控制：
1. [项目管理员权限](#_121-项目管理员权限)
* Apollo 默认允许所有登录用户创建项目，如果只允许部分用户创建项目，可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制)
2. [配置编辑、发布权限](#_122-配置编辑、发布权限)
* 配置编辑、发布权限支持按环境配置，比如开发环境开发人员可以自行完成配置编辑和发布的过程，但是生产环境发布权限交由测试或运维人员
* 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关，用于发布审核)，从而控制一次配置发布只能由一个人修改，另一个人发布，确保配置修改得到充分检查
3. [配置查看权限](#_61-配置查看权限)
* 可以指定某个环境只允许项目成员查看私有Namespace的配置，从而避免敏感配置泄露，如生产环境
### 7.1.3 系统访问
除了用户权限，在系统访问上也需要加以考虑：
1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的，所以出于安全考虑，禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网
2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5)，从而只有经过身份验证的客户端才能访问敏感配置
3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口，增强安全性
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/usage/third-party-sdks-user-guide.md | ## 1. Go
### Apollo Go 客户端 1
项目地址：[zouyx/agollo](https://github.com/zouyx/agollo)
> 非常感谢[@zouyx](https://github.com/zouyx)提供Go Apollo客户端的支持
### Apollo Go 客户端 2
项目地址：[philchia/agollo](https://github.com/philchia/agollo)
> 非常感谢[@philchia](https://github.com/philchia)提供Go Apollo客户端的支持
### Apollo Go 客户端 3
项目地址：[shima-park/agollo](https://github.com/shima-park/agollo)
> 非常感谢[@shima-park](https://github.com/shima-park)提供Go Apollo客户端的支持
### Apollo Go 客户端 4
项目地址：[go-microservices/php_conf_agent](https://github.com/go-microservices/php_conf_agent)
> 非常感谢[@GanymedeNil](https://github.com/GanymedeNil)提供Go Apollo客户端的支持
### Apollo Go 客户端 5
项目地址：[hyperjiang/lunar](https://github.com/hyperjiang/lunar)
> 非常感谢[@hyperjiang](https://github.com/hyperjiang)提供Go Apollo客户端的支持
### Apollo Go 客户端 6
项目地址：[tagconfig/tagconfig](https://github.com/tagconfig/tagconfig)
> 非常感谢[@n0trace](https://github.com/n0trace)提供Go Apollo客户端的支持
### Apollo Go 客户端 7
项目地址：[go-chassis/go-archaius](https://github.com/go-chassis/go-archaius/tree/master/examples/apollo)
> 非常感谢[@tianxiaoliang](https://github.com/tianxiaoliang) 和 [@Shonminh](https://github.com/Shonminh)提供Go Apollo客户端的支持
### Apollo Go 客户端 8
项目地址：[xhrg-product/apollo-client-golang](https://github.com/xhrg-product/apollo-client-golang)
> 非常感谢[@xhrg](https://github.com/xhrg)提供Go Apollo客户端的支持
## 2. Python
### Apollo Python 客户端 1
项目地址：[pyapollo](https://github.com/filamoon/pyapollo)
> 非常感谢[@filamoon](https://github.com/filamoon)提供Python Apollo客户端的支持
### Apollo Python 客户端 2
项目地址：[BruceWW-pyapollo](https://github.com/BruceWW/pyapollo)
> 非常感谢[@BruceWW](https://github.com/BruceWW)提供Python Apollo客户端的支持
### Apollo Python 客户端 3
项目地址：[xhrg-product/apollo-client-python](https://github.com/xhrg-product/apollo-client-python)
> 非常感谢[@xhrg-product](https://github.com/xhrg-product)提供Python Apollo客户端的支持
## 3. NodeJS
### Apollo NodeJS 客户端 1
项目地址：[node-apollo](https://github.com/Quinton/node-apollo)
> 非常感谢[@Quinton](https://github.com/Quinton)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 2
项目地址：[ctrip-apollo](https://github.com/kaelzhang/ctrip-apollo)
> 非常感谢[@kaelzhang](https://github.com/kaelzhang)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 3
项目地址：[node-apollo-client](https://github.com/shinux/node-apollo-client)
> 非常感谢[@shinux](https://github.com/shinux)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 4
项目地址：[ctrip-apollo-client](https://github.com/lvgithub/ctrip-apollo-client)
> 非常感谢[@lvgithub](https://github.com/lvgithub)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 5
项目地址：[apollo-node](https://github.com/lengyuxuan/apollo-node)
> 非常感谢[@lengyuxuan](https://github.com/lengyuxuan)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 6
项目地址：[egg-apollo-client](https://github.com/xuezier/egg-apollo-client)
> 非常感谢[@xuezier](https://github.com/xuezier)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 7
项目地址：[apollo-node-client](https://github.com/zhangxh1023/apollo-node-client)
> 非常感谢[@zhangxh1023](https://github.com/zhangxh1023)提供NodeJS Apollo客户端的支持
## 4. PHP
### Apollo PHP 客户端 1
项目地址：[apollo-php-client](https://github.com/multilinguals/apollo-php-client)
> 非常感谢[@t04041143](https://github.com/t04041143)提供PHP Apollo客户端的支持
### Apollo PHP 客户端 2
项目地址：[apollo-sdk-config](https://github.com/fengzhibin/apollo-sdk-config)
项目地址：[apollo-sdk-clientd](https://github.com/fengzhibin/apollo-sdk-clientd)
> 非常感谢[@fengzhibin](https://github.com/fengzhibin)提供PHP Apollo客户端的支持
## 5. C
### Apollo C 客户端
项目地址：[apollo-c-client](https://github.com/lzeqian/apollo)
> 非常感谢[@lzeqian](https://github.com/lzeqian)提供C Apollo客户端的支持
| ## 1. Go
### Apollo Go 客户端 1
项目地址：[zouyx/agollo](https://github.com/zouyx/agollo)
> 非常感谢[@zouyx](https://github.com/zouyx)提供Go Apollo客户端的支持
### Apollo Go 客户端 2
项目地址：[philchia/agollo](https://github.com/philchia/agollo)
> 非常感谢[@philchia](https://github.com/philchia)提供Go Apollo客户端的支持
### Apollo Go 客户端 3
项目地址：[shima-park/agollo](https://github.com/shima-park/agollo)
> 非常感谢[@shima-park](https://github.com/shima-park)提供Go Apollo客户端的支持
### Apollo Go 客户端 4
项目地址：[go-microservices/php_conf_agent](https://github.com/go-microservices/php_conf_agent)
> 非常感谢[@GanymedeNil](https://github.com/GanymedeNil)提供Go Apollo客户端的支持
### Apollo Go 客户端 5
项目地址：[hyperjiang/lunar](https://github.com/hyperjiang/lunar)
> 非常感谢[@hyperjiang](https://github.com/hyperjiang)提供Go Apollo客户端的支持
### Apollo Go 客户端 6
项目地址：[tagconfig/tagconfig](https://github.com/tagconfig/tagconfig)
> 非常感谢[@n0trace](https://github.com/n0trace)提供Go Apollo客户端的支持
### Apollo Go 客户端 7
项目地址：[go-chassis/go-archaius](https://github.com/go-chassis/go-archaius/tree/master/examples/apollo)
> 非常感谢[@tianxiaoliang](https://github.com/tianxiaoliang) 和 [@Shonminh](https://github.com/Shonminh)提供Go Apollo客户端的支持
### Apollo Go 客户端 8
项目地址：[xhrg-product/apollo-client-golang](https://github.com/xhrg-product/apollo-client-golang)
> 非常感谢[@xhrg](https://github.com/xhrg)提供Go Apollo客户端的支持
## 2. Python
### Apollo Python 客户端 1
项目地址：[pyapollo](https://github.com/filamoon/pyapollo)
> 非常感谢[@filamoon](https://github.com/filamoon)提供Python Apollo客户端的支持
### Apollo Python 客户端 2
项目地址：[BruceWW-pyapollo](https://github.com/BruceWW/pyapollo)
> 非常感谢[@BruceWW](https://github.com/BruceWW)提供Python Apollo客户端的支持
### Apollo Python 客户端 3
项目地址：[xhrg-product/apollo-client-python](https://github.com/xhrg-product/apollo-client-python)
> 非常感谢[@xhrg-product](https://github.com/xhrg-product)提供Python Apollo客户端的支持
## 3. NodeJS
### Apollo NodeJS 客户端 1
项目地址：[node-apollo](https://github.com/Quinton/node-apollo)
> 非常感谢[@Quinton](https://github.com/Quinton)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 2
项目地址：[ctrip-apollo](https://github.com/kaelzhang/ctrip-apollo)
> 非常感谢[@kaelzhang](https://github.com/kaelzhang)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 3
项目地址：[node-apollo-client](https://github.com/shinux/node-apollo-client)
> 非常感谢[@shinux](https://github.com/shinux)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 4
项目地址：[ctrip-apollo-client](https://github.com/lvgithub/ctrip-apollo-client)
> 非常感谢[@lvgithub](https://github.com/lvgithub)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 5
项目地址：[apollo-node](https://github.com/lengyuxuan/apollo-node)
> 非常感谢[@lengyuxuan](https://github.com/lengyuxuan)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 6
项目地址：[egg-apollo-client](https://github.com/xuezier/egg-apollo-client)
> 非常感谢[@xuezier](https://github.com/xuezier)提供NodeJS Apollo客户端的支持
### Apollo NodeJS 客户端 7
项目地址：[apollo-node-client](https://github.com/zhangxh1023/apollo-node-client)
> 非常感谢[@zhangxh1023](https://github.com/zhangxh1023)提供NodeJS Apollo客户端的支持
## 4. PHP
### Apollo PHP 客户端 1
项目地址：[apollo-php-client](https://github.com/multilinguals/apollo-php-client)
> 非常感谢[@t04041143](https://github.com/t04041143)提供PHP Apollo客户端的支持
### Apollo PHP 客户端 2
项目地址：[apollo-sdk-config](https://github.com/fengzhibin/apollo-sdk-config)
项目地址：[apollo-sdk-clientd](https://github.com/fengzhibin/apollo-sdk-clientd)
> 非常感谢[@fengzhibin](https://github.com/fengzhibin)提供PHP Apollo客户端的支持
## 5. C
### Apollo C 客户端
项目地址：[apollo-c-client](https://github.com/lzeqian/apollo)
> 非常感谢[@lzeqian](https://github.com/lzeqian)提供C Apollo客户端的支持
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-configservice/src/assembly/assembly-descriptor.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.
~
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>apollo-assembly</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!--scripts -->
<fileSet>
<directory>src/main/scripts</directory>
<outputDirectory>scripts</outputDirectory>
<includes>
<include>*.sh</include>
</includes>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>config</outputDirectory>
<excludes>
<exclude>apollo-configservice.conf</exclude>
<exclude>application-github.properties</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>apollo-configservice.conf</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<outputDirectory>/config</outputDirectory>
<includes>
<include>application-github.properties</include>
</includes>
</fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
</assembly>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>apollo-assembly</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!--scripts -->
<fileSet>
<directory>src/main/scripts</directory>
<outputDirectory>scripts</outputDirectory>
<includes>
<include>*.sh</include>
</includes>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>config</outputDirectory>
<excludes>
<exclude>apollo-configservice.conf</exclude>
<exclude>application-github.properties</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/config</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>apollo-configservice.conf</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<outputDirectory>/config</outputDirectory>
<includes>
<include>application-github.properties</include>
</includes>
</fileSet>
<!--artifact -->
<fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>${project.artifactId}-*.jar</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
</assembly>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/development/portal-how-to-enable-email-service.md | 在配置发布时候，我们希望发布信息邮件通知到相关的负责人。现支持发送邮件的动作有：普通发布、灰度发布、全量发布、回滚，通知对象包括：具有namespace编辑和发布权限的人员以及App负责人。
由于各公司的邮件服务往往有不同的实现，所以Apollo定义了一些SPI用来解耦，Apollo接入邮件服务的关键就是实现这些SPI。
## 一、实现方式一：使用Apollo提供的smtp邮件服务
### 1.1 接入步骤
在ApolloPortalDB.ServerConfig表配置以下参数，也可以通过管理员工具 - 系统参数页面进行配置，修改完一分钟实时生效。如下：
* **email.enabled** 设置为true即可启用默认的smtp邮件服务
* **email.config.host** smtp的服务地址，如`smtp.163.com`
* **email.config.user** smtp帐号用户名
* **email.config.password** smtp帐号密码
* **email.supported.envs** 支持发送邮件的环境列表，英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件，只有某些环境下的发布动作才会发送邮件。
* **email.sender** 邮件的发送人，可以不配置，默认为`email.config.user`。
* **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。
* **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化，方便管理和变更邮件内容。
* **email.template.release.module.diff** 发布邮件的diff模块。
* **email.template.rollback.module.diff** 回滚邮件的diff模块。
* **email.template.release.module.rules** 灰度发布的灰度规则模块。
我们提供了[邮件模板样例](#三、邮件模板样例)，方便大家使用。
## 二、实现方式二：接入公司的统一邮件服务
和SSO类似，每个公司也有自己的邮件服务实现，所以我们相应的定义了[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)接口，现有两个实现类：
1. CtripEmailService：携程实现的EmailService
2. DefaultEmailService：smtp实现
### 2.1 接入步骤
1. 提供自己公司的[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)实现，并在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中注册。
2. 在ApolloPortalDB.ServerConfig表配置以下参数，也可以通过管理员工具 - 系统参数页面进行配置，修改完一分钟实时生效。如下：
* **email.supported.envs** 支持发送邮件的环境列表，英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件，只有某些环境下的发布动作才会发送邮件。
* **email.sender** 邮件的发送人。
* **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。
* **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化，方便管理和变更邮件内容。
* **email.template.release.module.diff** 发布邮件的diff模块。
* **email.template.rollback.module.diff** 回滚邮件的diff模块。
* **email.template.release.module.rules** 灰度发布的灰度规则模块。
我们提供了[邮件模板样例](#三、邮件模板样例)，方便大家使用。
>注：运行时使用不同的实现是通过[Profiles](http://docs.spring.io/autorepo/docs/spring-boot/current/reference/html/boot-features-profiles.html)实现的，比如你自己的Email实现是在`custom` profile中的话，在打包脚本中可以指定-Dapollo_profile=github,custom。其中`github`是Apollo必须的一个profile，用于数据库的配置，`custom`是你自己实现的profile。同时需要注意在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中修改默认实现的条件`@Profile({"!custom"})`。
### 2.2 相关代码
1. [ConfigPublishListener](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/ConfigPublishListener.java)监听发布事件，调用emailbuilder构建邮件内容，然后调用EmailService发送邮件
2. [emailbuilder](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/components/emailbuilder)包是构建邮件内容的实现
3. [EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java) 邮件发送服务
4. [EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java) 邮件服务注册类
## 三、邮件模板样例
以下为发布邮件和回滚邮件的模板内容样式，邮件模板为html格式，发送html格式的邮件时，可能需要做一些额外的处理，取决于每个公司的邮件服务实现。为了减少字符数，模板经过了压缩处理，可自行格式化提高可读性。
### 3.1 email.template.framework
```html
<html><head><style type="text/css">.table{width:100%;max-width:100%;margin-bottom:20px;border-collapse:collapse;background-color:transparent}td{padding:8px;line-height:1.42857143;vertical-align:top;border:1px solid #ddd;border-top:1px solid #ddd}.table-bordered{border:1px solid #ddd}</style></head><body><h3>发布基本信息</h3><table class="table table-bordered"><tr><td width="10%"><b>AppId</b></td><td width="15%">#{appId}</td><td width="10%"><b>环境</b></td><td width="15%">#{env}</td><td width="10%"><b>集群</b></td><td width="15%">#{clusterName}</td><td width="10%"><b>Namespace</b></td><td width="15%">#{namespaceName}</td></tr><tr><td><b>发布者</b></td><td>#{operator}</td><td><b>发布时间</b></td><td>#{releaseTime}</td><td><b>发布标题</b></td><td>#{releaseTitle}</td><td><b>备注</b></td><td>#{releaseComment}</td></tr></table>#{diffModule}#{rulesModule}<br><a href="#{apollo.portal.address}/config/history.html?#/appid=#{appId}&env=#{env}&clusterName=#{clusterName}&namespaceName=#{namespaceName}&releaseHistoryId=#{releaseHistoryId}">点击查看详细的发布信息</a><br><br>如有Apollo使用问题请先查阅<a href="http://conf.ctripcorp.com/display/FRAM/Apollo">文档</a>，或直接回复本邮件咨询。</body></html>
```
> 注：使用此模板需要在 portal 的系统参数中配置 apollo.portal.address，指向 apollo portal 的地址
### 3.2 email.template.release.module.diff
```html
<h3>变更的配置</h3>
<table class="table table-bordered">
<tr>
<td width="10%"><b>Type</b></td>
<td width="20%"><b>Key</b></td>
<td width="35%"><b>Old Value</b></td>
<td width="35%"><b>New Value</b></td>
</tr>
#{diffContent}
</table>
```
### 3.3 email.template.rollback.module.diff
```html
<div>
<br><br>
<h3>变更的配置</h3>
<table class="table table-bordered">
<tr>
<td width="10%"><b>Type</b></td>
<td width="20%"><b>Key</b></td>
<td width="35%"><b>回滚前</b></td>
<td width="35%"><b>回滚后</b></td>
</tr>
#{diffContent}
</table>
<br>
</div>
```
### 3.4 email.template.release.module.rules
```html
<div>
<br>
<h3>灰度规则</h3>
#{rulesContent}
<br>
</div>
```
### 3.5 发布邮件样例
### 3.6 回滚邮件样例
 | 在配置发布时候，我们希望发布信息邮件通知到相关的负责人。现支持发送邮件的动作有：普通发布、灰度发布、全量发布、回滚，通知对象包括：具有namespace编辑和发布权限的人员以及App负责人。
由于各公司的邮件服务往往有不同的实现，所以Apollo定义了一些SPI用来解耦，Apollo接入邮件服务的关键就是实现这些SPI。
## 一、实现方式一：使用Apollo提供的smtp邮件服务
### 1.1 接入步骤
在ApolloPortalDB.ServerConfig表配置以下参数，也可以通过管理员工具 - 系统参数页面进行配置，修改完一分钟实时生效。如下：
* **email.enabled** 设置为true即可启用默认的smtp邮件服务
* **email.config.host** smtp的服务地址，如`smtp.163.com`
* **email.config.user** smtp帐号用户名
* **email.config.password** smtp帐号密码
* **email.supported.envs** 支持发送邮件的环境列表，英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件，只有某些环境下的发布动作才会发送邮件。
* **email.sender** 邮件的发送人，可以不配置，默认为`email.config.user`。
* **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。
* **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化，方便管理和变更邮件内容。
* **email.template.release.module.diff** 发布邮件的diff模块。
* **email.template.rollback.module.diff** 回滚邮件的diff模块。
* **email.template.release.module.rules** 灰度发布的灰度规则模块。
我们提供了[邮件模板样例](#三、邮件模板样例)，方便大家使用。
## 二、实现方式二：接入公司的统一邮件服务
和SSO类似，每个公司也有自己的邮件服务实现，所以我们相应的定义了[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)接口，现有两个实现类：
1. CtripEmailService：携程实现的EmailService
2. DefaultEmailService：smtp实现
### 2.1 接入步骤
1. 提供自己公司的[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)实现，并在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中注册。
2. 在ApolloPortalDB.ServerConfig表配置以下参数，也可以通过管理员工具 - 系统参数页面进行配置，修改完一分钟实时生效。如下：
* **email.supported.envs** 支持发送邮件的环境列表，英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件，只有某些环境下的发布动作才会发送邮件。
* **email.sender** 邮件的发送人。
* **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。
* **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化，方便管理和变更邮件内容。
* **email.template.release.module.diff** 发布邮件的diff模块。
* **email.template.rollback.module.diff** 回滚邮件的diff模块。
* **email.template.release.module.rules** 灰度发布的灰度规则模块。
我们提供了[邮件模板样例](#三、邮件模板样例)，方便大家使用。
>注：运行时使用不同的实现是通过[Profiles](http://docs.spring.io/autorepo/docs/spring-boot/current/reference/html/boot-features-profiles.html)实现的，比如你自己的Email实现是在`custom` profile中的话，在打包脚本中可以指定-Dapollo_profile=github,custom。其中`github`是Apollo必须的一个profile，用于数据库的配置，`custom`是你自己实现的profile。同时需要注意在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中修改默认实现的条件`@Profile({"!custom"})`。
### 2.2 相关代码
1. [ConfigPublishListener](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/ConfigPublishListener.java)监听发布事件，调用emailbuilder构建邮件内容，然后调用EmailService发送邮件
2. [emailbuilder](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/components/emailbuilder)包是构建邮件内容的实现
3. [EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java) 邮件发送服务
4. [EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java) 邮件服务注册类
## 三、邮件模板样例
以下为发布邮件和回滚邮件的模板内容样式，邮件模板为html格式，发送html格式的邮件时，可能需要做一些额外的处理，取决于每个公司的邮件服务实现。为了减少字符数，模板经过了压缩处理，可自行格式化提高可读性。
### 3.1 email.template.framework
```html
<html><head><style type="text/css">.table{width:100%;max-width:100%;margin-bottom:20px;border-collapse:collapse;background-color:transparent}td{padding:8px;line-height:1.42857143;vertical-align:top;border:1px solid #ddd;border-top:1px solid #ddd}.table-bordered{border:1px solid #ddd}</style></head><body><h3>发布基本信息</h3><table class="table table-bordered"><tr><td width="10%"><b>AppId</b></td><td width="15%">#{appId}</td><td width="10%"><b>环境</b></td><td width="15%">#{env}</td><td width="10%"><b>集群</b></td><td width="15%">#{clusterName}</td><td width="10%"><b>Namespace</b></td><td width="15%">#{namespaceName}</td></tr><tr><td><b>发布者</b></td><td>#{operator}</td><td><b>发布时间</b></td><td>#{releaseTime}</td><td><b>发布标题</b></td><td>#{releaseTitle}</td><td><b>备注</b></td><td>#{releaseComment}</td></tr></table>#{diffModule}#{rulesModule}<br><a href="#{apollo.portal.address}/config/history.html?#/appid=#{appId}&env=#{env}&clusterName=#{clusterName}&namespaceName=#{namespaceName}&releaseHistoryId=#{releaseHistoryId}">点击查看详细的发布信息</a><br><br>如有Apollo使用问题请先查阅<a href="http://conf.ctripcorp.com/display/FRAM/Apollo">文档</a>，或直接回复本邮件咨询。</body></html>
```
> 注：使用此模板需要在 portal 的系统参数中配置 apollo.portal.address，指向 apollo portal 的地址
### 3.2 email.template.release.module.diff
```html
<h3>变更的配置</h3>
<table class="table table-bordered">
<tr>
<td width="10%"><b>Type</b></td>
<td width="20%"><b>Key</b></td>
<td width="35%"><b>Old Value</b></td>
<td width="35%"><b>New Value</b></td>
</tr>
#{diffContent}
</table>
```
### 3.3 email.template.rollback.module.diff
```html
<div>
<br><br>
<h3>变更的配置</h3>
<table class="table table-bordered">
<tr>
<td width="10%"><b>Type</b></td>
<td width="20%"><b>Key</b></td>
<td width="35%"><b>回滚前</b></td>
<td width="35%"><b>回滚后</b></td>
</tr>
#{diffContent}
</table>
<br>
</div>
```
### 3.4 email.template.release.module.rules
```html
<div>
<br>
<h3>灰度规则</h3>
#{rulesContent}
<br>
</div>
```
### 3.5 发布邮件样例
### 3.6 回滚邮件样例
 | -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/design/apollo-design.md | #
# 一、总体设计
## 1.1 基础模型
如下即是Apollo的基础模型：
1. 用户在配置中心对配置进行修改并发布
2. 配置中心通知Apollo客户端有配置更新
3. Apollo客户端从配置中心拉取最新的配置、更新本地配置并通知到应用
## 1.2 架构模块
下图是Apollo架构模块的概览，详细说明可以参考[Apollo配置中心架构剖析](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ)。
上图简要描述了Apollo的总体设计，我们可以从下往上看：
* Config Service提供配置的读取、推送等功能，服务对象是Apollo客户端
* Admin Service提供配置的修改、发布等功能，服务对象是Apollo Portal（管理界面）
* Config Service和Admin Service都是多实例、无状态部署，所以需要将自己注册到Eureka中并保持心跳
* 在Eureka之上我们架了一层Meta Server用于封装Eureka的服务发现接口
* Client通过域名访问Meta Server获取Config Service服务列表（IP+Port），而后直接通过IP+Port访问服务，同时在Client侧会做load balance、错误重试
* Portal通过域名访问Meta Server获取Admin Service服务列表（IP+Port），而后直接通过IP+Port访问服务，同时在Portal侧会做load balance、错误重试
* 为了简化部署，我们实际上会把Config Service、Eureka和Meta Server三个逻辑角色部署在同一个JVM进程中
### 1.2.1 Why Eureka
为什么我们采用Eureka作为服务注册中心，而不是使用传统的zk、etcd呢？我大致总结了一下，有以下几方面的原因：
* 它提供了完整的Service Registry和Service Discovery实现
* 首先是提供了完整的实现，并且也经受住了Netflix自己的生产环境考验，相对使用起来会比较省心。
* 和Spring Cloud无缝集成
* 我们的项目本身就使用了Spring Cloud和Spring Boot，同时Spring Cloud还有一套非常完善的开源代码来整合Eureka，所以使用起来非常方便。
* 另外，Eureka还支持在我们应用自身的容器中启动，也就是说我们的应用启动完之后，既充当了Eureka的角色，同时也是服务的提供者。这样就极大的提高了服务的可用性。
* **这一点是我们选择Eureka而不是zk、etcd等的主要原因，为了提高配置中心的可用性和降低部署复杂度，我们需要尽可能地减少外部依赖。**
* Open Source
* 最后一点是开源，由于代码是开源的，所以非常便于我们了解它的实现原理和排查问题。
## 1.3 各模块概要介绍
### 1.3.1 Config Service
* 提供配置获取接口
* 提供配置更新推送接口（基于Http long polling）
* 服务端使用[Spring DeferredResult](http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/context/request/async/DeferredResult.html)实现异步化，从而大大增加长连接数量
* 目前使用的tomcat embed默认配置是最多10000个连接（可以调整），使用了4C8G的虚拟机实测可以支撑10000个连接，所以满足需求（一个应用实例只会发起一个长连接）。
* 接口服务对象为Apollo客户端
### 1.3.2 Admin Service
* 提供配置管理接口
* 提供配置修改、发布等接口
* 接口服务对象为Portal
### 1.3.3 Meta Server
* Portal通过域名访问Meta Server获取Admin Service服务列表（IP+Port）
* Client通过域名访问Meta Server获取Config Service服务列表（IP+Port）
* Meta Server从Eureka获取Config Service和Admin Service的服务信息，相当于是一个Eureka Client
* 增设一个Meta Server的角色主要是为了封装服务发现的细节，对Portal和Client而言，永远通过一个Http接口获取Admin Service和Config Service的服务信息，而不需要关心背后实际的服务注册和发现组件
* Meta Server只是一个逻辑角色，在部署时和Config Service是在一个JVM进程中的，所以IP、端口和Config Service一致
### 1.3.4 Eureka
* 基于[Eureka](https://github.com/Netflix/eureka)和[Spring Cloud Netflix](https://cloud.spring.io/spring-cloud-netflix/)提供服务注册和发现
* Config Service和Admin Service会向Eureka注册服务，并保持心跳
* 为了简单起见，目前Eureka在部署时和Config Service是在一个JVM进程中的（通过Spring Cloud Netflix）
### 1.3.5 Portal
* 提供Web界面供用户管理配置
* 通过Meta Server获取Admin Service服务列表（IP+Port），通过IP+Port访问服务
* 在Portal侧做load balance、错误重试
### 1.3.6 Client
* Apollo提供的客户端程序，为应用提供配置获取、实时更新等功能
* 通过Meta Server获取Config Service服务列表（IP+Port），通过IP+Port访问服务
* 在Client侧做load balance、错误重试
## 1.4 E-R Diagram
### 1.4.1 主体E-R Diagram
* **App**
* App信息
* **AppNamespace**
* App下Namespace的元信息
* **Cluster**
* 集群信息
* **Namespace**
* 集群下的namespace
* **Item**
* Namespace的配置，每个Item是一个key, value组合
* **Release**
* Namespace发布的配置，每个发布包含发布时该Namespace的所有配置
* **Commit**
* Namespace下的配置更改记录
* **Audit**
* 审计信息，记录用户在何时使用何种方式操作了哪个实体。
### 1.4.2 权限相关E-R Diagram
* **User**
* Apollo portal用户
* **UserRole**
* 用户和角色的关系
* **Role**
* 角色
* **RolePermission**
* 角色和权限的关系
* **Permission**
* 权限
* 对应到具体的实体资源和操作，如修改NamespaceA的配置，发布NamespaceB的配置等。
* **Consumer**
* 第三方应用
* **ConsumerToken**
* 发给第三方应用的token
* **ConsumerRole**
* 第三方应用和角色的关系
* **ConsumerAudit**
* 第三方应用访问审计
# 二、服务端设计
## 2.1 配置发布后的实时推送设计
在配置中心中，一个重要的功能就是配置发布后实时推送到客户端。下面我们简要看一下这块是怎么设计实现的。
上图简要描述了配置发布的大致过程：
1. 用户在Portal操作配置发布
2. Portal调用Admin Service的接口操作发布
3. Admin Service发布配置后，发送ReleaseMessage给各个Config Service
4. Config Service收到ReleaseMessage后，通知对应的客户端
### 2.1.1 发送ReleaseMessage的实现方式
Admin Service在配置发布后，需要通知所有的Config Service有配置发布，从而Config Service可以通知对应的客户端来拉取最新的配置。
从概念上来看，这是一个典型的消息使用场景，Admin Service作为producer发出消息，各个Config Service作为consumer消费消息。通过一个消息组件（Message Queue）就能很好的实现Admin Service和Config Service的解耦。
在实现上，考虑到Apollo的实际使用场景，以及为了尽可能减少外部依赖，我们没有采用外部的消息中间件，而是通过数据库实现了一个简单的消息队列。
实现方式如下：
1. Admin Service在配置发布后会往ReleaseMessage表插入一条消息记录，消息内容就是配置发布的AppId+Cluster+Namespace，参见[DatabaseMessageSender](https://github.com/ctripcorp/apollo/blob/master/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/DatabaseMessageSender.java)
2. Config Service有一个线程会每秒扫描一次ReleaseMessage表，看看是否有新的消息记录，参见[ReleaseMessageScanner](https://github.com/ctripcorp/apollo/blob/master/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScanner.java)
3. Config Service如果发现有新的消息记录，那么就会通知到所有的消息监听器（[ReleaseMessageListener](https://github.com/ctripcorp/apollo/blob/master/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageListener.java)），如[NotificationControllerV2](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java)，消息监听器的注册过程参见[ConfigServiceAutoConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceAutoConfiguration.java)
4. NotificationControllerV2得到配置发布的AppId+Cluster+Namespace后，会通知对应的客户端
示意图如下：
<img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/release-message-design.png" alt="release-message-design" width="400px">
### 2.1.2 Config Service通知客户端的实现方式
上一节中简要描述了NotificationControllerV2是如何得知有配置发布的，那NotificationControllerV2在得知有配置发布后是如何通知到客户端的呢？
实现方式如下：
1. 客户端会发起一个Http请求到Config Service的`notifications/v2`接口，也就是[NotificationControllerV2](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java)，参见[RemoteConfigLongPollService](https://github.com/ctripcorp/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java)
2. NotificationControllerV2不会立即返回结果，而是通过[Spring DeferredResult](http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/context/request/async/DeferredResult.html)把请求挂起
3. 如果在60秒内没有该客户端关心的配置发布，那么会返回Http状态码304给客户端
4. 如果有该客户端关心的配置发布，NotificationControllerV2会调用DeferredResult的[setResult](http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/context/request/async/DeferredResult.html#setResult-T-)方法，传入有配置变化的namespace信息，同时该请求会立即返回。客户端从返回的结果中获取到配置变化的namespace后，会立即请求Config Service获取该namespace的最新配置。
# 三、客户端设计
上图简要描述了Apollo客户端的实现原理：
1. 客户端和服务端保持了一个长连接，从而能第一时间获得配置更新的推送。（通过Http Long Polling实现）
2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。
* 这是一个fallback机制，为了防止推送机制失效导致配置不更新
* 客户端定时拉取会上报本地版本，所以一般情况下，对于定时拉取的操作，服务端都会返回304 - Not Modified
* 定时频率默认为每5分钟拉取一次，客户端也可以通过在运行时指定System Property: `apollo.refreshInterval`来覆盖，单位为分钟。
3. 客户端从Apollo配置中心服务端获取到应用的最新配置后，会保存在内存中
4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份
* 在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置
5. 应用程序可以从Apollo客户端获取最新的配置、订阅配置更新通知
## 3.1 和Spring集成的原理
Apollo除了支持API方式获取配置，也支持和Spring/Spring Boot集成，集成原理简述如下。
Spring从3.1版本开始增加了`ConfigurableEnvironment`和`PropertySource`：
* ConfigurableEnvironment
* Spring的ApplicationContext会包含一个Environment（实现ConfigurableEnvironment接口）
* ConfigurableEnvironment自身包含了很多个PropertySource
* PropertySource
* 属性源
* 可以理解为很多个Key - Value的属性配置
在运行时的结构形如：
需要注意的是，PropertySource之间是有优先级顺序的，如果有一个Key在多个property source中都存在，那么在前面的property source优先。
所以对上图的例子：
* env.getProperty(“key1”) -> value1
* **env.getProperty(“key2”) -> value2**
* env.getProperty(“key3”) -> value4
在理解了上述原理后，Apollo和Spring/Spring Boot集成的手段就呼之欲出了：在应用启动阶段，Apollo从远端获取配置，然后组装成PropertySource并插入到第一个即可，如下图所示：
相关代码可以参考[PropertySourcesProcessor](https://github.com/ctripcorp/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/PropertySourcesProcessor.java)
# 四、可用性考虑
<table>
<thead>
<tr>
<th width="20%">场景</th>
<th width="20%">影响</th>
<th width="30%">降级</th>
<th width="30%">原因</th>
</tr>
</thead>
<tbody>
<tr>
<td>某台Config Service下线</td>
<td>无影响</td>
<td></td>
<td>Config Service无状态，客户端重连其它Config Service</td>
</tr>
<tr>
<td>所有Config Service下线</td>
<td>客户端无法读取最新配置，Portal无影响</td>
<td>客户端重启时，可以读取本地缓存配置文件。如果是新扩容的机器，可以从其它机器上获取已缓存的配置文件，具体信息可以参考<a href='/#/zh/usage/java-sdk-user-guide?id=_123-本地缓存路径'>Java客户端使用指南 - 1.2.3 本地缓存路径</a>
</td>
<td></td>
</tr>
<tr>
<td>某台Admin Service下线</td>
<td>无影响</td>
<td></td>
<td>Admin Service无状态，Portal重连其它Admin Service</td>
</tr>
<tr>
<td>所有Admin Service下线</td>
<td>客户端无影响，Portal无法更新配置</td>
<td></td>
<td></td>
</tr>
<tr>
<td>某台Portal下线</td>
<td>无影响</td>
<td></td>
<td>Portal域名通过SLB绑定多台服务器，重试后指向可用的服务器</td>
</tr>
<tr>
<td>全部Portal下线</td>
<td>客户端无影响，Portal无法更新配置</td>
<td></td>
<td></td>
</tr>
<tr>
<td>某个数据中心下线</td>
<td>无影响</td>
<td></td>
<td>多数据中心部署，数据完全同步，Meta Server/Portal域名通过SLB自动切换到其它存活的数据中心</td>
</tr>
<tr>
<td>数据库宕机</td>
<td>客户端无影响，Portal无法更新配置</td>
<td>Config Service开启<a href="/#/zh/deployment/distributed-deployment-guide?id=_323-config-servicecacheenabled-是否开启配置缓存">配置缓存</a>后，对配置的读取不受数据库宕机影响</td>
<td></td>
</tr>
</tbody>
</table>
# 五、监控相关
## 5.1 Tracing
### 5.1.1 CAT
Apollo客户端和服务端目前支持[CAT](https://github.com/dianping/cat)自动打点，所以如果自己公司内部部署了CAT的话，只要引入cat-client后Apollo就会自动启用CAT打点。
如果不使用CAT的话，也不用担心，只要不引入cat-client，Apollo是不会启用CAT打点的。
Apollo也提供了Tracer相关的SPI，可以方便地对接自己公司的监控系统。
更多信息，可以参考[v0.4.0 Release Note](https://github.com/ctripcorp/apollo/releases/tag/v0.4.0)
### 5.1.2 SkyWalking
可以参考[@hepyu](https://github.com/hepyu)贡献的[apollo-skywalking-pro样例](https://github.com/hepyu/k8s-app-config/tree/master/product/standard/apollo-skywalking-pro)。
## 5.2 Metrics
从1.5.0版本开始，Apollo服务端支持通过`/prometheus`暴露prometheus格式的metrics，如`http://${someIp:somePort}/prometheus` | #
# 一、总体设计
## 1.1 基础模型
如下即是Apollo的基础模型：
1. 用户在配置中心对配置进行修改并发布
2. 配置中心通知Apollo客户端有配置更新
3. Apollo客户端从配置中心拉取最新的配置、更新本地配置并通知到应用
## 1.2 架构模块
下图是Apollo架构模块的概览，详细说明可以参考[Apollo配置中心架构剖析](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ)。
上图简要描述了Apollo的总体设计，我们可以从下往上看：
* Config Service提供配置的读取、推送等功能，服务对象是Apollo客户端
* Admin Service提供配置的修改、发布等功能，服务对象是Apollo Portal（管理界面）
* Config Service和Admin Service都是多实例、无状态部署，所以需要将自己注册到Eureka中并保持心跳
* 在Eureka之上我们架了一层Meta Server用于封装Eureka的服务发现接口
* Client通过域名访问Meta Server获取Config Service服务列表（IP+Port），而后直接通过IP+Port访问服务，同时在Client侧会做load balance、错误重试
* Portal通过域名访问Meta Server获取Admin Service服务列表（IP+Port），而后直接通过IP+Port访问服务，同时在Portal侧会做load balance、错误重试
* 为了简化部署，我们实际上会把Config Service、Eureka和Meta Server三个逻辑角色部署在同一个JVM进程中
### 1.2.1 Why Eureka
为什么我们采用Eureka作为服务注册中心，而不是使用传统的zk、etcd呢？我大致总结了一下，有以下几方面的原因：
* 它提供了完整的Service Registry和Service Discovery实现
* 首先是提供了完整的实现，并且也经受住了Netflix自己的生产环境考验，相对使用起来会比较省心。
* 和Spring Cloud无缝集成
* 我们的项目本身就使用了Spring Cloud和Spring Boot，同时Spring Cloud还有一套非常完善的开源代码来整合Eureka，所以使用起来非常方便。
* 另外，Eureka还支持在我们应用自身的容器中启动，也就是说我们的应用启动完之后，既充当了Eureka的角色，同时也是服务的提供者。这样就极大的提高了服务的可用性。
* **这一点是我们选择Eureka而不是zk、etcd等的主要原因，为了提高配置中心的可用性和降低部署复杂度，我们需要尽可能地减少外部依赖。**
* Open Source
* 最后一点是开源，由于代码是开源的，所以非常便于我们了解它的实现原理和排查问题。
## 1.3 各模块概要介绍
### 1.3.1 Config Service
* 提供配置获取接口
* 提供配置更新推送接口（基于Http long polling）
* 服务端使用[Spring DeferredResult](http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/context/request/async/DeferredResult.html)实现异步化，从而大大增加长连接数量
* 目前使用的tomcat embed默认配置是最多10000个连接（可以调整），使用了4C8G的虚拟机实测可以支撑10000个连接，所以满足需求（一个应用实例只会发起一个长连接）。
* 接口服务对象为Apollo客户端
### 1.3.2 Admin Service
* 提供配置管理接口
* 提供配置修改、发布等接口
* 接口服务对象为Portal
### 1.3.3 Meta Server
* Portal通过域名访问Meta Server获取Admin Service服务列表（IP+Port）
* Client通过域名访问Meta Server获取Config Service服务列表（IP+Port）
* Meta Server从Eureka获取Config Service和Admin Service的服务信息，相当于是一个Eureka Client
* 增设一个Meta Server的角色主要是为了封装服务发现的细节，对Portal和Client而言，永远通过一个Http接口获取Admin Service和Config Service的服务信息，而不需要关心背后实际的服务注册和发现组件
* Meta Server只是一个逻辑角色，在部署时和Config Service是在一个JVM进程中的，所以IP、端口和Config Service一致
### 1.3.4 Eureka
* 基于[Eureka](https://github.com/Netflix/eureka)和[Spring Cloud Netflix](https://cloud.spring.io/spring-cloud-netflix/)提供服务注册和发现
* Config Service和Admin Service会向Eureka注册服务，并保持心跳
* 为了简单起见，目前Eureka在部署时和Config Service是在一个JVM进程中的（通过Spring Cloud Netflix）
### 1.3.5 Portal
* 提供Web界面供用户管理配置
* 通过Meta Server获取Admin Service服务列表（IP+Port），通过IP+Port访问服务
* 在Portal侧做load balance、错误重试
### 1.3.6 Client
* Apollo提供的客户端程序，为应用提供配置获取、实时更新等功能
* 通过Meta Server获取Config Service服务列表（IP+Port），通过IP+Port访问服务
* 在Client侧做load balance、错误重试
## 1.4 E-R Diagram
### 1.4.1 主体E-R Diagram
* **App**
* App信息
* **AppNamespace**
* App下Namespace的元信息
* **Cluster**
* 集群信息
* **Namespace**
* 集群下的namespace
* **Item**
* Namespace的配置，每个Item是一个key, value组合
* **Release**
* Namespace发布的配置，每个发布包含发布时该Namespace的所有配置
* **Commit**
* Namespace下的配置更改记录
* **Audit**
* 审计信息，记录用户在何时使用何种方式操作了哪个实体。
### 1.4.2 权限相关E-R Diagram
* **User**
* Apollo portal用户
* **UserRole**
* 用户和角色的关系
* **Role**
* 角色
* **RolePermission**
* 角色和权限的关系
* **Permission**
* 权限
* 对应到具体的实体资源和操作，如修改NamespaceA的配置，发布NamespaceB的配置等。
* **Consumer**
* 第三方应用
* **ConsumerToken**
* 发给第三方应用的token
* **ConsumerRole**
* 第三方应用和角色的关系
* **ConsumerAudit**
* 第三方应用访问审计
# 二、服务端设计
## 2.1 配置发布后的实时推送设计
在配置中心中，一个重要的功能就是配置发布后实时推送到客户端。下面我们简要看一下这块是怎么设计实现的。
上图简要描述了配置发布的大致过程：
1. 用户在Portal操作配置发布
2. Portal调用Admin Service的接口操作发布
3. Admin Service发布配置后，发送ReleaseMessage给各个Config Service
4. Config Service收到ReleaseMessage后，通知对应的客户端
### 2.1.1 发送ReleaseMessage的实现方式
Admin Service在配置发布后，需要通知所有的Config Service有配置发布，从而Config Service可以通知对应的客户端来拉取最新的配置。
从概念上来看，这是一个典型的消息使用场景，Admin Service作为producer发出消息，各个Config Service作为consumer消费消息。通过一个消息组件（Message Queue）就能很好的实现Admin Service和Config Service的解耦。
在实现上，考虑到Apollo的实际使用场景，以及为了尽可能减少外部依赖，我们没有采用外部的消息中间件，而是通过数据库实现了一个简单的消息队列。
实现方式如下：
1. Admin Service在配置发布后会往ReleaseMessage表插入一条消息记录，消息内容就是配置发布的AppId+Cluster+Namespace，参见[DatabaseMessageSender](https://github.com/ctripcorp/apollo/blob/master/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/DatabaseMessageSender.java)
2. Config Service有一个线程会每秒扫描一次ReleaseMessage表，看看是否有新的消息记录，参见[ReleaseMessageScanner](https://github.com/ctripcorp/apollo/blob/master/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScanner.java)
3. Config Service如果发现有新的消息记录，那么就会通知到所有的消息监听器（[ReleaseMessageListener](https://github.com/ctripcorp/apollo/blob/master/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageListener.java)），如[NotificationControllerV2](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java)，消息监听器的注册过程参见[ConfigServiceAutoConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceAutoConfiguration.java)
4. NotificationControllerV2得到配置发布的AppId+Cluster+Namespace后，会通知对应的客户端
示意图如下：
<img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/release-message-design.png" alt="release-message-design" width="400px">
### 2.1.2 Config Service通知客户端的实现方式
上一节中简要描述了NotificationControllerV2是如何得知有配置发布的，那NotificationControllerV2在得知有配置发布后是如何通知到客户端的呢？
实现方式如下：
1. 客户端会发起一个Http请求到Config Service的`notifications/v2`接口，也就是[NotificationControllerV2](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerV2.java)，参见[RemoteConfigLongPollService](https://github.com/ctripcorp/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java)
2. NotificationControllerV2不会立即返回结果，而是通过[Spring DeferredResult](http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/context/request/async/DeferredResult.html)把请求挂起
3. 如果在60秒内没有该客户端关心的配置发布，那么会返回Http状态码304给客户端
4. 如果有该客户端关心的配置发布，NotificationControllerV2会调用DeferredResult的[setResult](http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/context/request/async/DeferredResult.html#setResult-T-)方法，传入有配置变化的namespace信息，同时该请求会立即返回。客户端从返回的结果中获取到配置变化的namespace后，会立即请求Config Service获取该namespace的最新配置。
# 三、客户端设计
上图简要描述了Apollo客户端的实现原理：
1. 客户端和服务端保持了一个长连接，从而能第一时间获得配置更新的推送。（通过Http Long Polling实现）
2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。
* 这是一个fallback机制，为了防止推送机制失效导致配置不更新
* 客户端定时拉取会上报本地版本，所以一般情况下，对于定时拉取的操作，服务端都会返回304 - Not Modified
* 定时频率默认为每5分钟拉取一次，客户端也可以通过在运行时指定System Property: `apollo.refreshInterval`来覆盖，单位为分钟。
3. 客户端从Apollo配置中心服务端获取到应用的最新配置后，会保存在内存中
4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份
* 在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置
5. 应用程序可以从Apollo客户端获取最新的配置、订阅配置更新通知
## 3.1 和Spring集成的原理
Apollo除了支持API方式获取配置，也支持和Spring/Spring Boot集成，集成原理简述如下。
Spring从3.1版本开始增加了`ConfigurableEnvironment`和`PropertySource`：
* ConfigurableEnvironment
* Spring的ApplicationContext会包含一个Environment（实现ConfigurableEnvironment接口）
* ConfigurableEnvironment自身包含了很多个PropertySource
* PropertySource
* 属性源
* 可以理解为很多个Key - Value的属性配置
在运行时的结构形如：
需要注意的是，PropertySource之间是有优先级顺序的，如果有一个Key在多个property source中都存在，那么在前面的property source优先。
所以对上图的例子：
* env.getProperty(“key1”) -> value1
* **env.getProperty(“key2”) -> value2**
* env.getProperty(“key3”) -> value4
在理解了上述原理后，Apollo和Spring/Spring Boot集成的手段就呼之欲出了：在应用启动阶段，Apollo从远端获取配置，然后组装成PropertySource并插入到第一个即可，如下图所示：
相关代码可以参考[PropertySourcesProcessor](https://github.com/ctripcorp/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/PropertySourcesProcessor.java)
# 四、可用性考虑
<table>
<thead>
<tr>
<th width="20%">场景</th>
<th width="20%">影响</th>
<th width="30%">降级</th>
<th width="30%">原因</th>
</tr>
</thead>
<tbody>
<tr>
<td>某台Config Service下线</td>
<td>无影响</td>
<td></td>
<td>Config Service无状态，客户端重连其它Config Service</td>
</tr>
<tr>
<td>所有Config Service下线</td>
<td>客户端无法读取最新配置，Portal无影响</td>
<td>客户端重启时，可以读取本地缓存配置文件。如果是新扩容的机器，可以从其它机器上获取已缓存的配置文件，具体信息可以参考<a href='/#/zh/usage/java-sdk-user-guide?id=_123-本地缓存路径'>Java客户端使用指南 - 1.2.3 本地缓存路径</a>
</td>
<td></td>
</tr>
<tr>
<td>某台Admin Service下线</td>
<td>无影响</td>
<td></td>
<td>Admin Service无状态，Portal重连其它Admin Service</td>
</tr>
<tr>
<td>所有Admin Service下线</td>
<td>客户端无影响，Portal无法更新配置</td>
<td></td>
<td></td>
</tr>
<tr>
<td>某台Portal下线</td>
<td>无影响</td>
<td></td>
<td>Portal域名通过SLB绑定多台服务器，重试后指向可用的服务器</td>
</tr>
<tr>
<td>全部Portal下线</td>
<td>客户端无影响，Portal无法更新配置</td>
<td></td>
<td></td>
</tr>
<tr>
<td>某个数据中心下线</td>
<td>无影响</td>
<td></td>
<td>多数据中心部署，数据完全同步，Meta Server/Portal域名通过SLB自动切换到其它存活的数据中心</td>
</tr>
<tr>
<td>数据库宕机</td>
<td>客户端无影响，Portal无法更新配置</td>
<td>Config Service开启<a href="/#/zh/deployment/distributed-deployment-guide?id=_323-config-servicecacheenabled-是否开启配置缓存">配置缓存</a>后，对配置的读取不受数据库宕机影响</td>
<td></td>
</tr>
</tbody>
</table>
# 五、监控相关
## 5.1 Tracing
### 5.1.1 CAT
Apollo客户端和服务端目前支持[CAT](https://github.com/dianping/cat)自动打点，所以如果自己公司内部部署了CAT的话，只要引入cat-client后Apollo就会自动启用CAT打点。
如果不使用CAT的话，也不用担心，只要不引入cat-client，Apollo是不会启用CAT打点的。
Apollo也提供了Tracer相关的SPI，可以方便地对接自己公司的监控系统。
更多信息，可以参考[v0.4.0 Release Note](https://github.com/ctripcorp/apollo/releases/tag/v0.4.0)
### 5.1.2 SkyWalking
可以参考[@hepyu](https://github.com/hepyu)贡献的[apollo-skywalking-pro样例](https://github.com/hepyu/k8s-app-config/tree/master/product/standard/apollo-skywalking-pro)。
## 5.2 Metrics
从1.5.0版本开始，Apollo服务端支持通过`/prometheus`暴露prometheus格式的metrics，如`http://${someIp:somePort}/prometheus` | -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-assembly/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-assembly</artifactId>
<name>Apollo Assembly</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</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-assembly</artifactId>
<name>Apollo Assembly</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-configservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-adminservice</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-portal</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-demo/src/main/resources/spring.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:context="http://www.springframework.org/schema/context"
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.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config order="10"/>
<apollo:config namespaces="TEST1.apollo,application.yaml" order="11"/>
<bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
<property name="timeout" value="${timeout:200}"/>
<property name="batch" value="${batch:100}"/>
</bean>
<context:annotation-config />
</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:context="http://www.springframework.org/schema/context"
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.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config order="10"/>
<apollo:config namespaces="TEST1.apollo,application.yaml" order="11"/>
<bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
<property name="timeout" value="${timeout:200}"/>
<property name="batch" value="${batch:100}"/>
</bean>
<context:annotation-config />
</beans>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/test/resources/logback-test.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.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| <?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.
~
-->
<configuration scan="true">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<Pattern>[%p] %c - %m%n</Pattern>
</encoder>
</appender>
<logger name="org.springframework.test" level="OFF" />
<root level="WARN">
<appender-ref ref="CONSOLE" />
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/resources/spring/XmlConfigAnnotationTest3.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.XMLConfigAnnotationTest.TestApolloConfigChangeListenerBean1"/>
</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.XMLConfigAnnotationTest.TestApolloConfigChangeListenerBean1"/>
</beans>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-assembly/src/main/resources/logback.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.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-assembly.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| <?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.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-assembly.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/zh/usage/dotnet-sdk-user-guide.md | >注意：本文档适用对象是Apollo系统的使用者，如果你是公司内Apollo系统的开发者/维护人员，建议先参考[Apollo开发指南](zh/development/apollo-development-guide)。
#
# 一、准备工作
## 1.1 环境要求
* .Net: 4.0+
## 1.2 必选设置
Apollo客户端依赖于`AppId`，`Environment`等环境信息来工作，所以请确保阅读下面的说明并且做正确的配置：
### 1.2.1 AppId
AppId是应用的身份信息，是从服务端获取配置的一个重要信息。
请确保在app.config或web.config有AppID的配置，其中内容形如：
```xml
<?xml version="1.0"?>
<configuration>
<appSettings>
<!-- Change to the actual app id -->
<add key="AppID" value="100004458"/>
</appSettings>
</configuration>
```
> 注：app.id是用来标识应用身份的唯一id，格式为string。
### 1.2.2 Environment
Apollo支持应用在不同的环境有不同的配置，所以Environment是另一个从服务器获取配置的重要信息。
Environment通过配置文件来指定，文件位置为`C:\opt\settings\server.properties`，文件内容形如：
```properties
env=DEV
```
目前，`env`支持以下几个值（大小写不敏感）：
* DEV
* Development environment
* FAT
* Feature Acceptance Test environment
* UAT
* User Acceptance Test environment
* PRO
* Production environment
### 1.2.3 服务地址
Apollo客户端针对不同的环境会从不同的服务器获取配置，所以请确保在app.config或web.config正确配置了服务器地址(Apollo.{ENV}.Meta)，其中内容形如：
```xml
<?xml version="1.0"?>
<configuration>
<appSettings>
<!-- Change to the actual app id -->
<add key="AppID" value="100004458"/>
<!-- Should change the apollo config service url for each environment -->
<add key="Apollo.DEV.Meta" value="http://dev-configservice:8080"/>
<add key="Apollo.FAT.Meta" value="http://fat-configservice:8080"/>
<add key="Apollo.UAT.Meta" value="http://uat-configservice:8080"/>
<add key="Apollo.PRO.Meta" value="http://pro-configservice:8080"/>
</appSettings>
</configuration>
```
### 1.2.4 本地缓存路径
Apollo客户端会把从服务端获取到的配置在本地文件系统缓存一份，用于在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置，不影响应用正常运行。
本地缓存路径位于`C:\opt\data\{appId}\config-cache`，所以请确保`C:\opt\data\`目录存在，且应用有读写权限。
### 1.2.5 可选设置
**Cluster**（集群）
Apollo支持配置按照集群划分，也就是说对于一个appId和一个环境，对不同的集群可以有不同的配置。
如果需要使用这个功能，你可以通过以下方式来指定运行时的集群：
1. 通过App Config
* 我们可以在App.config文件中设置Apollo.Cluster来指定运行时集群（注意大小写）
* 例如，下面的截图配置指定了运行时的集群为SomeCluster
* 
2. 通过配置文件
* 首先确保`C:\opt\settings\server.properties`在目标机器上存在
* 在这个文件中，可以设置数据中心集群，如`idc=xxx`
* 注意key为全小写
**Cluster Precedence**（集群顺序）
1. 如果`Apollo.Cluster`和`idc`同时指定：
* 我们会首先尝试从`Apollo.Cluster`指定的集群加载配置
* 如果没找到任何配置，会尝试从`idc`指定的集群加载配置
* 如果还是没找到，会从默认的集群（`default`）加载
2. 如果只指定了`Apollo.Cluster`：
* 我们会首先尝试从`Apollo.Cluster`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
3. 如果只指定了`idc`：
* 我们会首先尝试从`idc`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
4. 如果`Apollo.Cluster`和`idc`都没有指定：
* 我们会从默认的集群（`default`）加载配置
# 二、DLL引用
.Net客户端项目地址位于：[https://github.com/ctripcorp/apollo.net](https://github.com/ctripcorp/apollo.net)。
将项目下载到本地，切换到`Release`配置，编译Solution后会在`apollo.net\Apollo\bin\Release`中生成`Framework.Apollo.Client.dll`。
在应用中引用`Framework.Apollo.Client.dll`即可。
如果需要支持.Net Core的Apollo版本，可以参考[dotnet-core](https://github.com/ctripcorp/apollo.net/tree/dotnet-core)以及[nuget仓库](https://www.nuget.org/packages?q=Com.Ctrip.Framework.Apollo)
# 三、客户端用法
## 3.1 获取默认namespace的配置（application）
```c#
Config config = ConfigService.GetAppConfig(); //config instance is singleton for each namespace and is never null
string someKey = "someKeyFromDefaultNamespace";
string someDefaultValue = "someDefaultValueForTheKey";
string value = config.GetProperty(someKey, someDefaultValue);
```
通过上述的**config.GetProperty**可以获取到someKey对应的实时最新的配置值。
另外，配置值从内存中获取，所以不需要应用自己做缓存。
## 3.2 监听配置变化事件
监听配置变化事件只在应用真的关心配置变化，需要在配置变化时得到通知时使用，比如：数据库连接串变化后需要重建连接等。
如果只是希望每次都取到最新的配置的话，只需要按照上面的例子，调用**config.GetProperty**即可。
```c#
Config config = ConfigService.GetAppConfig(); //config instance is singleton for each namespace and is never null
config.ConfigChanged += new ConfigChangeEvent(OnChanged);
private void OnChanged(object sender, ConfigChangeEventArgs changeEvent)
{
Console.WriteLine("Changes for namespace {0}", changeEvent.Namespace);
foreach (string key in changeEvent.ChangedKeys)
{
ConfigChange change = changeEvent.GetChange(key);
Console.WriteLine("Change - key: {0}, oldValue: {1}, newValue: {2}, changeType: {3}", change.PropertyName, change.OldValue, change.NewValue, change.ChangeType);
}
}
```
## 3.3 获取公共Namespace的配置
```c#
string somePublicNamespace = "CAT";
Config config = ConfigService.GetConfig(somePublicNamespace); //config instance is singleton for each namespace and is never null
string someKey = "someKeyFromPublicNamespace";
string someDefaultValue = "someDefaultValueForTheKey";
string value = config.GetProperty(someKey, someDefaultValue);
```
## 3.4 Demo
apollo.net项目中有一个样例客户端的项目：`ApolloDemo`，具体信息可以参考[Apollo开发指南](zh/development/apollo-development-guide)中的[2.4 .Net样例客户端启动](zh/development/apollo-development-guide?id=_24-net样例客户端启动)部分。
>注：Apollo .Net客户端开源版目前默认会把日志直接输出到Console，大家可以自己实现Logging相关功能。
>
> 详见[https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi](https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi)
# 四、客户端设计
上图简要描述了Apollo客户端的实现原理：
1. 客户端和服务端保持了一个长连接，从而能第一时间获得配置更新的推送。（通过Http Long Polling实现）
2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。
* 这是一个fallback机制，为了防止推送机制失效导致配置不更新
* 客户端定时拉取会上报本地版本，所以一般情况下，对于定时拉取的操作，服务端都会返回304 - Not Modified
* 定时频率默认为每5分钟拉取一次，客户端也可以通过App.config设置`Apollo.RefreshInterval`来覆盖，单位为毫秒。
3. 客户端从Apollo配置中心服务端获取到应用的最新配置后，会保存在内存中
4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份
* 在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置
5. 应用程序可以从Apollo客户端获取最新的配置、订阅配置更新通知
# 五、本地开发模式
Apollo客户端还支持本地开发模式，这个主要用于当开发环境无法连接Apollo服务器的时候，比如在邮轮、飞机上做相关功能开发。
在本地开发模式下，Apollo只会从本地文件读取配置信息，不会从Apollo服务器读取配置。
可以通过下面的步骤开启Apollo本地开发模式。
## 5.1 修改环境
修改C:\opt\settings\server.properties文件，设置env为Local：
```properties
env=Local
```
## 5.2 准备本地配置文件
在本地开发模式下，Apollo客户端会从本地读取文件，所以我们需要事先准备好配置文件。
### 5.2.1 本地配置目录
本地配置目录位于：C:\opt\data\\{_appId_}\config-cache。
appId就是应用的appId，如100004458。
请确保该目录存在，且应用程序对该目录有读权限。
**【小技巧】** 推荐的方式是先在普通模式下使用Apollo，这样Apollo会自动创建该目录并在目录下生成配置文件。
### 5.2.2 本地配置文件
本地配置文件需要按照一定的文件名格式放置于本地配置目录下，文件名格式如下：
**_{appId}+{cluster}+{namespace}.json_**
* appId就是应用自己的appId，如100004458
* cluster就是应用使用的集群，一般在本地模式下没有做过配置的话，就是default
* namespace就是应用使用配置namespace，一般是application
文件内容以json格式存储，比如如果有两个key，一个是request.timeout，另一个是batch，那么文件内容就是如下格式：
```json
{
"request.timeout":"1000",
"batch":"2000"
}
```
## 5.3 修改配置
在本地开发模式下，Apollo不会实时监测文件内容是否有变化，所以如果修改了配置，需要重启应用生效。 | >注意：本文档适用对象是Apollo系统的使用者，如果你是公司内Apollo系统的开发者/维护人员，建议先参考[Apollo开发指南](zh/development/apollo-development-guide)。
#
# 一、准备工作
## 1.1 环境要求
* .Net: 4.0+
## 1.2 必选设置
Apollo客户端依赖于`AppId`，`Environment`等环境信息来工作，所以请确保阅读下面的说明并且做正确的配置：
### 1.2.1 AppId
AppId是应用的身份信息，是从服务端获取配置的一个重要信息。
请确保在app.config或web.config有AppID的配置，其中内容形如：
```xml
<?xml version="1.0"?>
<configuration>
<appSettings>
<!-- Change to the actual app id -->
<add key="AppID" value="100004458"/>
</appSettings>
</configuration>
```
> 注：app.id是用来标识应用身份的唯一id，格式为string。
### 1.2.2 Environment
Apollo支持应用在不同的环境有不同的配置，所以Environment是另一个从服务器获取配置的重要信息。
Environment通过配置文件来指定，文件位置为`C:\opt\settings\server.properties`，文件内容形如：
```properties
env=DEV
```
目前，`env`支持以下几个值（大小写不敏感）：
* DEV
* Development environment
* FAT
* Feature Acceptance Test environment
* UAT
* User Acceptance Test environment
* PRO
* Production environment
### 1.2.3 服务地址
Apollo客户端针对不同的环境会从不同的服务器获取配置，所以请确保在app.config或web.config正确配置了服务器地址(Apollo.{ENV}.Meta)，其中内容形如：
```xml
<?xml version="1.0"?>
<configuration>
<appSettings>
<!-- Change to the actual app id -->
<add key="AppID" value="100004458"/>
<!-- Should change the apollo config service url for each environment -->
<add key="Apollo.DEV.Meta" value="http://dev-configservice:8080"/>
<add key="Apollo.FAT.Meta" value="http://fat-configservice:8080"/>
<add key="Apollo.UAT.Meta" value="http://uat-configservice:8080"/>
<add key="Apollo.PRO.Meta" value="http://pro-configservice:8080"/>
</appSettings>
</configuration>
```
### 1.2.4 本地缓存路径
Apollo客户端会把从服务端获取到的配置在本地文件系统缓存一份，用于在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置，不影响应用正常运行。
本地缓存路径位于`C:\opt\data\{appId}\config-cache`，所以请确保`C:\opt\data\`目录存在，且应用有读写权限。
### 1.2.5 可选设置
**Cluster**（集群）
Apollo支持配置按照集群划分，也就是说对于一个appId和一个环境，对不同的集群可以有不同的配置。
如果需要使用这个功能，你可以通过以下方式来指定运行时的集群：
1. 通过App Config
* 我们可以在App.config文件中设置Apollo.Cluster来指定运行时集群（注意大小写）
* 例如，下面的截图配置指定了运行时的集群为SomeCluster
* 
2. 通过配置文件
* 首先确保`C:\opt\settings\server.properties`在目标机器上存在
* 在这个文件中，可以设置数据中心集群，如`idc=xxx`
* 注意key为全小写
**Cluster Precedence**（集群顺序）
1. 如果`Apollo.Cluster`和`idc`同时指定：
* 我们会首先尝试从`Apollo.Cluster`指定的集群加载配置
* 如果没找到任何配置，会尝试从`idc`指定的集群加载配置
* 如果还是没找到，会从默认的集群（`default`）加载
2. 如果只指定了`Apollo.Cluster`：
* 我们会首先尝试从`Apollo.Cluster`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
3. 如果只指定了`idc`：
* 我们会首先尝试从`idc`指定的集群加载配置
* 如果没找到，会从默认的集群（`default`）加载
4. 如果`Apollo.Cluster`和`idc`都没有指定：
* 我们会从默认的集群（`default`）加载配置
# 二、DLL引用
.Net客户端项目地址位于：[https://github.com/ctripcorp/apollo.net](https://github.com/ctripcorp/apollo.net)。
将项目下载到本地，切换到`Release`配置，编译Solution后会在`apollo.net\Apollo\bin\Release`中生成`Framework.Apollo.Client.dll`。
在应用中引用`Framework.Apollo.Client.dll`即可。
如果需要支持.Net Core的Apollo版本，可以参考[dotnet-core](https://github.com/ctripcorp/apollo.net/tree/dotnet-core)以及[nuget仓库](https://www.nuget.org/packages?q=Com.Ctrip.Framework.Apollo)
# 三、客户端用法
## 3.1 获取默认namespace的配置（application）
```c#
Config config = ConfigService.GetAppConfig(); //config instance is singleton for each namespace and is never null
string someKey = "someKeyFromDefaultNamespace";
string someDefaultValue = "someDefaultValueForTheKey";
string value = config.GetProperty(someKey, someDefaultValue);
```
通过上述的**config.GetProperty**可以获取到someKey对应的实时最新的配置值。
另外，配置值从内存中获取，所以不需要应用自己做缓存。
## 3.2 监听配置变化事件
监听配置变化事件只在应用真的关心配置变化，需要在配置变化时得到通知时使用，比如：数据库连接串变化后需要重建连接等。
如果只是希望每次都取到最新的配置的话，只需要按照上面的例子，调用**config.GetProperty**即可。
```c#
Config config = ConfigService.GetAppConfig(); //config instance is singleton for each namespace and is never null
config.ConfigChanged += new ConfigChangeEvent(OnChanged);
private void OnChanged(object sender, ConfigChangeEventArgs changeEvent)
{
Console.WriteLine("Changes for namespace {0}", changeEvent.Namespace);
foreach (string key in changeEvent.ChangedKeys)
{
ConfigChange change = changeEvent.GetChange(key);
Console.WriteLine("Change - key: {0}, oldValue: {1}, newValue: {2}, changeType: {3}", change.PropertyName, change.OldValue, change.NewValue, change.ChangeType);
}
}
```
## 3.3 获取公共Namespace的配置
```c#
string somePublicNamespace = "CAT";
Config config = ConfigService.GetConfig(somePublicNamespace); //config instance is singleton for each namespace and is never null
string someKey = "someKeyFromPublicNamespace";
string someDefaultValue = "someDefaultValueForTheKey";
string value = config.GetProperty(someKey, someDefaultValue);
```
## 3.4 Demo
apollo.net项目中有一个样例客户端的项目：`ApolloDemo`，具体信息可以参考[Apollo开发指南](zh/development/apollo-development-guide)中的[2.4 .Net样例客户端启动](zh/development/apollo-development-guide?id=_24-net样例客户端启动)部分。
>注：Apollo .Net客户端开源版目前默认会把日志直接输出到Console，大家可以自己实现Logging相关功能。
>
> 详见[https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi](https://github.com/ctripcorp/apollo.net/tree/master/Apollo/Logging/Spi)
# 四、客户端设计
上图简要描述了Apollo客户端的实现原理：
1. 客户端和服务端保持了一个长连接，从而能第一时间获得配置更新的推送。（通过Http Long Polling实现）
2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。
* 这是一个fallback机制，为了防止推送机制失效导致配置不更新
* 客户端定时拉取会上报本地版本，所以一般情况下，对于定时拉取的操作，服务端都会返回304 - Not Modified
* 定时频率默认为每5分钟拉取一次，客户端也可以通过App.config设置`Apollo.RefreshInterval`来覆盖，单位为毫秒。
3. 客户端从Apollo配置中心服务端获取到应用的最新配置后，会保存在内存中
4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份
* 在遇到服务不可用，或网络不通的时候，依然能从本地恢复配置
5. 应用程序可以从Apollo客户端获取最新的配置、订阅配置更新通知
# 五、本地开发模式
Apollo客户端还支持本地开发模式，这个主要用于当开发环境无法连接Apollo服务器的时候，比如在邮轮、飞机上做相关功能开发。
在本地开发模式下，Apollo只会从本地文件读取配置信息，不会从Apollo服务器读取配置。
可以通过下面的步骤开启Apollo本地开发模式。
## 5.1 修改环境
修改C:\opt\settings\server.properties文件，设置env为Local：
```properties
env=Local
```
## 5.2 准备本地配置文件
在本地开发模式下，Apollo客户端会从本地读取文件，所以我们需要事先准备好配置文件。
### 5.2.1 本地配置目录
本地配置目录位于：C:\opt\data\\{_appId_}\config-cache。
appId就是应用的appId，如100004458。
请确保该目录存在，且应用程序对该目录有读权限。
**【小技巧】** 推荐的方式是先在普通模式下使用Apollo，这样Apollo会自动创建该目录并在目录下生成配置文件。
### 5.2.2 本地配置文件
本地配置文件需要按照一定的文件名格式放置于本地配置目录下，文件名格式如下：
**_{appId}+{cluster}+{namespace}.json_**
* appId就是应用自己的appId，如100004458
* cluster就是应用使用的集群，一般在本地模式下没有做过配置的话，就是default
* namespace就是应用使用配置namespace，一般是application
文件内容以json格式存储，比如如果有两个key，一个是request.timeout，另一个是batch，那么文件内容就是如下格式：
```json
{
"request.timeout":"1000",
"batch":"2000"
}
```
## 5.3 修改配置
在本地开发模式下，Apollo不会实时监测文件内容是否有变化，所以如果修改了配置，需要重启应用生效。 | -1 |
apolloconfig/apollo | 3,713 | add apollo team introduction and community releated contents | ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-26T10:05:24Z | 2021-05-28T05:38:22Z | 4e1a5c13d784c5d80ba3b36b6ce169bd3f547e0e | b4893914af3a6a3754c2d5685ae2ec9fb23119c2 | add apollo team introduction and community releated contents. ## What's the purpose of this PR
add apollo team introduction and community releated contents
Reference issues: #3684 #3705 #3706 #3707 #3708 #3709
## Brief changelog
1. add team introduction page
2. add links to community governance
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/_coverpage.md | <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="30%">
> A reliable configuration management system
- Multiple environments and clusters support
- Configuration changes take effect in real time
- Versioned and grayscale releases management
- Great authentication, authorization and audit control
[GitHub](https://github.com/ctripcorp/apollo/)
[Get Started](zh/README) | <img src="https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/logo/logo-simple.png" alt="apollo-logo" width="30%">
> A reliable configuration management system
- Multiple environments and clusters support
- Configuration changes take effect in real time
- Versioned and grayscale releases management
- Great authentication, authorization and audit control
[GitHub](https://github.com/ctripcorp/apollo/)
[Get Started](zh/README) | -1 |