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,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/views/component/entrance.html
<a class="list-group-item hover" href="{{href}}"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="row icon-text icon-{{imgSrc}}"> <p class="btn-title">{{title}}</p> </div> </a>
<a class="list-group-item hover" href="{{href}}"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="row icon-text icon-{{imgSrc}}"> <p class="btn-title">{{title}}</p> </div> </a>
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.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. * */ role_module.controller('NamespaceRoleController', ['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'UserService', 'AppUtil', 'EnvService', 'PermissionService', function ($scope, $location, $window, $translate, toastr, AppService, UserService, AppUtil, EnvService, PermissionService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { appId: params.appid, namespaceName: params.namespaceName }; $scope.modifyRoleSubmitBtnDisabled = false; $scope.ReleaseRoleSubmitBtnDisabled = false; $scope.releaseRoleWidgetId = 'releaseRoleWidgetId'; $scope.modifyRoleWidgetId = 'modifyRoleWidgetId'; $scope.modifyRoleSelectedEnv = ""; $scope.releaseRoleSelectedEnv = ""; PermissionService.init_app_namespace_permission($scope.pageContext.appId, $scope.pageContext.namespaceName) .then(function (result) { }, function (result) { toastr.warn(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.InitNamespacePermissionError')); }); PermissionService.has_assign_user_permission($scope.pageContext.appId) .then(function (result) { $scope.hasAssignUserPermission = result.hasPermission; }, function (reslt) { }); EnvService.find_all_envs() .then(function (result) { $scope.envs = result; $scope.envRolesAssignedUsers = {}; for (var iLoop = 0; iLoop < result.length; iLoop++) { var env = result[iLoop]; PermissionService.get_namespace_env_role_users($scope.pageContext.appId, env, $scope.pageContext.namespaceName) .then(function (result) { $scope.envRolesAssignedUsers[result.env] = result; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.GetEnvGrantUserError', { env })); }); } }); PermissionService.get_namespace_role_users($scope.pageContext.appId, $scope.pageContext.namespaceName) .then(function (result) { $scope.rolesAssignedUsers = result; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.GetGrantUserError')); }); $scope.assignRoleToUser = function (roleType) { if ("ReleaseNamespace" === roleType) { var user = $('.' + $scope.releaseRoleWidgetId).select2('data')[0]; if (!user) { toastr.warning($translate.instant('Namespace.Role.PleaseChooseUser')); return; } $scope.ReleaseRoleSubmitBtnDisabled = true; var toAssignReleaseNamespaceRoleUser = user.id; var assignReleaseNamespaceRoleFunc = $scope.releaseRoleSelectedEnv === "" ? PermissionService.assign_release_namespace_role : function (appId, namespaceName, user) { return PermissionService.assign_release_namespace_env_role(appId, $scope.releaseRoleSelectedEnv, namespaceName, user); }; assignReleaseNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, toAssignReleaseNamespaceRoleUser) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Added')); $scope.ReleaseRoleSubmitBtnDisabled = false; if ($scope.releaseRoleSelectedEnv === "") { $scope.rolesAssignedUsers.releaseRoleUsers.push( { userId: toAssignReleaseNamespaceRoleUser }); } else { $scope.envRolesAssignedUsers[$scope.releaseRoleSelectedEnv].releaseRoleUsers.push( { userId: toAssignReleaseNamespaceRoleUser }); } $('.' + $scope.releaseRoleWidgetId).select2("val", ""); $scope.releaseRoleSelectedEnv = ""; }, function (result) { $scope.ReleaseRoleSubmitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.AddFailed')); }); } else { var user = $('.' + $scope.modifyRoleWidgetId).select2('data')[0]; if (!user) { toastr.warning($translate.instant('Namespace.Role.PleaseChooseUser')); return; } $scope.modifyRoleSubmitBtnDisabled = true; var toAssignModifyNamespaceRoleUser = user.id; var assignModifyNamespaceRoleFunc = $scope.modifyRoleSelectedEnv === "" ? PermissionService.assign_modify_namespace_role : function (appId, namespaceName, user) { return PermissionService.assign_modify_namespace_env_role(appId, $scope.modifyRoleSelectedEnv, namespaceName, user); }; assignModifyNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, toAssignModifyNamespaceRoleUser) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Added')); $scope.modifyRoleSubmitBtnDisabled = false; if ($scope.modifyRoleSelectedEnv === "") { $scope.rolesAssignedUsers.modifyRoleUsers.push( { userId: toAssignModifyNamespaceRoleUser }); } else { $scope.envRolesAssignedUsers[$scope.modifyRoleSelectedEnv].modifyRoleUsers.push( { userId: toAssignModifyNamespaceRoleUser }); } $('.' + $scope.modifyRoleWidgetId).select2("val", ""); $scope.modifyRoleSelectedEnv = ""; }, function (result) { $scope.modifyRoleSubmitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.AddFailed')); }); } }; $scope.removeUserRole = function (roleType, user, env) { if ("ReleaseNamespace" === roleType) { var removeReleaseNamespaceRoleFunc = !env ? PermissionService.remove_release_namespace_role : function (appId, namespaceName, user) { return PermissionService.remove_release_namespace_env_role(appId, env, namespaceName, user); }; removeReleaseNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, user) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Deleted')); if (!env) { removeUserFromList($scope.rolesAssignedUsers.releaseRoleUsers, user); } else { removeUserFromList($scope.envRolesAssignedUsers[env].releaseRoleUsers, user); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.DeleteFailed')); }); } else { var removeModifyNamespaceRoleFunc = !env ? PermissionService.remove_modify_namespace_role : function (appId, namespaceName, user) { return PermissionService.remove_modify_namespace_env_role(appId, env, namespaceName, user); }; removeModifyNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, user) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Deleted')); if (!env) { removeUserFromList($scope.rolesAssignedUsers.modifyRoleUsers, user); } else { removeUserFromList($scope.envRolesAssignedUsers[env].modifyRoleUsers, user); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.DeleteFailed')); }); } }; function removeUserFromList(list, user) { var index = 0; for (var i = 0; i < list.length; i++) { if (list[i].userId === user) { index = i; break; } } list.splice(index, 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. * */ role_module.controller('NamespaceRoleController', ['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'UserService', 'AppUtil', 'EnvService', 'PermissionService', function ($scope, $location, $window, $translate, toastr, AppService, UserService, AppUtil, EnvService, PermissionService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { appId: params.appid, namespaceName: params.namespaceName }; $scope.modifyRoleSubmitBtnDisabled = false; $scope.ReleaseRoleSubmitBtnDisabled = false; $scope.releaseRoleWidgetId = 'releaseRoleWidgetId'; $scope.modifyRoleWidgetId = 'modifyRoleWidgetId'; $scope.modifyRoleSelectedEnv = ""; $scope.releaseRoleSelectedEnv = ""; PermissionService.init_app_namespace_permission($scope.pageContext.appId, $scope.pageContext.namespaceName) .then(function (result) { }, function (result) { toastr.warn(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.InitNamespacePermissionError')); }); PermissionService.has_assign_user_permission($scope.pageContext.appId) .then(function (result) { $scope.hasAssignUserPermission = result.hasPermission; }, function (reslt) { }); EnvService.find_all_envs() .then(function (result) { $scope.envs = result; $scope.envRolesAssignedUsers = {}; for (var iLoop = 0; iLoop < result.length; iLoop++) { var env = result[iLoop]; PermissionService.get_namespace_env_role_users($scope.pageContext.appId, env, $scope.pageContext.namespaceName) .then(function (result) { $scope.envRolesAssignedUsers[result.env] = result; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.GetEnvGrantUserError', { env })); }); } }); PermissionService.get_namespace_role_users($scope.pageContext.appId, $scope.pageContext.namespaceName) .then(function (result) { $scope.rolesAssignedUsers = result; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.GetGrantUserError')); }); $scope.assignRoleToUser = function (roleType) { if ("ReleaseNamespace" === roleType) { var user = $('.' + $scope.releaseRoleWidgetId).select2('data')[0]; if (!user) { toastr.warning($translate.instant('Namespace.Role.PleaseChooseUser')); return; } $scope.ReleaseRoleSubmitBtnDisabled = true; var toAssignReleaseNamespaceRoleUser = user.id; var assignReleaseNamespaceRoleFunc = $scope.releaseRoleSelectedEnv === "" ? PermissionService.assign_release_namespace_role : function (appId, namespaceName, user) { return PermissionService.assign_release_namespace_env_role(appId, $scope.releaseRoleSelectedEnv, namespaceName, user); }; assignReleaseNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, toAssignReleaseNamespaceRoleUser) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Added')); $scope.ReleaseRoleSubmitBtnDisabled = false; if ($scope.releaseRoleSelectedEnv === "") { $scope.rolesAssignedUsers.releaseRoleUsers.push( { userId: toAssignReleaseNamespaceRoleUser }); } else { $scope.envRolesAssignedUsers[$scope.releaseRoleSelectedEnv].releaseRoleUsers.push( { userId: toAssignReleaseNamespaceRoleUser }); } $('.' + $scope.releaseRoleWidgetId).select2("val", ""); $scope.releaseRoleSelectedEnv = ""; }, function (result) { $scope.ReleaseRoleSubmitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.AddFailed')); }); } else { var user = $('.' + $scope.modifyRoleWidgetId).select2('data')[0]; if (!user) { toastr.warning($translate.instant('Namespace.Role.PleaseChooseUser')); return; } $scope.modifyRoleSubmitBtnDisabled = true; var toAssignModifyNamespaceRoleUser = user.id; var assignModifyNamespaceRoleFunc = $scope.modifyRoleSelectedEnv === "" ? PermissionService.assign_modify_namespace_role : function (appId, namespaceName, user) { return PermissionService.assign_modify_namespace_env_role(appId, $scope.modifyRoleSelectedEnv, namespaceName, user); }; assignModifyNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, toAssignModifyNamespaceRoleUser) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Added')); $scope.modifyRoleSubmitBtnDisabled = false; if ($scope.modifyRoleSelectedEnv === "") { $scope.rolesAssignedUsers.modifyRoleUsers.push( { userId: toAssignModifyNamespaceRoleUser }); } else { $scope.envRolesAssignedUsers[$scope.modifyRoleSelectedEnv].modifyRoleUsers.push( { userId: toAssignModifyNamespaceRoleUser }); } $('.' + $scope.modifyRoleWidgetId).select2("val", ""); $scope.modifyRoleSelectedEnv = ""; }, function (result) { $scope.modifyRoleSubmitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.AddFailed')); }); } }; $scope.removeUserRole = function (roleType, user, env) { if ("ReleaseNamespace" === roleType) { var removeReleaseNamespaceRoleFunc = !env ? PermissionService.remove_release_namespace_role : function (appId, namespaceName, user) { return PermissionService.remove_release_namespace_env_role(appId, env, namespaceName, user); }; removeReleaseNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, user) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Deleted')); if (!env) { removeUserFromList($scope.rolesAssignedUsers.releaseRoleUsers, user); } else { removeUserFromList($scope.envRolesAssignedUsers[env].releaseRoleUsers, user); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.DeleteFailed')); }); } else { var removeModifyNamespaceRoleFunc = !env ? PermissionService.remove_modify_namespace_role : function (appId, namespaceName, user) { return PermissionService.remove_modify_namespace_env_role(appId, env, namespaceName, user); }; removeModifyNamespaceRoleFunc($scope.pageContext.appId, $scope.pageContext.namespaceName, user) .then(function (result) { toastr.success($translate.instant('Namespace.Role.Deleted')); if (!env) { removeUserFromList($scope.rolesAssignedUsers.modifyRoleUsers, user); } else { removeUserFromList($scope.envRolesAssignedUsers[env].modifyRoleUsers, user); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.Role.DeleteFailed')); }); } }; function removeUserFromList(list, user) { var index = 0; for (var i = 0; i < list.length; i++) { if (list[i].userId === user) { index = i; break; } } list.splice(index, 1); } }]);
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/controller/AppController.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ app_module.controller('CreateAppController', ['$scope', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'OrganizationService', 'SystemRoleService', 'UserService', createAppController]); function createAppController($scope, $window, $translate, toastr, AppService, AppUtil, OrganizationService, SystemRoleService, UserService) { $scope.app = {}; $scope.submitBtnDisabled = false; $scope.create = create; init(); function init() { initOrganization(); initSystemRole(); } function initOrganization() { OrganizationService.find_organizations().then(function (result) { var organizations = []; result.forEach(function (item) { var org = {}; org.id = item.orgId; org.text = item.orgName + '(' + item.orgId + ')'; org.name = item.orgName; organizations.push(org); }); $('#organization').select2({ placeholder: $translate.instant('Common.PleaseChooseDepartment'), width: '100%', data: organizations }); }, function (result) { toastr.error(AppUtil.errorMsg(result), "load organizations error"); }); } function initSystemRole() { SystemRoleService.has_open_manage_app_master_role_limit().then( function (value) { $scope.isOpenManageAppMasterRoleLimit = value.isManageAppMasterPermissionEnabled; UserService.load_user().then( function (value1) { $scope.currentUser = value1; }, function (reason) { toastr.error(AppUtil.errorMsg(reason), "load current user info failed"); }) }, function (reason) { toastr.error(AppUtil.errorMsg(reason), "init system role of manageAppMaster failed"); } ); } function create() { $scope.submitBtnDisabled = true; var selectedOrg = $('#organization').select2('data')[0]; if (!selectedOrg.id) { toastr.warning($translate.instant('Common.PleaseChooseDepartment')); $scope.submitBtnDisabled = false; return; } $scope.app.orgId = selectedOrg.id; $scope.app.orgName = selectedOrg.name; // owner var owner = $('.ownerSelector').select2('data')[0]; if ($scope.isOpenManageAppMasterRoleLimit) { owner = { id: $scope.currentUser.userId }; } if (!owner) { toastr.warning($translate.instant('Common.PleaseChooseOwner')); $scope.submitBtnDisabled = false; return; } $scope.app.ownerName = owner.id; //admins $scope.app.admins = []; var admins = $(".adminSelector").select2('data'); if ($scope.isOpenManageAppMasterRoleLimit) { admins = [{ id: $scope.currentUser.userId }]; } if (admins) { admins.forEach(function (admin) { $scope.app.admins.push(admin.id); }) } AppService.create($scope.app).then(function (result) { toastr.success($translate.instant('Common.Created')); setInterval(function () { $scope.submitBtnDisabled = false; $window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + result.appId; }, 1000); }, function (result) { $scope.submitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Common.CreateFailed')); }); } $(".J_ownerSelectorPanel").on("select2:select", ".ownerSelector", selectEventHandler); var $adminSelectorPanel = $(".J_adminSelectorPanel"); $adminSelectorPanel.on("select2:select", ".adminSelector", selectEventHandler); $adminSelectorPanel.on("select2:unselect", ".adminSelector", selectEventHandler); function selectEventHandler() { $('.J_owner').remove(); var owner = $('.ownerSelector').select2('data')[0]; if (owner) { $(".adminSelector").parent().find(".select2-selection__rendered").prepend( '<li class="select2-selection__choice J_owner">' + _.escape(owner.text) + '</li>') } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ app_module.controller('CreateAppController', ['$scope', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'OrganizationService', 'SystemRoleService', 'UserService', createAppController]); function createAppController($scope, $window, $translate, toastr, AppService, AppUtil, OrganizationService, SystemRoleService, UserService) { $scope.app = {}; $scope.submitBtnDisabled = false; $scope.create = create; init(); function init() { initOrganization(); initSystemRole(); } function initOrganization() { OrganizationService.find_organizations().then(function (result) { var organizations = []; result.forEach(function (item) { var org = {}; org.id = item.orgId; org.text = item.orgName + '(' + item.orgId + ')'; org.name = item.orgName; organizations.push(org); }); $('#organization').select2({ placeholder: $translate.instant('Common.PleaseChooseDepartment'), width: '100%', data: organizations }); }, function (result) { toastr.error(AppUtil.errorMsg(result), "load organizations error"); }); } function initSystemRole() { SystemRoleService.has_open_manage_app_master_role_limit().then( function (value) { $scope.isOpenManageAppMasterRoleLimit = value.isManageAppMasterPermissionEnabled; UserService.load_user().then( function (value1) { $scope.currentUser = value1; }, function (reason) { toastr.error(AppUtil.errorMsg(reason), "load current user info failed"); }) }, function (reason) { toastr.error(AppUtil.errorMsg(reason), "init system role of manageAppMaster failed"); } ); } function create() { $scope.submitBtnDisabled = true; var selectedOrg = $('#organization').select2('data')[0]; if (!selectedOrg.id) { toastr.warning($translate.instant('Common.PleaseChooseDepartment')); $scope.submitBtnDisabled = false; return; } $scope.app.orgId = selectedOrg.id; $scope.app.orgName = selectedOrg.name; // owner var owner = $('.ownerSelector').select2('data')[0]; if ($scope.isOpenManageAppMasterRoleLimit) { owner = { id: $scope.currentUser.userId }; } if (!owner) { toastr.warning($translate.instant('Common.PleaseChooseOwner')); $scope.submitBtnDisabled = false; return; } $scope.app.ownerName = owner.id; //admins $scope.app.admins = []; var admins = $(".adminSelector").select2('data'); if ($scope.isOpenManageAppMasterRoleLimit) { admins = [{ id: $scope.currentUser.userId }]; } if (admins) { admins.forEach(function (admin) { $scope.app.admins.push(admin.id); }) } AppService.create($scope.app).then(function (result) { toastr.success($translate.instant('Common.Created')); setInterval(function () { $scope.submitBtnDisabled = false; $window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + result.appId; }, 1000); }, function (result) { $scope.submitBtnDisabled = false; toastr.error(AppUtil.errorMsg(result), $translate.instant('Common.CreateFailed')); }); } $(".J_ownerSelectorPanel").on("select2:select", ".ownerSelector", selectEventHandler); var $adminSelectorPanel = $(".J_adminSelectorPanel"); $adminSelectorPanel.on("select2:select", ".adminSelector", selectEventHandler); $adminSelectorPanel.on("select2:unselect", ".adminSelector", selectEventHandler); function selectEventHandler() { $('.J_owner').remove(); var owner = $('.ownerSelector').select2('data')[0]; if (owner) { $(".adminSelector").parent().find(".select2-selection__rendered").prepend( '<li class="select2-selection__choice J_owner">' + _.escape(owner.text) + '</li>') } } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./docs/en/deployment/quick-start.md
TODO
TODO
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./changes/changes-1.9.1.md
Changes by Version ================== Release Notes. Apollo 1.9.1 ------------------ * [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937) * [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933) ------------------ All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/9?closed=1)
Changes by Version ================== Release Notes. Apollo 1.9.1 ------------------ * [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937) * [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933) ------------------ All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/9?closed=1)
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/controller/config/DiffConfigController.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. * */ diff_item_module.controller("DiffItemController", ['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'ConfigService', function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, ConfigService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { appId: params.appid, env: params.env, clusterName: params.clusterName, namespaceName: params.namespaceName }; var sourceItems = []; $scope.diff = diff; $scope.syncBtnDisabled = false; $scope.showCommentDiff = false; $scope.collectSelectedClusters = collectSelectedClusters; $scope.syncItemNextStep = syncItemNextStep; $scope.backToAppHomePage = backToAppHomePage; $scope.switchSelect = switchSelect; $scope.showText = showText; $scope.itemsKeyedByKey = {}; $scope.syncData = { syncToNamespaces: [], syncItems: [] }; function diff() { $scope.syncData = parseSyncSourceData(); if ($scope.syncData.syncToNamespaces.length < 2) { toastr.warning($translate.instant('Config.Diff.PleaseChooseTwoCluster')); return; } $scope.syncData.syncToNamespaces.forEach(function (namespace) { ConfigService.find_items(namespace.appId, namespace.env, namespace.clusterName, namespace.namespaceName).then(function (result) { result.forEach(function (item) { var itemsKeyedByClusterName = $scope.itemsKeyedByKey[item.key] || {}; itemsKeyedByClusterName[namespace.env + ':' + namespace.clusterName + ':' + namespace.namespaceName] = item; $scope.itemsKeyedByKey[item.key] = itemsKeyedByClusterName; }); }); }); $scope.syncItemNextStep(1); } var selectedClusters = []; function collectSelectedClusters(data) { selectedClusters = data; } function parseSyncSourceData() { var syncData = { syncToNamespaces: [], syncItems: [] }; var namespaceName = $scope.pageContext.namespaceName; selectedClusters.forEach(function (cluster) { if (cluster.checked) { cluster.clusterName = cluster.name; cluster.namespaceName = namespaceName; syncData.syncToNamespaces.push(cluster); } }); return syncData; } ////// flow control /////// $scope.syncItemStep = 1; function syncItemNextStep(offset) { $scope.syncItemStep += offset; } function backToAppHomePage() { $window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.pageContext.appId; } function switchSelect(o) { o.checked = !o.checked; } function showText(text) { $scope.text = text; AppUtil.showModal('#showTextModal'); } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ diff_item_module.controller("DiffItemController", ['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'ConfigService', function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, ConfigService) { var params = AppUtil.parseParams($location.$$url); $scope.pageContext = { appId: params.appid, env: params.env, clusterName: params.clusterName, namespaceName: params.namespaceName }; var sourceItems = []; $scope.diff = diff; $scope.syncBtnDisabled = false; $scope.showCommentDiff = false; $scope.collectSelectedClusters = collectSelectedClusters; $scope.syncItemNextStep = syncItemNextStep; $scope.backToAppHomePage = backToAppHomePage; $scope.switchSelect = switchSelect; $scope.showText = showText; $scope.itemsKeyedByKey = {}; $scope.syncData = { syncToNamespaces: [], syncItems: [] }; function diff() { $scope.syncData = parseSyncSourceData(); if ($scope.syncData.syncToNamespaces.length < 2) { toastr.warning($translate.instant('Config.Diff.PleaseChooseTwoCluster')); return; } $scope.syncData.syncToNamespaces.forEach(function (namespace) { ConfigService.find_items(namespace.appId, namespace.env, namespace.clusterName, namespace.namespaceName).then(function (result) { result.forEach(function (item) { var itemsKeyedByClusterName = $scope.itemsKeyedByKey[item.key] || {}; itemsKeyedByClusterName[namespace.env + ':' + namespace.clusterName + ':' + namespace.namespaceName] = item; $scope.itemsKeyedByKey[item.key] = itemsKeyedByClusterName; }); }); }); $scope.syncItemNextStep(1); } var selectedClusters = []; function collectSelectedClusters(data) { selectedClusters = data; } function parseSyncSourceData() { var syncData = { syncToNamespaces: [], syncItems: [] }; var namespaceName = $scope.pageContext.namespaceName; selectedClusters.forEach(function (cluster) { if (cluster.checked) { cluster.clusterName = cluster.name; cluster.namespaceName = namespaceName; syncData.syncToNamespaces.push(cluster); } }); return syncData; } ////// flow control /////// $scope.syncItemStep = 1; function syncItemNextStep(offset) { $scope.syncItemStep += offset; } function backToAppHomePage() { $window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.pageContext.appId; } function switchSelect(o) { o.checked = !o.checked; } function showText(text) { $scope.text = text; AppUtil.showModal('#showTextModal'); } }]);
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/services/ServerConfigService.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('ServerConfigService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var server_config_resource = $resource('', {}, { create_server_config: { method: 'POST', url: AppUtil.prefixPath() + '/server/config' }, get_server_config_info: { method: 'GET', url: AppUtil.prefixPath() + '/server/config/:key' } }); return { create: function (serverConfig) { var d = $q.defer(); server_config_resource.create_server_config({}, serverConfig, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, getServerConfigInfo: function (key) { var d = $q.defer(); server_config_resource.get_server_config_info({ key: key }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('ServerConfigService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var server_config_resource = $resource('', {}, { create_server_config: { method: 'POST', url: AppUtil.prefixPath() + '/server/config' }, get_server_config_info: { method: 'GET', url: AppUtil.prefixPath() + '/server/config/:key' } }); return { create: function (serverConfig) { var d = $q.defer(); server_config_resource.create_server_config({}, serverConfig, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, getServerConfigInfo: function (key) { var d = $q.defer(); server_config_resource.get_server_config_info({ key: key }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./docs/en/usage/apollo-user-guide.md
TODO
TODO
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./docs/en/design/apollo-introduction.md
TODO
TODO
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/vendor/ui-ace/worker-json.js
"no use strict";!function(e){function t(e,t){var n=e,r="";while(n){var i=t[n];if(typeof i=="string")return i+r;if(i)return i.location.replace(/\/*$/,"/")+(r||i.main||i.name);if(i===!1)return"";var s=n.lastIndexOf("/");if(s===-1)break;r=n.substr(s)+r,n=n.slice(0,s)}return e}if(typeof e.window!="undefined"&&e.document)return;if(e.require&&e.define)return;e.console||(e.console=function(){var e=Array.prototype.slice.call(arguments,0);postMessage({type:"log",data:e})},e.console.error=e.console.warn=e.console.log=e.console.trace=e.console),e.window=e,e.ace=e,e.onerror=function(e,t,n,r,i){postMessage({type:"error",data:{message:e,data:i.data,file:t,line:n,col:r,stack:i.stack}})},e.normalizeModule=function(t,n){if(n.indexOf("!")!==-1){var r=n.split("!");return e.normalizeModule(t,r[0])+"!"+e.normalizeModule(t,r[1])}if(n.charAt(0)=="."){var i=t.split("/").slice(0,-1).join("/");n=(i?i+"/":"")+n;while(n.indexOf(".")!==-1&&s!=n){var s=n;n=n.replace(/^\.\//,"").replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return n},e.require=function(r,i){i||(i=r,r=null);if(!i.charAt)throw new Error("worker.js require() accepts only (parentId, id) as arguments");i=e.normalizeModule(r,i);var s=e.require.modules[i];if(s)return s.initialized||(s.initialized=!0,s.exports=s.factory().exports),s.exports;if(!e.require.tlns)return console.log("unable to load "+i);var o=t(i,e.require.tlns);return o.slice(-3)!=".js"&&(o+=".js"),e.require.id=i,e.require.modules[i]={},importScripts(o),e.require(r,i)},e.require.modules={},e.require.tlns={},e.define=function(t,n,r){arguments.length==2?(r=n,typeof t!="string"&&(n=t,t=e.require.id)):arguments.length==1&&(r=t,n=[],t=e.require.id);if(typeof r!="function"){e.require.modules[t]={exports:r,initialized:!0};return}n.length||(n=["require","exports","module"]);var i=function(n){return e.require(t,n)};e.require.modules[t]={exports:{},factory:function(){var e=this,t=r.apply(this,n.map(function(t){switch(t){case"require":return i;case"exports":return e.exports;case"module":return e;default:return i(t)}}));return t&&(e.exports=t),e}}},e.define.amd={},require.tlns={},e.initBaseUrls=function(t){for(var n in t)require.tlns[n]=t[n]},e.initSender=function(){var n=e.require("ace/lib/event_emitter").EventEmitter,r=e.require("ace/lib/oop"),i=function(){};return function(){r.implement(this,n),this.callback=function(e,t){postMessage({type:"call",id:t,data:e})},this.emit=function(e,t){postMessage({type:"event",name:e,data:t})}}.call(i.prototype),new i};var n=e.main=null,r=e.sender=null;e.onmessage=function(t){var i=t.data;if(i.event&&r)r._signal(i.event,i.data);else if(i.command)if(n[i.command])n[i.command].apply(n,i.args);else{if(!e[i.command])throw new Error("Unknown command:"+i.command);e[i.command].apply(e,i.args)}else if(i.init){e.initBaseUrls(i.tlns),require("ace/lib/es5-shim"),r=e.sender=e.initSender();var s=require(i.module)[i.classname];n=e.main=new s(r)}}}(this),define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),define("ace/worker/mirror",["require","exports","module","ace/range","ace/document","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../document").Document,s=e("../lib/lang"),o=t.Mirror=function(e){this.sender=e;var t=this.doc=new i(""),n=this.deferredUpdate=s.delayedCall(this.onUpdate.bind(this)),r=this;e.on("change",function(e){var i=e.data;if(i[0].start)t.applyDeltas(i);else for(var s=0;s<i.length;s+=2){if(Array.isArray(i[s+1]))var o={action:"insert",start:i[s],lines:i[s+1]};else var o={action:"remove",start:i[s],end:i[s+1]};t.applyDelta(o,!0)}if(r.$timeout)return n.schedule(r.$timeout);r.onUpdate()})};(function(){this.$timeout=500,this.setTimeout=function(e){this.$timeout=e},this.setValue=function(e){this.doc.setValue(e),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(e){this.sender.callback(this.doc.getValue(),e)},this.onUpdate=function(){},this.isPending=function(){return this.deferredUpdate.isPending()}}).call(o.prototype)}),define("ace/mode/json/json_parse",["require","exports","module"],function(e,t,n){"use strict";var r,i,s={'"':'"',"\\":"\\","/":"/",b:"\b",f:"\f",n:"\n",r:"\r",t:" "},o,u=function(e){throw{name:"SyntaxError",message:e,at:r,text:o}},a=function(e){return e&&e!==i&&u("Expected '"+e+"' instead of '"+i+"'"),i=o.charAt(r),r+=1,i},f=function(){var e,t="";i==="-"&&(t="-",a("-"));while(i>="0"&&i<="9")t+=i,a();if(i==="."){t+=".";while(a()&&i>="0"&&i<="9")t+=i}if(i==="e"||i==="E"){t+=i,a();if(i==="-"||i==="+")t+=i,a();while(i>="0"&&i<="9")t+=i,a()}e=+t;if(!isNaN(e))return e;u("Bad number")},l=function(){var e,t,n="",r;if(i==='"')while(a()){if(i==='"')return a(),n;if(i==="\\"){a();if(i==="u"){r=0;for(t=0;t<4;t+=1){e=parseInt(a(),16);if(!isFinite(e))break;r=r*16+e}n+=String.fromCharCode(r)}else{if(typeof s[i]!="string")break;n+=s[i]}}else n+=i}u("Bad string")},c=function(){while(i&&i<=" ")a()},h=function(){switch(i){case"t":return a("t"),a("r"),a("u"),a("e"),!0;case"f":return a("f"),a("a"),a("l"),a("s"),a("e"),!1;case"n":return a("n"),a("u"),a("l"),a("l"),null}u("Unexpected '"+i+"'")},p,d=function(){var e=[];if(i==="["){a("["),c();if(i==="]")return a("]"),e;while(i){e.push(p()),c();if(i==="]")return a("]"),e;a(","),c()}}u("Bad array")},v=function(){var e,t={};if(i==="{"){a("{"),c();if(i==="}")return a("}"),t;while(i){e=l(),c(),a(":"),Object.hasOwnProperty.call(t,e)&&u('Duplicate key "'+e+'"'),t[e]=p(),c();if(i==="}")return a("}"),t;a(","),c()}}u("Bad object")};return p=function(){c();switch(i){case"{":return v();case"[":return d();case'"':return l();case"-":return f();default:return i>="0"&&i<="9"?f():h()}},function(e,t){var n;return o=e,r=0,i=" ",n=p(),c(),i&&u("Syntax error"),typeof t=="function"?function s(e,n){var r,i,o=e[n];if(o&&typeof o=="object")for(r in o)Object.hasOwnProperty.call(o,r)&&(i=s(o,r),i!==undefined?o[r]=i:delete o[r]);return t.call(e,n,o)}({"":n},""):n}}),define("ace/mode/json_worker",["require","exports","module","ace/lib/oop","ace/worker/mirror","ace/mode/json/json_parse"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../worker/mirror").Mirror,s=e("./json/json_parse"),o=t.JsonWorker=function(e){i.call(this,e),this.setTimeout(200)};r.inherits(o,i),function(){this.onUpdate=function(){var e=this.doc.getValue(),t=[];try{e&&s(e)}catch(n){var r=this.doc.indexToPosition(n.at-1);t.push({row:r.row,column:r.column,text:n.message,type:"error"})}this.sender.emit("annotate",t)}}.call(o.prototype)}),define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _=" \n \f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}})
"no use strict";!function(e){function t(e,t){var n=e,r="";while(n){var i=t[n];if(typeof i=="string")return i+r;if(i)return i.location.replace(/\/*$/,"/")+(r||i.main||i.name);if(i===!1)return"";var s=n.lastIndexOf("/");if(s===-1)break;r=n.substr(s)+r,n=n.slice(0,s)}return e}if(typeof e.window!="undefined"&&e.document)return;if(e.require&&e.define)return;e.console||(e.console=function(){var e=Array.prototype.slice.call(arguments,0);postMessage({type:"log",data:e})},e.console.error=e.console.warn=e.console.log=e.console.trace=e.console),e.window=e,e.ace=e,e.onerror=function(e,t,n,r,i){postMessage({type:"error",data:{message:e,data:i.data,file:t,line:n,col:r,stack:i.stack}})},e.normalizeModule=function(t,n){if(n.indexOf("!")!==-1){var r=n.split("!");return e.normalizeModule(t,r[0])+"!"+e.normalizeModule(t,r[1])}if(n.charAt(0)=="."){var i=t.split("/").slice(0,-1).join("/");n=(i?i+"/":"")+n;while(n.indexOf(".")!==-1&&s!=n){var s=n;n=n.replace(/^\.\//,"").replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return n},e.require=function(r,i){i||(i=r,r=null);if(!i.charAt)throw new Error("worker.js require() accepts only (parentId, id) as arguments");i=e.normalizeModule(r,i);var s=e.require.modules[i];if(s)return s.initialized||(s.initialized=!0,s.exports=s.factory().exports),s.exports;if(!e.require.tlns)return console.log("unable to load "+i);var o=t(i,e.require.tlns);return o.slice(-3)!=".js"&&(o+=".js"),e.require.id=i,e.require.modules[i]={},importScripts(o),e.require(r,i)},e.require.modules={},e.require.tlns={},e.define=function(t,n,r){arguments.length==2?(r=n,typeof t!="string"&&(n=t,t=e.require.id)):arguments.length==1&&(r=t,n=[],t=e.require.id);if(typeof r!="function"){e.require.modules[t]={exports:r,initialized:!0};return}n.length||(n=["require","exports","module"]);var i=function(n){return e.require(t,n)};e.require.modules[t]={exports:{},factory:function(){var e=this,t=r.apply(this,n.map(function(t){switch(t){case"require":return i;case"exports":return e.exports;case"module":return e;default:return i(t)}}));return t&&(e.exports=t),e}}},e.define.amd={},require.tlns={},e.initBaseUrls=function(t){for(var n in t)require.tlns[n]=t[n]},e.initSender=function(){var n=e.require("ace/lib/event_emitter").EventEmitter,r=e.require("ace/lib/oop"),i=function(){};return function(){r.implement(this,n),this.callback=function(e,t){postMessage({type:"call",id:t,data:e})},this.emit=function(e,t){postMessage({type:"event",name:e,data:t})}}.call(i.prototype),new i};var n=e.main=null,r=e.sender=null;e.onmessage=function(t){var i=t.data;if(i.event&&r)r._signal(i.event,i.data);else if(i.command)if(n[i.command])n[i.command].apply(n,i.args);else{if(!e[i.command])throw new Error("Unknown command:"+i.command);e[i.command].apply(e,i.args)}else if(i.init){e.initBaseUrls(i.tlns),require("ace/lib/es5-shim"),r=e.sender=e.initSender();var s=require(i.module)[i.classname];n=e.main=new s(r)}}}(this),define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),define("ace/worker/mirror",["require","exports","module","ace/range","ace/document","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../document").Document,s=e("../lib/lang"),o=t.Mirror=function(e){this.sender=e;var t=this.doc=new i(""),n=this.deferredUpdate=s.delayedCall(this.onUpdate.bind(this)),r=this;e.on("change",function(e){var i=e.data;if(i[0].start)t.applyDeltas(i);else for(var s=0;s<i.length;s+=2){if(Array.isArray(i[s+1]))var o={action:"insert",start:i[s],lines:i[s+1]};else var o={action:"remove",start:i[s],end:i[s+1]};t.applyDelta(o,!0)}if(r.$timeout)return n.schedule(r.$timeout);r.onUpdate()})};(function(){this.$timeout=500,this.setTimeout=function(e){this.$timeout=e},this.setValue=function(e){this.doc.setValue(e),this.deferredUpdate.schedule(this.$timeout)},this.getValue=function(e){this.sender.callback(this.doc.getValue(),e)},this.onUpdate=function(){},this.isPending=function(){return this.deferredUpdate.isPending()}}).call(o.prototype)}),define("ace/mode/json/json_parse",["require","exports","module"],function(e,t,n){"use strict";var r,i,s={'"':'"',"\\":"\\","/":"/",b:"\b",f:"\f",n:"\n",r:"\r",t:" "},o,u=function(e){throw{name:"SyntaxError",message:e,at:r,text:o}},a=function(e){return e&&e!==i&&u("Expected '"+e+"' instead of '"+i+"'"),i=o.charAt(r),r+=1,i},f=function(){var e,t="";i==="-"&&(t="-",a("-"));while(i>="0"&&i<="9")t+=i,a();if(i==="."){t+=".";while(a()&&i>="0"&&i<="9")t+=i}if(i==="e"||i==="E"){t+=i,a();if(i==="-"||i==="+")t+=i,a();while(i>="0"&&i<="9")t+=i,a()}e=+t;if(!isNaN(e))return e;u("Bad number")},l=function(){var e,t,n="",r;if(i==='"')while(a()){if(i==='"')return a(),n;if(i==="\\"){a();if(i==="u"){r=0;for(t=0;t<4;t+=1){e=parseInt(a(),16);if(!isFinite(e))break;r=r*16+e}n+=String.fromCharCode(r)}else{if(typeof s[i]!="string")break;n+=s[i]}}else n+=i}u("Bad string")},c=function(){while(i&&i<=" ")a()},h=function(){switch(i){case"t":return a("t"),a("r"),a("u"),a("e"),!0;case"f":return a("f"),a("a"),a("l"),a("s"),a("e"),!1;case"n":return a("n"),a("u"),a("l"),a("l"),null}u("Unexpected '"+i+"'")},p,d=function(){var e=[];if(i==="["){a("["),c();if(i==="]")return a("]"),e;while(i){e.push(p()),c();if(i==="]")return a("]"),e;a(","),c()}}u("Bad array")},v=function(){var e,t={};if(i==="{"){a("{"),c();if(i==="}")return a("}"),t;while(i){e=l(),c(),a(":"),Object.hasOwnProperty.call(t,e)&&u('Duplicate key "'+e+'"'),t[e]=p(),c();if(i==="}")return a("}"),t;a(","),c()}}u("Bad object")};return p=function(){c();switch(i){case"{":return v();case"[":return d();case'"':return l();case"-":return f();default:return i>="0"&&i<="9"?f():h()}},function(e,t){var n;return o=e,r=0,i=" ",n=p(),c(),i&&u("Syntax error"),typeof t=="function"?function s(e,n){var r,i,o=e[n];if(o&&typeof o=="object")for(r in o)Object.hasOwnProperty.call(o,r)&&(i=s(o,r),i!==undefined?o[r]=i:delete o[r]);return t.call(e,n,o)}({"":n},""):n}}),define("ace/mode/json_worker",["require","exports","module","ace/lib/oop","ace/worker/mirror","ace/mode/json/json_parse"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../worker/mirror").Mirror,s=e("./json/json_parse"),o=t.JsonWorker=function(e){i.call(this,e),this.setTimeout(200)};r.inherits(o,i),function(){this.onUpdate=function(){var e=this.doc.getValue(),t=[];try{e&&s(e)}catch(n){var r=this.doc.indexToPosition(n.at-1);t.push({row:r.row,column:r.column,text:n.message,type:"error"})}this.sender.emit("annotate",t)}}.call(o.prototype)}),define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _=" \n \f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}})
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./SECURITY.md
# Security Policy ## Reporting a Vulnerability If you have apprehensions regarding Apollo's security or you discover vulnerability or potential threat, don’t hesitate to get in touch with us by dropping a mail at apollo-config@googlegroups.com. In the mail, specify the description of the issue or potential threat. You are also urged to recommend the way to reproduce and replicate the issue. The Apollo community will get back to you after assessing and analysing the findings. PLEASE PAY ATTENTION to report the security issue on the security email before disclosing it on public domain.
# Security Policy ## Reporting a Vulnerability If you have apprehensions regarding Apollo's security or you discover vulnerability or potential threat, don’t hesitate to get in touch with us by dropping a mail at apollo-config@googlegroups.com. In the mail, specify the description of the issue or potential threat. You are also urged to recommend the way to reproduce and replicate the issue. The Apollo community will get back to you after assessing and analysing the findings. PLEASE PAY ATTENTION to report the security issue on the security email before disclosing it on public domain.
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js
/*! * angular-translate - v2.18.1 - 2018-05-19 * * Copyright (c) 2018 The angular-translate team, Pascal Precht; Licensed MIT */ !function(t,e){"function"==typeof define&&define.amd?define([],function(){return e()}):"object"==typeof module&&module.exports?module.exports=e():e()}(0,function(){function t(t){"use strict";var n;if(1===angular.version.major&&4<=angular.version.minor){var o=t.get("$cookies");n={get:function(t){return o.get(t)},put:function(t,e){o.put(t,e)}}}else{var r=t.get("$cookieStore");n={get:function(t){return r.get(t)},put:function(t,e){r.put(t,e)}}}return{get:function(t){return n.get(t)},set:function(t,e){n.put(t,e)},put:function(t,e){n.put(t,e)}}}return t.$inject=["$injector"],angular.module("pascalprecht.translate").factory("$translateCookieStorage",t),t.displayName="$translateCookieStorage","pascalprecht.translate"});
/*! * angular-translate - v2.18.1 - 2018-05-19 * * Copyright (c) 2018 The angular-translate team, Pascal Precht; Licensed MIT */ !function(t,e){"function"==typeof define&&define.amd?define([],function(){return e()}):"object"==typeof module&&module.exports?module.exports=e():e()}(0,function(){function t(t){"use strict";var n;if(1===angular.version.major&&4<=angular.version.minor){var o=t.get("$cookies");n={get:function(t){return o.get(t)},put:function(t,e){o.put(t,e)}}}else{var r=t.get("$cookieStore");n={get:function(t){return r.get(t)},put:function(t,e){r.put(t,e)}}}return{get:function(t){return n.get(t)},set:function(t,e){n.put(t,e)},put:function(t,e){n.put(t,e)}}}return t.$inject=["$injector"],angular.module("pascalprecht.translate").factory("$translateCookieStorage",t),t.displayName="$translateCookieStorage","pascalprecht.translate"});
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/directive/item-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('itemmodal', itemModalDirective); function itemModalDirective($translate, toastr, $sce, AppUtil, EventManager, ConfigService) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/item-modal.html', transclude: true, replace: true, scope: { appId: '=', env: '=', cluster: '=', toOperationNamespace: '=', item: '=' }, link: function (scope) { var TABLE_VIEW_OPER_TYPE = { CREATE: 'create', UPDATE: 'update' }; scope.doItem = doItem; scope.collectSelectedClusters = collectSelectedClusters; scope.showHiddenChars = showHiddenChars; $('#itemModal').on('show.bs.modal', function (e) { scope.showHiddenCharsContext = false; scope.hiddenCharCounter = 0; scope.valueWithHiddenChars = $sce.trustAsHtml(''); }); $("#valueEditor").textareafullscreen(); function doItem() { if (!scope.item.value) { scope.item.value = ""; } if (scope.item.tableViewOperType == TABLE_VIEW_OPER_TYPE.CREATE) { //check key unique var hasRepeatKey = false; scope.toOperationNamespace.items.forEach(function (item) { if (!item.isDeleted && scope.item.key == item.item.key) { toastr.error($translate.instant('ItemModal.KeyExists', { key: scope.item.key })); hasRepeatKey = true; } }); if (hasRepeatKey) { return; } scope.item.addItemBtnDisabled = true; if (scope.toOperationNamespace.isBranch) { ConfigService.create_item(scope.appId, scope.env, scope.toOperationNamespace.baseInfo.clusterName, scope.toOperationNamespace.baseInfo.namespaceName, scope.item).then( function (result) { toastr.success($translate.instant('ItemModal.AddedTips')); scope.item.addItemBtnDisabled = false; AppUtil.hideModal('#itemModal'); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ItemModal.AddFailed')); scope.item.addItemBtnDisabled = false; }); } else { if (selectedClusters.length == 0) { toastr.error($translate.instant('ItemModal.PleaseChooseCluster')); scope.item.addItemBtnDisabled = false; return; } selectedClusters.forEach(function (cluster) { ConfigService.create_item(scope.appId, cluster.env, cluster.name, scope.toOperationNamespace.baseInfo.namespaceName, scope.item).then( function (result) { scope.item.addItemBtnDisabled = false; AppUtil.hideModal('#itemModal'); toastr.success(cluster.env + " , " + scope.item.key, $translate.instant('ItemModal.AddedTips')); if (cluster.env == scope.env && cluster.name == scope.cluster) { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.toOperationNamespace }); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ItemModal.AddFailed')); scope.item.addItemBtnDisabled = false; }); }); } } else { if (!scope.item.comment) { scope.item.comment = ""; } ConfigService.update_item(scope.appId, scope.env, scope.toOperationNamespace.baseInfo.clusterName, scope.toOperationNamespace.baseInfo.namespaceName, scope.item).then( function (result) { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.toOperationNamespace }); AppUtil.hideModal('#itemModal'); toastr.success($translate.instant('ItemModal.ModifiedTips')); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ItemModal.ModifyFailed')); }); } } var selectedClusters = []; function collectSelectedClusters(data) { selectedClusters = data; } function showHiddenChars() { var value = scope.item.value; if (!value) { return; } var hiddenCharCounter = 0, valueWithHiddenChars = _.escape(value); for (var i = 0; i < value.length; i++) { var c = value[i]; if (isHiddenChar(c)) { valueWithHiddenChars = valueWithHiddenChars.replace(c, viewHiddenChar); hiddenCharCounter++; } } scope.showHiddenCharsContext = true; scope.hiddenCharCounter = hiddenCharCounter; scope.valueWithHiddenChars = $sce.trustAsHtml(valueWithHiddenChars); } function isHiddenChar(c) { return c == '\t' || c == '\n' || c == ' '; } function viewHiddenChar(c) { if (c == '\t') { return '<mark>#' + $translate.instant('ItemModal.Tabs') + '#</mark>'; } else if (c == '\n') { return '<mark>#' + $translate.instant('ItemModal.NewLine') + '#</mark>'; } else if (c == ' ') { return '<mark>#' + $translate.instant('ItemModal.Space') + '#</mark>'; } } } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('itemmodal', itemModalDirective); function itemModalDirective($translate, toastr, $sce, AppUtil, EventManager, ConfigService) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/item-modal.html', transclude: true, replace: true, scope: { appId: '=', env: '=', cluster: '=', toOperationNamespace: '=', item: '=' }, link: function (scope) { var TABLE_VIEW_OPER_TYPE = { CREATE: 'create', UPDATE: 'update' }; scope.doItem = doItem; scope.collectSelectedClusters = collectSelectedClusters; scope.showHiddenChars = showHiddenChars; $('#itemModal').on('show.bs.modal', function (e) { scope.showHiddenCharsContext = false; scope.hiddenCharCounter = 0; scope.valueWithHiddenChars = $sce.trustAsHtml(''); }); $("#valueEditor").textareafullscreen(); function doItem() { if (!scope.item.value) { scope.item.value = ""; } if (scope.item.tableViewOperType == TABLE_VIEW_OPER_TYPE.CREATE) { //check key unique var hasRepeatKey = false; scope.toOperationNamespace.items.forEach(function (item) { if (!item.isDeleted && scope.item.key == item.item.key) { toastr.error($translate.instant('ItemModal.KeyExists', { key: scope.item.key })); hasRepeatKey = true; } }); if (hasRepeatKey) { return; } scope.item.addItemBtnDisabled = true; if (scope.toOperationNamespace.isBranch) { ConfigService.create_item(scope.appId, scope.env, scope.toOperationNamespace.baseInfo.clusterName, scope.toOperationNamespace.baseInfo.namespaceName, scope.item).then( function (result) { toastr.success($translate.instant('ItemModal.AddedTips')); scope.item.addItemBtnDisabled = false; AppUtil.hideModal('#itemModal'); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ItemModal.AddFailed')); scope.item.addItemBtnDisabled = false; }); } else { if (selectedClusters.length == 0) { toastr.error($translate.instant('ItemModal.PleaseChooseCluster')); scope.item.addItemBtnDisabled = false; return; } selectedClusters.forEach(function (cluster) { ConfigService.create_item(scope.appId, cluster.env, cluster.name, scope.toOperationNamespace.baseInfo.namespaceName, scope.item).then( function (result) { scope.item.addItemBtnDisabled = false; AppUtil.hideModal('#itemModal'); toastr.success(cluster.env + " , " + scope.item.key, $translate.instant('ItemModal.AddedTips')); if (cluster.env == scope.env && cluster.name == scope.cluster) { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.toOperationNamespace }); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ItemModal.AddFailed')); scope.item.addItemBtnDisabled = false; }); }); } } else { if (!scope.item.comment) { scope.item.comment = ""; } ConfigService.update_item(scope.appId, scope.env, scope.toOperationNamespace.baseInfo.clusterName, scope.toOperationNamespace.baseInfo.namespaceName, scope.item).then( function (result) { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.toOperationNamespace }); AppUtil.hideModal('#itemModal'); toastr.success($translate.instant('ItemModal.ModifiedTips')); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ItemModal.ModifyFailed')); }); } } var selectedClusters = []; function collectSelectedClusters(data) { selectedClusters = data; } function showHiddenChars() { var value = scope.item.value; if (!value) { return; } var hiddenCharCounter = 0, valueWithHiddenChars = _.escape(value); for (var i = 0; i < value.length; i++) { var c = value[i]; if (isHiddenChar(c)) { valueWithHiddenChars = valueWithHiddenChars.replace(c, viewHiddenChar); hiddenCharCounter++; } } scope.showHiddenCharsContext = true; scope.hiddenCharCounter = hiddenCharCounter; scope.valueWithHiddenChars = $sce.trustAsHtml(valueWithHiddenChars); } function isHiddenChar(c) { return c == '\t' || c == '\n' || c == ' '; } function viewHiddenChar(c) { if (c == '\t') { return '<mark>#' + $translate.instant('ItemModal.Tabs') + '#</mark>'; } else if (c == '\n') { return '<mark>#' + $translate.instant('ItemModal.NewLine') + '#</mark>'; } else if (c == ' ') { return '<mark>#' + $translate.instant('ItemModal.Space') + '#</mark>'; } } } } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/views/component/user-selector.html
<select class="{{id}}" style="width: 450px;" ng-disabled="disabled"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> </select>
<select class="{{id}}" style="width: 450px;" ng-disabled="disabled"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> </select>
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/services/UserService.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('UserService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var user_resource = $resource('', {}, { load_user: { method: 'GET', url: AppUtil.prefixPath() + '/user' }, find_users: { method: 'GET', url: AppUtil.prefixPath() + '/users' }, create_or_update_user: { method: 'POST', url: AppUtil.prefixPath() + '/users' } }); return { load_user: function () { var finished = false; var d = $q.defer(); user_resource.load_user({}, function (result) { finished = true; d.resolve(result); }, function (result) { finished = true; d.reject(result); }); return d.promise; }, find_users: function (keyword) { var d = $q.defer(); user_resource.find_users({ keyword: keyword }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, createOrUpdateUser: function (user) { var d = $q.defer(); user_resource.create_or_update_user({}, user, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('UserService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var user_resource = $resource('', {}, { load_user: { method: 'GET', url: AppUtil.prefixPath() + '/user' }, find_users: { method: 'GET', url: AppUtil.prefixPath() + '/users' }, create_or_update_user: { method: 'POST', url: AppUtil.prefixPath() + '/users' } }); return { load_user: function () { var finished = false; var d = $q.defer(); user_resource.load_user({}, function (result) { finished = true; d.resolve(result); }, function (result) { finished = true; d.reject(result); }); return d.promise; }, find_users: function (keyword) { var d = $q.defer(); user_resource.find_users({ keyword: keyword }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, createOrUpdateUser: function (user) { var d = $q.defer(); user_resource.create_or_update_user({}, user, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } } }]);
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/namespace.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="namespace"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="./img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css"> <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <title>{{'Namespace.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container hidden" ng-controller="LinkNamespaceController"> <div class="row"> <div class="col-md-8 col-md-offset-2"> <div class="panel"> <header class="panel-heading"> <div class="row"> <div class="col-md-6">{{'Namespace.Title' | translate }} <small><a target="_blank" href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace"> {{'Namespace.UnderstandMore' | translate }} </a> </small> </div> <div class="col-md-6 text-right"> <button type="button" class="btn btn-info" ng-click="back()">{{'Common.ReturnToIndex' | translate }} </button> </div> </div> </header> <div class="panel-body"> <div class="alert alert-info no-radius"> <strong>Tips:</strong> <ul ng-show="type == 'link'"> <li>{{'Namespace.Link.Tips1' | translate }}</li> <li>{{'Namespace.Link.Tips2' | translate }}</li> </ul> <ul ng-show="type == 'create' && appNamespace.isPublic"> <li>{{'Namespace.CreatePublic.Tips1' | translate }}</li> <li>{{'Namespace.CreatePublic.Tips2' | translate }}</li> <li>{{'Namespace.CreatePublic.Tips3' | translate }}</li> <li>{{'Namespace.CreatePublic.Tips4' | translate }}</li> </ul> <ul ng-show="type == 'create' && !appNamespace.isPublic"> <li>{{'Namespace.CreatePrivate.Tips1' | translate }}</li> <li>{{'Namespace.CreatePrivate.Tips2' | translate }}</li> <li>{{'Namespace.CreatePrivate.Tips3' | translate }}</li> <li>{{'Namespace.CreatePrivate.Tips4' | translate }}</li> </ul> </div> <div class="row text-right" style="padding-right: 20px;"> <div class="btn-group btn-group-sm" role="group" aria-label="..."> <button type="button" class="btn btn-default" ng-class="{active:type=='link'}" ng-click="switchType('link')">{{'Namespace.AssociationPublicNamespace' | translate }} </button> <button type="button" class="btn btn-default" ng-class="{active:type=='create'}" ng-click="switchType('create')">{{'Namespace.CreateNamespace' | translate }} </button> </div> </div> <form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace" style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()"> <div class="form-group"> <label class="col-sm-3 control-label">{{'Common.AppId' | translate }}</label> <div class="col-sm-6" valdr-form-group> <label class="form-control-static" ng-bind="appId"></label> </div> </div> <div class="form-horizontal" ng-show="type == 'link'"> <div class="form-group"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.ChooseCluster' | translate }} </label> <div class="col-sm-6" valdr-form-group> <apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="true" apollo-select="collectSelectedClusters"></apolloclusterselector> </div> </div> </div> <div class="form-group" ng-show="type == 'create'"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.NamespaceName' | translate }} </label> <div class="col-sm-5" valdr-form-group> <div ng-class="{'input-group':appNamespace.isPublic && appendNamespacePrefix}"> <span class="input-group-addon" ng-show="appNamespace.isPublic && appendNamespacePrefix" ng-bind="appBaseInfo.namespacePrefix"></span> <input type="text" name="namespaceName" class="form-control" ng-model="appNamespace.name"> </div> </div> <div class="col-sm-2"> <select class="form-control" name="format" ng-model="appNamespace.format"> <option value="properties">properties</option> <option value="xml">xml</option> <option value="json">json</option> <option value="yml">yml</option> <option value="yaml">yaml</option> <option value="txt">txt</option> </select> </div> &nbsp;&nbsp; <span ng-show="appNamespace.isPublic && appendNamespacePrefix" ng-bind="concatNamespace()" style="line-height: 34px;"></span> </div> <div class="form-group" ng-show="type == 'create' && appNamespace.isPublic"> <label class="col-sm-3 control-label"> {{'Namespace.AutoAddDepartmentPrefix' | translate }} </label> <div class="col-sm-6" valdr-form-group> <div> <label class="checkbox-inline"> <input type="checkbox" ng-model="appendNamespacePrefix" /> {{appBaseInfo.namespacePrefix}} </label> </div> <small>{{'Namespace.AutoAddDepartmentPrefixTips' | translate }}</small> </div> </div> <div class="form-group" ng-show="type == 'create' && (pageSetting.canAppAdminCreatePrivateNamespace || hasRootPermission)"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.NamespaceType' | translate }} </label> <div class="col-sm-4" valdr-form-group> <label class="radio-inline"> <input type="radio" name="namespaceType" value="true" ng-value="true" ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Public' | translate }} </label> <label class="radio-inline"> <input type="radio" name="namespaceType" value="false" ng-value="false" ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Private' | translate }} </label> </div> </div> <div class="form-group" ng-show="type == 'create'" valdr-form-group> <label class="col-sm-3 control-label">{{'Namespace.Remark' | translate }}</label> <div class="col-sm-7" valdr-form-group> <textarea class="form-control" rows="3" name="comment" ng-model="appNamespace.comment"></textarea> </div> </div> <div class="form-group" ng-show="type == 'link'"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.Namespace' | translate }} </label> <div class="col-sm-4" valdr-form-group> <select id="namespaces"> <option></option> </select> </div> </div> <div class="form-group"> <div class="col-sm-offset-3 col-sm-10"> <button type="submit" class="btn btn-primary" ng-disabled="(type == 'create' && namespaceForm.$invalid) || submitBtnDisabled"> {{'Common.Submit' | translate }} </button> </div> </div> </form> <div class="row text-center" ng-show="step == 2"> <img src="img/sync-succ.png" style="height: 100px; width: 100px"> <h3>{{'Common.Created' | translate }}</h3> </div> </div> </div> </div> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <!--directive--> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/controller/NamespaceController.js"></script> <script src="scripts/valdr.js" type="text/javascript"></script> </body> </html>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="namespace"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="./img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css"> <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <title>{{'Namespace.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container hidden" ng-controller="LinkNamespaceController"> <div class="row"> <div class="col-md-8 col-md-offset-2"> <div class="panel"> <header class="panel-heading"> <div class="row"> <div class="col-md-6">{{'Namespace.Title' | translate }} <small><a target="_blank" href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace"> {{'Namespace.UnderstandMore' | translate }} </a> </small> </div> <div class="col-md-6 text-right"> <button type="button" class="btn btn-info" ng-click="back()">{{'Common.ReturnToIndex' | translate }} </button> </div> </div> </header> <div class="panel-body"> <div class="alert alert-info no-radius"> <strong>Tips:</strong> <ul ng-show="type == 'link'"> <li>{{'Namespace.Link.Tips1' | translate }}</li> <li>{{'Namespace.Link.Tips2' | translate }}</li> </ul> <ul ng-show="type == 'create' && appNamespace.isPublic"> <li>{{'Namespace.CreatePublic.Tips1' | translate }}</li> <li>{{'Namespace.CreatePublic.Tips2' | translate }}</li> <li>{{'Namespace.CreatePublic.Tips3' | translate }}</li> <li>{{'Namespace.CreatePublic.Tips4' | translate }}</li> </ul> <ul ng-show="type == 'create' && !appNamespace.isPublic"> <li>{{'Namespace.CreatePrivate.Tips1' | translate }}</li> <li>{{'Namespace.CreatePrivate.Tips2' | translate }}</li> <li>{{'Namespace.CreatePrivate.Tips3' | translate }}</li> <li>{{'Namespace.CreatePrivate.Tips4' | translate }}</li> </ul> </div> <div class="row text-right" style="padding-right: 20px;"> <div class="btn-group btn-group-sm" role="group" aria-label="..."> <button type="button" class="btn btn-default" ng-class="{active:type=='link'}" ng-click="switchType('link')">{{'Namespace.AssociationPublicNamespace' | translate }} </button> <button type="button" class="btn btn-default" ng-class="{active:type=='create'}" ng-click="switchType('create')">{{'Namespace.CreateNamespace' | translate }} </button> </div> </div> <form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace" style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()"> <div class="form-group"> <label class="col-sm-3 control-label">{{'Common.AppId' | translate }}</label> <div class="col-sm-6" valdr-form-group> <label class="form-control-static" ng-bind="appId"></label> </div> </div> <div class="form-horizontal" ng-show="type == 'link'"> <div class="form-group"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.ChooseCluster' | translate }} </label> <div class="col-sm-6" valdr-form-group> <apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="true" apollo-select="collectSelectedClusters"></apolloclusterselector> </div> </div> </div> <div class="form-group" ng-show="type == 'create'"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.NamespaceName' | translate }} </label> <div class="col-sm-5" valdr-form-group> <div ng-class="{'input-group':appNamespace.isPublic && appendNamespacePrefix}"> <span class="input-group-addon" ng-show="appNamespace.isPublic && appendNamespacePrefix" ng-bind="appBaseInfo.namespacePrefix"></span> <input type="text" name="namespaceName" class="form-control" ng-model="appNamespace.name"> </div> </div> <div class="col-sm-2"> <select class="form-control" name="format" ng-model="appNamespace.format"> <option value="properties">properties</option> <option value="xml">xml</option> <option value="json">json</option> <option value="yml">yml</option> <option value="yaml">yaml</option> <option value="txt">txt</option> </select> </div> &nbsp;&nbsp; <span ng-show="appNamespace.isPublic && appendNamespacePrefix" ng-bind="concatNamespace()" style="line-height: 34px;"></span> </div> <div class="form-group" ng-show="type == 'create' && appNamespace.isPublic"> <label class="col-sm-3 control-label"> {{'Namespace.AutoAddDepartmentPrefix' | translate }} </label> <div class="col-sm-6" valdr-form-group> <div> <label class="checkbox-inline"> <input type="checkbox" ng-model="appendNamespacePrefix" /> {{appBaseInfo.namespacePrefix}} </label> </div> <small>{{'Namespace.AutoAddDepartmentPrefixTips' | translate }}</small> </div> </div> <div class="form-group" ng-show="type == 'create' && (pageSetting.canAppAdminCreatePrivateNamespace || hasRootPermission)"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.NamespaceType' | translate }} </label> <div class="col-sm-4" valdr-form-group> <label class="radio-inline"> <input type="radio" name="namespaceType" value="true" ng-value="true" ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Public' | translate }} </label> <label class="radio-inline"> <input type="radio" name="namespaceType" value="false" ng-value="false" ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Private' | translate }} </label> </div> </div> <div class="form-group" ng-show="type == 'create'" valdr-form-group> <label class="col-sm-3 control-label">{{'Namespace.Remark' | translate }}</label> <div class="col-sm-7" valdr-form-group> <textarea class="form-control" rows="3" name="comment" ng-model="appNamespace.comment"></textarea> </div> </div> <div class="form-group" ng-show="type == 'link'"> <label class="col-sm-3 control-label"> <apollorequiredfield></apollorequiredfield> {{'Namespace.Namespace' | translate }} </label> <div class="col-sm-4" valdr-form-group> <select id="namespaces"> <option></option> </select> </div> </div> <div class="form-group"> <div class="col-sm-offset-3 col-sm-10"> <button type="submit" class="btn btn-primary" ng-disabled="(type == 'create' && namespaceForm.$invalid) || submitBtnDisabled"> {{'Common.Submit' | translate }} </button> </div> </div> </form> <div class="row text-center" ng-show="step == 2"> <img src="img/sync-succ.png" style="height: 100px; width: 100px"> <h3>{{'Common.Created' | translate }}</h3> </div> </div> </div> </div> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <!--directive--> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/controller/NamespaceController.js"></script> <script src="scripts/valdr.js" type="text/javascript"></script> </body> </html>
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.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. * */ application_module.controller("ConfigNamespaceController", ['$rootScope', '$scope', '$translate', 'toastr', 'AppUtil', 'EventManager', 'ConfigService', 'PermissionService', 'UserService', 'NamespaceBranchService', 'NamespaceService', controller]); function controller($rootScope, $scope, $translate, toastr, AppUtil, EventManager, ConfigService, PermissionService, UserService, NamespaceBranchService, NamespaceService) { $scope.rollback = rollback; $scope.preDeleteItem = preDeleteItem; $scope.deleteItem = deleteItem; $scope.editItem = editItem; $scope.createItem = createItem; $scope.preRevokeItem = preRevokeItem; $scope.revokeItem = revokeItem; $scope.closeTip = closeTip; $scope.showText = showText; $scope.createBranch = createBranch; $scope.preCreateBranch = preCreateBranch; $scope.preDeleteBranch = preDeleteBranch; $scope.deleteBranch = deleteBranch; $scope.showNoModifyPermissionDialog = showNoModifyPermissionDialog; $scope.lockCheck = lockCheck; $scope.emergencyPublish = emergencyPublish; init(); function init() { initRole(); initUser(); initPublishInfo(); } function initRole() { PermissionService.get_app_role_users($rootScope.pageContext.appId) .then(function (result) { var masterUsers = ''; result.masterUsers.forEach(function (user) { masterUsers += _.escape(user.userId) + ','; }); $scope.masterUsers = masterUsers.substring(0, masterUsers.length - 1); }, function (result) { }); } function initUser() { UserService.load_user().then(function (result) { $scope.currentUser = result.userId; }); } function initPublishInfo() { NamespaceService.getNamespacePublishInfo($rootScope.pageContext.appId) .then(function (result) { if (!result) { return; } $scope.hasNotPublishNamespace = false; var namespacePublishInfo = []; Object.keys(result).forEach(function (env) { if (env.indexOf("$") >= 0) { return; } var envPublishInfo = result[env]; Object.keys(envPublishInfo).forEach(function (cluster) { var clusterPublishInfo = envPublishInfo[cluster]; if (clusterPublishInfo) { $scope.hasNotPublishNamespace = true; if (Object.keys(envPublishInfo).length > 1) { namespacePublishInfo.push("[" + env + ", " + cluster + "]"); } else { namespacePublishInfo.push("[" + env + "]"); } } }) }); $scope.namespacePublishInfo = namespacePublishInfo; }); } EventManager.subscribe(EventManager.EventType.REFRESH_NAMESPACE, function (context) { if (context.namespace) { refreshSingleNamespace(context.namespace); } else { refreshAllNamespaces(context); } }); function refreshAllNamespaces(context) { if ($rootScope.pageContext.env == '') { return; } ConfigService.load_all_namespaces($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName).then( function (result) { $scope.namespaces = result; $('.config-item-container').removeClass('hide'); initPublishInfo(); //If there is a namespace parameter in the URL, expand the corresponding namespace directly if (context && context.firstLoad && $rootScope.pageContext.namespaceName) { refreshSingleNamespace({ baseInfo: { namespaceName: $rootScope.pageContext.namespaceName }, searchInfo: { showSearchInput: true, searchItemKey: $rootScope.pageContext.item, } }); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function refreshSingleNamespace(namespace) { if ($rootScope.pageContext.env == '') { return; } const showSearchItemInput = namespace.searchInfo ? namespace.searchInfo.showSearchInput : false; const searchItemKey = namespace.searchInfo ? namespace.searchInfo.searchItemKey : ''; ConfigService.load_namespace($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, namespace.baseInfo.namespaceName).then( function (result) { $scope.namespaces.forEach(function (namespace, index) { if (namespace.baseInfo.namespaceName === result.baseInfo.namespaceName) { result.showNamespaceBody = true; result.initialized = true; result.show = namespace.show; $scope.namespaces[index] = result; result.showSearchItemInput = showSearchItemInput; result.searchItemKey = searchItemKey; } }); initPublishInfo(); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function rollback() { EventManager.emit(EventManager.EventType.ROLLBACK_NAMESPACE); } $scope.tableViewOperType = '', $scope.item = {}; $scope.toOperationNamespace; var toDeleteItemId = 0; function preDeleteItem(namespace, item) { if (!lockCheck(namespace)) { return; } $scope.config = {}; $scope.config.key = _.escape(item.key); $scope.config.value = _.escape(item.value); $scope.toOperationNamespace = namespace; toDeleteItemId = item.id; $("#deleteConfirmDialog").modal("show"); } function deleteItem() { ConfigService.delete_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName, toDeleteItemId).then( function (result) { toastr.success($translate.instant('Config.Deleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.DeleteFailed')); }); } function preRevokeItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.toOperationNamespace = namespace; toRevokeItemId = namespace.baseInfo.id; $("#revokeItemConfirmDialog").modal("show"); } function revokeItem() { ConfigService.revoke_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName).then( function (result) { toastr.success($translate.instant('Revoke.RevokeSuccessfully')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Revoke.RevokeFailed')); } ); } //修改配置 function editItem(namespace, toEditItem) { if (!lockCheck(namespace)) { return; } $scope.item = _.clone(toEditItem); if (namespace.isBranch || namespace.isLinkedNamespace) { var existedItem = false; namespace.items.forEach(function (item) { if (!item.isDeleted && item.item.key == toEditItem.key) { existedItem = true; } }); if (!existedItem) { $scope.item.lineNum = 0; $scope.item.tableViewOperType = 'create'; } else { $scope.item.tableViewOperType = 'update'; } } else { $scope.item.tableViewOperType = 'update'; } $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } //新增配置 function createItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.item = { tableViewOperType: 'create' }; $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } var selectedClusters = []; $scope.collectSelectedClusters = function (data) { selectedClusters = data; }; function lockCheck(namespace) { if (namespace.lockOwner && $scope.currentUser != namespace.lockOwner) { $scope.lockOwner = namespace.lockOwner; $('#namespaceLockedDialog').modal('show'); return false; } return true; } function closeTip(clusterName) { var hideTip = JSON.parse(localStorage.getItem("hideTip")); if (!hideTip) { hideTip = {}; hideTip[$rootScope.pageContext.appId] = {}; } if (!hideTip[$rootScope.pageContext.appId]) { hideTip[$rootScope.pageContext.appId] = {}; } hideTip[$rootScope.pageContext.appId][clusterName] = true; $rootScope.hideTip = hideTip; localStorage.setItem("hideTip", JSON.stringify(hideTip)); } function showText(text) { $scope.text = text; $('#showTextModal').modal('show'); } function showNoModifyPermissionDialog() { $("#modifyNoPermissionDialog").modal('show'); } var toCreateBranchNamespace = {}; function preCreateBranch(namespace) { toCreateBranchNamespace = namespace; AppUtil.showModal("#createBranchTips"); } function createBranch() { NamespaceBranchService.createBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, toCreateBranchNamespace.baseInfo.namespaceName) .then(function (result) { toastr.success($translate.instant('Config.GrayscaleCreated')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: toCreateBranchNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.GrayscaleCreateFailed')); }) } function preDeleteBranch(branch) { //normal delete branch.branchStatus = 0; $scope.toDeleteBranch = branch; AppUtil.showModal('#deleteBranchDialog'); } function deleteBranch() { NamespaceBranchService.deleteBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, $scope.toDeleteBranch.baseInfo.namespaceName, $scope.toDeleteBranch.baseInfo.clusterName ) .then(function (result) { toastr.success($translate.instant('Config.BranchDeleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toDeleteBranch.parentNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.BranchDeleteFailed')); }) } EventManager.subscribe(EventManager.EventType.EMERGENCY_PUBLISH, function (context) { AppUtil.showModal("#emergencyPublishAlertDialog"); $scope.emergencyPublishContext = context; }); function emergencyPublish() { if ($scope.emergencyPublishContext.mergeAndPublish) { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } else { EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } } EventManager.subscribe(EventManager.EventType.DELETE_NAMESPACE_FAILED, function (context) { $scope.deleteNamespaceContext = context; if (context.reason == 'master_instance') { AppUtil.showModal('#deleteNamespaceDenyForMasterInstanceDialog'); } else if (context.reason == 'branch_instance') { AppUtil.showModal('#deleteNamespaceDenyForBranchInstanceDialog'); } else if (context.reason == 'public_namespace') { var otherAppAssociatedNamespaces = context.otherAppAssociatedNamespaces; var namespaceTips = []; otherAppAssociatedNamespaces.forEach(function (namespace) { var appId = namespace.appId; var clusterName = namespace.clusterName; var url = AppUtil.prefixPath() + '/config.html?#/appid=' + appId + '&env=' + $scope.pageContext.env + '&cluster=' + clusterName; namespaceTips.push("<a target='_blank' href=\'" + url + "\'>AppId = " + appId + ", Cluster = " + clusterName + ", Namespace = " + namespace.namespaceName + "</a>"); }); $scope.deleteNamespaceContext.detailReason = $translate.instant('Config.DeleteNamespaceFailedTips') + "<br>" + namespaceTips.join("<br>"); AppUtil.showModal('#deleteNamespaceDenyForPublicNamespaceDialog'); } }); EventManager.subscribe(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, function (context) { $scope.syntaxCheckContext = context; AppUtil.showModal('#syntaxCheckFailedDialog'); }); new Clipboard('.clipboard'); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ application_module.controller("ConfigNamespaceController", ['$rootScope', '$scope', '$translate', 'toastr', 'AppUtil', 'EventManager', 'ConfigService', 'PermissionService', 'UserService', 'NamespaceBranchService', 'NamespaceService', controller]); function controller($rootScope, $scope, $translate, toastr, AppUtil, EventManager, ConfigService, PermissionService, UserService, NamespaceBranchService, NamespaceService) { $scope.rollback = rollback; $scope.preDeleteItem = preDeleteItem; $scope.deleteItem = deleteItem; $scope.editItem = editItem; $scope.createItem = createItem; $scope.preRevokeItem = preRevokeItem; $scope.revokeItem = revokeItem; $scope.closeTip = closeTip; $scope.showText = showText; $scope.createBranch = createBranch; $scope.preCreateBranch = preCreateBranch; $scope.preDeleteBranch = preDeleteBranch; $scope.deleteBranch = deleteBranch; $scope.showNoModifyPermissionDialog = showNoModifyPermissionDialog; $scope.lockCheck = lockCheck; $scope.emergencyPublish = emergencyPublish; init(); function init() { initRole(); initUser(); initPublishInfo(); } function initRole() { PermissionService.get_app_role_users($rootScope.pageContext.appId) .then(function (result) { var masterUsers = ''; result.masterUsers.forEach(function (user) { masterUsers += _.escape(user.userId) + ','; }); $scope.masterUsers = masterUsers.substring(0, masterUsers.length - 1); }, function (result) { }); } function initUser() { UserService.load_user().then(function (result) { $scope.currentUser = result.userId; }); } function initPublishInfo() { NamespaceService.getNamespacePublishInfo($rootScope.pageContext.appId) .then(function (result) { if (!result) { return; } $scope.hasNotPublishNamespace = false; var namespacePublishInfo = []; Object.keys(result).forEach(function (env) { if (env.indexOf("$") >= 0) { return; } var envPublishInfo = result[env]; Object.keys(envPublishInfo).forEach(function (cluster) { var clusterPublishInfo = envPublishInfo[cluster]; if (clusterPublishInfo) { $scope.hasNotPublishNamespace = true; if (Object.keys(envPublishInfo).length > 1) { namespacePublishInfo.push("[" + env + ", " + cluster + "]"); } else { namespacePublishInfo.push("[" + env + "]"); } } }) }); $scope.namespacePublishInfo = namespacePublishInfo; }); } EventManager.subscribe(EventManager.EventType.REFRESH_NAMESPACE, function (context) { if (context.namespace) { refreshSingleNamespace(context.namespace); } else { refreshAllNamespaces(context); } }); function refreshAllNamespaces(context) { if ($rootScope.pageContext.env == '') { return; } ConfigService.load_all_namespaces($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName).then( function (result) { $scope.namespaces = result; $('.config-item-container').removeClass('hide'); initPublishInfo(); //If there is a namespace parameter in the URL, expand the corresponding namespace directly if (context && context.firstLoad && $rootScope.pageContext.namespaceName) { refreshSingleNamespace({ baseInfo: { namespaceName: $rootScope.pageContext.namespaceName }, searchInfo: { showSearchInput: true, searchItemKey: $rootScope.pageContext.item, } }); } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function refreshSingleNamespace(namespace) { if ($rootScope.pageContext.env == '') { return; } const showSearchItemInput = namespace.searchInfo ? namespace.searchInfo.showSearchInput : false; const searchItemKey = namespace.searchInfo ? namespace.searchInfo.searchItemKey : ''; ConfigService.load_namespace($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, namespace.baseInfo.namespaceName).then( function (result) { $scope.namespaces.forEach(function (namespace, index) { if (namespace.baseInfo.namespaceName === result.baseInfo.namespaceName) { result.showNamespaceBody = true; result.initialized = true; result.show = namespace.show; $scope.namespaces[index] = result; result.showSearchItemInput = showSearchItemInput; result.searchItemKey = searchItemKey; } }); initPublishInfo(); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.LoadingAllNamespaceError')); }); } function rollback() { EventManager.emit(EventManager.EventType.ROLLBACK_NAMESPACE); } $scope.tableViewOperType = '', $scope.item = {}; $scope.toOperationNamespace; var toDeleteItemId = 0; function preDeleteItem(namespace, item) { if (!lockCheck(namespace)) { return; } $scope.config = {}; $scope.config.key = _.escape(item.key); $scope.config.value = _.escape(item.value); $scope.toOperationNamespace = namespace; toDeleteItemId = item.id; $("#deleteConfirmDialog").modal("show"); } function deleteItem() { ConfigService.delete_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName, toDeleteItemId).then( function (result) { toastr.success($translate.instant('Config.Deleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.DeleteFailed')); }); } function preRevokeItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.toOperationNamespace = namespace; toRevokeItemId = namespace.baseInfo.id; $("#revokeItemConfirmDialog").modal("show"); } function revokeItem() { ConfigService.revoke_item($rootScope.pageContext.appId, $rootScope.pageContext.env, $scope.toOperationNamespace.baseInfo.clusterName, $scope.toOperationNamespace.baseInfo.namespaceName).then( function (result) { toastr.success($translate.instant('Revoke.RevokeSuccessfully')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toOperationNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Revoke.RevokeFailed')); } ); } //修改配置 function editItem(namespace, toEditItem) { if (!lockCheck(namespace)) { return; } $scope.item = _.clone(toEditItem); if (namespace.isBranch || namespace.isLinkedNamespace) { var existedItem = false; namespace.items.forEach(function (item) { if (!item.isDeleted && item.item.key == toEditItem.key) { existedItem = true; } }); if (!existedItem) { $scope.item.lineNum = 0; $scope.item.tableViewOperType = 'create'; } else { $scope.item.tableViewOperType = 'update'; } } else { $scope.item.tableViewOperType = 'update'; } $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } //新增配置 function createItem(namespace) { if (!lockCheck(namespace)) { return; } $scope.item = { tableViewOperType: 'create' }; $scope.toOperationNamespace = namespace; AppUtil.showModal('#itemModal'); } var selectedClusters = []; $scope.collectSelectedClusters = function (data) { selectedClusters = data; }; function lockCheck(namespace) { if (namespace.lockOwner && $scope.currentUser != namespace.lockOwner) { $scope.lockOwner = namespace.lockOwner; $('#namespaceLockedDialog').modal('show'); return false; } return true; } function closeTip(clusterName) { var hideTip = JSON.parse(localStorage.getItem("hideTip")); if (!hideTip) { hideTip = {}; hideTip[$rootScope.pageContext.appId] = {}; } if (!hideTip[$rootScope.pageContext.appId]) { hideTip[$rootScope.pageContext.appId] = {}; } hideTip[$rootScope.pageContext.appId][clusterName] = true; $rootScope.hideTip = hideTip; localStorage.setItem("hideTip", JSON.stringify(hideTip)); } function showText(text) { $scope.text = text; $('#showTextModal').modal('show'); } function showNoModifyPermissionDialog() { $("#modifyNoPermissionDialog").modal('show'); } var toCreateBranchNamespace = {}; function preCreateBranch(namespace) { toCreateBranchNamespace = namespace; AppUtil.showModal("#createBranchTips"); } function createBranch() { NamespaceBranchService.createBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, toCreateBranchNamespace.baseInfo.namespaceName) .then(function (result) { toastr.success($translate.instant('Config.GrayscaleCreated')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: toCreateBranchNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.GrayscaleCreateFailed')); }) } function preDeleteBranch(branch) { //normal delete branch.branchStatus = 0; $scope.toDeleteBranch = branch; AppUtil.showModal('#deleteBranchDialog'); } function deleteBranch() { NamespaceBranchService.deleteBranch($rootScope.pageContext.appId, $rootScope.pageContext.env, $rootScope.pageContext.clusterName, $scope.toDeleteBranch.baseInfo.namespaceName, $scope.toDeleteBranch.baseInfo.clusterName ) .then(function (result) { toastr.success($translate.instant('Config.BranchDeleted')); EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: $scope.toDeleteBranch.parentNamespace }); }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('Config.BranchDeleteFailed')); }) } EventManager.subscribe(EventManager.EventType.EMERGENCY_PUBLISH, function (context) { AppUtil.showModal("#emergencyPublishAlertDialog"); $scope.emergencyPublishContext = context; }); function emergencyPublish() { if ($scope.emergencyPublishContext.mergeAndPublish) { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } else { EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: $scope.emergencyPublishContext.namespace, isEmergencyPublish: true }); } } EventManager.subscribe(EventManager.EventType.DELETE_NAMESPACE_FAILED, function (context) { $scope.deleteNamespaceContext = context; if (context.reason == 'master_instance') { AppUtil.showModal('#deleteNamespaceDenyForMasterInstanceDialog'); } else if (context.reason == 'branch_instance') { AppUtil.showModal('#deleteNamespaceDenyForBranchInstanceDialog'); } else if (context.reason == 'public_namespace') { var otherAppAssociatedNamespaces = context.otherAppAssociatedNamespaces; var namespaceTips = []; otherAppAssociatedNamespaces.forEach(function (namespace) { var appId = namespace.appId; var clusterName = namespace.clusterName; var url = AppUtil.prefixPath() + '/config.html?#/appid=' + appId + '&env=' + $scope.pageContext.env + '&cluster=' + clusterName; namespaceTips.push("<a target='_blank' href=\'" + url + "\'>AppId = " + appId + ", Cluster = " + clusterName + ", Namespace = " + namespace.namespaceName + "</a>"); }); $scope.deleteNamespaceContext.detailReason = $translate.instant('Config.DeleteNamespaceFailedTips') + "<br>" + namespaceTips.join("<br>"); AppUtil.showModal('#deleteNamespaceDenyForPublicNamespaceDialog'); } }); EventManager.subscribe(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, function (context) { $scope.syntaxCheckContext = context; AppUtil.showModal('#syntaxCheckFailedDialog'); }); new Clipboard('.clipboard'); }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/config/history.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="release_history"> <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.History.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container" ng-controller="ReleaseHistoryController"> <section class="release-history panel col-md-12 no-radius hidden"> <div class="panel-heading row"> <div class="operation-caption-container col-md-3"> <div class="operation-caption release-operation-normal text-center" style="left:0;"> <small>{{'Config.History.MasterVersionPublish' | translate }}</small> </div> <div class="operation-caption release-operation-rollback text-center" style="left: 110px;"> <small>{{'Config.History.MasterVersionRollback' | translate }}</small> </div> <div class="operation-caption release-operation-gray text-center" style="left: 220px;"> <small>{{'Config.History.GrayscaleOperator' | translate }}</small> </div> </div> <div class="col-md-6 text-center"> <h4>{{'Config.History.PublishHistory' | translate }}</h4> <small>({{'Common.AppId' | translate }}:{{pageContext.appId}}, {{'Common.Environment' | translate }}:{{pageContext.env}}, {{'Common.Cluster' | translate }}:{{pageContext.clusterName}}, {{'Common.Namespace' | translate }}:{{pageContext.namespaceName}}) </small> </div> <div class="pull-right back-btn"> <a type="button" class="btn btn-info" href="{{ '/config.html' | prefixPath }}?#/appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> <div class="release-history-container panel-body row" ng-show="!isConfigHidden && releaseHistories && releaseHistories.length > 0"> <div class="release-history-list col-md-3"> <div class="media hover" ng-class="{'active': releaseHistory.id == selectedReleaseHistory}" ng-repeat="releaseHistory in releaseHistories" ng-click="showReleaseHistoryDetail(releaseHistory)"> <div class="release-operation" ng-class="{'release-operation-normal': releaseHistory.operation == 0 || releaseHistory.operation == 5, 'release-operation-gray': releaseHistory.operation == 2 || releaseHistory.operation == 3 || releaseHistory.operation == 4 || releaseHistory.operation == 7 || releaseHistory.operation == 8, 'release-operation-rollback': releaseHistory.operation == 1 || releaseHistory.operation == 6}"> </div> <h4 class="media-left text-center" ng-bind="releaseHistory.operatorDisplayName + '(' + releaseHistory.operator + ')'"> </h4> <div class="media-body"> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 0"> {{'Config.History.OperationType0' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 1"> {{'Config.History.OperationType1' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 2"> {{'Config.History.OperationType2' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 3"> {{'Config.History.OperationType3' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 4"> {{'Config.History.OperationType4' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 5"> {{'Config.History.OperationType5' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 6"> {{'Config.History.OperationType6' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 7"> {{'Config.History.OperationType7' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 8"> {{'Config.History.OperationType8' | translate }}</h5> <h6 class="col-md-5 text-right" ng-bind="releaseHistory.releaseTimeFormatted"></h6> <span class="label label-warning no-radius emergency-publish" ng-if="releaseHistory.operationContext.isEmergencyPublish">{{'Config.History.UrgentPublish' | translate }}</span> </div> </div> <div class="load-more media panel-heading text-center hover" ng-show="!hasLoadAll" ng-click="findReleaseHistory()"> {{'Config.History.LoadMore' | translate }} </div> </div> <!--properties mode info--> <div class="release-info col-md-9 panel panel-default no-radius" ng-show="!isTextNamespace"> <div class="panel-heading"> <span ng-bind="history.releaseTitle"></span> <span class="label label-warning no-radius" ng-if="history.isReleaseAbandoned">{{'Config.History.Abandoned' | translate }}</span> <span class="pull-right" ng-bind="history.releaseTime | date: 'yyyy-MM-dd HH:mm:ss'"></span> <div class="row" style="padding-top: 10px;"> <div class="col-md-5"> <small ng-show="history.releaseComment" ng-bind="history.releaseComment"></small> </div> <div class="col-md-7 text-right"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Config.History.RollbackToTips' | translate }}" ng-show="namespace.hasReleasePermission && !history.isReleaseAbandoned && (history.operation == 0 || history.operation == 1 || history.operation == 4)" ng-click="preRollback()"> <img src="../img/rollback.png"> {{'Config.History.RollbackTo' | translate }} </button> <div class="btn-group"> <button type="button" class="btn btn-default btn-sm" ng-class="{'active':history.viewType == 'diff'}" data-tooltip="tooltip" data-placement="bottom" title="{{'Config.History.ChangedItemTips' | translate }}" ng-click="switchConfigViewType(history, 'diff')">{{'Config.History.ChangedItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm" ng-class="{'active':history.viewType == 'all'}" data-tooltip="tooltip" data-placement="bottom" title="{{'Config.History.AllItemTips' | translate }}" ng-click="switchConfigViewType(history, 'all')">{{'Config.History.AllItem' | translate }} </button> </div> </div> </div> </div> <div class="panel-body config"> <section ng-show="history.viewType=='diff'"> <h4 class="section-title">{{'Config.History.ChangedItem' | translate }}</h4> <div ng-show="history.changes && history.changes.length > 0"> <table class="no-margin table table-striped table-hover table-bordered"> <thead> <tr> <th>{{'Config.History.ChangeType' | translate }}</th> <th>{{'Config.History.ChangeKey' | translate }}</th> <th>{{'Config.History.ChangeOldValue' | translate }}</th> <th>{{'Config.History.ChangeNewValue' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="change in history.changes"> <td width="10%"> <span ng-show="change.type == 'ADDED'">{{'Config.History.ChangeTypeNew' | translate }}</span> <span ng-show="change.type == 'MODIFIED'">{{'Config.History.ChangeTypeModify' | translate }}</span> <span ng-show="change.type == 'DELETED'">{{'Config.History.ChangeTypeDelete' | translate }}</span> </td> <td class="cursor-pointer" width="20%" ng-click="showText(change.entity.firstEntity.key)"> <span ng-bind="change.entity.firstEntity.key | limitTo: 250"></span> <span ng-bind="change.entity.firstEntity.key.length > 250 ? '...' :''"></span> </td> <td class="cursor-pointer" width="35%" ng-click="showText(change.entity.firstEntity.value)"> <span ng-bind="change.entity.firstEntity.value | limitTo: 250"></span> <span ng-bind="change.entity.firstEntity.value.length > 250 ? '...' :''"></span> </td> <td class="cursor-pointer" width="35%" ng-click="showText(change.entity.secondEntity.value)"> <span ng-bind="change.entity.secondEntity.value | limitTo: 250"></span> <span ng-bind="change.entity.secondEntity.value.length > 250 ? '...' :''"></span> </td> </tr> </tbody> </table> </div> <div class="text-center empty-container" ng-show="!history.changes || history.changes.length == 0"> <h5>{{'Config.History.NoChange' | translate }}</h5> </div> </section> <section ng-show="history.viewType=='all'"> <h4 class="section-title">{{'Config.History.AllItem' | translate }}</h4> <table class="no-margin table table-striped table-hover table-bordered" ng-show="history.configuration && history.configuration.length > 0"> <thead> <tr> <th>{{'Config.History.ChangeKey' | translate }}</th> <th>{{'Config.History.ChangeValue' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="item in history.configuration"> <td class="cursor-pointer" width="30%" ng-click="showText(item.firstEntity)"> <span ng-bind="item.firstEntity | limitTo: 250"></span> <span ng-bind="item.firstEntity.length > 250 ? '...' :''"></span> </td> <td class="cursor-pointer" width="70%" ng-click="showText(item.secondEntity)"> <span ng-bind="item.secondEntity | limitTo: 250"></span> <span ng-bind="item.secondEntity.length > 250 ? '...' :''"></span> </td> </tr> </tbody> </table> <div class="text-center empty-container" ng-show="history.viewType=='all' && (!history.configuration || history.configuration.length == 0)"> <h5>{{'Config.History.NoItem' | translate }}</h5> </div> </section> <section ng-show="history.branchName != history.clusterName && history.operation != 8 && history.operation != 7"> <hr> <h4 class="section-title">{{'Config.History.GrayscaleRule' | translate }}</h4> <table class="no-margin table table-striped table-hover table-bordered" ng-show="history.operationContext.rules"> <thead> <tr> <th>{{'Config.History.GrayscaleAppId' | translate }}</th> <th>{{'Config.History.GrayscaleIp' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="rule in history.operationContext.rules"> <td width="20%" ng-bind="rule.clientAppId"></td> <td width="80%" ng-bind="rule.clientIpList.join(', ')"></td> </tr> </tbody> </table> <h5 class="text-center empty-container" ng-show="!history.operationContext.rules"> {{'Config.History.NoGrayscaleRule' | translate }} </h5> </section> </div> </div> <!--text mode--> <div class="release-info col-md-9" ng-show="isTextNamespace && history.changes && history.changes.length > 0"> <apollodiff ng-repeat="change in history.changes" old-str="change.entity.firstEntity.value" new-str="change.entity.secondEntity.value" apollo-id="'releaseStrDiff'"> </apollodiff> </div> </div> <div class="panel-body" ng-show="isConfigHidden || !releaseHistories || releaseHistories.length == 0"> <h4 class="text-center empty-container" ng-show="isConfigHidden"> {{'Config.History.NoPermissionTips' | translate }}</h4> <h4 class="text-center empty-container" ng-show="!isConfigHidden"> {{'Config.History.NoPublishHistory' | translate }}</h4> </div> </section> <showtextmodal text="text"></showtextmodal> <rollbackmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName"> </rollbackmodal> <apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'" apollo-title="'Config.RollbackAlert.DialogTitle' | translate" apollo-detail="'Config.RollbackAlert.DialogContent' | translate" apollo-show-cancel-btn="true" apollo-confirm="rollback"> </apolloconfirmdialog> </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/diff.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/ReleaseService.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/ReleaseHistoryService.js"></script> <script type="application/javascript" src="../scripts/services/ConfigService.js"></script> <script type="application/javascript" src="../scripts/services/PermissionService.js"></script> <script type="application/javascript" src="../scripts/services/EventManager.js"></script> <script type="application/javascript" src="../scripts/AppUtils.js"></script> <script type="application/javascript" src="../scripts/controller/config/ReleaseHistoryController.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> <script type="application/javascript" src="../scripts/directive/diff-directive.js"></script> <script type="application/javascript" src="../scripts/directive/rollback-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="release_history"> <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.History.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container" ng-controller="ReleaseHistoryController"> <section class="release-history panel col-md-12 no-radius hidden"> <div class="panel-heading row"> <div class="operation-caption-container col-md-3"> <div class="operation-caption release-operation-normal text-center" style="left:0;"> <small>{{'Config.History.MasterVersionPublish' | translate }}</small> </div> <div class="operation-caption release-operation-rollback text-center" style="left: 110px;"> <small>{{'Config.History.MasterVersionRollback' | translate }}</small> </div> <div class="operation-caption release-operation-gray text-center" style="left: 220px;"> <small>{{'Config.History.GrayscaleOperator' | translate }}</small> </div> </div> <div class="col-md-6 text-center"> <h4>{{'Config.History.PublishHistory' | translate }}</h4> <small>({{'Common.AppId' | translate }}:{{pageContext.appId}}, {{'Common.Environment' | translate }}:{{pageContext.env}}, {{'Common.Cluster' | translate }}:{{pageContext.clusterName}}, {{'Common.Namespace' | translate }}:{{pageContext.namespaceName}}) </small> </div> <div class="pull-right back-btn"> <a type="button" class="btn btn-info" href="{{ '/config.html' | prefixPath }}?#/appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> <div class="release-history-container panel-body row" ng-show="!isConfigHidden && releaseHistories && releaseHistories.length > 0"> <div class="release-history-list col-md-3"> <div class="media hover" ng-class="{'active': releaseHistory.id == selectedReleaseHistory}" ng-repeat="releaseHistory in releaseHistories" ng-click="showReleaseHistoryDetail(releaseHistory)"> <div class="release-operation" ng-class="{'release-operation-normal': releaseHistory.operation == 0 || releaseHistory.operation == 5, 'release-operation-gray': releaseHistory.operation == 2 || releaseHistory.operation == 3 || releaseHistory.operation == 4 || releaseHistory.operation == 7 || releaseHistory.operation == 8, 'release-operation-rollback': releaseHistory.operation == 1 || releaseHistory.operation == 6}"> </div> <h4 class="media-left text-center" ng-bind="releaseHistory.operatorDisplayName + '(' + releaseHistory.operator + ')'"> </h4> <div class="media-body"> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 0"> {{'Config.History.OperationType0' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 1"> {{'Config.History.OperationType1' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 2"> {{'Config.History.OperationType2' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 3"> {{'Config.History.OperationType3' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 4"> {{'Config.History.OperationType4' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 5"> {{'Config.History.OperationType5' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 6"> {{'Config.History.OperationType6' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 7"> {{'Config.History.OperationType7' | translate }}</h5> <h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 8"> {{'Config.History.OperationType8' | translate }}</h5> <h6 class="col-md-5 text-right" ng-bind="releaseHistory.releaseTimeFormatted"></h6> <span class="label label-warning no-radius emergency-publish" ng-if="releaseHistory.operationContext.isEmergencyPublish">{{'Config.History.UrgentPublish' | translate }}</span> </div> </div> <div class="load-more media panel-heading text-center hover" ng-show="!hasLoadAll" ng-click="findReleaseHistory()"> {{'Config.History.LoadMore' | translate }} </div> </div> <!--properties mode info--> <div class="release-info col-md-9 panel panel-default no-radius" ng-show="!isTextNamespace"> <div class="panel-heading"> <span ng-bind="history.releaseTitle"></span> <span class="label label-warning no-radius" ng-if="history.isReleaseAbandoned">{{'Config.History.Abandoned' | translate }}</span> <span class="pull-right" ng-bind="history.releaseTime | date: 'yyyy-MM-dd HH:mm:ss'"></span> <div class="row" style="padding-top: 10px;"> <div class="col-md-5"> <small ng-show="history.releaseComment" ng-bind="history.releaseComment"></small> </div> <div class="col-md-7 text-right"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Config.History.RollbackToTips' | translate }}" ng-show="namespace.hasReleasePermission && !history.isReleaseAbandoned && (history.operation == 0 || history.operation == 1 || history.operation == 4)" ng-click="preRollback()"> <img src="../img/rollback.png"> {{'Config.History.RollbackTo' | translate }} </button> <div class="btn-group"> <button type="button" class="btn btn-default btn-sm" ng-class="{'active':history.viewType == 'diff'}" data-tooltip="tooltip" data-placement="bottom" title="{{'Config.History.ChangedItemTips' | translate }}" ng-click="switchConfigViewType(history, 'diff')">{{'Config.History.ChangedItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm" ng-class="{'active':history.viewType == 'all'}" data-tooltip="tooltip" data-placement="bottom" title="{{'Config.History.AllItemTips' | translate }}" ng-click="switchConfigViewType(history, 'all')">{{'Config.History.AllItem' | translate }} </button> </div> </div> </div> </div> <div class="panel-body config"> <section ng-show="history.viewType=='diff'"> <h4 class="section-title">{{'Config.History.ChangedItem' | translate }}</h4> <div ng-show="history.changes && history.changes.length > 0"> <table class="no-margin table table-striped table-hover table-bordered"> <thead> <tr> <th>{{'Config.History.ChangeType' | translate }}</th> <th>{{'Config.History.ChangeKey' | translate }}</th> <th>{{'Config.History.ChangeOldValue' | translate }}</th> <th>{{'Config.History.ChangeNewValue' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="change in history.changes"> <td width="10%"> <span ng-show="change.type == 'ADDED'">{{'Config.History.ChangeTypeNew' | translate }}</span> <span ng-show="change.type == 'MODIFIED'">{{'Config.History.ChangeTypeModify' | translate }}</span> <span ng-show="change.type == 'DELETED'">{{'Config.History.ChangeTypeDelete' | translate }}</span> </td> <td class="cursor-pointer" width="20%" ng-click="showText(change.entity.firstEntity.key)"> <span ng-bind="change.entity.firstEntity.key | limitTo: 250"></span> <span ng-bind="change.entity.firstEntity.key.length > 250 ? '...' :''"></span> </td> <td class="cursor-pointer" width="35%" ng-click="showText(change.entity.firstEntity.value)"> <span ng-bind="change.entity.firstEntity.value | limitTo: 250"></span> <span ng-bind="change.entity.firstEntity.value.length > 250 ? '...' :''"></span> </td> <td class="cursor-pointer" width="35%" ng-click="showText(change.entity.secondEntity.value)"> <span ng-bind="change.entity.secondEntity.value | limitTo: 250"></span> <span ng-bind="change.entity.secondEntity.value.length > 250 ? '...' :''"></span> </td> </tr> </tbody> </table> </div> <div class="text-center empty-container" ng-show="!history.changes || history.changes.length == 0"> <h5>{{'Config.History.NoChange' | translate }}</h5> </div> </section> <section ng-show="history.viewType=='all'"> <h4 class="section-title">{{'Config.History.AllItem' | translate }}</h4> <table class="no-margin table table-striped table-hover table-bordered" ng-show="history.configuration && history.configuration.length > 0"> <thead> <tr> <th>{{'Config.History.ChangeKey' | translate }}</th> <th>{{'Config.History.ChangeValue' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="item in history.configuration"> <td class="cursor-pointer" width="30%" ng-click="showText(item.firstEntity)"> <span ng-bind="item.firstEntity | limitTo: 250"></span> <span ng-bind="item.firstEntity.length > 250 ? '...' :''"></span> </td> <td class="cursor-pointer" width="70%" ng-click="showText(item.secondEntity)"> <span ng-bind="item.secondEntity | limitTo: 250"></span> <span ng-bind="item.secondEntity.length > 250 ? '...' :''"></span> </td> </tr> </tbody> </table> <div class="text-center empty-container" ng-show="history.viewType=='all' && (!history.configuration || history.configuration.length == 0)"> <h5>{{'Config.History.NoItem' | translate }}</h5> </div> </section> <section ng-show="history.branchName != history.clusterName && history.operation != 8 && history.operation != 7"> <hr> <h4 class="section-title">{{'Config.History.GrayscaleRule' | translate }}</h4> <table class="no-margin table table-striped table-hover table-bordered" ng-show="history.operationContext.rules"> <thead> <tr> <th>{{'Config.History.GrayscaleAppId' | translate }}</th> <th>{{'Config.History.GrayscaleIp' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="rule in history.operationContext.rules"> <td width="20%" ng-bind="rule.clientAppId"></td> <td width="80%" ng-bind="rule.clientIpList.join(', ')"></td> </tr> </tbody> </table> <h5 class="text-center empty-container" ng-show="!history.operationContext.rules"> {{'Config.History.NoGrayscaleRule' | translate }} </h5> </section> </div> </div> <!--text mode--> <div class="release-info col-md-9" ng-show="isTextNamespace && history.changes && history.changes.length > 0"> <apollodiff ng-repeat="change in history.changes" old-str="change.entity.firstEntity.value" new-str="change.entity.secondEntity.value" apollo-id="'releaseStrDiff'"> </apollodiff> </div> </div> <div class="panel-body" ng-show="isConfigHidden || !releaseHistories || releaseHistories.length == 0"> <h4 class="text-center empty-container" ng-show="isConfigHidden"> {{'Config.History.NoPermissionTips' | translate }}</h4> <h4 class="text-center empty-container" ng-show="!isConfigHidden"> {{'Config.History.NoPublishHistory' | translate }}</h4> </div> </section> <showtextmodal text="text"></showtextmodal> <rollbackmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName"> </rollbackmodal> <apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'" apollo-title="'Config.RollbackAlert.DialogTitle' | translate" apollo-detail="'Config.RollbackAlert.DialogContent' | translate" apollo-show-cancel-btn="true" apollo-confirm="rollback"> </apolloconfirmdialog> </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/diff.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/ReleaseService.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/ReleaseHistoryService.js"></script> <script type="application/javascript" src="../scripts/services/ConfigService.js"></script> <script type="application/javascript" src="../scripts/services/PermissionService.js"></script> <script type="application/javascript" src="../scripts/services/EventManager.js"></script> <script type="application/javascript" src="../scripts/AppUtils.js"></script> <script type="application/javascript" src="../scripts/controller/config/ReleaseHistoryController.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> <script type="application/javascript" src="../scripts/directive/diff-directive.js"></script> <script type="application/javascript" src="../scripts/directive/rollback-modal-directive.js"></script> </body> </html>
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/scripts/directive/diff-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('apollodiff', function ($compile, $window, AppUtil) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/diff.html', transclude: true, replace: true, scope: { oldStr: '=', newStr: '=', apolloId: '=' }, link: function (scope, element, attrs) { scope.$watch('oldStr', makeDiff); scope.$watch('newStr', makeDiff); function makeDiff() { var displayArea = document.getElementById(scope.apolloId); if (!displayArea) { return; } //clear displayArea.innerHTML = ''; var color = '', span = null, pre = ''; var oldStr = scope.oldStr == undefined ? '' : scope.oldStr; var newStr = scope.newStr == undefined ? '' : scope.newStr; var diff = JsDiff.diffLines(oldStr, newStr), fragment = document.createDocumentFragment(); diff.forEach(function (part) { // green for additions, red for deletions // grey for common parts color = part.added ? 'green' : part.removed ? 'red' : 'grey'; span = document.createElement('span'); span.style.color = color; pre = part.added ? '+' : part.removed ? '-' : ''; span.appendChild(document.createTextNode(pre + part.value)); fragment.appendChild(span); }); displayArea.appendChild(fragment); } } } });
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('apollodiff', function ($compile, $window, AppUtil) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/diff.html', transclude: true, replace: true, scope: { oldStr: '=', newStr: '=', apolloId: '=' }, link: function (scope, element, attrs) { scope.$watch('oldStr', makeDiff); scope.$watch('newStr', makeDiff); function makeDiff() { var displayArea = document.getElementById(scope.apolloId); if (!displayArea) { return; } //clear displayArea.innerHTML = ''; var color = '', span = null, pre = ''; var oldStr = scope.oldStr == undefined ? '' : scope.oldStr; var newStr = scope.newStr == undefined ? '' : scope.newStr; var diff = JsDiff.diffLines(oldStr, newStr), fragment = document.createDocumentFragment(); diff.forEach(function (part) { // green for additions, red for deletions // grey for common parts color = part.added ? 'green' : part.removed ? 'red' : 'grey'; span = document.createElement('span'); span.style.color = color; pre = part.added ? '+' : part.removed ? '-' : ''; span.appendChild(document.createTextNode(pre + part.value)); fragment.appendChild(span); }); displayArea.appendChild(fragment); } } } });
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/ServiceBootstrap.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals; import com.ctrip.framework.apollo.core.spi.Ordered; import com.google.common.collect.Lists; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.ServiceLoader; public class ServiceBootstrap { public static <S> S loadFirst(Class<S> clazz) { Iterator<S> iterator = loadAll(clazz); if (!iterator.hasNext()) { throw new IllegalStateException(String.format( "No implementation defined in /META-INF/services/%s, please check whether the file exists and has the right implementation class!", clazz.getName())); } return iterator.next(); } public static <S> Iterator<S> loadAll(Class<S> clazz) { ServiceLoader<S> loader = ServiceLoader.load(clazz); return loader.iterator(); } public static <S extends Ordered> List<S> loadAllOrdered(Class<S> clazz) { Iterator<S> iterator = loadAll(clazz); List<S> candidates = Lists.newArrayList(iterator); Collections.sort(candidates, new Comparator<S>() { @Override public int compare(S o1, S o2) { // the smaller order has higher priority return Integer.compare(o1.getOrder(), o2.getOrder()); } }); return candidates; } public static <S extends Ordered> S loadPrimary(Class<S> clazz) { List<S> candidates = loadAllOrdered(clazz); if (candidates.isEmpty()) { throw new IllegalStateException(String.format( "No implementation defined in /META-INF/services/%s, please check whether the file exists and has the right implementation class!", clazz.getName())); } return candidates.get(0); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.internals; import com.ctrip.framework.apollo.core.spi.Ordered; import com.google.common.collect.Lists; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.ServiceLoader; public class ServiceBootstrap { public static <S> S loadFirst(Class<S> clazz) { Iterator<S> iterator = loadAll(clazz); if (!iterator.hasNext()) { throw new IllegalStateException(String.format( "No implementation defined in /META-INF/services/%s, please check whether the file exists and has the right implementation class!", clazz.getName())); } return iterator.next(); } public static <S> Iterator<S> loadAll(Class<S> clazz) { ServiceLoader<S> loader = ServiceLoader.load(clazz); return loader.iterator(); } public static <S extends Ordered> List<S> loadAllOrdered(Class<S> clazz) { Iterator<S> iterator = loadAll(clazz); List<S> candidates = Lists.newArrayList(iterator); Collections.sort(candidates, new Comparator<S>() { @Override public int compare(S o1, S o2) { // the smaller order has higher priority return Integer.compare(o1.getOrder(), o2.getOrder()); } }); return candidates; } public static <S extends Ordered> S loadPrimary(Class<S> clazz) { List<S> candidates = loadAllOrdered(clazz); if (candidates.isEmpty()) { throw new IllegalStateException(String.format( "No implementation defined in /META-INF/services/%s, please check whether the file exists and has the right implementation class!", clazz.getName())); } return candidates.get(0); } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest1.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.XmlConfigPlaceholderTest.TestXmlBean"> <property name="timeout" value="${timeout:100}"/> <property name="batch" value="${batch:200}"/> </bean> </beans>
<?xml version="1.0" encoding="UTF-8"?> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:apollo="http://www.ctrip.com/schema/apollo" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd"> <apollo:config /> <bean class="com.ctrip.framework.apollo.spring.XmlConfigPlaceholderTest.TestXmlBean"> <property name="timeout" value="${timeout:100}"/> <property name="batch" value="${batch:200}"/> </bean> </beans>
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./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,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./.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,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/JavaConfigPlaceholderTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue; import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import java.util.List; import java.util.Properties; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.stereotype.Component; /** * @author Jason Song(song_s@ctrip.com) */ public class JavaConfigPlaceholderTest extends AbstractSpringIntegrationTest { private static final String TIMEOUT_PROPERTY = "timeout"; private static final int DEFAULT_TIMEOUT = 100; private static final String BATCH_PROPERTY = "batch"; private static final int DEFAULT_BATCH = 200; private static final String FX_APOLLO_NAMESPACE = "FX.apollo"; private static final String JSON_PROPERTY = "jsonProperty"; private static final String OTHER_JSON_PROPERTY = "otherJsonProperty"; @Test public void testPropertySourceWithNoNamespace() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); check(someTimeout, someBatch, AppConfig1.class); } @Test public void testPropertySourceWithNoConfig() throws Exception { Config config = mock(Config.class); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); check(DEFAULT_TIMEOUT, DEFAULT_BATCH, AppConfig1.class); } @Test public void testApplicationPropertySource() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); check(someTimeout, someBatch, AppConfig2.class); } @Test public void testPropertiesCompatiblePropertySource() throws Exception { int someTimeout = 1000; int someBatch = 2000; Properties properties = mock(Properties.class); when(properties.getProperty(TIMEOUT_PROPERTY)).thenReturn(String.valueOf(someTimeout)); when(properties.getProperty(BATCH_PROPERTY)).thenReturn(String.valueOf(someBatch)); PropertiesCompatibleConfigFile configFile = mock(PropertiesCompatibleConfigFile.class); when(configFile.asProperties()).thenReturn(properties); mockConfigFile("application.yaml", configFile); check(someTimeout, someBatch, AppConfig9.class); } @Test public void testPropertiesCompatiblePropertySourceWithNonNormalizedCase() throws Exception { int someTimeout = 1000; int someBatch = 2000; Properties properties = mock(Properties.class); when(properties.getProperty(TIMEOUT_PROPERTY)).thenReturn(String.valueOf(someTimeout)); when(properties.getProperty(BATCH_PROPERTY)).thenReturn(String.valueOf(someBatch)); PropertiesCompatibleConfigFile configFile = mock(PropertiesCompatibleConfigFile.class); when(configFile.asProperties()).thenReturn(properties); mockConfigFile("application.yaml", configFile); check(someTimeout, someBatch, AppConfig10.class); } @Test public void testMultiplePropertySources() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); Config fxApollo = mock(Config.class); when(application.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); check(someTimeout, someBatch, AppConfig3.class); } @Test public void testMultiplePropertiesCompatiblePropertySourcesWithSameProperties() throws Exception { int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Properties properties = mock(Properties.class); when(properties.getProperty(TIMEOUT_PROPERTY)).thenReturn(String.valueOf(someTimeout)); when(properties.getProperty(BATCH_PROPERTY)).thenReturn(String.valueOf(someBatch)); PropertiesCompatibleConfigFile configFile = mock(PropertiesCompatibleConfigFile.class); when(configFile.asProperties()).thenReturn(properties); mockConfigFile("application.yml", configFile); Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); check(someTimeout, someBatch, AppConfig11.class); } @Test public void testMultiplePropertySourcesCoverWithSameProperties() throws Exception { //Multimap does not maintain the strict input order of namespace. int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(fxApollo.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); check(someTimeout, someBatch, AppConfig6.class); } @Test public void testMultiplePropertySourcesCoverWithSamePropertiesWithPropertiesCompatiblePropertySource() throws Exception { //Multimap does not maintain the strict input order of namespace. int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(fxApollo.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); check(someTimeout, someBatch, AppConfig6.class); } @Test public void testMultiplePropertySourcesWithSamePropertiesWithWeight() throws Exception { int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(application.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); check(anotherTimeout, someBatch, AppConfig2.class, AppConfig4.class); } @Test public void testApplicationPropertySourceWithValueInjectedAsParameter() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AppConfig5.class); TestJavaConfigBean2 bean = context.getBean(TestJavaConfigBean2.class); assertEquals(someTimeout, bean.getTimeout()); assertEquals(someBatch, bean.getBatch()); } @Test public void testApplicationPropertySourceWithValueInjectedAsConstructorArgs() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AppConfig7.class); TestJavaConfigBean3 bean = context.getBean(TestJavaConfigBean3.class); assertEquals(someTimeout, bean.getTimeout()); assertEquals(someBatch, bean.getBatch()); } @Test public void testNestedProperty() throws Exception { String a = "a"; String b = "b"; int someValue = 1234; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(String.format("%s.%s", a, b)), anyString())) .thenReturn(String.valueOf(someValue)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testNestedPropertyWithDefaultValue() throws Exception { String a = "a"; String b = "b"; String c = "c"; int someValue = 1234; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(c), anyString())).thenReturn(String.valueOf(someValue)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testNestedPropertyWithNestedDefaultValue() throws Exception { String a = "a"; String b = "b"; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(100, bean.getNestedProperty()); } @Test public void testMultipleNestedProperty() throws Exception { String a = "a"; String b = "b"; String nestedKey = "c.d"; String nestedProperty = String.format("${%s}", nestedKey); int someValue = 1234; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(String.format("%s.%s", a, b)), anyString())).thenReturn(nestedProperty); when(config.getProperty(eq(nestedKey), anyString())).thenReturn(String.valueOf(someValue)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testMultipleNestedPropertyWithDefaultValue() throws Exception { String a = "a"; String b = "b"; String nestedKey = "c.d"; int someValue = 1234; String nestedProperty = String.format("${%s:%d}", nestedKey, someValue); Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(String.format("%s.%s", a, b)), anyString())).thenReturn(nestedProperty); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testApolloJsonValue() { String someJson = "[{\"a\":\"astring\", \"b\":10},{\"a\":\"astring2\", \"b\":20}]"; String otherJson = "[{\"a\":\"otherString\", \"b\":10},{\"a\":\"astring2\", \"b\":20}]"; Config config = mock(Config.class); when(config.getProperty(eq(JSON_PROPERTY), anyString())).thenReturn(someJson); when(config.getProperty(eq(OTHER_JSON_PROPERTY), anyString())).thenReturn(otherJson); when(config.getProperty(eq("a"), anyString())).thenReturn(JSON_PROPERTY); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( AppConfig8.class); TestJsonPropertyBean testJsonPropertyBean = context.getBean(TestJsonPropertyBean.class); assertEquals(2, testJsonPropertyBean.getJsonBeanList().size()); assertEquals("astring", testJsonPropertyBean.getJsonBeanList().get(0).getA()); assertEquals(10, testJsonPropertyBean.getJsonBeanList().get(0).getB()); assertEquals("astring2", testJsonPropertyBean.getJsonBeanList().get(1).getA()); assertEquals(20, testJsonPropertyBean.getJsonBeanList().get(1).getB()); assertEquals(testJsonPropertyBean.getJsonBeanList(), testJsonPropertyBean.getEmbeddedJsonBeanList()); assertEquals("otherString", testJsonPropertyBean.getOtherJsonBeanList().get(0).getA()); assertEquals(10, testJsonPropertyBean.getOtherJsonBeanList().get(0).getB()); assertEquals("astring2", testJsonPropertyBean.getOtherJsonBeanList().get(1).getA()); assertEquals(20, testJsonPropertyBean.getOtherJsonBeanList().get(1).getB()); } @Test(expected = BeanCreationException.class) public void testApolloJsonValueWithInvalidJson() throws Exception { String someInvalidJson = "someInvalidJson"; Config config = mock(Config.class); when(config.getProperty(eq(JSON_PROPERTY), anyString())).thenReturn(someInvalidJson); when(config.getProperty(eq(OTHER_JSON_PROPERTY), anyString())).thenReturn(someInvalidJson); when(config.getProperty(eq("a"), anyString())).thenReturn(JSON_PROPERTY); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); new AnnotationConfigApplicationContext(AppConfig8.class).getBean(TestJsonPropertyBean.class); } @Test(expected = BeanCreationException.class) public void testApolloJsonValueWithNoPropertyValue() throws Exception { Config config = mock(Config.class); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); new AnnotationConfigApplicationContext(AppConfig8.class); } private void check(int expectedTimeout, int expectedBatch, Class<?>... annotatedClasses) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses); TestJavaConfigBean bean = context.getBean(TestJavaConfigBean.class); assertEquals(expectedTimeout, bean.getTimeout()); assertEquals(expectedBatch, bean.getBatch()); } @Configuration @EnableApolloConfig static class AppConfig1 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig("application") static class AppConfig2 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig({"application", "FX.apollo"}) static class AppConfig3 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig(value = "FX.apollo", order = 10) static class AppConfig4 { } @Configuration @EnableApolloConfig static class AppConfig5 { @Bean TestJavaConfigBean2 testJavaConfigBean2(@Value("${timeout:100}") int timeout, @Value("${batch:200}") int batch) { TestJavaConfigBean2 bean = new TestJavaConfigBean2(); bean.setTimeout(timeout); bean.setBatch(batch); return bean; } } @Configuration @EnableApolloConfig({"FX.apollo", "application"}) static class AppConfig6 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @ComponentScan( includeFilters = {@Filter(type = FilterType.ANNOTATION, value = {Component.class})}, excludeFilters = {@Filter(type = FilterType.ANNOTATION, value = {Configuration.class})}) @EnableApolloConfig static class AppConfig7 { } @Configuration @EnableApolloConfig static class NestedPropertyConfig1 { @Bean TestNestedPropertyBean testNestedPropertyBean() { return new TestNestedPropertyBean(); } } @Configuration @EnableApolloConfig static class AppConfig8 { @Bean TestJsonPropertyBean testJavaConfigBean() { return new TestJsonPropertyBean(); } } @Configuration @EnableApolloConfig("application.yaml") static class AppConfig9 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig("application.yaMl") static class AppConfig10 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig({"application.yml", "FX.apollo"}) static class AppConfig11 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Component static class TestJavaConfigBean { @Value("${timeout:100}") private int timeout; private int batch; @Value("${batch:200}") public void setBatch(int batch) { this.batch = batch; } public int getTimeout() { return timeout; } public int getBatch() { return batch; } } static class TestJavaConfigBean2 { private int timeout; private int batch; public int getTimeout() { return timeout; } public void setTimeout(int timeout) { this.timeout = timeout; } public int getBatch() { return batch; } public void setBatch(int batch) { this.batch = batch; } } @Component static class TestJavaConfigBean3 { private final int timeout; private final int batch; @Autowired public TestJavaConfigBean3(@Value("${timeout:100}") int timeout, @Value("${batch:200}") int batch) { this.timeout = timeout; this.batch = batch; } public int getTimeout() { return timeout; } public int getBatch() { return batch; } } static class TestNestedPropertyBean { @Value("${${a}.${b}:${c:100}}") private int nestedProperty; public int getNestedProperty() { return nestedProperty; } } static class TestJsonPropertyBean { @ApolloJsonValue("${jsonProperty}") private List<JsonBean> jsonBeanList; private List<JsonBean> otherJsonBeanList; @ApolloJsonValue("${${a}}") private List<JsonBean> embeddedJsonBeanList; public List<JsonBean> getJsonBeanList() { return jsonBeanList; } @ApolloJsonValue("${otherJsonProperty}") public void setOtherJsonBeanList(List<JsonBean> otherJsonBeanList) { this.otherJsonBeanList = otherJsonBeanList; } public List<JsonBean> getOtherJsonBeanList() { return otherJsonBeanList; } public List<JsonBean> getEmbeddedJsonBeanList() { return embeddedJsonBeanList; } } static class JsonBean { private String a; private int b; String getA() { return a; } public void setA(String a) { this.a = a; } int getB() { return b; } public void setB(int b) { this.b = b; } @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } JsonBean jsonBean = (JsonBean) o; if (b != jsonBean.b) { return false; } return a != null ? a.equals(jsonBean.a) : jsonBean.a == null; } @Override public int hashCode() { int result = a != null ? a.hashCode() : 0; result = 31 * result + b; return result; } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.spring; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue; import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig; import java.util.List; import java.util.Properties; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.stereotype.Component; /** * @author Jason Song(song_s@ctrip.com) */ public class JavaConfigPlaceholderTest extends AbstractSpringIntegrationTest { private static final String TIMEOUT_PROPERTY = "timeout"; private static final int DEFAULT_TIMEOUT = 100; private static final String BATCH_PROPERTY = "batch"; private static final int DEFAULT_BATCH = 200; private static final String FX_APOLLO_NAMESPACE = "FX.apollo"; private static final String JSON_PROPERTY = "jsonProperty"; private static final String OTHER_JSON_PROPERTY = "otherJsonProperty"; @Test public void testPropertySourceWithNoNamespace() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); check(someTimeout, someBatch, AppConfig1.class); } @Test public void testPropertySourceWithNoConfig() throws Exception { Config config = mock(Config.class); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); check(DEFAULT_TIMEOUT, DEFAULT_BATCH, AppConfig1.class); } @Test public void testApplicationPropertySource() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); check(someTimeout, someBatch, AppConfig2.class); } @Test public void testPropertiesCompatiblePropertySource() throws Exception { int someTimeout = 1000; int someBatch = 2000; Properties properties = mock(Properties.class); when(properties.getProperty(TIMEOUT_PROPERTY)).thenReturn(String.valueOf(someTimeout)); when(properties.getProperty(BATCH_PROPERTY)).thenReturn(String.valueOf(someBatch)); PropertiesCompatibleConfigFile configFile = mock(PropertiesCompatibleConfigFile.class); when(configFile.asProperties()).thenReturn(properties); mockConfigFile("application.yaml", configFile); check(someTimeout, someBatch, AppConfig9.class); } @Test public void testPropertiesCompatiblePropertySourceWithNonNormalizedCase() throws Exception { int someTimeout = 1000; int someBatch = 2000; Properties properties = mock(Properties.class); when(properties.getProperty(TIMEOUT_PROPERTY)).thenReturn(String.valueOf(someTimeout)); when(properties.getProperty(BATCH_PROPERTY)).thenReturn(String.valueOf(someBatch)); PropertiesCompatibleConfigFile configFile = mock(PropertiesCompatibleConfigFile.class); when(configFile.asProperties()).thenReturn(properties); mockConfigFile("application.yaml", configFile); check(someTimeout, someBatch, AppConfig10.class); } @Test public void testMultiplePropertySources() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); Config fxApollo = mock(Config.class); when(application.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); check(someTimeout, someBatch, AppConfig3.class); } @Test public void testMultiplePropertiesCompatiblePropertySourcesWithSameProperties() throws Exception { int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Properties properties = mock(Properties.class); when(properties.getProperty(TIMEOUT_PROPERTY)).thenReturn(String.valueOf(someTimeout)); when(properties.getProperty(BATCH_PROPERTY)).thenReturn(String.valueOf(someBatch)); PropertiesCompatibleConfigFile configFile = mock(PropertiesCompatibleConfigFile.class); when(configFile.asProperties()).thenReturn(properties); mockConfigFile("application.yml", configFile); Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); check(someTimeout, someBatch, AppConfig11.class); } @Test public void testMultiplePropertySourcesCoverWithSameProperties() throws Exception { //Multimap does not maintain the strict input order of namespace. int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(fxApollo.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); check(someTimeout, someBatch, AppConfig6.class); } @Test public void testMultiplePropertySourcesCoverWithSamePropertiesWithPropertiesCompatiblePropertySource() throws Exception { //Multimap does not maintain the strict input order of namespace. int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(fxApollo.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); check(someTimeout, someBatch, AppConfig6.class); } @Test public void testMultiplePropertySourcesWithSamePropertiesWithWeight() throws Exception { int someTimeout = 1000; int anotherTimeout = someTimeout + 1; int someBatch = 2000; Config application = mock(Config.class); when(application.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(application.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, application); Config fxApollo = mock(Config.class); when(fxApollo.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(anotherTimeout)); mockConfig(FX_APOLLO_NAMESPACE, fxApollo); check(anotherTimeout, someBatch, AppConfig2.class, AppConfig4.class); } @Test public void testApplicationPropertySourceWithValueInjectedAsParameter() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AppConfig5.class); TestJavaConfigBean2 bean = context.getBean(TestJavaConfigBean2.class); assertEquals(someTimeout, bean.getTimeout()); assertEquals(someBatch, bean.getBatch()); } @Test public void testApplicationPropertySourceWithValueInjectedAsConstructorArgs() throws Exception { int someTimeout = 1000; int someBatch = 2000; Config config = mock(Config.class); when(config.getProperty(eq(TIMEOUT_PROPERTY), anyString())).thenReturn(String.valueOf(someTimeout)); when(config.getProperty(eq(BATCH_PROPERTY), anyString())).thenReturn(String.valueOf(someBatch)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(AppConfig7.class); TestJavaConfigBean3 bean = context.getBean(TestJavaConfigBean3.class); assertEquals(someTimeout, bean.getTimeout()); assertEquals(someBatch, bean.getBatch()); } @Test public void testNestedProperty() throws Exception { String a = "a"; String b = "b"; int someValue = 1234; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(String.format("%s.%s", a, b)), anyString())) .thenReturn(String.valueOf(someValue)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testNestedPropertyWithDefaultValue() throws Exception { String a = "a"; String b = "b"; String c = "c"; int someValue = 1234; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(c), anyString())).thenReturn(String.valueOf(someValue)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testNestedPropertyWithNestedDefaultValue() throws Exception { String a = "a"; String b = "b"; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(100, bean.getNestedProperty()); } @Test public void testMultipleNestedProperty() throws Exception { String a = "a"; String b = "b"; String nestedKey = "c.d"; String nestedProperty = String.format("${%s}", nestedKey); int someValue = 1234; Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(String.format("%s.%s", a, b)), anyString())).thenReturn(nestedProperty); when(config.getProperty(eq(nestedKey), anyString())).thenReturn(String.valueOf(someValue)); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testMultipleNestedPropertyWithDefaultValue() throws Exception { String a = "a"; String b = "b"; String nestedKey = "c.d"; int someValue = 1234; String nestedProperty = String.format("${%s:%d}", nestedKey, someValue); Config config = mock(Config.class); when(config.getProperty(eq(a), anyString())).thenReturn(a); when(config.getProperty(eq(b), anyString())).thenReturn(b); when(config.getProperty(eq(String.format("%s.%s", a, b)), anyString())).thenReturn(nestedProperty); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(NestedPropertyConfig1.class); TestNestedPropertyBean bean = context.getBean(TestNestedPropertyBean.class); assertEquals(someValue, bean.getNestedProperty()); } @Test public void testApolloJsonValue() { String someJson = "[{\"a\":\"astring\", \"b\":10},{\"a\":\"astring2\", \"b\":20}]"; String otherJson = "[{\"a\":\"otherString\", \"b\":10},{\"a\":\"astring2\", \"b\":20}]"; Config config = mock(Config.class); when(config.getProperty(eq(JSON_PROPERTY), anyString())).thenReturn(someJson); when(config.getProperty(eq(OTHER_JSON_PROPERTY), anyString())).thenReturn(otherJson); when(config.getProperty(eq("a"), anyString())).thenReturn(JSON_PROPERTY); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( AppConfig8.class); TestJsonPropertyBean testJsonPropertyBean = context.getBean(TestJsonPropertyBean.class); assertEquals(2, testJsonPropertyBean.getJsonBeanList().size()); assertEquals("astring", testJsonPropertyBean.getJsonBeanList().get(0).getA()); assertEquals(10, testJsonPropertyBean.getJsonBeanList().get(0).getB()); assertEquals("astring2", testJsonPropertyBean.getJsonBeanList().get(1).getA()); assertEquals(20, testJsonPropertyBean.getJsonBeanList().get(1).getB()); assertEquals(testJsonPropertyBean.getJsonBeanList(), testJsonPropertyBean.getEmbeddedJsonBeanList()); assertEquals("otherString", testJsonPropertyBean.getOtherJsonBeanList().get(0).getA()); assertEquals(10, testJsonPropertyBean.getOtherJsonBeanList().get(0).getB()); assertEquals("astring2", testJsonPropertyBean.getOtherJsonBeanList().get(1).getA()); assertEquals(20, testJsonPropertyBean.getOtherJsonBeanList().get(1).getB()); } @Test(expected = BeanCreationException.class) public void testApolloJsonValueWithInvalidJson() throws Exception { String someInvalidJson = "someInvalidJson"; Config config = mock(Config.class); when(config.getProperty(eq(JSON_PROPERTY), anyString())).thenReturn(someInvalidJson); when(config.getProperty(eq(OTHER_JSON_PROPERTY), anyString())).thenReturn(someInvalidJson); when(config.getProperty(eq("a"), anyString())).thenReturn(JSON_PROPERTY); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); new AnnotationConfigApplicationContext(AppConfig8.class).getBean(TestJsonPropertyBean.class); } @Test(expected = BeanCreationException.class) public void testApolloJsonValueWithNoPropertyValue() throws Exception { Config config = mock(Config.class); mockConfig(ConfigConsts.NAMESPACE_APPLICATION, config); new AnnotationConfigApplicationContext(AppConfig8.class); } private void check(int expectedTimeout, int expectedBatch, Class<?>... annotatedClasses) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(annotatedClasses); TestJavaConfigBean bean = context.getBean(TestJavaConfigBean.class); assertEquals(expectedTimeout, bean.getTimeout()); assertEquals(expectedBatch, bean.getBatch()); } @Configuration @EnableApolloConfig static class AppConfig1 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig("application") static class AppConfig2 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig({"application", "FX.apollo"}) static class AppConfig3 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig(value = "FX.apollo", order = 10) static class AppConfig4 { } @Configuration @EnableApolloConfig static class AppConfig5 { @Bean TestJavaConfigBean2 testJavaConfigBean2(@Value("${timeout:100}") int timeout, @Value("${batch:200}") int batch) { TestJavaConfigBean2 bean = new TestJavaConfigBean2(); bean.setTimeout(timeout); bean.setBatch(batch); return bean; } } @Configuration @EnableApolloConfig({"FX.apollo", "application"}) static class AppConfig6 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @ComponentScan( includeFilters = {@Filter(type = FilterType.ANNOTATION, value = {Component.class})}, excludeFilters = {@Filter(type = FilterType.ANNOTATION, value = {Configuration.class})}) @EnableApolloConfig static class AppConfig7 { } @Configuration @EnableApolloConfig static class NestedPropertyConfig1 { @Bean TestNestedPropertyBean testNestedPropertyBean() { return new TestNestedPropertyBean(); } } @Configuration @EnableApolloConfig static class AppConfig8 { @Bean TestJsonPropertyBean testJavaConfigBean() { return new TestJsonPropertyBean(); } } @Configuration @EnableApolloConfig("application.yaml") static class AppConfig9 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig("application.yaMl") static class AppConfig10 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Configuration @EnableApolloConfig({"application.yml", "FX.apollo"}) static class AppConfig11 { @Bean TestJavaConfigBean testJavaConfigBean() { return new TestJavaConfigBean(); } } @Component static class TestJavaConfigBean { @Value("${timeout:100}") private int timeout; private int batch; @Value("${batch:200}") public void setBatch(int batch) { this.batch = batch; } public int getTimeout() { return timeout; } public int getBatch() { return batch; } } static class TestJavaConfigBean2 { private int timeout; private int batch; public int getTimeout() { return timeout; } public void setTimeout(int timeout) { this.timeout = timeout; } public int getBatch() { return batch; } public void setBatch(int batch) { this.batch = batch; } } @Component static class TestJavaConfigBean3 { private final int timeout; private final int batch; @Autowired public TestJavaConfigBean3(@Value("${timeout:100}") int timeout, @Value("${batch:200}") int batch) { this.timeout = timeout; this.batch = batch; } public int getTimeout() { return timeout; } public int getBatch() { return batch; } } static class TestNestedPropertyBean { @Value("${${a}.${b}:${c:100}}") private int nestedProperty; public int getNestedProperty() { return nestedProperty; } } static class TestJsonPropertyBean { @ApolloJsonValue("${jsonProperty}") private List<JsonBean> jsonBeanList; private List<JsonBean> otherJsonBeanList; @ApolloJsonValue("${${a}}") private List<JsonBean> embeddedJsonBeanList; public List<JsonBean> getJsonBeanList() { return jsonBeanList; } @ApolloJsonValue("${otherJsonProperty}") public void setOtherJsonBeanList(List<JsonBean> otherJsonBeanList) { this.otherJsonBeanList = otherJsonBeanList; } public List<JsonBean> getOtherJsonBeanList() { return otherJsonBeanList; } public List<JsonBean> getEmbeddedJsonBeanList() { return embeddedJsonBeanList; } } static class JsonBean { private String a; private int b; String getA() { return a; } public void setA(String a) { this.a = a; } int getB() { return b; } public void setB(int b) { this.b = b; } @Override public boolean equals(Object o) { if (this == o) { return true; } if (o == null || getClass() != o.getClass()) { return false; } JsonBean jsonBean = (JsonBean) o; if (b != jsonBean.b) { return false; } return a != null ? a.equals(jsonBean.a) : jsonBean.a == null; } @Override public int hashCode() { int result = a != null ? a.hashCode() : 0; result = 31 * result + b; return result; } } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-client/src/test/resources/yaml/orderedcase.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. # k2: "someValue" k4: "anotherValue" k1: "yetAnotherValue"
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # k2: "someValue" k4: "anotherValue" k1: "yetAnotherValue"
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServerEurekaServerConfigure.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; import org.springframework.context.annotation.Configuration; /** * Start Eureka Server annotations according to configuration * * @author Zhiqiang Lin(linzhiqiang0514@163.com) */ @Configuration @EnableEurekaServer @ConditionalOnProperty(name = "apollo.eureka.server.enabled", havingValue = "true", matchIfMissing = true) public class ConfigServerEurekaServerConfigure { }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; import org.springframework.context.annotation.Configuration; /** * Start Eureka Server annotations according to configuration * * @author Zhiqiang Lin(linzhiqiang0514@163.com) */ @Configuration @EnableEurekaServer @ConditionalOnProperty(name = "apollo.eureka.server.enabled", havingValue = "true", matchIfMissing = true) public class ConfigServerEurekaServerConfigure { }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ReleaseMessageKeyGenerator.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.google.common.base.Joiner; import com.ctrip.framework.apollo.core.ConfigConsts; public class ReleaseMessageKeyGenerator { private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR); public static String generate(String appId, String cluster, String namespace) { return STRING_JOINER.join(appId, cluster, namespace); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.utils; import com.google.common.base.Joiner; import com.ctrip.framework.apollo.core.ConfigConsts; public class ReleaseMessageKeyGenerator { private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR); public static String generate(String appId, String cluster, String namespace) { return STRING_JOINER.join(appId, cluster, namespace); } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/resources/static/vendor/angular/angular-toastr-1.4.1.tpls.min.js
!function () { "use strict"; function t(t, e, s, n, o, r, a) { function i(t) { if (t)d(t.toastId); else for (var e = 0; e < O.length; e++)d(O[e].toastId) } function l(t, e, s) { var n = m().iconClasses.error; return g(n, t, e, s) } function c(t, e, s) { var n = m().iconClasses.info; return g(n, t, e, s) } function u(t, e, s) { var n = m().iconClasses.success; return g(n, t, e, s) } function p(t, e, s) { var n = m().iconClasses.warning; return g(n, t, e, s) } function d(e, s) { function n(t) { for (var e = 0; e < O.length; e++)if (O[e].toastId === t)return O[e] } function o() { return !O.length } var i = n(e); i && !i.deleting && (i.deleting = !0, i.isOpened = !1, t.leave(i.el).then(function () { i.scope.options.onHidden && i.scope.options.onHidden(s), i.scope.$destroy(); var t = O.indexOf(i); delete B[i.scope.message], O.splice(t, 1); var e = r.maxOpened; e && O.length >= e && O[e - 1].open.resolve(), o() && (h.remove(), h = null, T = a.defer()) })) } function g(t, e, s, n) { return angular.isObject(s) && (n = s, s = null), v({iconClass: t, message: e, optionsOverride: n, title: s}) } function m() { return angular.extend({}, r) } function f(e) { if (h)return T.promise; h = angular.element("<div></div>"), h.attr("id", e.containerId), h.addClass(e.positionClass), h.css({"pointer-events": "auto"}); var s = angular.element(document.querySelector(e.target)); if (!s || !s.length)throw"Target for toasts doesn't exist"; return t.enter(h, s).then(function () { T.resolve() }), T.promise } function v(s) { function r(t, e, s) { s.allowHtml ? (t.scope.allowHtml = !0, t.scope.title = o.trustAsHtml(e.title), t.scope.message = o.trustAsHtml(e.message)) : (t.scope.title = e.title, t.scope.message = e.message), t.scope.toastType = t.iconClass, t.scope.toastId = t.toastId, t.scope.options = { extendedTimeOut: s.extendedTimeOut, messageClass: s.messageClass, onHidden: s.onHidden, onShown: s.onShown, progressBar: s.progressBar, tapToDismiss: s.tapToDismiss, timeOut: s.timeOut, titleClass: s.titleClass, toastClass: s.toastClass }, s.closeButton && (t.scope.options.closeHtml = s.closeHtml) } function i() { function t(t) { for (var e = ["containerId", "iconClasses", "maxOpened", "newestOnTop", "positionClass", "preventDuplicates", "preventOpenDuplicates", "templates"], s = 0, n = e.length; n > s; s++)delete t[e[s]]; return t } var e = {toastId: C++, isOpened: !1, scope: n.$new(), open: a.defer()}; return e.iconClass = s.iconClass, s.optionsOverride && (p = angular.extend(p, t(s.optionsOverride)), e.iconClass = s.optionsOverride.iconClass || e.iconClass), r(e, s, p), e.el = l(e.scope), e } function l(t) { var s = angular.element("<div toast></div>"), n = e.get("$compile"); return n(s)(t) } function c() { return p.maxOpened && O.length <= p.maxOpened || !p.maxOpened } function u() { var t = p.preventDuplicates && s.message === w, e = p.preventOpenDuplicates && B[s.message]; return t || e ? !0 : (w = s.message, B[s.message] = !0, !1) } var p = m(); if (!u()) { var g = i(); if (O.push(g), p.autoDismiss && p.maxOpened > 0)for (var v = O.slice(0, O.length - p.maxOpened), T = 0, $ = v.length; $ > T; T++)d(v[T].toastId); return c() && g.open.resolve(), g.open.promise.then(function () { f(p).then(function () { if (g.isOpened = !0, p.newestOnTop)t.enter(g.el, h).then(function () { g.scope.init() }); else { var e = h[0].lastChild ? angular.element(h[0].lastChild) : null; t.enter(g.el, h, e).then(function () { g.scope.init() }) } }) }), g } } var h, C = 0, O = [], w = "", B = {}, T = a.defer(), $ = { clear: i, error: l, info: c, remove: d, success: u, warning: p }; return $ } angular.module("toastr", []).factory("toastr", t), t.$inject = ["$animate", "$injector", "$document", "$rootScope", "$sce", "toastrConfig", "$q"] }(), function () { "use strict"; angular.module("toastr").constant("toastrConfig", { allowHtml: !1, autoDismiss: !1, closeButton: !1, closeHtml: "<button>&times;</button>", containerId: "toast-container", extendedTimeOut: 1e3, iconClasses: {error: "toast-error", info: "toast-info", success: "toast-success", warning: "toast-warning"}, maxOpened: 0, messageClass: "toast-message", newestOnTop: !0, onHidden: null, onShown: null, positionClass: "toast-top-right", preventDuplicates: !1, preventOpenDuplicates: !1, progressBar: !1, tapToDismiss: !0, target: "body", templates: {toast: "directives/toast/toast.html", progressbar: "directives/progressbar/progressbar.html"}, timeOut: 5e3, titleClass: "toast-title", toastClass: "toast" }) }(), function () { "use strict"; function t(t) { function e(t, e, s, n) { function o() { var t = (i - (new Date).getTime()) / a * 100; e.css("width", t + "%") } var r, a, i; n.progressBar = t, t.start = function (t) { r && clearInterval(r), a = parseFloat(t), i = (new Date).getTime() + a, r = setInterval(o, 10) }, t.stop = function () { r && clearInterval(r) }, t.$on("$destroy", function () { clearInterval(r) }) } return { replace: !0, require: "^toast", templateUrl: function () { return t.templates.progressbar }, link: e } } angular.module("toastr").directive("progressBar", t), t.$inject = ["toastrConfig"] }(), function () { "use strict"; function t() { this.progressBar = null, this.startProgressBar = function (t) { this.progressBar && this.progressBar.start(t) }, this.stopProgressBar = function () { this.progressBar && this.progressBar.stop() } } angular.module("toastr").controller("ToastController", t) }(), function () { "use strict"; function t(t, e, s, n) { function o(s, o, r, a) { function i(t) { return a.startProgressBar(t), e(function () { a.stopProgressBar(), n.remove(s.toastId) }, t, 1) } function l() { s.progressBar = !1, a.stopProgressBar() } function c() { return s.options.closeHtml } var u; if (s.toastClass = s.options.toastClass, s.titleClass = s.options.titleClass, s.messageClass = s.options.messageClass, s.progressBar = s.options.progressBar, c()) { var p = angular.element(s.options.closeHtml), d = t.get("$compile"); p.addClass("toast-close-button"), p.attr("ng-click", "close()"), d(p)(s), o.prepend(p) } s.init = function () { s.options.timeOut && (u = i(s.options.timeOut)), s.options.onShown && s.options.onShown() }, o.on("mouseenter", function () { l(), u && e.cancel(u) }), s.tapToast = function () { s.options.tapToDismiss && s.close(!0) }, s.close = function (t) { n.remove(s.toastId, t) }, o.on("mouseleave", function () { (0 !== s.options.timeOut || 0 !== s.options.extendedTimeOut) && (s.$apply(function () { s.progressBar = s.options.progressBar }), u = i(s.options.extendedTimeOut)) }) } return { replace: !0, templateUrl: function () { return s.templates.toast }, controller: "ToastController", link: o } } angular.module("toastr").directive("toast", t), t.$inject = ["$injector", "$interval", "toastrConfig", "toastr"] }(), angular.module("toastr").run(["$templateCache", function (t) { t.put("directives/progressbar/progressbar.html", '<div class="toast-progress"></div>\n'), t.put("directives/toast/toast.html", '<div class="{{toastClass}} {{toastType}}" ng-click="tapToast()">\n <div ng-switch on="allowHtml">\n <div ng-switch-default ng-if="title" class="{{titleClass}}">{{title}}</div>\n <div ng-switch-default class="{{messageClass}}">{{message}}</div>\n <div ng-switch-when="true" ng-if="title" class="{{titleClass}}" ng-bind-html="title"></div>\n <div ng-switch-when="true" class="{{messageClass}}" ng-bind-html="message"></div>\n </div>\n <progress-bar ng-if="progressBar"></progress-bar>\n</div>\n') }]);
!function () { "use strict"; function t(t, e, s, n, o, r, a) { function i(t) { if (t)d(t.toastId); else for (var e = 0; e < O.length; e++)d(O[e].toastId) } function l(t, e, s) { var n = m().iconClasses.error; return g(n, t, e, s) } function c(t, e, s) { var n = m().iconClasses.info; return g(n, t, e, s) } function u(t, e, s) { var n = m().iconClasses.success; return g(n, t, e, s) } function p(t, e, s) { var n = m().iconClasses.warning; return g(n, t, e, s) } function d(e, s) { function n(t) { for (var e = 0; e < O.length; e++)if (O[e].toastId === t)return O[e] } function o() { return !O.length } var i = n(e); i && !i.deleting && (i.deleting = !0, i.isOpened = !1, t.leave(i.el).then(function () { i.scope.options.onHidden && i.scope.options.onHidden(s), i.scope.$destroy(); var t = O.indexOf(i); delete B[i.scope.message], O.splice(t, 1); var e = r.maxOpened; e && O.length >= e && O[e - 1].open.resolve(), o() && (h.remove(), h = null, T = a.defer()) })) } function g(t, e, s, n) { return angular.isObject(s) && (n = s, s = null), v({iconClass: t, message: e, optionsOverride: n, title: s}) } function m() { return angular.extend({}, r) } function f(e) { if (h)return T.promise; h = angular.element("<div></div>"), h.attr("id", e.containerId), h.addClass(e.positionClass), h.css({"pointer-events": "auto"}); var s = angular.element(document.querySelector(e.target)); if (!s || !s.length)throw"Target for toasts doesn't exist"; return t.enter(h, s).then(function () { T.resolve() }), T.promise } function v(s) { function r(t, e, s) { s.allowHtml ? (t.scope.allowHtml = !0, t.scope.title = o.trustAsHtml(e.title), t.scope.message = o.trustAsHtml(e.message)) : (t.scope.title = e.title, t.scope.message = e.message), t.scope.toastType = t.iconClass, t.scope.toastId = t.toastId, t.scope.options = { extendedTimeOut: s.extendedTimeOut, messageClass: s.messageClass, onHidden: s.onHidden, onShown: s.onShown, progressBar: s.progressBar, tapToDismiss: s.tapToDismiss, timeOut: s.timeOut, titleClass: s.titleClass, toastClass: s.toastClass }, s.closeButton && (t.scope.options.closeHtml = s.closeHtml) } function i() { function t(t) { for (var e = ["containerId", "iconClasses", "maxOpened", "newestOnTop", "positionClass", "preventDuplicates", "preventOpenDuplicates", "templates"], s = 0, n = e.length; n > s; s++)delete t[e[s]]; return t } var e = {toastId: C++, isOpened: !1, scope: n.$new(), open: a.defer()}; return e.iconClass = s.iconClass, s.optionsOverride && (p = angular.extend(p, t(s.optionsOverride)), e.iconClass = s.optionsOverride.iconClass || e.iconClass), r(e, s, p), e.el = l(e.scope), e } function l(t) { var s = angular.element("<div toast></div>"), n = e.get("$compile"); return n(s)(t) } function c() { return p.maxOpened && O.length <= p.maxOpened || !p.maxOpened } function u() { var t = p.preventDuplicates && s.message === w, e = p.preventOpenDuplicates && B[s.message]; return t || e ? !0 : (w = s.message, B[s.message] = !0, !1) } var p = m(); if (!u()) { var g = i(); if (O.push(g), p.autoDismiss && p.maxOpened > 0)for (var v = O.slice(0, O.length - p.maxOpened), T = 0, $ = v.length; $ > T; T++)d(v[T].toastId); return c() && g.open.resolve(), g.open.promise.then(function () { f(p).then(function () { if (g.isOpened = !0, p.newestOnTop)t.enter(g.el, h).then(function () { g.scope.init() }); else { var e = h[0].lastChild ? angular.element(h[0].lastChild) : null; t.enter(g.el, h, e).then(function () { g.scope.init() }) } }) }), g } } var h, C = 0, O = [], w = "", B = {}, T = a.defer(), $ = { clear: i, error: l, info: c, remove: d, success: u, warning: p }; return $ } angular.module("toastr", []).factory("toastr", t), t.$inject = ["$animate", "$injector", "$document", "$rootScope", "$sce", "toastrConfig", "$q"] }(), function () { "use strict"; angular.module("toastr").constant("toastrConfig", { allowHtml: !1, autoDismiss: !1, closeButton: !1, closeHtml: "<button>&times;</button>", containerId: "toast-container", extendedTimeOut: 1e3, iconClasses: {error: "toast-error", info: "toast-info", success: "toast-success", warning: "toast-warning"}, maxOpened: 0, messageClass: "toast-message", newestOnTop: !0, onHidden: null, onShown: null, positionClass: "toast-top-right", preventDuplicates: !1, preventOpenDuplicates: !1, progressBar: !1, tapToDismiss: !0, target: "body", templates: {toast: "directives/toast/toast.html", progressbar: "directives/progressbar/progressbar.html"}, timeOut: 5e3, titleClass: "toast-title", toastClass: "toast" }) }(), function () { "use strict"; function t(t) { function e(t, e, s, n) { function o() { var t = (i - (new Date).getTime()) / a * 100; e.css("width", t + "%") } var r, a, i; n.progressBar = t, t.start = function (t) { r && clearInterval(r), a = parseFloat(t), i = (new Date).getTime() + a, r = setInterval(o, 10) }, t.stop = function () { r && clearInterval(r) }, t.$on("$destroy", function () { clearInterval(r) }) } return { replace: !0, require: "^toast", templateUrl: function () { return t.templates.progressbar }, link: e } } angular.module("toastr").directive("progressBar", t), t.$inject = ["toastrConfig"] }(), function () { "use strict"; function t() { this.progressBar = null, this.startProgressBar = function (t) { this.progressBar && this.progressBar.start(t) }, this.stopProgressBar = function () { this.progressBar && this.progressBar.stop() } } angular.module("toastr").controller("ToastController", t) }(), function () { "use strict"; function t(t, e, s, n) { function o(s, o, r, a) { function i(t) { return a.startProgressBar(t), e(function () { a.stopProgressBar(), n.remove(s.toastId) }, t, 1) } function l() { s.progressBar = !1, a.stopProgressBar() } function c() { return s.options.closeHtml } var u; if (s.toastClass = s.options.toastClass, s.titleClass = s.options.titleClass, s.messageClass = s.options.messageClass, s.progressBar = s.options.progressBar, c()) { var p = angular.element(s.options.closeHtml), d = t.get("$compile"); p.addClass("toast-close-button"), p.attr("ng-click", "close()"), d(p)(s), o.prepend(p) } s.init = function () { s.options.timeOut && (u = i(s.options.timeOut)), s.options.onShown && s.options.onShown() }, o.on("mouseenter", function () { l(), u && e.cancel(u) }), s.tapToast = function () { s.options.tapToDismiss && s.close(!0) }, s.close = function (t) { n.remove(s.toastId, t) }, o.on("mouseleave", function () { (0 !== s.options.timeOut || 0 !== s.options.extendedTimeOut) && (s.$apply(function () { s.progressBar = s.options.progressBar }), u = i(s.options.extendedTimeOut)) }) } return { replace: !0, templateUrl: function () { return s.templates.toast }, controller: "ToastController", link: o } } angular.module("toastr").directive("toast", t), t.$inject = ["$injector", "$interval", "toastrConfig", "toastr"] }(), angular.module("toastr").run(["$templateCache", function (t) { t.put("directives/progressbar/progressbar.html", '<div class="toast-progress"></div>\n'), t.put("directives/toast/toast.html", '<div class="{{toastClass}} {{toastType}}" ng-click="tapToast()">\n <div ng-switch on="allowHtml">\n <div ng-switch-default ng-if="title" class="{{titleClass}}">{{title}}</div>\n <div ng-switch-default class="{{messageClass}}">{{message}}</div>\n <div ng-switch-when="true" ng-if="title" class="{{titleClass}}" ng-bind-html="title"></div>\n <div ng-switch-when="true" class="{{messageClass}}" ng-bind-html="message"></div>\n </div>\n <progress-bar ng-if="progressBar"></progress-bar>\n</div>\n') }]);
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySourceTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.biz.AbstractUnitTest; import com.ctrip.framework.apollo.biz.MockBeanFactory; import com.ctrip.framework.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.core.ConfigConsts; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.springframework.test.util.ReflectionTestUtils; import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ public class BizDBPropertySourceTest extends AbstractUnitTest { @Mock private ServerConfigRepository serverConfigRepository; private BizDBPropertySource propertySource; private String clusterConfigKey = "clusterKey"; private String clusterConfigValue = "clusterValue"; private String dcConfigKey = "dcKey"; private String dcConfigValue = "dcValue"; private String defaultKey = "defaultKey"; private String defaultValue = "defaultValue"; @Before public void initTestData() { propertySource = spy(new BizDBPropertySource()); ReflectionTestUtils.setField(propertySource, "serverConfigRepository", serverConfigRepository); List<ServerConfig> configs = Lists.newLinkedList(); //cluster config String cluster = "cluster"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue, cluster)); String dc = "dc"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + "dc", dc)); configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //dc config configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue, dc)); configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //default config configs.add(MockBeanFactory.mockServerConfig(defaultKey, defaultValue, ConfigConsts.CLUSTER_NAME_DEFAULT)); System.setProperty(ConfigConsts.APOLLO_CLUSTER_KEY, cluster); when(propertySource.getCurrentDataCenter()).thenReturn(dc); when(serverConfigRepository.findAll()).thenReturn(configs); } @After public void clear() { System.clearProperty(ConfigConsts.APOLLO_CLUSTER_KEY); } @Test public void testGetClusterConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(clusterConfigKey), clusterConfigValue); } @Test public void testGetDcConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(dcConfigKey), dcConfigValue); } @Test public void testGetDefaultConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(defaultKey), defaultValue); } @Test public void testGetNull() { propertySource.refresh(); assertNull(propertySource.getProperty("noKey")); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.google.common.collect.Lists; import com.ctrip.framework.apollo.biz.AbstractUnitTest; import com.ctrip.framework.apollo.biz.MockBeanFactory; import com.ctrip.framework.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.core.ConfigConsts; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.springframework.test.util.ReflectionTestUtils; import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ public class BizDBPropertySourceTest extends AbstractUnitTest { @Mock private ServerConfigRepository serverConfigRepository; private BizDBPropertySource propertySource; private String clusterConfigKey = "clusterKey"; private String clusterConfigValue = "clusterValue"; private String dcConfigKey = "dcKey"; private String dcConfigValue = "dcValue"; private String defaultKey = "defaultKey"; private String defaultValue = "defaultValue"; @Before public void initTestData() { propertySource = spy(new BizDBPropertySource()); ReflectionTestUtils.setField(propertySource, "serverConfigRepository", serverConfigRepository); List<ServerConfig> configs = Lists.newLinkedList(); //cluster config String cluster = "cluster"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue, cluster)); String dc = "dc"; configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + "dc", dc)); configs.add(MockBeanFactory.mockServerConfig(clusterConfigKey, clusterConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //dc config configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue, dc)); configs.add(MockBeanFactory.mockServerConfig(dcConfigKey, dcConfigValue + ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.CLUSTER_NAME_DEFAULT)); //default config configs.add(MockBeanFactory.mockServerConfig(defaultKey, defaultValue, ConfigConsts.CLUSTER_NAME_DEFAULT)); System.setProperty(ConfigConsts.APOLLO_CLUSTER_KEY, cluster); when(propertySource.getCurrentDataCenter()).thenReturn(dc); when(serverConfigRepository.findAll()).thenReturn(configs); } @After public void clear() { System.clearProperty(ConfigConsts.APOLLO_CLUSTER_KEY); } @Test public void testGetClusterConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(clusterConfigKey), clusterConfigValue); } @Test public void testGetDcConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(dcConfigKey), dcConfigValue); } @Test public void testGetDefaultConfig() { propertySource.refresh(); assertEquals(propertySource.getProperty(defaultKey), defaultValue); } @Test public void testGetNull() { propertySource.refresh(); assertNull(propertySource.getProperty("noKey")); } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-mockserver/src/test/resources/mockdata-application.properties
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # key1=value1 key2=value2
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # key1=value1 key2=value2
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/GrayReleaseRuleDTO.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.google.common.collect.Sets; import java.util.Set; public class GrayReleaseRuleDTO extends BaseDTO { private String appId; private String clusterName; private String namespaceName; private String branchName; private Set<GrayReleaseRuleItemDTO> ruleItems; private Long releaseId; public GrayReleaseRuleDTO(String appId, String clusterName, String namespaceName, String branchName) { this.appId = appId; this.clusterName = clusterName; this.namespaceName = namespaceName; this.branchName = branchName; this.ruleItems = Sets.newHashSet(); } public String getAppId() { return appId; } public String getClusterName() { return clusterName; } public String getNamespaceName() { return namespaceName; } public String getBranchName() { return branchName; } public Set<GrayReleaseRuleItemDTO> getRuleItems() { return ruleItems; } public void setRuleItems(Set<GrayReleaseRuleItemDTO> ruleItems) { this.ruleItems = ruleItems; } public void addRuleItem(GrayReleaseRuleItemDTO ruleItem) { this.ruleItems.add(ruleItem); } public Long getReleaseId() { return releaseId; } public void setReleaseId(Long releaseId) { this.releaseId = releaseId; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.google.common.collect.Sets; import java.util.Set; public class GrayReleaseRuleDTO extends BaseDTO { private String appId; private String clusterName; private String namespaceName; private String branchName; private Set<GrayReleaseRuleItemDTO> ruleItems; private Long releaseId; public GrayReleaseRuleDTO(String appId, String clusterName, String namespaceName, String branchName) { this.appId = appId; this.clusterName = clusterName; this.namespaceName = namespaceName; this.branchName = branchName; this.ruleItems = Sets.newHashSet(); } public String getAppId() { return appId; } public String getClusterName() { return clusterName; } public String getNamespaceName() { return namespaceName; } public String getBranchName() { return branchName; } public Set<GrayReleaseRuleItemDTO> getRuleItems() { return ruleItems; } public void setRuleItems(Set<GrayReleaseRuleItemDTO> ruleItems) { this.ruleItems = ruleItems; } public void addRuleItem(GrayReleaseRuleItemDTO ruleItem) { this.ruleItems.add(ruleItem); } public Long getReleaseId() { return releaseId; } public void setReleaseId(Long releaseId) { this.releaseId = releaseId; } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-buildtools/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-buildtools</artifactId> <name>Apollo BuildTools</name> <build> <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> <executions> <execution> <id>copy-resources</id> <phase>validate</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> <outputDirectory>${basedir}/target</outputDirectory> <resources> <resource> <directory>src/main/scripts</directory> </resource> </resources> </configuration> </execution> </executions> </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-buildtools</artifactId> <name>Apollo BuildTools</name> <build> <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> <executions> <execution> <id>copy-resources</id> <phase>validate</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> <outputDirectory>${basedir}/target</outputDirectory> <resources> <resource> <directory>src/main/scripts</directory> </resource> </resources> </configuration> </execution> </executions> </plugin> </plugins> </build> </project>
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.component.txtresolver; import com.ctrip.framework.apollo.common.dto.ItemChangeSets; import com.ctrip.framework.apollo.common.dto.ItemDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.google.common.base.Strings; import org.springframework.stereotype.Component; import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; /** * normal property file resolver. * update comment and blank item implement by create new item and delete old item. * update normal key/value item implement by update. */ @Component("propertyResolver") public class PropertyResolver implements ConfigTextResolver { private static final String KV_SEPARATOR = "="; private static final String ITEM_SEPARATOR = "\n"; @Override public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO> baseItems) { Map<Integer, ItemDTO> oldLineNumMapItem = BeanUtils.mapByKey("lineNum", baseItems); Map<String, ItemDTO> oldKeyMapItem = BeanUtils.mapByKey("key", baseItems); //remove comment and blank item map. oldKeyMapItem.remove(""); String[] newItems = configText.split(ITEM_SEPARATOR); Set<String> repeatKeys = new HashSet<>(); if (isHasRepeatKey(newItems, repeatKeys)) { throw new BadRequestException(String.format("Config text has repeated keys: %s, please check your input.", repeatKeys.toString())); } ItemChangeSets changeSets = new ItemChangeSets(); Map<Integer, String> newLineNumMapItem = new HashMap<>();//use for delete blank and comment item int lineCounter = 1; for (String newItem : newItems) { newItem = newItem.trim(); newLineNumMapItem.put(lineCounter, newItem); ItemDTO oldItemByLine = oldLineNumMapItem.get(lineCounter); //comment item if (isCommentItem(newItem)) { handleCommentLine(namespaceId, oldItemByLine, newItem, lineCounter, changeSets); //blank item } else if (isBlankItem(newItem)) { handleBlankLine(namespaceId, oldItemByLine, lineCounter, changeSets); //normal item } else { handleNormalLine(namespaceId, oldKeyMapItem, newItem, lineCounter, changeSets); } lineCounter++; } deleteCommentAndBlankItem(oldLineNumMapItem, newLineNumMapItem, changeSets); deleteNormalKVItem(oldKeyMapItem, changeSets); return changeSets; } private boolean isHasRepeatKey(String[] newItems, @NotNull Set<String> repeatKeys) { Set<String> keys = new HashSet<>(); int lineCounter = 1; for (String item : newItems) { if (!isCommentItem(item) && !isBlankItem(item)) { String[] kv = parseKeyValueFromItem(item); if (kv != null) { String key = kv[0].toLowerCase(); if(!keys.add(key)){ repeatKeys.add(key); } } else { throw new BadRequestException("line:" + lineCounter + " key value must separate by '='"); } } lineCounter++; } return !repeatKeys.isEmpty(); } private String[] parseKeyValueFromItem(String item) { int kvSeparator = item.indexOf(KV_SEPARATOR); if (kvSeparator == -1) { return null; } String[] kv = new String[2]; kv[0] = item.substring(0, kvSeparator).trim(); kv[1] = item.substring(kvSeparator + 1).trim(); return kv; } private void handleCommentLine(Long namespaceId, ItemDTO oldItemByLine, String newItem, int lineCounter, ItemChangeSets changeSets) { String oldComment = oldItemByLine == null ? "" : oldItemByLine.getComment(); //create comment. implement update comment by delete old comment and create new comment if (!(isCommentItem(oldItemByLine) && newItem.equals(oldComment))) { changeSets.addCreateItem(buildCommentItem(0L, namespaceId, newItem, lineCounter)); } } private void handleBlankLine(Long namespaceId, ItemDTO oldItem, int lineCounter, ItemChangeSets changeSets) { if (!isBlankItem(oldItem)) { changeSets.addCreateItem(buildBlankItem(0L, namespaceId, lineCounter)); } } private void handleNormalLine(Long namespaceId, Map<String, ItemDTO> keyMapOldItem, String newItem, int lineCounter, ItemChangeSets changeSets) { String[] kv = parseKeyValueFromItem(newItem); if (kv == null) { throw new BadRequestException("line:" + lineCounter + " key value must separate by '='"); } String newKey = kv[0]; String newValue = kv[1].replace("\\n", "\n"); //handle user input \n ItemDTO oldItem = keyMapOldItem.get(newKey); if (oldItem == null) {//new item changeSets.addCreateItem(buildNormalItem(0L, namespaceId, newKey, newValue, "", lineCounter)); } else if (!newValue.equals(oldItem.getValue()) || lineCounter != oldItem.getLineNum()) {//update item changeSets.addUpdateItem( buildNormalItem(oldItem.getId(), namespaceId, newKey, newValue, oldItem.getComment(), lineCounter)); } keyMapOldItem.remove(newKey); } private boolean isCommentItem(ItemDTO item) { return item != null && "".equals(item.getKey()) && (item.getComment().startsWith("#") || item.getComment().startsWith("!")); } private boolean isCommentItem(String line) { return line != null && (line.startsWith("#") || line.startsWith("!")); } private boolean isBlankItem(ItemDTO item) { return item != null && "".equals(item.getKey()) && "".equals(item.getComment()); } private boolean isBlankItem(String line) { return Strings.nullToEmpty(line).trim().isEmpty(); } private void deleteNormalKVItem(Map<String, ItemDTO> baseKeyMapItem, ItemChangeSets changeSets) { //surplus item is to be deleted for (Map.Entry<String, ItemDTO> entry : baseKeyMapItem.entrySet()) { changeSets.addDeleteItem(entry.getValue()); } } private void deleteCommentAndBlankItem(Map<Integer, ItemDTO> oldLineNumMapItem, Map<Integer, String> newLineNumMapItem, ItemChangeSets changeSets) { for (Map.Entry<Integer, ItemDTO> entry : oldLineNumMapItem.entrySet()) { int lineNum = entry.getKey(); ItemDTO oldItem = entry.getValue(); String newItem = newLineNumMapItem.get(lineNum); //1. old is blank by now is not //2.old is comment by now is not exist or modified if ((isBlankItem(oldItem) && !isBlankItem(newItem)) || isCommentItem(oldItem) && (newItem == null || !newItem.equals(oldItem.getComment()))) { changeSets.addDeleteItem(oldItem); } } } private ItemDTO buildCommentItem(Long id, Long namespaceId, String comment, int lineNum) { return buildNormalItem(id, namespaceId, "", "", comment, lineNum); } private ItemDTO buildBlankItem(Long id, Long namespaceId, int lineNum) { return buildNormalItem(id, namespaceId, "", "", "", lineNum); } private ItemDTO buildNormalItem(Long id, Long namespaceId, String key, String value, String comment, int lineNum) { ItemDTO item = new ItemDTO(key, value, comment, lineNum); item.setId(id); item.setNamespaceId(namespaceId); return item; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.component.txtresolver; import com.ctrip.framework.apollo.common.dto.ItemChangeSets; import com.ctrip.framework.apollo.common.dto.ItemDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.google.common.base.Strings; import org.springframework.stereotype.Component; import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; /** * normal property file resolver. * update comment and blank item implement by create new item and delete old item. * update normal key/value item implement by update. */ @Component("propertyResolver") public class PropertyResolver implements ConfigTextResolver { private static final String KV_SEPARATOR = "="; private static final String ITEM_SEPARATOR = "\n"; @Override public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO> baseItems) { Map<Integer, ItemDTO> oldLineNumMapItem = BeanUtils.mapByKey("lineNum", baseItems); Map<String, ItemDTO> oldKeyMapItem = BeanUtils.mapByKey("key", baseItems); //remove comment and blank item map. oldKeyMapItem.remove(""); String[] newItems = configText.split(ITEM_SEPARATOR); Set<String> repeatKeys = new HashSet<>(); if (isHasRepeatKey(newItems, repeatKeys)) { throw new BadRequestException(String.format("Config text has repeated keys: %s, please check your input.", repeatKeys.toString())); } ItemChangeSets changeSets = new ItemChangeSets(); Map<Integer, String> newLineNumMapItem = new HashMap<>();//use for delete blank and comment item int lineCounter = 1; for (String newItem : newItems) { newItem = newItem.trim(); newLineNumMapItem.put(lineCounter, newItem); ItemDTO oldItemByLine = oldLineNumMapItem.get(lineCounter); //comment item if (isCommentItem(newItem)) { handleCommentLine(namespaceId, oldItemByLine, newItem, lineCounter, changeSets); //blank item } else if (isBlankItem(newItem)) { handleBlankLine(namespaceId, oldItemByLine, lineCounter, changeSets); //normal item } else { handleNormalLine(namespaceId, oldKeyMapItem, newItem, lineCounter, changeSets); } lineCounter++; } deleteCommentAndBlankItem(oldLineNumMapItem, newLineNumMapItem, changeSets); deleteNormalKVItem(oldKeyMapItem, changeSets); return changeSets; } private boolean isHasRepeatKey(String[] newItems, @NotNull Set<String> repeatKeys) { Set<String> keys = new HashSet<>(); int lineCounter = 1; for (String item : newItems) { if (!isCommentItem(item) && !isBlankItem(item)) { String[] kv = parseKeyValueFromItem(item); if (kv != null) { String key = kv[0].toLowerCase(); if(!keys.add(key)){ repeatKeys.add(key); } } else { throw new BadRequestException("line:" + lineCounter + " key value must separate by '='"); } } lineCounter++; } return !repeatKeys.isEmpty(); } private String[] parseKeyValueFromItem(String item) { int kvSeparator = item.indexOf(KV_SEPARATOR); if (kvSeparator == -1) { return null; } String[] kv = new String[2]; kv[0] = item.substring(0, kvSeparator).trim(); kv[1] = item.substring(kvSeparator + 1).trim(); return kv; } private void handleCommentLine(Long namespaceId, ItemDTO oldItemByLine, String newItem, int lineCounter, ItemChangeSets changeSets) { String oldComment = oldItemByLine == null ? "" : oldItemByLine.getComment(); //create comment. implement update comment by delete old comment and create new comment if (!(isCommentItem(oldItemByLine) && newItem.equals(oldComment))) { changeSets.addCreateItem(buildCommentItem(0L, namespaceId, newItem, lineCounter)); } } private void handleBlankLine(Long namespaceId, ItemDTO oldItem, int lineCounter, ItemChangeSets changeSets) { if (!isBlankItem(oldItem)) { changeSets.addCreateItem(buildBlankItem(0L, namespaceId, lineCounter)); } } private void handleNormalLine(Long namespaceId, Map<String, ItemDTO> keyMapOldItem, String newItem, int lineCounter, ItemChangeSets changeSets) { String[] kv = parseKeyValueFromItem(newItem); if (kv == null) { throw new BadRequestException("line:" + lineCounter + " key value must separate by '='"); } String newKey = kv[0]; String newValue = kv[1].replace("\\n", "\n"); //handle user input \n ItemDTO oldItem = keyMapOldItem.get(newKey); if (oldItem == null) {//new item changeSets.addCreateItem(buildNormalItem(0L, namespaceId, newKey, newValue, "", lineCounter)); } else if (!newValue.equals(oldItem.getValue()) || lineCounter != oldItem.getLineNum()) {//update item changeSets.addUpdateItem( buildNormalItem(oldItem.getId(), namespaceId, newKey, newValue, oldItem.getComment(), lineCounter)); } keyMapOldItem.remove(newKey); } private boolean isCommentItem(ItemDTO item) { return item != null && "".equals(item.getKey()) && (item.getComment().startsWith("#") || item.getComment().startsWith("!")); } private boolean isCommentItem(String line) { return line != null && (line.startsWith("#") || line.startsWith("!")); } private boolean isBlankItem(ItemDTO item) { return item != null && "".equals(item.getKey()) && "".equals(item.getComment()); } private boolean isBlankItem(String line) { return Strings.nullToEmpty(line).trim().isEmpty(); } private void deleteNormalKVItem(Map<String, ItemDTO> baseKeyMapItem, ItemChangeSets changeSets) { //surplus item is to be deleted for (Map.Entry<String, ItemDTO> entry : baseKeyMapItem.entrySet()) { changeSets.addDeleteItem(entry.getValue()); } } private void deleteCommentAndBlankItem(Map<Integer, ItemDTO> oldLineNumMapItem, Map<Integer, String> newLineNumMapItem, ItemChangeSets changeSets) { for (Map.Entry<Integer, ItemDTO> entry : oldLineNumMapItem.entrySet()) { int lineNum = entry.getKey(); ItemDTO oldItem = entry.getValue(); String newItem = newLineNumMapItem.get(lineNum); //1. old is blank by now is not //2.old is comment by now is not exist or modified if ((isBlankItem(oldItem) && !isBlankItem(newItem)) || isCommentItem(oldItem) && (newItem == null || !newItem.equals(oldItem.getComment()))) { changeSets.addDeleteItem(oldItem); } } } private ItemDTO buildCommentItem(Long id, Long namespaceId, String comment, int lineNum) { return buildNormalItem(id, namespaceId, "", "", comment, lineNum); } private ItemDTO buildBlankItem(Long id, Long namespaceId, int lineNum) { return buildNormalItem(id, namespaceId, "", "", "", lineNum); } private ItemDTO buildNormalItem(Long id, Long namespaceId, String key, String value, String comment, int lineNum) { ItemDTO item = new ItemDTO(key, value, comment, lineNum); item.setId(id); item.setNamespaceId(namespaceId); return item; } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-client-config-data/src/test/java/com/ctrip/framework/apollo/config/data/system/ApolloClientSystemPropertiesCompatibleTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.config.data.system; import com.ctrip.framework.apollo.core.ApolloClientSystemConsts; import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer; import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author vdisk <vdisk@foxmail.com> */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = ApolloClientPropertyCompatibleTestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.NONE) public class ApolloClientSystemPropertiesCompatibleTest { @Autowired private ConfigurableEnvironment environment; @Test public void testSystemPropertiesCompatible() { System.setProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CACHE_DIR, "test-3/cacheDir"); System .setProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_ACCESS_KEY_SECRET, "test-3-secret"); System.setProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE, "https://test-3-config-service"); Assert.assertEquals("test-3/cacheDir", this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CACHE_DIR)); Assert.assertEquals("test-3-secret", this.environment.getProperty(ApolloClientSystemConsts.APOLLO_ACCESS_KEY_SECRET)); Assert.assertEquals("https://test-3-config-service", this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE)); System.clearProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CACHE_DIR); System.clearProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_ACCESS_KEY_SECRET); System.clearProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE); } @After public void clearProperty() { for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) { System.clearProperty(propertyName); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.config.data.system; import com.ctrip.framework.apollo.core.ApolloClientSystemConsts; import com.ctrip.framework.apollo.spring.boot.ApolloApplicationContextInitializer; import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author vdisk <vdisk@foxmail.com> */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = ApolloClientPropertyCompatibleTestConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.NONE) public class ApolloClientSystemPropertiesCompatibleTest { @Autowired private ConfigurableEnvironment environment; @Test public void testSystemPropertiesCompatible() { System.setProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CACHE_DIR, "test-3/cacheDir"); System .setProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_ACCESS_KEY_SECRET, "test-3-secret"); System.setProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE, "https://test-3-config-service"); Assert.assertEquals("test-3/cacheDir", this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CACHE_DIR)); Assert.assertEquals("test-3-secret", this.environment.getProperty(ApolloClientSystemConsts.APOLLO_ACCESS_KEY_SECRET)); Assert.assertEquals("https://test-3-config-service", this.environment.getProperty(ApolloClientSystemConsts.APOLLO_CONFIG_SERVICE)); System.clearProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CACHE_DIR); System.clearProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_ACCESS_KEY_SECRET); System.clearProperty(ApolloClientSystemConsts.DEPRECATED_APOLLO_CONFIG_SERVICE); } @After public void clearProperty() { for (String propertyName : ApolloApplicationContextInitializer.APOLLO_SYSTEM_PROPERTIES) { System.clearProperty(propertyName); } } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/NetworkProvider.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.spi.provider; /** * Provider for network related properties */ public interface NetworkProvider extends Provider { /** * @return the host address, i.e. ip */ String getHostAddress(); /** * @return the host name */ String getHostName(); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.foundation.spi.provider; /** * Provider for network related properties */ public interface NetworkProvider extends Provider { /** * @return the host address, i.e. ip */ String getHostAddress(); /** * @return the host name */ String getHostName(); }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/BizDBPropertySource.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.ctrip.framework.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.common.config.RefreshablePropertySource; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.foundation.Foundation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Map; import java.util.Objects; /** * @author Jason Song(song_s@ctrip.com) */ @Component public class BizDBPropertySource extends RefreshablePropertySource { private static final Logger logger = LoggerFactory.getLogger(BizDBPropertySource.class); @Autowired private ServerConfigRepository serverConfigRepository; public BizDBPropertySource(String name, Map<String, Object> source) { super(name, source); } public BizDBPropertySource() { super("DBConfig", Maps.newConcurrentMap()); } String getCurrentDataCenter() { return Foundation.server().getDataCenter(); } @Override protected void refresh() { Iterable<ServerConfig> dbConfigs = serverConfigRepository.findAll(); Map<String, Object> newConfigs = Maps.newHashMap(); //default cluster's configs for (ServerConfig config : dbConfigs) { if (Objects.equals(ConfigConsts.CLUSTER_NAME_DEFAULT, config.getCluster())) { newConfigs.put(config.getKey(), config.getValue()); } } //data center's configs String dataCenter = getCurrentDataCenter(); for (ServerConfig config : dbConfigs) { if (Objects.equals(dataCenter, config.getCluster())) { newConfigs.put(config.getKey(), config.getValue()); } } //cluster's config if (!Strings.isNullOrEmpty(System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY))) { String cluster = System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY); for (ServerConfig config : dbConfigs) { if (Objects.equals(cluster, config.getCluster())) { newConfigs.put(config.getKey(), config.getValue()); } } } //put to environment for (Map.Entry<String, Object> config: newConfigs.entrySet()){ String key = config.getKey(); Object value = config.getValue(); if (this.source.get(key) == null) { logger.info("Load config from DB : {} = {}", key, value); } else if (!Objects.equals(this.source.get(key), value)) { logger.info("Load config from DB : {} = {}. Old value = {}", key, value, this.source.get(key)); } this.source.put(key, value); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.google.common.base.Strings; import com.google.common.collect.Maps; import com.ctrip.framework.apollo.biz.entity.ServerConfig; import com.ctrip.framework.apollo.biz.repository.ServerConfigRepository; import com.ctrip.framework.apollo.common.config.RefreshablePropertySource; import com.ctrip.framework.apollo.core.ConfigConsts; import com.ctrip.framework.foundation.Foundation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Map; import java.util.Objects; /** * @author Jason Song(song_s@ctrip.com) */ @Component public class BizDBPropertySource extends RefreshablePropertySource { private static final Logger logger = LoggerFactory.getLogger(BizDBPropertySource.class); @Autowired private ServerConfigRepository serverConfigRepository; public BizDBPropertySource(String name, Map<String, Object> source) { super(name, source); } public BizDBPropertySource() { super("DBConfig", Maps.newConcurrentMap()); } String getCurrentDataCenter() { return Foundation.server().getDataCenter(); } @Override protected void refresh() { Iterable<ServerConfig> dbConfigs = serverConfigRepository.findAll(); Map<String, Object> newConfigs = Maps.newHashMap(); //default cluster's configs for (ServerConfig config : dbConfigs) { if (Objects.equals(ConfigConsts.CLUSTER_NAME_DEFAULT, config.getCluster())) { newConfigs.put(config.getKey(), config.getValue()); } } //data center's configs String dataCenter = getCurrentDataCenter(); for (ServerConfig config : dbConfigs) { if (Objects.equals(dataCenter, config.getCluster())) { newConfigs.put(config.getKey(), config.getValue()); } } //cluster's config if (!Strings.isNullOrEmpty(System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY))) { String cluster = System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY); for (ServerConfig config : dbConfigs) { if (Objects.equals(cluster, config.getCluster())) { newConfigs.put(config.getKey(), config.getValue()); } } } //put to environment for (Map.Entry<String, Object> config: newConfigs.entrySet()){ String key = config.getKey(); Object value = config.getValue(); if (this.source.get(key) == null) { logger.info("Load config from DB : {} = {}", key, value); } else if (!Objects.equals(this.source.get(key), value)) { logger.info("Load config from DB : {} = {}. Old value = {}", key, value, this.source.get(key)); } this.source.put(key, value); } } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.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.Cluster; import com.ctrip.framework.apollo.biz.service.ClusterService; import com.ctrip.framework.apollo.common.dto.ClusterDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.exception.NotFoundException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.core.ConfigConsts; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @RestController public class ClusterController { private final ClusterService clusterService; public ClusterController(final ClusterService clusterService) { this.clusterService = clusterService; } @PostMapping("/apps/{appId}/clusters") public ClusterDTO create(@PathVariable("appId") String appId, @RequestParam(value = "autoCreatePrivateNamespace", defaultValue = "true") boolean autoCreatePrivateNamespace, @Valid @RequestBody ClusterDTO dto) { Cluster entity = BeanUtils.transform(Cluster.class, dto); Cluster managedEntity = clusterService.findOne(appId, entity.getName()); if (managedEntity != null) { throw new BadRequestException("cluster already exist."); } if (autoCreatePrivateNamespace) { entity = clusterService.saveWithInstanceOfAppNamespaces(entity); } else { entity = clusterService.saveWithoutInstanceOfAppNamespaces(entity); } return BeanUtils.transform(ClusterDTO.class, entity); } @DeleteMapping("/apps/{appId}/clusters/{clusterName:.+}") public void delete(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName, @RequestParam String operator) { Cluster entity = clusterService.findOne(appId, clusterName); if (entity == null) { throw new NotFoundException("cluster not found for clusterName " + clusterName); } if(ConfigConsts.CLUSTER_NAME_DEFAULT.equals(entity.getName())){ throw new BadRequestException("can not delete default cluster!"); } clusterService.delete(entity.getId(), operator); } @GetMapping("/apps/{appId}/clusters") public List<ClusterDTO> find(@PathVariable("appId") String appId) { List<Cluster> clusters = clusterService.findParentClusters(appId); return BeanUtils.batchTransform(ClusterDTO.class, clusters); } @GetMapping("/apps/{appId}/clusters/{clusterName:.+}") public ClusterDTO get(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { Cluster cluster = clusterService.findOne(appId, clusterName); if (cluster == null) { throw new NotFoundException("cluster not found for name " + clusterName); } return BeanUtils.transform(ClusterDTO.class, cluster); } @GetMapping("/apps/{appId}/cluster/{clusterName}/unique") public boolean isAppIdUnique(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { return clusterService.isClusterNameUnique(appId, clusterName); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.adminservice.controller; import com.ctrip.framework.apollo.biz.entity.Cluster; import com.ctrip.framework.apollo.biz.service.ClusterService; import com.ctrip.framework.apollo.common.dto.ClusterDTO; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.exception.NotFoundException; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.core.ConfigConsts; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @RestController public class ClusterController { private final ClusterService clusterService; public ClusterController(final ClusterService clusterService) { this.clusterService = clusterService; } @PostMapping("/apps/{appId}/clusters") public ClusterDTO create(@PathVariable("appId") String appId, @RequestParam(value = "autoCreatePrivateNamespace", defaultValue = "true") boolean autoCreatePrivateNamespace, @Valid @RequestBody ClusterDTO dto) { Cluster entity = BeanUtils.transform(Cluster.class, dto); Cluster managedEntity = clusterService.findOne(appId, entity.getName()); if (managedEntity != null) { throw new BadRequestException("cluster already exist."); } if (autoCreatePrivateNamespace) { entity = clusterService.saveWithInstanceOfAppNamespaces(entity); } else { entity = clusterService.saveWithoutInstanceOfAppNamespaces(entity); } return BeanUtils.transform(ClusterDTO.class, entity); } @DeleteMapping("/apps/{appId}/clusters/{clusterName:.+}") public void delete(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName, @RequestParam String operator) { Cluster entity = clusterService.findOne(appId, clusterName); if (entity == null) { throw new NotFoundException("cluster not found for clusterName " + clusterName); } if(ConfigConsts.CLUSTER_NAME_DEFAULT.equals(entity.getName())){ throw new BadRequestException("can not delete default cluster!"); } clusterService.delete(entity.getId(), operator); } @GetMapping("/apps/{appId}/clusters") public List<ClusterDTO> find(@PathVariable("appId") String appId) { List<Cluster> clusters = clusterService.findParentClusters(appId); return BeanUtils.batchTransform(ClusterDTO.class, clusters); } @GetMapping("/apps/{appId}/clusters/{clusterName:.+}") public ClusterDTO get(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { Cluster cluster = clusterService.findOne(appId, clusterName); if (cluster == null) { throw new NotFoundException("cluster not found for name " + clusterName); } return BeanUtils.transform(ClusterDTO.class, cluster); } @GetMapping("/apps/{appId}/cluster/{clusterName}/unique") public boolean isAppIdUnique(@PathVariable("appId") String appId, @PathVariable("clusterName") String clusterName) { return clusterService.isClusterNameUnique(appId, clusterName); } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/AbstractBaseIntegrationTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.integration; import com.ctrip.framework.apollo.biz.service.BizDBPropertySource; import com.google.gson.Gson; import com.ctrip.framework.apollo.ConfigServiceTestConfiguration; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.biz.utils.ReleaseKeyGenerator; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; 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.boot.web.client.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; import java.time.Duration; import java.util.Date; import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.PostConstruct; /** * @author Jason Song(song_s@ctrip.com) */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = AbstractBaseIntegrationTest.TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT) public abstract class AbstractBaseIntegrationTest { @Autowired private ReleaseMessageRepository releaseMessageRepository; @Autowired private ReleaseRepository releaseRepository; private static final Gson GSON = new Gson(); protected RestTemplate restTemplate = (new TestRestTemplate(new RestTemplateBuilder() .setConnectTimeout(Duration.ofSeconds(5)))).getRestTemplate(); @PostConstruct private void postConstruct() { restTemplate.setErrorHandler(new DefaultResponseErrorHandler()); } @Value("${local.server.port}") int port; protected String getHostUrl() { return "localhost:" + port; } @Configuration @Import(ConfigServiceTestConfiguration.class) protected static class TestConfiguration { @Bean public BizConfig bizConfig(final BizDBPropertySource bizDBPropertySource) { return new TestBizConfig(bizDBPropertySource); } } protected void sendReleaseMessage(String message) { ReleaseMessage releaseMessage = new ReleaseMessage(message); releaseMessageRepository.save(releaseMessage); } public Release buildRelease(String name, String comment, Namespace namespace, Map<String, String> configurations, String owner) { Release release = new Release(); release.setReleaseKey(ReleaseKeyGenerator.generateReleaseKey(namespace)); release.setDataChangeCreatedTime(new Date()); release.setDataChangeCreatedBy(owner); release.setDataChangeLastModifiedBy(owner); release.setName(name); release.setComment(comment); release.setAppId(namespace.getAppId()); release.setClusterName(namespace.getClusterName()); release.setNamespaceName(namespace.getNamespaceName()); release.setConfigurations(GSON.toJson(configurations)); release = releaseRepository.save(release); return release; } protected void periodicSendMessage(ExecutorService executorService, String message, AtomicBoolean stop) { executorService.submit(() -> { //wait for the request connected to server while (!stop.get() && !Thread.currentThread().isInterrupted()) { try { TimeUnit.MILLISECONDS.sleep(100); } catch (InterruptedException e) { } //double check if (stop.get()) { break; } sendReleaseMessage(message); } }); } private static class TestBizConfig extends BizConfig { public TestBizConfig(final BizDBPropertySource propertySource) { super(propertySource); } @Override public int appNamespaceCacheScanInterval() { //should be short enough to update the AppNamespace cache in time return 1; } @Override public TimeUnit appNamespaceCacheScanIntervalTimeUnit() { return TimeUnit.MILLISECONDS; } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.integration; import com.ctrip.framework.apollo.biz.service.BizDBPropertySource; import com.google.gson.Gson; import com.ctrip.framework.apollo.ConfigServiceTestConfiguration; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.Release; import com.ctrip.framework.apollo.biz.entity.ReleaseMessage; import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository; import com.ctrip.framework.apollo.biz.repository.ReleaseRepository; import com.ctrip.framework.apollo.biz.utils.ReleaseKeyGenerator; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; 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.boot.web.client.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; import java.time.Duration; import java.util.Date; import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.PostConstruct; /** * @author Jason Song(song_s@ctrip.com) */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = AbstractBaseIntegrationTest.TestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT) public abstract class AbstractBaseIntegrationTest { @Autowired private ReleaseMessageRepository releaseMessageRepository; @Autowired private ReleaseRepository releaseRepository; private static final Gson GSON = new Gson(); protected RestTemplate restTemplate = (new TestRestTemplate(new RestTemplateBuilder() .setConnectTimeout(Duration.ofSeconds(5)))).getRestTemplate(); @PostConstruct private void postConstruct() { restTemplate.setErrorHandler(new DefaultResponseErrorHandler()); } @Value("${local.server.port}") int port; protected String getHostUrl() { return "localhost:" + port; } @Configuration @Import(ConfigServiceTestConfiguration.class) protected static class TestConfiguration { @Bean public BizConfig bizConfig(final BizDBPropertySource bizDBPropertySource) { return new TestBizConfig(bizDBPropertySource); } } protected void sendReleaseMessage(String message) { ReleaseMessage releaseMessage = new ReleaseMessage(message); releaseMessageRepository.save(releaseMessage); } public Release buildRelease(String name, String comment, Namespace namespace, Map<String, String> configurations, String owner) { Release release = new Release(); release.setReleaseKey(ReleaseKeyGenerator.generateReleaseKey(namespace)); release.setDataChangeCreatedTime(new Date()); release.setDataChangeCreatedBy(owner); release.setDataChangeLastModifiedBy(owner); release.setName(name); release.setComment(comment); release.setAppId(namespace.getAppId()); release.setClusterName(namespace.getClusterName()); release.setNamespaceName(namespace.getNamespaceName()); release.setConfigurations(GSON.toJson(configurations)); release = releaseRepository.save(release); return release; } protected void periodicSendMessage(ExecutorService executorService, String message, AtomicBoolean stop) { executorService.submit(() -> { //wait for the request connected to server while (!stop.get() && !Thread.currentThread().isInterrupted()) { try { TimeUnit.MILLISECONDS.sleep(100); } catch (InterruptedException e) { } //double check if (stop.get()) { break; } sendReleaseMessage(message); } }); } private static class TestBizConfig extends BizConfig { public TestBizConfig(final BizDBPropertySource propertySource) { super(propertySource); } @Override public int appNamespaceCacheScanInterval() { //should be short enough to update the AppNamespace cache in time return 1; } @Override public TimeUnit appNamespaceCacheScanIntervalTimeUnit() { return TimeUnit.MILLISECONDS; } } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.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-admin-server-fat kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-fat data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-admin-server-fat labels: app: service-apollo-admin-server-fat spec: ports: - protocol: TCP port: 8090 targetPort: 8090 selector: app: pod-apollo-admin-server-fat type: ClusterIP sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-admin-server-fat labels: app: deployment-apollo-admin-server-fat spec: replicas: 2 selector: matchLabels: app: pod-apollo-admin-server-fat strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-admin-server-fat spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-admin-server-fat topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-admin-server-fat configMap: name: configmap-apollo-admin-server-fat items: - key: application-github.properties path: application-github.properties containers: - image: apolloconfig/apollo-adminservice:1.10.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-admin-server-fat ports: - protocol: TCP containerPort: 8090 volumeMounts: - name: volume-configmap-apollo-admin-server-fat mountPath: /apollo-adminservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_ADMIN_SERVICE_NAME value: "service-apollo-admin-server-fat.sre" readinessProbe: tcpSocket: port: 8090 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8090 initialDelaySeconds: 120 periodSeconds: 10 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-admin-server-fat kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-fat data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-admin-server-fat labels: app: service-apollo-admin-server-fat spec: ports: - protocol: TCP port: 8090 targetPort: 8090 selector: app: pod-apollo-admin-server-fat type: ClusterIP sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-admin-server-fat labels: app: deployment-apollo-admin-server-fat spec: replicas: 2 selector: matchLabels: app: pod-apollo-admin-server-fat strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-admin-server-fat spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-admin-server-fat topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-admin-server-fat configMap: name: configmap-apollo-admin-server-fat items: - key: application-github.properties path: application-github.properties containers: - image: apolloconfig/apollo-adminservice:1.10.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-admin-server-fat ports: - protocol: TCP containerPort: 8090 volumeMounts: - name: volume-configmap-apollo-admin-server-fat mountPath: /apollo-adminservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_ADMIN_SERVICE_NAME value: "service-apollo-admin-server-fat.sre" readinessProbe: tcpSocket: port: 8090 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8090 initialDelaySeconds: 120 periodSeconds: 10 dnsPolicy: ClusterFirst restartPolicy: Always
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseHistoryService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.ReleaseHistory; import com.ctrip.framework.apollo.biz.repository.ReleaseHistoryRepository; import com.google.gson.Gson; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.Map; import java.util.Set; /** * @author Jason Song(song_s@ctrip.com) */ @Service public class ReleaseHistoryService { private static final Gson GSON = new Gson(); private final ReleaseHistoryRepository releaseHistoryRepository; private final AuditService auditService; public ReleaseHistoryService( final ReleaseHistoryRepository releaseHistoryRepository, final AuditService auditService) { this.releaseHistoryRepository = releaseHistoryRepository; this.auditService = auditService; } public Page<ReleaseHistory> findReleaseHistoriesByNamespace(String appId, String clusterName, String namespaceName, Pageable pageable) { return releaseHistoryRepository.findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(appId, clusterName, namespaceName, pageable); } public Page<ReleaseHistory> findByReleaseIdAndOperation(long releaseId, int operation, Pageable page) { return releaseHistoryRepository.findByReleaseIdAndOperationOrderByIdDesc(releaseId, operation, page); } public Page<ReleaseHistory> findByPreviousReleaseIdAndOperation(long previousReleaseId, int operation, Pageable page) { return releaseHistoryRepository.findByPreviousReleaseIdAndOperationOrderByIdDesc(previousReleaseId, operation, page); } public Page<ReleaseHistory> findByReleaseIdAndOperationInOrderByIdDesc(long releaseId, Set<Integer> operations, Pageable page) { return releaseHistoryRepository.findByReleaseIdAndOperationInOrderByIdDesc(releaseId, operations, page); } @Transactional public ReleaseHistory createReleaseHistory(String appId, String clusterName, String namespaceName, String branchName, long releaseId, long previousReleaseId, int operation, Map<String, Object> operationContext, String operator) { ReleaseHistory releaseHistory = new ReleaseHistory(); releaseHistory.setAppId(appId); releaseHistory.setClusterName(clusterName); releaseHistory.setNamespaceName(namespaceName); releaseHistory.setBranchName(branchName); releaseHistory.setReleaseId(releaseId); releaseHistory.setPreviousReleaseId(previousReleaseId); releaseHistory.setOperation(operation); if (operationContext == null) { releaseHistory.setOperationContext("{}"); //default empty object } else { releaseHistory.setOperationContext(GSON.toJson(operationContext)); } releaseHistory.setDataChangeCreatedTime(new Date()); releaseHistory.setDataChangeCreatedBy(operator); releaseHistory.setDataChangeLastModifiedBy(operator); releaseHistoryRepository.save(releaseHistory); auditService.audit(ReleaseHistory.class.getSimpleName(), releaseHistory.getId(), Audit.OP.INSERT, releaseHistory.getDataChangeCreatedBy()); return releaseHistory; } @Transactional public int batchDelete(String appId, String clusterName, String namespaceName, String operator) { return releaseHistoryRepository.batchDelete(appId, clusterName, namespaceName, operator); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.service; import com.ctrip.framework.apollo.biz.entity.Audit; import com.ctrip.framework.apollo.biz.entity.ReleaseHistory; import com.ctrip.framework.apollo.biz.repository.ReleaseHistoryRepository; import com.google.gson.Gson; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.Map; import java.util.Set; /** * @author Jason Song(song_s@ctrip.com) */ @Service public class ReleaseHistoryService { private static final Gson GSON = new Gson(); private final ReleaseHistoryRepository releaseHistoryRepository; private final AuditService auditService; public ReleaseHistoryService( final ReleaseHistoryRepository releaseHistoryRepository, final AuditService auditService) { this.releaseHistoryRepository = releaseHistoryRepository; this.auditService = auditService; } public Page<ReleaseHistory> findReleaseHistoriesByNamespace(String appId, String clusterName, String namespaceName, Pageable pageable) { return releaseHistoryRepository.findByAppIdAndClusterNameAndNamespaceNameOrderByIdDesc(appId, clusterName, namespaceName, pageable); } public Page<ReleaseHistory> findByReleaseIdAndOperation(long releaseId, int operation, Pageable page) { return releaseHistoryRepository.findByReleaseIdAndOperationOrderByIdDesc(releaseId, operation, page); } public Page<ReleaseHistory> findByPreviousReleaseIdAndOperation(long previousReleaseId, int operation, Pageable page) { return releaseHistoryRepository.findByPreviousReleaseIdAndOperationOrderByIdDesc(previousReleaseId, operation, page); } public Page<ReleaseHistory> findByReleaseIdAndOperationInOrderByIdDesc(long releaseId, Set<Integer> operations, Pageable page) { return releaseHistoryRepository.findByReleaseIdAndOperationInOrderByIdDesc(releaseId, operations, page); } @Transactional public ReleaseHistory createReleaseHistory(String appId, String clusterName, String namespaceName, String branchName, long releaseId, long previousReleaseId, int operation, Map<String, Object> operationContext, String operator) { ReleaseHistory releaseHistory = new ReleaseHistory(); releaseHistory.setAppId(appId); releaseHistory.setClusterName(clusterName); releaseHistory.setNamespaceName(namespaceName); releaseHistory.setBranchName(branchName); releaseHistory.setReleaseId(releaseId); releaseHistory.setPreviousReleaseId(previousReleaseId); releaseHistory.setOperation(operation); if (operationContext == null) { releaseHistory.setOperationContext("{}"); //default empty object } else { releaseHistory.setOperationContext(GSON.toJson(operationContext)); } releaseHistory.setDataChangeCreatedTime(new Date()); releaseHistory.setDataChangeCreatedBy(operator); releaseHistory.setDataChangeLastModifiedBy(operator); releaseHistoryRepository.save(releaseHistory); auditService.audit(ReleaseHistory.class.getSimpleName(), releaseHistory.getId(), Audit.OP.INSERT, releaseHistory.getDataChangeCreatedBy()); return releaseHistory; } @Transactional public int batchDelete(String appId, String clusterName, String namespaceName, String operator) { return releaseHistoryRepository.batchDelete(appId, clusterName, namespaceName, operator); } }
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # create namespace kubectl create namespace sre # dev-env kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record # fat-env kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record # uat-env kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record # prod-env kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record # portal kubectl apply -f service-apollo-portal-server.yaml --record
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # create namespace kubectl create namespace sre # dev-env kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record # fat-env kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record # uat-env kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record # prod-env kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record # portal kubectl apply -f service-apollo-portal-server.yaml --record
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-buildtools/.gitignore
/target/
/target/
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./doc/images/apollo-home-screenshot.jpg
JFIFHHdExifMM*(i> X8Photoshop 3.08BIM8BIM%ُ B~ ICC_PROFILE applmntrRGB XYZ  'acspAPPLAPPL-appldescPbdscmcprt#wtptrXYZgXYZbXYZrTRC aarg $ vcgt D0ndin t>chad ,mmod (bTRC gTRC aabg $ aagg $ descDisplaymluc& hrHRkoKRnbNOidhuHUcsCZdaDKnlNLfiFIitITesESroROfrCAarukUAheILzhTWviVNskSKzhCNruRUenGBfrFRmshiINthTHcaESenAUesXLdeDEenUSptBRplPLelGRsvSEtrTRptPTjaJPDELL P2415QtextCopyright Apple Inc., 2020XYZ XYZ q8XYZ _YnXYZ % curv #(-26;@EJOTY^chmrw| %+28>ELRY`gnu| &/8AKT]gqz !-8COZfr~ -;HUcq~ +:IXgw'7HYj{+=Oat 2FZn  % : O d y  ' = T j " 9 Q i  * C \ u & @ Z t .Id %A^z &Ca~1Om&Ed#Cc'Ij4Vx&IlAe@e Ek*Qw;c*R{Gp@j>i  A l !!H!u!!!"'"U"""# #8#f###$$M$|$$% %8%h%%%&'&W&&&''I'z''( (?(q(())8)k))**5*h**++6+i++,,9,n,,- -A-v--..L.../$/Z///050l0011J1112*2c223 3F3334+4e4455M555676r667$7`7788P8899B999:6:t::;-;k;;<'<e<<="=a==> >`>>?!?a??@#@d@@A)AjAAB0BrBBC:C}CDDGDDEEUEEF"FgFFG5G{GHHKHHIIcIIJ7J}JK KSKKL*LrLMMJMMN%NnNOOIOOP'PqPQQPQQR1R|RSS_SSTBTTU(UuUVV\VVWDWWX/X}XYYiYZZVZZ[E[[\5\\]']x]^^l^__a_``W``aOaabIbbcCccd@dde=eef=ffg=ggh?hhiCiijHjjkOkklWlmm`mnnknooxop+ppq:qqrKrss]sttptu(uuv>vvwVwxxnxy*yyzFz{{c{|!||}A}~~b~#G k͂0WGrׇ;iΉ3dʋ0cʍ1fΏ6n֑?zM _ɖ4 uL$h՛BdҞ@iءG&vVǥ8nRĩ7u\ЭD-u`ֲK³8%yhYѹJº;.! zpg_XQKFAǿ=ȼ:ɹ8ʷ6˶5̵5͵6ζ7ϸ9к<Ѿ?DINU\dlvۀ܊ݖޢ)߯6DScs 2F[p(@Xr4Pm8Ww)Kmparaff Y [vcgtndin6UM&@ P@T@333333sf32 W)mmod0U6Bs X" }!1AQa"q2#BR$3br %&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz w!1AQaq"2B #3Rbr $4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyzC    ) )1))))))11111111;;;;;;EEEEEMMMMMMMMMMC ""Q7-7QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ ?Z( ( ( i!FI /RԞqDi ݜ'jfB?_ 8{\6\6TغL: }frƵdWK 6T}/SxA1dj.5.cE&iiQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEZ( ( (1 82z`&HSWC,OVvϡRެjX Pҷ@@xXo,wh/W%]l/|EdT=nH)'꤃T^ BBt'Zz)#RfsGO%-'jW?OM~US)lQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( y,c$gIsAURݙOKa<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(X<`NFYگxIЅhEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPZ( ( (XeF}h7X7d,p+C*ʜ9U']M[+/Z TGQ}EpZwyHtck[XK» F=B$!=EjHq+{zDv = -x&] R+<;>#RH~RX)DP BsRO摻oS?Zъxg]:P"Z( (Ψ܀d^W'K3yVcvNvt5ä4q%?/ӊ|!{*@)#?@떆t=ܯܚ&?(.;n׵PESӡE8?JÿtTV>%ЮGdRnZ) \;) ^auTW'gMAǏ κA4ܟcy 1n3?(SzGGW)2z |eHb2XuGҀ:+w b'0?:ꕃrB(QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEsAιOiS$fTfU@$_jA,l \? G(dZN#r†\=*SYM+#JCfS3@e )ʐuA!hs!!G5K˅Tf9.$$!Tu'*SyWw,fQ-'}z7EUle[G $ܹ]r袿{,߻P۱8zJ =e9^FH=Ao(H)b0'@(M.E^(Ьij)i gnmttw\ݞk(?*+y/5 a})ڽ[I*㯿P]K<O&H=pɭFmꭌ=hZ*WvӱXdW# s\@UU*2A `zUxn2!\]#G&7(FP+&U19r mEQEVY &w+]ek.+9b?`ln Кh^04rwy%8Bch_Wi"5xݞ( 1iʐ>vsWw_(V&7$ڀ:hdD5%smdm- 26?Njގ.-5ӳp;4Ec<Œ_2{zؠ((((((((((((((((((((+4Pr-3NPz5E1Q DŽVgj'B@Q@Q@Q@"CK! 2IqW+1q~tjn^;XА%b[.8k@mw'HpqӰZm⫸ {eav06n}2)G>1r3U?ܿ59R <8"i8D' ik*"el`2s[R@<p+koPlb c\׾h^ӑEfq!`6gަmoh`Hea^o1vgHOH]n1>g;t>JM6C6B]FK)/>dhђ9`[>cnqکA RʓJn lqsoŒ 0f2(Qhh{vtQEQEQETr(d(X~%`@WBSzN_s_*&dǬuj`m}8^ke6 JA]=84EajMxl/-ͼw('p#L[strb}:ߢ-uպ%ad:n! r= ϷY%ݛs`׏JEb1K62r6':uMe 8ʾՠ` 6<^͓[K7`A_j謍CUr1瓐vzKub2ƀ6袊((((λ,eHn_k?Oa}s^%I l0O~HVGuKmA8`Yڶ-dmNe#%(f-gNma3O}kRxMUҾ`rezFkҠ.!IP>ji(]~2gK`2zJ_ Hel*pp+8#.X4d PSoM2hQ[$ׁWeby%%Âsr21@Z6I3ۭBi 5#3vg81-Iw )'!ݳll9ҹ纵âl{7Vjj G nր:+o3h%y9ZW3݄]UO->q<f/mT S)ڀ5hsE0(k^t."23\\KD`T<zWKKo%qI,_!lC gtiL3̨qsIj[۞5b{G߳g!egngV.k1u✖dT@5/OЅ7#% Km\%#a%m7;E֤ɭfYjzPmEPEPEPEPEPEP +!gib2Iz\Ckvaq\F ά0Djxd!8V'zmUB-: =>wmK&' o31V5 hX^%ҳey$@V'4p>>W.Ulܪ Sb3nКQy3x(9\?-^ޫ+r u`ɩej ʊ5xSbfKԭm>QEQEQEQEQEZ( IYHUQO`*JOZzL-0ouxiq7JoXؑqݗf-#K/߫rOWk? ơ4˟ [۠5#!YMhjZmQzR_i͐|=-̛Y} >w; עf} 3u8_OpU6@ ?[Sa#v.3oV--$[HcaW~-G%ʤԴ+ ?Mݵ~}W@$Zg{7^XxdY#%YA"JWC~@4QY4.k7*4˭tnDl!OWZEci?r% =k6jHe,2zuxy?@|{5Z?/vuIu].~b\z2ƼRZ;Ȕ GlxS6i,2糏POUxk:r=FK2(==kZO;{ㄽϘgk.3oo?I*r#Yy+^^)/TtPhZѰXHAIxYfm33k [+"so+ڨ͵[y .$Qr=s]WU#+ԫrֿtܹ2r~G_go+ t;1@Fbe#EMpIn63k]"?ldWȠGj]%H;75[9.#/wU#שWZ!~@EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPY?im?Ѭ hRʰҿDz H }r\\Kh*BGKwR;!\kR ګOt^ 3x|/ހ {yZ9n%%Y0~PõtA.ݶ@9~W, {wmB &2A~i y+d!֊޽q{0m)H*u?Tm%7Q3 8DH kHhn( D3'9{VdRGr0Qy')Mxoȳ77ґ38ZۍI# XIy?Zl/-5X5IbKj[/U*03zPkA!Y{Pp3W r?PǪJ$r(]^i/m"CW+?ZځzRH: KY׺I)+VC#thP-Bğ+6t3cӟUwFgklfHX,涎I.F%y@ dDssgPKjd97Ub[Qd9_³o -%a;N1r3@խ!H-up8xROlz@J GM$Ws 9ɨ.~5{E Viwj6| w"կ3ARbrIv\ #MTԵKWOg l`UqEX,I~Q}FPx*4QY{[\2wz5j;Vx>,QEUK1rǥfiF2ZvץeddH&l ~:nK7<Q$vk%Qkm=J2LVQA.$X_AƟ[I+&p:۴O?ت7:tѢFxY5;.!6,H\`w:+b3O8XW:DΛ\uu 5Ja-e ϴ7ʣ$@<D5ͬ9U?]ݢhF5E?Ul&3Qcaڀ.{IV>өZگ"((((((((((((((((((((((Rww'KEDŽVgj'B@Q@Q@Q@lKKcwJC& Y?|uWV4 ٌ;_Gx!ip,s[x{<>&_Oq$#co] K&1BgKNd\ uK#TWeT,3؟:Fj?fghfF˸qdIa$ 6 \:M8nB| hsU+lahc,س9$aRٵ 縼{P$7qިzؒiieb9[@r)><t&/%|K '?Ҁ)jq`^2ZeGw\ P@'nPEPEPEPX^$<UЅn{X/!6 #=հP=eқkK6ZRHm٫_htmѢ#$'#=yhX57yJpz@$>go'|3׭_)ԉ6O;P%g7jg(n`ʳ1`x8[glIx˙cUx=wVZQY6~G6vPk$wWz4GFw=ƍKƇI!W{ $My#92v~(k * rGN໏M2_y@UnGP:t6"?ܞI?9xI0x>^3,WZDEsT&`d2`u >oV9,#84gDW ϯJqI.>F66 R= ^;4w*+:PPIoCЏTvZUK[&X~4%n`êQ^y;}4P > :AyV>QEQEQEQEp^)&-#䒫ݻu?WĺS" 9^UIH{VUƏosG SMqz4k6QH a9"%UQBڻn3?.$ݳ85C3P q>˞޽jye%2k6=&#TthfQ[KjGZ9mVT܌Nx*m<J">zzb$fV}}(}!-Yjh-(O+&,u]kpm8PYGD7߷f,tqր/+[ݭ1TQs.d$okrY@ yTHu y){T&s%23J0OvIGwU]:tDhcj$egyi++ܴW0?w Z?2N 9M?Q9k7cL:<Cxi60RRW=jaXQ. 0T1{P5L[ӷNWJ^"zWkɶ]'ԚqD\imf= KyP܀sFJ=:ƫ#n`N1늒<Ug}LHpƺEMO6\49?[PEPEPEPU.mbn\(}u:ٹ7ۜcj7q~X_s2'cWZC;e@SE<bXX:7B^kI]2ޟJ2~cq֕ݝF ޹@^o/L1G+b֯)yXi'sI$YWd ژ[y:@묲^Xs/drhYcdVp\kRG$2LJ<dH٥,/Iq7uh++?9DDz"!jTOB 'M0iv lb?Hۙry<w{ C,:,#[*^$+(g:gmiwP-D(#WѴ<#3Hf5jn`êQW.vj; > :AyV>Q@Q@Q@Q@Z( _HIպF^^' ɠVx?/l|6Mde>WyyIgv:W .@OMɮS&f܌sjLBt 7 49q֦}4]ΑJfhDF|O_aD,p5|<o3h݆ݎqǭ3S?'}V}kb7x=T0k׼ [ }b #\@i^o"`y4FI|Lm5džu DAQ_= R R$Px1ٴR y21oקxN*0ebA'iq#XriReg=IPM29.Co"0M[T>gG^/{I4/a$a2c??׵y-qM7q@?.Wq?\t[b u9qp|G Q*zuΈ@9verǺ&cp%ʵU"5=yW}᷍QW<kojvJZHGRJѼs=R=k׫=Vzb<Wp5Er>t֟;=ZJ FV?^wFq% ζGGy_+>e}O39݁ad}†Lvs@O|=5bau*:+GMJ#0 ]cxG28?=ռ{5L_r>p>MlV]Ԛl;ظ~b?:QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEsAͻ!/-dnaiRR@bU(OPUAv("pfZ('HiXqRE&) XQNT@8dGR<i"C)ȧʮXdЪQ@Ƣ푶Wk}O]*oKqv׿W ,j }ۏW((6 =>(cH6ȡbc"%NF{F7*ΡTPLx@E #4(ј;(,9J}Shn=N9P(,fc U((((((((((((((((((((((( [<$Bk7U ٴ@"((((((((((((((((((Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Z( |K.5T>tTP˓=c3]J1 ^'k~|*kzn]"ּޭg$sl?Zh|Jsa_ ~^}j{vWGE#mxz~5i-]g$C^hu{Q7WS4 }<:a>ՙMQ ıǧק_i^Mnqw ŬeW_ 7gl۽ ~xST/uSb1W{ AݏOP7ijApDJr51Ƒ"ƃ }*+kX-"[D(((jp}7AǸ`i0IZEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE <f)FA<TPhO;tܡKmC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍B+"%Heu鑀>EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE7ڏ7ڢKQTTQ`%}}*(yooEE;/GQQE`%}}*) |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEgvv,n9^OHU(%+Fͺ+-{EuŸ$ GEbEuHQ={tV'$Z?_(G=ͺ+-{IŭRO`}k |0?ŽWؗR ~e=?CiO;v_?GQ.aܿEPӲ ?ŽG=;v_?GQ.aܿEPӲ ?ŽIvk*Qe=?Cr˰{Xw/T?¯iʌԶaER((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((QEQE ( (?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP ߿e>?-qPW٩\ VEW:}ɌNjttHYBas;VS+`1 &\6+ٖ\9$ȍKc5u[ʹz_h1kxl2< }A4E$+5U+T+ɚ w<lԂ**K5ENK+GEVjG+ګkګu9-O??S?* XEBĀU78j+hEoeZ4n5Fpz 63\HSkޜTXyb[)aj Bcw0墔ҏk{ V]C12cҙefR<=GyĢWm#ܤ}j텵rE'yO‡Y-4v]d,`wڥ])$o5x/W稭})XH Fp'ީ^El"}=G֩TM*2yJ뼬:]B(c ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( cI;})Vx ܍n5QWܙCzRʸ#JsJkU2 dw`9އd IKI+mI Vikou~*m3~cfڵs,XԞW8k9gilEi>P" z{}*TNV;oʂdv<MNE #<?shv@ O9)nϽް{_v^֫$M~4q 88# 4wH#R@9V6j6K!D%#w|?StW{dN-|;UWVeΙa1.ƫ0|A|8{m"3;1DUqx'Y6Ee2S9,ۂXں/A? m2QY(AEܳ6ԚuDȓz~1($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?L`QE1Q@Q@/~?<[ץCG麜vW""#SO9?VZ[]>P>Qf?t9We*h56S(fy9s]&7Y^Gu\tWT覕UZ-Ťl6K&zu=QEiN<s3WW׵W6+ׄrZI!I__iu?BG#HtJ'jK k.]ϙ|v罊M>HĎݳץe+!C=j:Iu.Xdm=՚Zܹ}q֫QC-䔈jWA,G ծMMpLWI1Ӄ]G.ǖ9?SMUcx'c-Jvl簪ZU6125EWVMl x,MͼZ_h2c\$X.Ao{hff#JCpcAc5E5M're^N<wyYt຅Q\ǠQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE^2YDy<vj֛cxK\]N-WQg}CPY|E܊۬V)F 1#/9xUZ N[LGidѰy?8-[kBGVw4,s?D&6<uţ$;u Z( ,i:ё%ԏԞ¤ӡ RJsk!RSfm2oY8@CNzbu|w`7_]. oS-/v03ƐƱF0 N>((AD$(~TQE ( ( ($@ E&i"!'EQEQHHihhel րEPEPEPEPEPEPEPEPEPEPEPEA5\HY{},xQ`EC )E}T?J ( K~Χ.Է1ҖtQEQE¥CHҕbRZ.+V6-UFŧp^bRZW^bQ}(AEO}(ؾ l_J6/ ҍEz*bQp^}(ؾ\,Wؾl_J. lZMJcbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾN2Y<.QE1(AD$(~TQE ξL5  Z5~Hwo$c ,u-G~t3rOQ?M1l6N֩x[{c\4ر8 >gob39-ZD]>Y&&'ڨZZ-90>1ש+Y渙IM" y7i$7 Q &]j3Iou~m b?*҆>ByV ,3Y[IP$</ )6Qu6 y!۟mֹa_iqmjVmŒFўs[:)3H6ƣ }>K3+"bN{օMi03avs3{-(YZ4˒Xބgx,¦6P10?ր.k ZɏSq k^-EXdb5oBɌFNgg-*?|SpdjlH i"BvKahF.]@+Fh]X̾e.W;r[Ydnm'i韭uTQEQEQEQEQEQEQEQEQEW7-~=m'Sϵt#kbBrU7dؒTFQ.fo?@+_Ok:^mr# aIaTcPּFe2VP8vwI; tElwj԰9Awy/ZX+F7̮4QEdh?OP\oc- KT ((dZU# ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ~C4QE1(AD$(~TQE {YٮۙI?6q#(,8ƀ95#ӭ"rcPXOUJ k{qd'#$?T[h c=8 .lc,CR:ݽM!idrbRʔƅąAa89Cu3nbAlcVsͷ:YvŅnw㩮 Ry6Z̐W_?ʦᲁ.Iwcbz@OmVF$,TA+1A$s3(;[ٽ+]'UK3$ӻVgo1%_*0jĹu*pïF!x_j)%, *pX-j̟SSv3=@+kd`kB]aGP/ݪ귒oGLF$t4Zs}j>Bk>UV9MZnxT?LJP.|* S-6ijFY݉'(?K.q0#$Qswf%cs3coõnZ( ( ( ( ( ( ( ( ( Q."~#6dVr>?~Ț8 Coxtr̍++ǫ|?s//\Gxv̈NMury<*=GDj'VGTV$?ڳ#!3MވKVzQ\P\o?F:RB ( (?IU? R0((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((W?pS@KES(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( H Rua"<Sr9LF;$jkʼnnl` =TI,bvO*<LqSH; WpƱDQFjM4QE!AsS?[tKH:R(( Y'V$*HŠ((( 0Z.4,jaQ S?TAIj`{e{ Ky5 dB{[KEbZI6VA =z۩ʳYڐ3G=\fky ^'d2xnMDCiB@s|}?hv͟w<hҿQj$-ɴ+/9R ֫FI'<JpUZkSTԀcMu*y mb0NUK/z5H!ee9Pt5lNfJ򕲌=ufbg Ar/۬$\+")*hsT{2VsrvD6/x裚NBhvD ߽jum+lTs ;-,^kDžfᡕXn{f[2"6pĥA#hQEQEQEQEdU^\;i^=0 њ14O8/|<e\Y9őתJlZ+ZEд \@ϩ[`SauM<+]1P^'k"EcϧZ"Tz:-^2I_SIFx+$?'ZVyY3+ ^LńW3mCnr\(G* (qȠ ^-IqԷ6=_T%唦 K#|1Yn޵Ϯq'VxveB+(VǙi4qͩ20 v#:X7m$)pv*T0Mf]1XFa$Jޏa%RI<LJ r8\ᵎ}Bko\v s(66Vh`B|H=a}zYզa̻`W5e` "Y )%Y:qհVխ%BHZF#Ԛ{hdBʲuh+,_pI㚷uaHZwQz\$]ܬB1ma>_nCj G /w15ͤ+unvLftaȮcP00EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEU~B)%)(AI !=)i wϵ&2o3ڏ3ڥhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jban=?Yy-o@ )iJZQ@Q@$*UdZQEQEQE=@ﴤbذ8rһf#j%$CRbh_ [BEO!Sӽzey~]^YK,Q1;<רQ&(B\ƒr?s柧%-s8E:t{LϻHI=oF?_ͿƤ4AY!ĖQٞMǏ'F?__NB[c?.M.*t(,ϴp=UqZEbح"lt{_q]\Գa[p*K=>?ٓif<ry Z:Dc8}cYiڼ'bF_Z۶,kT;r;ڮnXٳp`r݁`tǭji::EVɓHBz=bVfs#dVhh(((+Ku@]n#ki-dziNK!,q$K!#{f6(Q$K-˨or?z^z(b#cO*3SZ;]-I&lG=v7B[uoZ?*Tz>eMDĀA GJe [<rǣ4CR&KiY$w\oAg 0ԑjH9ea qYtP5q8f㌂L@3hӶn"X6XnUk+bܶG:g>\iI9 Gs} g3Fvioch8$ޕkkqm3,ں][oU*T)ϱ5;֯clvmh/g,$pnU%T~ax#DEq pFzk|hh%1d3đI>bNxLLd0#djZ cLldn#VnV "[),)|giUY!d[z.K0wmbwW۴ 5„,f ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ~C4QE1(AD~OŠ Y'IER(((@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R(( Y'V~O­T(Lё\cSSmc\FI ׿O*PM]UdOcȣ"s]{}W^o}?fQ^9>T+Ϸ>Uwo/=2+?׿O*EuٮQ^9>T+Ϸ>Uwo/="Eu]{}k{y)ydW+Ϸ>UG]Ocȣ"s]{}W^o}?=_{EG"QpS(ȯW^o}??׿O*fǑFk?׿O*ic{ з?`N:w.ⓦVEVGHQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEU~B)%)(AD$(~TQE ( (9 -W_m %AIk˭<ؿ$<5h2k fO'9/{WQi6.ƨ2 gsɠ W^mEtP `q^]Gb6ɻ 綽{6tNC÷jQX M``v8un>Qmy53O ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE]qҬo~^~jcvJMҟE3kzцOQSmo~mo~([ߥ[ߥ>fFOQSmo~mo~([ߥ[ߥ>fFOQSmo~aiP6J]ҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6J\QSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:4[ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~J*P h hb?(AD$(~TQE ( (0|=gscd]&2 ;}*}n+Z74^OZP+k{x#"p9z˱o97^{@_cn[wdug5EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQET?[u=As@-P((~jO­T((((((ڕ1z}(:㞸@ NQĐ#kB ( ( *[4Rʅm 3ǵVtІ䑿8JѢwÒb ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (9]cXsii*f#=yoW{k?ͮ)\۞uJz_:W(:YT˹]/W{l_(pil_gUfG<sKgU:W+69=_:W(:YQ.%:GΫ= ͢ywi.ΫWS- @F@lt9k~kJS|fjI͝42mH *{㢉Uw|<EUn:(n:*WɹɹTP_&{㢏&{㢭Q@|<EUn:(n:*Wɹ3OoCV=tj+Oq'AIV=ty7?y7?jotQotU(s=Gs=V MEMEZ*7?y7?jotQotU(s=Gs=V MEMEZ*7?y7?jotSJ] $ } ʮQ@ 1 Q#&ԏ9Md?/@s=Gs=V MEMEZ*7?y7?jotQotU(s=Gs=V MEMEZ*7?y7?j*J!ݝ8V U=^6'ޟotQe:@|<EUn:(n:*WɹɹTP_&{㢏&{㢭Q@] $ } ʬE 1 RU[/O( ~C4QE1(AD$('IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@$*UdZQEj6l>m<:\& VFi|n\ڔ3X;K WC04FRη'5-w #r}*ZЭ"R9QAb=qPGi6"n0+~Pߨ#?s^&ӭ 5m!@aUsMhZ;M8 Ԛak[Ʉy'<VOkHU =OEg ڮ?*ܶ4+uk-BY$cc+uu,? ?t\m늓P%`ܦT]ߒYPcr7R<r>hU#06wǦ+kPm|Qԟjʿݭh[UF U4蠀jlUL4& [+ZIɨD:0$(f6v@* a85%WQ fAw kU*JfOOkkqu3(VێbXx* ~խTKUQ7@-qK1Ÿlm2("v2^P6V</cm%J\3xQavrr ϭ[uxxqckVZ6`uH%?S@mag$dg5;IGU4=2ʹXPK<:gষ)L((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((5 OEf֖!i?.Š)@,pI J0Om('>Z{[-t0ۓמ+UMRm]\62?w늧]Vs Dma8ǭ($b'fdfC(IqUX0:o|S%!XmF她2N=Ex$X] 8i0F _pkP_ް‰ _zK{V ;WV/+OX3EEZ:|̍#άdy+0~k~j|H҇Ǝ_U>`*]^ H A}N*q7<mڄg4&ξ~˭G~X.lNi%E,8zS{!g^f\g^1HdX+BxMid3:ƥe Tl.I6Z dr~V#5gOq5Q#1 |sPWw[^ivL>Y'fMI\DXy{]rpF~=*mYO6o,%ڏ\6xl3ҹKˋ}[}?nHv!fr;~uF&+,F68u=+8V+i3 r1\G Ǡz*{?Ug?Z_쟏UV=tj*ro<`Uss0Q9) &B\u{mgm38fDWQ}PlD?Es$b}LIfszR \un?! X`kq!N Ґ&5;̀IqRaNwN3:MIRcos.Lcs88ɨMA/w#MO@±}DxF=+RIvG3 4q$3Kgcsnr訪 01qHI\LN70h"KQWSg=wvF"ȩԣU6 (YH%H\魥ˤ BS>N?̂Xm[,$RSm>wn}}iXܩʸ;Ꚛbetz|j14,A[n%R{Pum,u/4IukD1,66?yyK}-"բCr=ހ;}/Z~cnϜ.F ץm$s &єWhC-B(k&%_)X0Fh({'>`*,?D P( (Z]`Iwqq,`Hȉm u'ހ:+GDǷǿ9f^jBȦﵳnNq∭&>Kmf}nbOӡ쮮8y jqӟJSkhĒ#8W0sP[q-6a,"RpedSԅN;u]HivrS̈>z$ey|!saeɸAFri<qp,41 U^Ĝ`;MG_$] d~JĺmvQ$6Pv%6~i,ks3x x8cqxO+6g!@]Q@e?_ʭUYTV=ujDz~?έPP<VдA>n~i-RZq^B޷+i<h<JV=F]ҵg6q^4v]C`\qgֺ k׷R1ܭ:)P3 NJO|8>AXxk~MfYQY~egs$`qVQmg *{'UdZ(W?pS@KES(AXt3=m eiEJI3*qh:;Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>%>cSx[Svz ǵpF/j'B -\+&I)iJZH(( Y'V$*HŠ( ŐMpLe6 Mj[;:n#U8"dZbEcQ1@O$A5D̪Gg?W9\\ Q^^weMO.cuWQǀB.I-[VMaᇂO}K? 8В=p1Y> Vm"e@I;x 4RKV|Npsnc{ @0^NkDY̲F*" Aq~,A6EL(G]R5&T""{䌯=}z1I8Q/UmCGU%ZhdN^5Gʓ]qGcSa{5nK}OTdvjτdA5D̪@$Q1%y|KkopRF`=K\lg8+eV( bu G} /1}+ӵk-9() L)F%Uay/|Eoہ$tE9Njc5血 UUQ@S'CMָC'k((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((<-?AZZ"k< 쭀kQB]uOʧ֩8OҰ n8 Igw'3ZV6kUY*I8WF].$]28z9'Yc8e9E]$C=!$:qesw =zW*sם +.܌rj6Mn9ݞs罹EIp^)iSOcKΒ}&YfiG'M,<G-FI.~U;U)$67$(،UT܉J]?1]?$ U/|UjOD)AiPR;`@rO 2=b*@T'ƬBx-Qi%ċA!Fr; M gbr8j['N.o I5* cEh6v}8,ry95R4;'LKʲf$S]>6?˜t r-H:Ȍ^G+ ij\Zh)BCA'X72G6Q[KI7˺P$X//#yXڋèlyO/?w9:uך6\% +6쑌C gY(RG`|c:5鵟wֿbZqO¯ (V=ujdz΀-U[/Oժe:YtF-k F,vr> ! NPcVkT'C,n</pU?GTIszo[{/@|;- {  Ցm6<+PJpWoPOֵͥ& VȤG%ƿ4p̱ES%o˨ˬ5E1V pP$?ӌzƉ- $Ww*93Uจ<k$g~F,[C85cE{PЀ'[:~cXG嫶2O=8*ր8?RҟT- (;KspaPҶS-()p.ͷȮxy )vv h:~-mn0ih֟غ*%aZIX?3sү.`pscҫ_N8pN)xA?ڇrG\ֱiw:dJ䁏R;>{ [3Șfp@1ҙcbyv0@ r~Mc{QƝۿ8=k+2Fymq79iE~Zs@TQEUd/E{'>`*EP+m@[ 1ֹ}#Uc-)1 R~k~]nIc)G=FE>g¸dfs] dFK1جrGlֵ jUNu25Ēow/ʙ皥}&Udm7H@>6ucn?Ymg=:9Un} !J]^$ˊ1@<SV<A h%s$0'QXaGOuW wqQRH#j퍽BYC+r#s啥]K-B½Y펞"3ܳ7pOqbȴ(.忊%͍߁{tEe<z(*0Z/V{'UdZ w[B[hTYŲ}ރڽF r:4X<Sp2pi %"IQO^"'$5p:wggwdF00AxR_խe9=5~cI9<ӷ=M' 0zk?_goz CmnG@MEU[/Oժe:EPT!~ঀ(#(A\g?/:<O쵵>rQEzgQEQEQEQEQEQEQRIّ0襧G%,ǰ41Xe$I )L-`( L vQE((((((vhS=ޠF9?ҹbT]O Vl͉qA[Uhiw 1Mg#OyWUh76^uSUp0=xkU^TnbbxIa~AO3Y!:;3>&֔*NΦ]+ # A5Zz?b&iHҖt$Š((~jO­T(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((gBY<L1`)8<\SS3͢_/yƧ]rfZ_گǗh<G$c6<G6<?9%=V6<??_/.͢_/yƎIvg.myƏmWx4rK{9v3k߹Zs%t}9!c)I-iJ Jڍ9)]B_W6}C֛xWYZ?y?f?y?j\xQ\xP*s<Gs<@uDžuDžZ?y?jdzΏ:x˜=EO9'ڀ.[/Oժ=R5G8#ڀ.U| < EUn<(n<(-Un<(<(Wι?ι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| i{DaO`qP?D TF"F;Tsϵr3*s<Gs<@uDžuDžZ?y?j\xQ\xP*s<Gs<@uDžuDžZ?y?K0Zi]ڣj*Dz~?έU%Yt9:x€-QU|۟ <۟ KU|۟ < EU<(<(Wι?ι? UV=tN6ŸRF"F;PQEB*P h hb?(A\g?/:<O쵵>rQEzgQEQEQEQEQEVv%ڿ&I8~EE]:1#&?Lae%jܶHF~OtȞ"dm>Y'&v(xmCjgcg?ҭrAy7f@c8MI#ӿ~P~NŃ!y+yX!N1u)IŦ8)tӎy;<{zgGdYq.k./wȈv`[IcJQnQ;>U*[=4֫sOص Xt{ڃLn?kR7jTCvK$Q3N*ԏfJxW&؃(#;zW=C W% m4Vhϑ?M /B[tQEvaEPEPEPEPEPK=u- m(HAnO{mP.qǯ_\^4NWFڶ-?zXȮc1lyG$yӎ#>Xn3zaܬp=8(Frtq+K)8@ROUuؤ{HD.sg<b/KxWyw<5]V]4[%1=;z<K$ D1'$_ʸ*|CIi/4a$YFIҸ02jvDɤ(O+OG_/ei 5#GJZAҖ ( (?IU "GJԌu֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhSrhwLw-րE3-іhS2ޟoOրE3-іhS2ޟoOրE3-іhSrhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swsw~ૻR h hb?(A\g?/:<O쵵>rQEzgQEQEQEQEQEQE6W_$IӍߝQei 1T*q["I=ٸ|C0ҳm.m%i}pAj*qZXe-FObm2 Z|c*ƢN/VT3NW!~A˝R3ěV}o{<k%Xciȥ.ʛݰ``(%Š($(((((7m:SF(/;38ҙޝEGؿO618g>IN\e?ΐ QE\i;"%VR݅QVdF/k2MEO#- K^IQ@Q@~O­UX?IUQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@J $Ԛι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| ë gs@f+ -QU| < EU<(<(Wι?ι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| < EU<) ($$(A-MViʱ('$RhZ*s<Gs<@uDžuDžZ?y?j\xQ\xP*s<Gs<@uDžuDžZ?y?j\xQ\xP*s<Gs<@uDžuDžZ>J7\V(kp[BgpͻhϷ5Kg?֪ީ:Z6wW ϟDh"4 ù\&>g?'=;l??6ȟ}ù\&>g?'=;l??6ȟ}ù\&>g?'=;l??6ȟ}ù\&>g?'=;l??6ȟ}ù\,~5RMjU{}~C4w, CQ(J?.5#/(,*?pUE(A\g?/:5 #*oٻ<ڵҚlƺn #_/yƽiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȭ=B1Raj_v[^$ŵ9;j*TԺt䤴;qҖt0B((~jO­T((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((/|Uj0Z+?P=ڤ,M<\hQ\ 1%/LLFfE.Xf7VZL˸&~m,QEUKi.dG̸̱<@wl+f(pL}qO5,U(u 43f6'=8Dڎm'qqn9"h5})V㷭*jd#f8H{ТYk120\xۚ/[ԢtD6PREb{Ҵ(߇uV=tjYDz?έ[/O( ( (3)w!UFI<s@?o4moShN<YT7#ȩ@ EU-GCK,AwXzMKEfl_: w̋ߑހ4h`<iE20Uۃ]ShRg14#te "&ih _쟏_d/@((-Ussnи ܨ4\]hpk=ٺƀ,QEUX<3@8"y;Qf>u<RA<W0 92J.!kQת# _J hFO ]ۢ'\ِ/'܏14rw'ksGV8@/|UkV>`*ڀ<)I+ޝMO)-QE1Q@UKU]*CA[̭EO"wuI 2`lez*u'LMr:RG^tI3.rcߥ.e9YJ(&b#Hg 8*n> 9%)QWFm)7Ufeda&@AOA)'9Z#fj?7Gf> |JVVF(SJBS?fSm\x_Q^yP T!Z((AD?IRc-QE((((((((((((((((((((((* -:R߇JZAҖAEPEP? U`Y'VFQEQEQE&ik<MmVS{ 9.1%{\gHȸ??rGR׉VoTྑvRATZ+ S3 {+3X^%vmbqM=H~?֓*J=2")eXUw73N2~nIuin5`ۅps@ 8# ˬ.uTMeeC;_OZ?-\DF )~=KZYEoq#K"ؒI<Oaj@Q@Q@Q@Wj!]N[=&9cT4h1GE2GؠYBA|;+3GMOT]Ynlw`#6ڇjO\a׵ mh2.eaOy5bИlI@fj)fi* 'JeXZL~y`rZ'GVHU'8X0 NKNnV>[g +7,,k&zFIhQ@Q@Q@Q@BT[2*|Kǽ;0Eai^!dаhpi5`"iSA$S~o= Mpcֱn4ɗSZ)u vv@mB*;(c-tU1屰gv n7k@U ܧPJz ri,:%ΦEC1o\8.[\&`^I2,zP{MޞԸD[d{d]<H,A$u{RC;Ak4`}뤰Ӭ6qր4jI^`^<oQn;oC1TFGQԛV/]|ݕ`cڀ;j+dMJ6RUWg?w]QEQEQEQ\u[6mH7Ơv  aczn]P@#cyޫzcQnGP6+gXkxgViP3Fp3*ZI3M<dڤV )<\Uݴ0Jp?%iBsVlԒybEأ(B5pdPpCYzg,e:CC ?JZhtLy$m6GӸzCp6nqθ(WHK v:#'B[^=I'V#+}pݖmvRb]Gn3бvcIat6ok=G%k qPU,C`"{JfK1I䟔ֶ vS`jy-0l.Ǡ̵6"ԇi<9?7kCSJSqs1 3ܝ(Bp1Zֵe @i_P6ɒf'8bD2%8$$ctW!]H,N\}uQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEV_U>`*@UK;kvTP:Ε>~SQֺx?ڗk8X6mĥCwRHvZ,QäGQ p=HhR=zM y[]CG"C}+S d !3zmzMe"v_1a6&q5k&e2yw ǭuz_Y8 fi70^xPu?*W<Pno8k{BUCW7wg%Ʋl>czW[ݘ䲱8un 3cvZGm"_o<F2Y :`+iȖ$-H_{cZ>-"K $ZWq̛>%.b:m-ЉcF!W ֓]b*9 FXcd>v3@<8-gZnKiS*K[a'ۡϓv3. DIs9X%l+Ubdxz5J!T}timE19h;-qܛUWN!&]oN{}/_m6)cɸZ,1/ rdɯN;US`:4/HZJ*{?Ug?Z_쟏UV=tj*!cy}paXynw#4i<oTUWi|;q ƜOo'9$nGOK< :(u\dMeiV7),H6 Aa1 u\dM hlir[C?sZy&D}+LHݷi8@YW}I ,2yinsbIB2=]7Loܣd;Ě51\|ژ<c#Zoc;]sj}-B@ rp:-Έz-ީ{m&[1e0HsֻqS7-l-# 'qۀOJƲҴ4ӠFўIPw ~r@9=kբ Cu!U`xqJuh X2HSXG zסB᲎I"F(0Fy:W)S,%ʰaH9˷ƶ<?ac}89ZޡhS$]ܶdEbEFx Nk{7ZN 0C 2GzV.i]r#^}sIj%bU/#@%Ƥds ? \vF)c*' +7ykMTrvQ@l?D Qe:%?_ʀ-QE6^D6q'L!/Zi4XX$ϻt~ G7{6y[T,u_p[9[dRk6ԕcDGmL tHhk=n[Ҫk6Wm Ф7P IlO#uz?))Bd\xs9Hey>?rfʲJ|`S<99@OX8Up37J^K@~܂@id/%张@2%SAm5t^ ]P~lr,1JdD/IX=Ÿ%c'G&ѢWAk,b IԚF{{vhfs2## ?ͯu[KTT9< ':O+ŷ3IG ]tcZxH-gZʅ}gLz{Yp2kWPgm;K,W ۂqmn:}+j{m F~l]QZ8_ӚΟjn96N(e2ɥ'8i[-??#}+ax/*#ҳ/z. <E섨 wQEU>`*ګK0Y@tSE:x)_Z~؟mS1>m,\!}nGvJ5O읱ht\Ρ76+*54S*{*m.Ϝ}̌vuukyԡtrzj4kHDN6*Gh>ȏ,̨$o`ӎsךοUK5R@'0eW:ejǩαÆfݻ g=kMخWiHwoҰfXQ'hiӸN[=z۴s0~» *̓E[UuP6$YOao¨2*})[-`.hLA,W`J*pA`{3~q<+ڌlgV.Z[YI G˩ `wG?9:<L Ɍ9yl8hSזXd$)8[n$}4k&s g<=( <~l v<sIpH kIS@E nJ+C50쮮1|8JEY$y݅zoڼSm\X_Q^yP T!Z((AD$(~TQE ( ( ( ( ( ( )3Y:EڄK0PRVAOkIREPEPEPEPEPEPEPEPEPKkOeg*2K8N?_\~~A;=kV4Y cvNxVYfqssU?1_X_)vx߆8_NIo gn-E_9 iW] =ͻѢLcAg|=~=ŝ4sK?F2O!loee[ipַ-/-:VYA)|>rZ5_#rDZuW(.ԷzK~΀#)iJZQ@Q@$*UdZQEQEQE4mD;@ZAcX,jW_kksc#=).HK|>B:}İt|#"эQIa;(PK GoCjOaxWwWZ\b7 ~$s闺żp\y+[ \g^p8w]hmC8\<:c<XUbUc$(~&69*[x0$rp۲kԣZã!%G.IMmOH*%lMɎo{fIf%3 p~8M6Ff)ILwf(RGhcu4ulY,2%1wsOmbr'澹ecc.$I68=8t'ҢvH rmPEPEPEPL IYf8MyuIh_^eɡVzk+%4Ef8ڭ[⪠Œj`ub]k ;[iʡ 95{'K:b|ԟBsJҬ^؉|ұVvaUH<?jw˩M(<Q#P /-H8GB>}m@n.hv>w5ݲɧj"Dph:.?O'޺x/ 2/g3YƓi5kNH`qc>FY=OOtjΪ8eQWKkwo{ڸxۡUm4 uXIUG<Aimj\Ʃ6s@h(((ZiyY*d/>ƶW  ϗG6aU؂ѭey Z,mfVT֞?Sׁ]LG#(A%ޅ]2͌}=+[%mVI V7v_$/fYG#R2dϲе]09%e *PEVHIJfMZ=<Yyˁ5R\V +!=F)Pc_CKY_i=ŹذX``t84%O]\f`;`F0o7 w(ZHY]ɕ3N$c~t1w!яMwP4<~Ux=`)gPp}Z/$ʓa>mGU~dolp1zM IӮ,>=d#ȡp{c]iK ]tVn.4ȨuUNxJN 81#K`*ĹVxe'z8Xݏ8?_:V/'Kˠor2N9Wnmumv1KgjNXVLv_*XSJA2?gNN  *+ M4(V p;Zլ[{QX jbȮ85@Q@Q@Q@kEu]*cI;W~J4eƍ"iKlӎ{Z)#'7+RK?}\=jGߤv I7K<u66(PFx+USoD|leq۶!q\G4F0L=ww{hN$4+s^=t2FIl'U5dRBxZSHu߯9-=i&9_-+QR2#֬e V@<Cg^Ykb%IJJ?ʄƻ+ `0Hi ڰՠӍ{%y>wb'v;PimF-SR?(ns0kYv/ZiZiDP! ܞ5a_n-CCn P4]X呲e_,tAjJ]ޥ:{zۄK-rWQ+8v ~uв#!*FAx?ZZv]jh8$U;lb{xmY 1\@@Ikϧ %XzdP ]i%W7Z#bGAm<p k&aIۉ\ {Voa Ƹ,߼s[ӮRnP1y1,[71sӚHj΍5UFIaI%2Pq\WL GOϥbi݃vr3[0[o1\LUc05Ph†:s̓'F ?^^QX=&>D!ߏJz((((((((((((((((((((((((((((((((((((((((((/|Uj0Z( KI|6vc} S/t8u=Anu`=C}x[P&|; FRt#4;Sbuuo@BZ3먠wPКK2kt~n9U ڛkxe$c玙YEro˻!L4u<TkL_hE[c19'zbZ(o Vy[vͽ,AぎxoRl MwF!Ej(sZo5{yV1jܩwdU@m/b!n0zGNihdzέU[e:Ul?@1KE`i}ap:`Y#;~nOb{Hzˆ[-%u`>rMoNCOK<݉gs՘55&k`v>*Qm 6 *dq SuoWN`6K2zb( }K}.͠y|$vn2+5\ : br+1J-$gw;}OUJ+l3!Mǜgگ@|gk+Le0e:cOl//ځs qIpZ<W]EsZ5͔%.]ܰfu 'Nў[/cI2[F܁3~Q@<& [Xr+m/m#1}`M}:֝QEV=tK0_쟏_Q@.!OmqlYxm3iNGһZw>"$İ8b;:q^F)hn^mCR[y-ؼE2IvҢvo$dI|zgi;ka<?s-KnDBxN=+C[[V%fB1 z(4)[6y[ۜy$f'o4yZPGbtP/qƹ5F>psU;ҵyWu1sGvtP+O ꚓ\(D嗦Jj ^dY# G$:k8En?l<9}\qo~LPȋ*ǥuPEPY= UIE:tSGŸe<QkGX˙ܿ߾#T')?hw r[~7zN[6ڱX]Ne;U ;( -VY s*)D54Al/<jZr,O 1IӋwcUVFZqkj~Y*wm<@\,gngkrCι):Q{%e4{d&hP a!^ƫ鹻@rqӐ>E Aԓ:<M m uˊ#41VC`6G\>-]m4a۸>?ʪElFM+<- +uCj(L(@*?pUE(AD$(~TQE ( ( ( ( ( {9uD$}q[.`[y-߁"@ppwFk D8PB@ɭ+CXB .܏o™kܶ5Fp w:"ڙ!`n|ܿ_닉ZO׏COq?\δ ψYq͸c_ZXcXccݺ^~ߪZ/Lv>7vKX*/ T{+((((((((&g1St@HmALgQh2]Hol\=}ǽbwZ6o(g+}4 uXL!b<)3\kdF@sJ?Tl1|=sD͛ƒY}LP]`CCs1L.ɂUI e_9/-$c'*yZ4mic)`.T،umPj~IٰƸ>>kM,N"ɍIO5pLv ?[֯[H1 =]k p>D>ET?[u=As@-P((~jO­T(JZ&:[|e~mcךϟDj$FRtWx"4x"4 u.{DTV">oU`v"4v"47DŽ>~8$XPpȟȟ/g Ey'|'cG'|'cGaxw=>>K{xw=OOƏOOƏe.:+?<???<??=s<ϟDhϟDhRXs_C"k3e]ݑ+id)D rA(/F8?OoXZ9b1P]QEQEQEQEQEQEQEQER@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@&2/-/SM}0~UD<=>UNV34Nҷ//;sOiE!Q@Q@Q@Q@&)h(Ǎ%C2iP'u;I\{cp:֡ T/]R/&/SM[((((((((((((((((((((((((((((((((((((((((((p^9r\>mժ(mU(mU(mU(mU(mU(mU(mU(mU(mU(m𨥕.Sɇ-WE*['6Wi888"@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~m!FK7`tPTn.+0N@V mhmCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjβ ;Or}*PXϦ @lpñKz׻b ) ޾o_ZlQOoxNz׻`QG`;֍^F[}g_Z7{}my}h޾`Q>xNz׻`QG`;֍^F[}g_Z7{}my}h޾}my#Kɯ]l ($$jVUk9mJEU~B)%)(AD$(~TQE ( ( ( ( ( ( ( ( QEQEQEQEQEQEQEQEQEQEQEQEQEQET?[u=As@-P((V7PUW \4?MH_Z73w4f H]E;tW}<?Mgd8E/F<?>T1߳Ch9pqa1Ͽ>UnCc Ͽ>Ux}ww4}g={_x}c[fw4s>cG#}4?Mfg#}?V١h4?Mϸ{80QLJ*~SG١h}DZLJ*F<?>Uh>SG3=MH\Q#;&7VHc2:*_Cn$ě֍L4?Mf1֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳC0IF}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F fGR8S}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳC) fGR8@w֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zdu#~U7١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?MBdu#~Tgzѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}CS |ƑQ>~ঀ(#(AD~OŠHA2>:Rc-M())[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@.Է]Ҡ "ltҖtQEQE ?jЬաR0QUpOPUU{Wj ?Ɲ*^Ċ <EVkkycg (@(un j 2iykIpS3hđ$A$lH }UK{k-qn_[+ Rֿ۱t *9$H2HB{VFj>zn(#]'T* ( ( ( ( ( ( (4QEQEQEQEcTqo$cvc4ECt 1wlzdf ztY3@QEQEQEQEQEQEQEOP[_QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEA??ʧ#]'TQEQEQEQEQEQEQEUA%˄Rp3P)NC vhhRhdv3!y\ )8 4QEQEQEQEQEQEQE*t@EQEU'1<jèf:ER/Ƨx'dTj)3Q3#rKERMFYDL+ڭI"D$ }P%4xxR[][0u2=h-Y.pdOY*v/$p8fy EPEajZ}VV0v15$fIUQOjMBw@Q_mEPz?O@Q@Q@Q@Q@ 0Nbj-?~bhQ/qSzպ(EUQe`nIQdVw[w9+hWi<go|U(=jv֡MÄp3( (["C+y8PzXBTd +i1 g;*-?BIEP袰kRi",g;q(vX4ȃ;}֫W_w( ( ( ( ?OPGO 袊(((qp- 5BY{g r0bA*;+qP*9$HTOVMJ(R_- E Z(((K~ΫXR߇M-QLG(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE ?jЬաR0/Vun6y9BJ+ _f(S@ΟL/norvN{=AH`Uh%K_<{nxpMq44b'΀4u[kovmD85[_[qFXtՆ60-.㎹oǯ?iϢ˨3t @mր5luktPm22[cԬpp,MMjj`qLgmld DijEN FNct5VVգe d7hhW uOp喋\~% #mqI phl'Ӛc% ZSP~nvs eBU]{gh|= $/p<8vIҼP'λ-*'Q $3UtFr,coTzmaX'o[\7?/mF@5HUd`*䃟4^9m?Z|?aԢR)SkDf6 =AqˏwTQEA??ʧ#]'TQEQEQEQEQEQEW⫛soy^=秥vx[}e Ʊ43K$ >3[Z}ů'iĪ=(Ew觐W^qЏQ].D0ݲ=::<Ey_qޫce`H2AQ\<vW銑YUa6?*ͅyH'A>vw1_j j)RxhU`zpkgm\i yC?z*QWʻ <Y$o rtQ@ZdPHHWApq\=k&{)`9灑wz|* @>Y'kb(0I 1rRQEQEQEQEQEQEQEOP[_QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEp4=DCoTSDu*~o]ŌJR0k#Soo)8cX w%ޖ38v< .!Pݫ1U;Ic (U<GH*@\@-gs kH +ol\Nt4vjVv)i3I1`suRdK_W/+2h[uj'j O*;-^[ɗ;H iC,bbB6N:[d.U@8=((((((((((((((((((#]'T* ( ( ( ( ( (1n`8yo',E?ɮۼ2)n<FHOc< Gavb&o8I;hxQ'& ͨ#+81VDžUyvʳ.'do*ozX_JA8cװY>I{8ʞ#]5e1xd1ڀ,X:f"vOJMwʶm }uQEQEQEQEQEQETz?OEP^uE'Õ;N0|xx^ :י W0T$_€$q]'xs'qƄZëw)~ohVڛ# ?>ម8@Ea^WͷV?/_9lV |Gg#*/>ݓ8jK{ [82A'ɫ%Ԓ;1idul`A)8 Sa qg{O ޽T/Q[6$,9Or9ǯ`8rJ͆f`qmob`3l1lީ8P9DQGr_Ѵ;: Yd.B9 c޹^բfقX}*oő\ҚfD^,÷dXJoj3$C, cu{ u0$ HEKkLWQ<8?޻m>vQ[O' xjt摃O֦P?\@.Agߨ%& 2 dO mp#}Vّt$1ah?aԢR)Sk~\k(#]'T* ( ( ( (9YD#RH: 5d8OZW̅'p,|@<e1 mYUO~sNέlh</gc]g?C 4D].%'vKMID[6c87)-s}Ze22‡^~<S-i沷TQpjص4հyH`=p>Y_]G?ۢ Lb˂v#~UGmn&B ߕq6 ʵ)Gpv9n bpG;WMxPE,* G`l-` H8IJ6>;C'9\:?JQie-Ndʲ䑯v r@=}W4]JK~SKUKCݑ]m[>[o+&`pjw UR \uy:`-m봹8U00U.&4d\;U}BMeZ4YC~.0NG^OztfW<=]W$w(CP*y6WY.V%Ιre7`9?9"&Nh2+?Ooφ?{RNIs+c _C\/?]c20_p8 H׊,`H~xV ;>a>-AVPQ@Q@Q@Q@A??ʧ#]'PQEQEQEͬm#B!ڙJA5Sh YJBO^^Koy<2P,p`;%Ŭ:|#WWwǭe `bIR  aA9HK)-_g1#M4N^L@kP ;.aZ^$[ok^U]`,(6=z.RT8.#Dq$0yktkR>`?^l"NP"'b(((.Է?pU-:E(AD$(~TQE ( (!xg]:Ƞ*A(xbeI]QC >ֹ 5V]]e8QCq–EH?ʳ5kɷu3XDOjO<j9ه@1t$5@u?_OIӒuCfj IӮ4fg`rN}MuQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE?OP\oc- KT ((աY=Ba\iځUQ4:=k8mKW\"aU@>䚒 }{I+onWa(9̍ihsYV=] Ţ]C$ W<'=EtRi֓G S&AQ@U5Kɬ80pv[ZLiR}>bt=R <d?{Z>uV<d`:` ([wcY]6od63֝5ͽu~8B5wW!\z vp (ܞ=6i.خ0AMuPEPz?O@Q@Q@Q@Q@Q@Q@bk7_wg8EP,"-Z^3ʷp}k:C-%ΆNnҧ(;{ylo#9ۃx3N<d(s;kVZwp9+–{d#mR}O_{Po b("TW#}UNkk222N\±@!%l(((((((* o+:R 袊(((((((((((((((((<9ޡ&bns+CUSle;+R3f >w^Z[4M8D%WA9}5,kyϦ2k0M=BE3/qk/s;z$qںj(((((((((((((((((((IU=A??ʧ((((((I,/R;4Y^=@}@u2n9|xr{m<py8a+~moΣwN Dqӏƫ/omkx¾3s쨠FݼOm[oTP3 (((((((tSz("NzgↃ$ȶbvN wTPXjbl|ϟca^[Z5Y"G_ʧO=k9->f_Jxon}+7LOZڈmP'Ԋh(CϫTɭ?s`ۣ; AŒ`EEsAo)ǘ77^H?+6WyXa>T}2IP&Ks-d="흮 I 1vWcErKZC8…螟Vl-WMF(4-YT׶}]qC2G Ը9k OK@KG$?]A\Q@F{{,,RǨܚEr~olnf=YEQE*tSEPEPEPEP+麞v/*ݞrr9+ iEEW8@z ɣJ5E2#~njvwJ, h> Q5uŻ-zsIn-dh ':(;IH#J=EaZXkXI +8Eӵ+ۆ+dėl3>U|yS(2 H5ԕ:_^ΐi:g=M9=sҊ䆛^4[@dc?5~9 +1ҴenOSX^jV[y)dWcEsF}3VtM:v vN: zֽ\˦FϤU1NpkCDOH'_$>կERPky{؊ <WF[2F~@9O= ;7p}j 0# (((((#]'T*((($.||dRy5@]΋x3=ۅ p~֬E^ۭޚ)fFx$?P5;{xVg"L=֦.<q)fdkFҴQ.oA|UUP0)PEPEPEP?[u^*?W h hb?(AD$(~TQE ( (9? ʐ$|,!8=QKޱamh{ kh}l) IeYXdG<<zvV# 7~[UmDz10qgemo4ĘyN\}? h"nF"(j<Gʼ%Њn O5ulAsܞs xaX Qx ((((((((((((((((* -:R߇JZAҖAEPEP1=BCo0{5#'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahtS41+<bL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=AmGaj(f" }hahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4GOM؞1R~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'#]'Q&JO Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4GOM؞1R~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'#]'Q&JO Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? ?[u^)MUNI!Z((AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQEX(i Y"j#""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥+,QHcjO"/OքZK@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-Qmf?YTyz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@(̎p1'B¥?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?ZbGVj$ZD^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEVX2::ԞD^ ""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""j53# cYkyz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@5ƒ*Y5EE(AI #ږ?IRc,o_Z7:@7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7z :P\oc- KT ((IUڑQ@Q@aoߞj?ZXso{G1ǿLiq~ciIG \FA8h1ǿo{Yvwl>1"i6y@?QLde,7"aciWm[r.@>h1ǿo{YǗk88M1=sZ5hk((k-D_hC>̘l8pF}zio n?PC|͎Wt4U;iʻ9{T+mL'WA@U;=Bk&F#8nu}:O&y@~qiQQCq p{u(Iy9pqEV4g\R2rO#: H 8'Ҁ'KYK[ I0'GoJDYX@׊fLmӃU/_.YKڮq8Z/_uϗ7oąl\ y3hZ4ÄAw)~9 Kk58u8L yMv@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Ej(?-KE]^:mym €7+Y3PEpp20A$w.no'dR|dGE`X]A6~C|n2=1U`S%kYm0#4\(m3RڝE. $AF_Ҁ:+?Kв[n (((((((((((((((((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI )H!BTd@^ҤFO@ȫ֖s B۞JEfuԾD 2MwYبkn9$&.QT;@u†ū#-g'=? +*#afK1&Yn(z4EPEPEPEPEPEPEPEPI OTQYiM: ;W>d\EYڛ<eFw@Uj[Gbw_I6O JXԵ),ؠV+TeGԊfq5֜1w,ܟlQ\MjAi7,K7z6S? )f<Mrϫ [ s_hrY2y\lv098qU=qlZ 13YESZ+.~ΟdӠڹ@tW)7ޟl/H`olWIR[-v |'K-RYQ 5EahA{ۭ[f}:m$h\sxO_+GE#Xt4Ec^kG= 0v}~,:彡kΫ1@UNnll eW=mkq`U滷8})y<z}kRO@]I>\4"nGm_̹!.IǭuTV.{srAvCI,:ڠ((((OT€%(IW) $]5yU[SJ::(bd~ iy;/f:tAU OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq΍,Hʡz;*^AERQ^ek֝)eUu=I<Wuj<} SfmO;E$זQcP"4l" 6 JVvr8>*FQEE?STPM-QLG(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE]Uڤ}*HŠ(({_?/\tZJh[K-+3P>uKr#D~Q4G *)(wq9 |1O4Uq!ID7?QX1j6`e|jNm3}}?T Mx/*c&i^cg"l?zlڳsV(Smyoƀ6.meY7m\jrQN&m8aEo[t4QEQE¥k-bLOQB:xG[I-YGlmymaq@hA&>j `LΚg܀c mQٷNsHu6wٷNs@1n<xE XA>5ӮSmG~w&͸szU{i>Lr*@Lz}d,Uemqu eg *_q=6rS729OcߧQT'_m?g1Ǧzu Vwo9q}j)K`{ի"}=t%1Ϯy^~QFySU:9cvau1<_*HUN߅jFn`[q@5VK{|cvVi!hd1zݮcAHE;Q{hmbLc@}:E;KJ,0faƣOԭ_n4uc}ϵsxC^5quxC^5vtQEQEQEQEQEQEQEQEQEQEꖥT-U{vb랟ZCK7SGwm)xGqm>M)>|\rjڊ7.d.$S\A⤽ҤS&!N<IX> *O :?^*杦Id<0=UGy&.|1)p j@<#]Vn'9Xڽ!>c7gYw֖mܟ }(iǀұL]Akm[CPcQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-dkrZ ̌@ IZ[}irgU{4$KxWn `Xs r*ƥOs7*Ð{?.{y3؜u< Jc>e4<<cq@I QZEs9)QߏNE2bU8r?zt{]JΑ ϩMyI-п>0N2{zi$+Hp;S{UH?k??[6z\]ټ`( lKsߞTNM$БZ$&+˰UtdS!A$Cws"NΎ3BnYF~A?\S袀 ( ( ( ( ( ( ("OT¥ SmOr@D+af<k_UӎnO,N3 c?:j-| Gm"F_ɀbGeciFj֕XSE9qת/uΥq?qqS@S_ O䋽3Ωi?֢~su9m'L[[`!-ܚbv7Ze3sߎ3քM=ޛp`i~ Vt0Y4K!iyw?P!64SGynTs;ìI??ʶ:- n1JrS]2 [Fv[yeMgU{XӉ,7r޵CS~m^pI[e H:c kY Aqׂ}뫵-j s4Ho؊p[L~| nn$[++ d#Zw[]ݙ-Џ. @OEPFNuncE8|yzWn@>4wd{6Ѡ :n?*MnDօ?i;|+Gej,Զ3P)ijI-Lm@HǟҴ<4Ug<tkFu.c.}3ZZn|l7$w=I ,tg}Kaj:E5u'8?Rh˧nɓyvc෯=iXz8 *%u2Jߎ9/Z.mqR,QGn)!cC+yfRێ|˞D SBG#<u-qy.3tջI'Xh&(dGfK5䷐^S3a:t6y_{e\i-tgY'ig(Wc񪋣^;uD; 4[Kq:[;gֺjt$zҠ((((OT€%(G_uAt{d+7VխSqpy: DbͤxP\yGn„#SksrrO @+߆Ư ; ?w-uam+q\U] =Y5ݽ qjngՊ# (~륬٢ (kڛ{XuS+g=Ouhhi`$?o N#\|Ozk:gKKT+ ,c7wZDBy{ku/ I$ߕe=pk״VV6ٔSiEQYQ@O(~gT?pS@KES(AD$(~TQE ( (9-S^"3[EPyzۆ#T?Cޱ4J6[;Q2y,9+VRRԑb)si\ZG , AI.ieԭcўGMR-Z0 ,q֢uPjݜe xꚤzt |$8E=e9O?ʇ9%l>E*;dnF.98t=Z[(1|u4QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQET?[u=As@-P(( ?Ү%WjFQEQEcj^W uǭcd_ʊu/?yƻ*(?<GV<쨠7&y4d_ʊo<GN<쨠 m"n(((k-D_h(((((<zs2 <q*#Ǘkih?<G#ǗkӨ1{Xu. y9?oPEPEPEPEPEPEPEPEPEPEPQAjZK@EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@C%2Ȓȁ?OlPEPEPEPEPEPEPEPEPEPEPEPI OTQEQEQEQEQEQEQEQEQEQEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@D_j$ZKEP\wJ^V"pIT1mH YZa |5,<^,o/ؼ_?~_jvʨm?/Q˦h).*cRhG@Ptٚ|vesZtAER<W{^#J ?"k9ȴ,9?J,̠\K˭WJխMVڼ8 @'"WToR:$r3BpWJ1<qRQEHŠ(T?pTj)%)(AD$(~TQE ( (0|?gscd]&2AvVPgso*mIX9=iMp᱐:}knԴ]C ֠O(؃&>5Q@zF-sv&9b;{VPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?F:RB ( (+|JT>ϥ]QEQEQEQEQEQEQEQEQEQE¥lh(((((((((((((((((((T-E=Z( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ("OTU-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥l h((((((((((((?ֿRIOTQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETI O~ʀ%((h((((((()5E,Z((AD$('IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@U6?W>SUc{VH~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chdu#TftS?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@ 2y/١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55M!GSI??ʧ~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SP1Hcrt@ h>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@p1w4zw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw5 CԎ1W*ITfw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMES"0xCXR߇M-QLG(AI&GJZ Y'IQSvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{.'=?Y.Է1ҖtQEQE ?jЬաR0((7P>߿=co$?QaI 0ǿCL?Ql_pQyWPN=? 0ǿCL?cYڛeݰ"$T4Ig<tiCL?{XK ȶrGpzU}܋cP8 ϧZ 0ǿCL?fdj_ ;]?P~fwsaZU{[tQEQE*tSE`iL;#oQ85u}kd>rI4rFC6.|3V6Ab?. c>QU`On O,Lb?<PR{KxViANOwJ<n:g~EVκpdZkiײy6@Ads@QUHm (U/-y-$@\USZdh9w4 >9 J+Ai3;9Y Ĝ8(((((((((((* o+:R 袹Fk).2BQހ::+2Xӯ%- g3Yk(6__jb\R.bl~St]8F9lQU:2?%f[Wޠ$g@h.y.eɇ~SޠgK5)YID\U8:KEsZ6u}s炊vZ(mWSJC6SNLiػƀ5袸kZy6IVZ(ӬtrBzd\EZ<eF1ߟ테W-嬀u *+է7Vv2m1bN j[[=Z9/ @yE <Ld֬Xj[]۹e94ErVIumqxU6z­Yk}@ WA(ƽ=)*]b0Wz5 $ pЎ(B((((((((((((((((((((((((((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO 袙$$!UFI=V2kLp 8#vё.d_%sךEe:mD 2OyY(7RrI]5BRd GQ?nn Z29r~_ȰHno$ 3iޙu(s@ Z( ( ( ( ( ( ( ( tSz(b&\5qejo{ ~€:+ծ$' 2I-xZqq]I}5-JK+y%bFT}Hh7i5r˴چ}4s}dwaԣk[*cd@TQ\~]<h+ OvU;eg%2?Zv{1 Wzc@ڀ:+3ImB.\aCcE7X:uN.HTO[4ErSniPK"*0?cKedc4bl[iG)n `]@hfkCQeȊ8$ilu3H& F:\\\qhU8W[{;[vXwoQXWI=݁Zn?jͻMsO{!\BqEuW7j"Y$ۂyې?ɩ@\)_k)P@mVkky#gҝ9?G^alrz*yA@sW?ic&0@z5٠Gڀ($n{ HoEPEPEPEPPGOIT=Q@! )k.TI*Wu>t__Ώ:/\x7J*܏w!W=ի= P[=&mN}c2~ug&LaYXZ5oo 108{ ztRUt QZUc÷:,q m*@kh(C_;[V+Nz+uk]^\OU>ęIQM<V4DAMyU5+V1#F'|n *(ZFZU ˜f0( -:bK~Ϋ4QE1(AD$(~TQE ( ( ( ( ( ( (h]\T3KE%`:8IEE΂XX:r*Z(()1:ӃqREPEPEPEPEPEPEr%{]'Il}'9PsEr6fǸ?ʰu-->Av$2IM-3G":぀H<Ub/*F1d=ߎޟvTW 6&<7*V۵VzKˑ?(R߇ -:t)jQEQEC}ڴ+>?hT((C,?_ҹ<C,?_ҹnV>Rf==+yffT4ϧ]Aܴ(_u c"ʲJJs}(5S6 !g5\HRDQ.OV Z<"Y_ڟSkdp_OUC$^%ʸ| '6qZG5ޛ'Ķ啻~?sJ/AlA[' {Yn&DyDMWxڹzܸmӼ C0CXtx{[t{[tQEQE*tS;ֳtu(hA=GXiZm_q#es6p2GngQU-onlb$v"ә5#+_noةW }MV6֒>E vFj̺})㵱X;`N1縭tH#ع-UD/ZgsznU@$vNh'իg]Du5QݼtF[Mt9>7lߏ=8 #7"-UK}NK ɁǑ[7z;m綛ʞBAcUЮtl Q:O\։!Kը,x7 P.;sPG]\ |m >]S<1ioFs1^ӴoM,qʸ;9sւNq4W_Һ:Ӵwd/n(((((((((((-ԯzJ?΀'[U;r)F!9gB C (#Y8:H)2$ q/$?V߳A^:T7dm7B۝"np8ۏʠʹ 졜W'154cP}&7u{E,L-0*0G^o_[CCi\~|`ҴɞDcn454|YsԚ4Yn` NI`6NJt}-~P#OZm`[kxפjVk ُ{Ҵh?9-t_\^1|Oknv#3?M{s6F|9 x~ך?:8ޥsu}Zo߳?61ԓӚ\ϊv_խmg43O$"rsr];N`pz1zU䀉?ޟqMĎcfR&GNKJ6摗%ր(0ԵۏY<󮁬mZ-$4hbFeWn,.KUdH&U} oǾi0b\n#ׯ Vv}9Gֽ3Gym1x7c qQԧCЪiUycY2ʧN3OR麛p<3B̪;Nyo1n2imm;]Jg7_,JPC0?`N 7nG.L )&joifgLx4'ipO!S . *"6Q^lJ5[k[00?ϽX((((((((((((((((((((((((((IU=A??ʧ((((((((((((((((tSz$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ=[Dx_ '֨jVS)%q(PV\ġ%E T`'i֨>!y&P=eѮ]JΑ qSRKt/f0O WȐxHV0p8?TNճgIѿ>6aDzFĽO7?l,~}@DoБ?iFeG{ 6 o%Q?֠ƻuG(PO?€7,#?* ⥢(((((((?OPGO[@$Ny0ԵۏY<WN:ۉ<q;wg㨪#IRo GkX"F_0T)~L0;5zI7E4C9j:=Gu\y`g$t*Su"FLp#Zeu߂Nq4Z rNB6),zWZKc0==Ϥ\-iCKԨe'ךiŤY ~w<~Ҁ#Y}xFxAeM]5ewc qL@E9\\ژlȵ?)p?ַuF{U/~>lgLɏEԢE=ET`P!-"bm|WaRb+p8Sx'޺8'Gq1N1sEWm7n= ӪWlbEWZ5R$pUy2ْ1 q؟]tʪF@)-WY8X۷zWvYϧR#ٳҴT.>arܐ:/ӴmCPIptQ*p^͓gwjmKK|ҮS$pz 5fS/L|n]e;O5o^ڡIwZԹ71gp!G|cV6\I[;pze%1ɪͣjwk @?qmaf䏹 QyЉ&xrk~Fc/ooUyu"RΎ3Aܖ fBz׊䧿G[1*A`yc+x%vbṃ8qpy@nDobry4Axyzօ9neH_6<ueA^)[{@qu>z4t3 JdAZcgyl7Mpp :((((*IU=A??ʀ'(?vAt{l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆Rqrs*ރ߱5֥C~GC»-OAͿ\Ւ]@.m_|mjs?/]=fQEt]^\uaO#?ouֽyⷉ" k5j^#P9b{֐DZׯ<E:ZZ,doqi Xr?ƼWS𶦒Ȁ8U`zװZj.m={4#QYQEAsU\ox~ঀ(#(AD$(~TQE ( ( ( ( ( k2cIU Q]녏PRJkk72R?A]Cqw)ڋ31-Ű}V%!G\:<9;D>Qq?PArqny߸gqj.{8D(ZXIpO n<אF1ׯj}EY1uaw?΀6Q]:%H^ypQjp`Owq}>Ԥo -?OYWIb<@yր:xu7ROُ%Cn\zc֔jΛ{g?eZn Ƹ|[&CnG#4 E13 hޮBytє +k@tWAt|s Ԣ((((((敦X&K=u- m(5tc]nv|3n@}p mbى+G<CHrGNxZQgDF|&ݽgTϵKc, ùXǯ6VSLq򀤟֪7I|7\+=xM_-֖[k"y[UM pdeC)%1D`I<cZdk%cXфgsu8_F{L|C9QE?OP\oc- KT ((աY=BaEPEPiqwy n\z/F<'#P_Ǘk8Cy4dj?_ڊ5//yƻj(?<GF< =n(((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( J?Χ-ԯz( ( h- z=QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE*tSEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOIT=Q@A%2ȓH?OlPEPEPEPEPEPEPEPEPEPEPEPz?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A??ʧ#]'PQEAt°*MZ8GVȦ5 b[(.2:+6E |5,<`.=ԿaEW;::7g>1ȿ/2]3FIwW;‹揄?տtz|VEsZ ) _^ڐ҄l\u~HO8rak0,̀+c*)ks3Uҭu{Smr=ՇU>8 k JKݑO+۪')du$r3B į"b*yh( -:bK~Ϋ4QE1(AD$(~TQE ( ( ( ( ( (1@Ҟo<sH\*6<nIe䃞_W( 1$Iy]ҹbMʌFHTP 6PU[ݷ~"J'9N9+f̻4ҭqYF I`r ES4JIpI9-IgX+%ry'(((((((ݝ^M^ޣ%% (eWeEq?mmݜg麙w=?ʻj(uRx@=@N ln' A}WiEr=ˎ:`I/&/SM[ ( K~Χ.Է1ҖtQEQE ?jЬգR0((((((((((IU=A??ʧ(((((((((((((((((((R o+:((((((((((((((((((((((((((((((((((((((((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO 袊((((((((((((?OPGO((((((((((((((((((((#]'T*((((((((((.Է?pU-:E(AD$(IE7zѽ}i)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾K~Υ޾)>΀:RB ( (+ >OY"j#""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,QHb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw5QFц#Vj(?-D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴPe3# TD_M ""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""j53# U?ֿ@SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@(̎p1Ryw4'*Zȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋ(̎p1Vj$ZD_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴPibc,"*Y5EE(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE]Uڤ}*HŠ(( 7|tǵgo{F,_ҹ迷=֣j414ᤣ#rz~4kj?=֬;Sv컶RğjF[4<玀w c?Zgl0屴-˹ƠpANgj?=֬Cy5ARTPca&͘mEPEPI OTQH̨܀O@+.=sKQN7@jXZGX$nʮ0FW:Nł\ I@誖Z6)Ie88@V%k %3 g |vʞERl1rO)֗Z@z~-A I5Ho<qmXE4xnԐ]Ģ#? Z*bKS%mÒ F/UlG֘H![[]Ҕ3g{N[y}#PFy,`gq<{U+}cMC #?LҢj6V7ms*;MVCstEsvsj@e"O,q=sַ+hyj(<ԕzR[5yi< hm;dr@Ys@;zƝu/#?L@TU[Ku @zjw@94r(((RԵꖀ%o oR- 2(um>O*P_Ђ3rF˵6A Nz@V?$G[*j0O۫΄S:P%szVu{\,EPV3<:I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E6I$2HBhVBkT` vѕ.d_;sy@}cNȂP\@ ; u M$d*g#XPbds{@]%eX]$zL77r`lf=:mԢe@Af5((((((((?ֿRI +3Wm>ɧA'j;S~{gێZK{H@Yy~&Դ7s [k0TYZ%Jr LЮ&Ӗ[.囓 +ks$6ss+7nPpPME#0U,ǁɮZ}\=x"5qMuTW;k<*<cUrk1}kޱP3Vvz)p r2=*gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF ޺z(=_T( o>U|uLOC4͹rOր4(VMSY.a4!z5= -cp?Ƞ +YOՄm:͐kvQ{a"<b:+UY۵3=.]9ct ${{{PMEWH9[S8 fC/^I@4Vf<dS۝eYϪ>e7f1A'QX="kkk((((*$ZKQ'(Z( dEr0EQUq4Cb:+Ol?ӿ/i SWGPK=&]8u'V;.+Ig d%b]}3[Pc tz4RUϴl}EhW\-ā¥4QE!ZiҖ_.(uWSԟwZVkZs)8Q&iQO<V4DQMymV1#F'<P`ݏXi%iWk7.s隒aEPSj*Y5EE(AD$(~TQE ( ( ( ( ( (9x_R/&*v9l}?ϽZ;.Nc̣p+хoQXv5弁B۾9#$sNoӬRۀtעWvc&/^JD'4QU/o"{I+^(?Ҁ:+NեB?&r=:m2Oo@V&fZ(fSSֶxA[hQEQEQEQEQETιpXqx[qahҬc$u7| Tÿֻ]lLa%F7n;PoHŖa85Suȟue!gcM4d;vhZaӝvuA0ۿi||(t1x?) SYjk3G4Xc .OQJH[FX =kr/:ïQE`ki4AYGszW%_>~G!\{Zz( K~Χ.Է1ҖtQEQE]Uڤ}*HŠ(({_?/\tZJh[K-+3P>uKr#D~Q4G *)(wq9 |1O4Uq!ID7?QX1j6`e|jNm3}}?T Mx/*c&i^cg"l?zlڳsV(Smyoƀ6.meY7m\jrQN&m8aEo[t4QEQE¥k-s'w]=Q:<ObmN"q޺;8onkmBtW( @?p%h67ML ;ip33[1&H[S9`uTHK>\ ϨPҼ\V&1ʝݨ!x/-ܓ$t_ih[^/H8z*8F4{!$ F} g\fRNc*,CKm5\s9?g+dޠtZcr74XT=R+[''gO0F18PRIu87S4k$SeQG =*RBy G1"n ild囨鎤Y~ێgҀ142啷x[K=01@tHLOy 1V@0A$@=,(s(tF7[+،ܖjQ\ 8 M$w6&aX zLҤjm ? 7B؆ՈsC$Wf(m̻rFz榵%ȟ tcF;Ku-rqz|4X Ɍ8wm if~~4v?\f9kזK=*`nv0Z @P$Anյ.Yd`;Uyt5;:(B۟()s UPAdn.E [p8Oߩ#ٷ^sJ.>yowoIی>3l"p=2#5dS:Hs qYyvelIPlZM 1s ~UCag7|g?jl4W[am>dwn! H#~R.&*}S% $r(R֓]70n(Xu= .rgHUB3&{<A)p vy' {eCw zZ[rr'i8a),c}yPQ@Q@Q@Ej(?-K\ƣ SqL.pzdQ w+1\ 4O^8Q2T-M;]%֣pg1}۴R&( ay^sJɾ۪]eتhs4zvuEm EmJ[_1vGq)'q(F+ : ?fߟ81((((((((((((((((((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI 5-RfF ^zԭʹ[3iY+,99cR'⛕a=[E}x_@N:jg1NR_b1}8 ~$("BIZ1*p9L= .rgHUB⦼Ҥ_L`' =RD_8ǩ=굟f=.H|0{ބ6%Yc~sZ*'M&_MAH?ϭjxWOeG*̺2Kc ?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Zy?5S[q'n'1UPp5{lF#X/1Rx沊145vJ]QK)e8xtRϩ IU'rEތGTQm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4Χq!/39=8,M skJa_"Vçj2&l2rFI9銯ċz*: / inwn {稫_K6pԖpoyL͓5f9%+7QVL͸sIiƣqHqGeciFktRϩ64OAuzIob\g⢳6Ih@l~ ;F1Sz ^ѧ̖S5oڧo|Ȥ;Uciwl\ܛWOZ j-A0bNV֨4ˆ'~J?af9dfaI\^R>P$$34zTAeǷF*$ë!2t6^GD:ɞ8B@/9@̟2 Mq<;D6Udpyb[vW=qn Fm!4+V-~*>f8rId٤]:ʊCs^޼t-N+:}Z}2XcԟZ@Q@Q@Q@Q@D_j$ZKEP\wJ뫑U:կVn[iTucZ(@IyŇ'I݅ j FjFGEWm $_V 7*w7oAZRØj9яWa:򫔺"zkK{շxG@P[KYDQE 3u]*W6#ʰWz^<[DI=ǵf%F; uΖV2@XVoz<9ȴ,9?ל*^ԒI*zׯiZj.m)ӞAG}M*(4 ("STPR(~ঀ(#(AD$(~TQE ( ( ( ( ( iXh'?C@Z~n\4OVu#--7[Nr9z׾*4d6o%[瞿m/5$B "ztegy~o3>bm}?nVw6׷NVi7!9oC:K&wq8CH*nO),%-g<Gqcsw[4nG-Zwv\IԀp8=@^#g $b8 8 nQ߯$g9#6+~1֢rVOj oOh<]Zl[q}=ΧrGz~y%uL 1so-F2(Pwec?]EehZi[.]fh(((((扡T(b-4s`qk R!#O_qX]֫g |cwVXO#o ?f,党%Qҹ3dg9\.qsfqFB9_X)S r`Rr9`Kk, ʞF7[m>Xy v#=*[Tvl1OvSKHc`2sy14$)ƫvuĖ'$ Lc'OlC2Z/oF==ϽuQE?OP\oc- KT ((IUڑQ@Q@ڽו.qX:Ǘk8Cy4ej_ʊu/?yƻ*(ɿ_:Ǘk8/?yƻ*(H|ۻn9}+f((($ZKQ'*Z((((()i((((((((JrS˷@ Kxe&<t ( ( ( ( KRPZ((((((((((((((((((((((((((((((((((((((((k-D_h((((((((((((((((k-D_ h*-DD {f ( ( ( ( ( ( ( ( ( ( ("OT¥((((((((((((((((((((OT€%(G_uՋioYy8GVȪ[jĶQ$\duv-I?c/wZ^/ȿ/; eTu?\6U֨|[4mqpA)Xw4|# (_κZ>;2ۊO:Oq)+/uuZDBykkhbifP]Ag IT奉fZ֦{wS^Qzuu KݑO+ڪ7)du ʒ9JqB+ȥJp}8(aEPSj*Y5EE(AD$(~TQE ( ( ( ( ( ( ( QEQEQEQEb(((((((((((R߇ -:t)jQEQEW_>v/|JR0(((((((((($ZKQ'?REPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQAjZK{QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQED_j$['Z((((((((((((((((*$ZKQ'?@EQEQEQEQEQEQEQEQEQEQEQEQE¥lh((((((((((((((((((((k-Dd?KEPEPIE-%PEPEPEPEPEPEPSj*Y7QC4QE1(AD~OŠHA2>:Rc-M())[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@.Է]Ҡ "ltҖtQEQE]U^k sw5V?hTw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf i FGR8MhHIU=Ch>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١ja 'P[_CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@p1w4zw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw5 CԎ1W*ITfw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55M!GSI??ʧ~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SP1Hcrt@ h>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP9",d?pU-:E(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE ?jЬաR0((7P>߿=co$?QaI 0ǿCL?Ql_pQyWPN=? 0ǿCL?cYڛeݰ"$T4Ig<tiCL?{XK ȶrGpzU}܋cP8 ϧZ 0ǿCL?fdj_ ;]?P~fwsaZU{[tQEQE*tSE1cRB$eǮR!Ip2 z+զ=COHݕ^B@?wh^j6 @F@'hQT//?T]Ҡ$r@?P(^Y-lV[Y/12gۥ$זOو7xʞTo5++> R$RZ@z}A.HH y^xq~x@4Ve9bTfHm (Y.{Tl14 1 +5yÌk F 0Np#C]-u:O&PF~4[ Y) A Ѣh"Y9W|ޗbc@U[[kgǦ5BM{IC88 ٢I}kAqz5SsJD>z?\~xkQY#[gCq֮E\E@hMViC0A8((((* o+:R 被\[G\E?Ҁ,Y֚v҆a؂qIyXXs&<OҢ[^ڸuo<@6A)$ >l^BIeO PEEVvن]pz}zPvrlؕ<NfɸYLM8TաNM?nY6 t@6=~5.Q S(Zqik"q F`Xg='ڟkyo{lۓ$gt( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( tSz((((((((((((((((*IU=A??ʀ'd$HdU$Xɯ2H#Y$̌UۋKFD!|Ϸ^hosyL 3=g`HwA'v =J?e1G Fa1jg~OO€:+""a`,s[kzeԢfF~5h(((((((?OPGOӬtrBzd=Z합k3Tc hbV;{v4'Դyk%v'Ե),Fح䕊Q"Ou, ]7'@TW8:ITZڕ̲M?n@@ޣQMf IR\=0FA=P[Esv̟ٳtϵ;\z=jCf5wXŒc{P[Efi7Xˌ1ltȫ}c>v ZT֌N B3`֥4W"W9>EqwMAuwIehP0 @5Rk4xFm>sIIg3)$i\][\}m=k=lr;6;f/K:qk:hu{C5UѕR?Ƞo5+Y˖ENr_z;idV226Gq@UY)kJvssa/#2>2r{@5X^^68c#MoY7c!e# ױ"Z$cԨ&((((tSz( B@<R#)$]1US 4 |迾t__ιDnT1i4C4M}z SWGzzM.9$ e#i,L³dk"ߥbaq(g麥-pA>LJntY@U ЁeIQE%-yvZvWˊ?U$W{ֺ<} 7k3Rxi`$jWڬcJFO(tTP9KHaEP?[u^*?W h hb?(AD$(~TQE ( ( ( ( ( (9Z=l ht uuSW_]ig;Ʒ,k݃٤\2O>ݿ^#2Ḟ K,uEbkҮmu-G2,{qpZWW)@p9T)qo#QȬHl忁2>~uX$eݝH><CO<1poZoBzgu?hXC$GRt9- ß`Oζ֓{a?ʵn42xLKq/l\f[[fO<E@Q@Q@Q@Q@Q@Ik!8p>wWI~j%{~M+M3yرMw {pZ2r>P=G43bc|`zpX:o}S\$|f$'ޱ2+ F[! dQk99GAh7V^uSUp08状]LEH,'{3ZYNF%1Z%ZB#p<VmM7Jy nUޭjh:R +ӗ#_cGdUȒ"Rv$1W 2}`4QE?OP\oc- KT ((աY=BaEPEP7aIaCrg7E1Q[Ϧ[34VgR;)}:FBhURPs@tbɷi#=?ɮB"vo ~bmjuK[%ۇg%&,^U#0Mi98(ύDٮ~>%g,,Qx bq?l\q2#Ȳ"nڸ ƣn&M($q:zàkok((#]'T*9맪'I$ } Taڝ9"U+y5_YClt<:;mP1kwz^S9 Q&'ML ;i֭q8df`q~sZIykhr玕NM;.#P 'Ubc,}֢PKg$B2GOmIk{/JdzڣGԭd$4tRiJ'c*#Jm5\qr9ݜ1HDl@@Qnug,*=R+K7hCy%g0LF8{OͬO)QdxqjHS o(U ?wdRA{ɚHNYqONt+քYIzM8Ҁ"t=WL#T`r8qSԿmWJCwkql[e*9"K ր+[mZWvcURMkiR؃z ,䝞S(va?x=hFl>zԚOjB #d~ug]R!*xsZShplnWiHiLv,Bw,`>@zϕ'pU-<u F~Qk<r>zr(ϩ_O٪IoϘ6cNsoJ Q:\m :q3($g&㳙5 /vhvڧG8ޛa3 3۩ M?ȵC|. 7JK-> r畇>q[ }v0F1|Kr^6*H=ր2rO{?WKx46@'jhR:]52pr{ҿc->͌l&io4Qf<}IWD.6FH]o~lgdT7P),1@qjS\5۴n>o1>aQ"K;<r(׊ߠ((((R o+:a\"rIO?AWaY:/Z9<GqGz»Rݣqy :ՉﭵIR; x2]Guy#P@>Q>vr^iI( Z8ft[ yīe ݺ ;MkI$<c tY*gjttWU"U%Ϯ}24lc[n$db(* U4X6B2[VFyb{p;BjK=_`WnqEEiI\d@Ci3[1bF{i2xzq·̬rU=Et{Gu.Q;n3MYE4lY4s[zKeV];wzvug6V3K}c!R n P6uB v=O)ACLn-\u'uq.Ȕ*`V|p_hr1<b((((((((((((((((((((((((((((((((IU=A??ʧ((((((((((((((((tSz$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ=[Dx_ '֨jVS)%q(PV\ġ%E T`'i֨>!y&P=eѮ]JΑ qSRKt/f0O WȐxHV0p8?TNճgIѿ>6aDzFĽO7?l,~}@DoБ?iFeG{ 6 o%Q?֠ƻuG(PO?€7,#?* ⥢(((((((?OPGO[@$Ny0ԵۏY<WN:ۉ<q;wg㨪#IRo GkX"F_0T)~L0;5zI7E4C9j:=Gu\y`g$t*Su"FLp#Zeu߂Nq4C_;Umyk_HAd5As{MG>F&:snթ@[)H*A9 6T븚ݮhV nJrSnq4ѭΧq!/79=8,M skja_"Vá?Z wNA<dzbǢQ"ʪ0N̐i[i1 v6zrKbf"XwNF09jK8'Gq1N1sVWC, m, >ÚO-f?\Tyi% nx<du 68b]%W)ȍBq67zRУUc`?ZԺ6[osX;]Ҁ2|2t 3TZ7ͪj2/rnG.L )&kONӭ%;ROzVK6jz~ukmԟI\KnɓyvRN1yo^z4P@ Zζ"q^:^`Gi2pr>sͼ!o@r^?֡5ıɪ\3B}*ڒ 9e@ܤSE`h&}O׻x%vblANI[c1|a24REvBKSAO:imi,wnjAV5;Ck8Olt*EN@> ( ( ( ( ?OPGO 袊+]q3|?*[ յkm\jBJO7ذ i"Q۰=H8OTծxUz 5ᔂ?}\`(ܨG@9 7wMum߻QSusoW)tD(dv Wt<Z\DŽ? OYDQE 2]*W6#XuS+g-Oujxi`${ZWkhƭX; ֵN#lc7wZDBy{6U- X5:VkڋcF^} 9h빩EVEQ@\ox~?[u^)%)(AD$(~TQE ( ( ( ( ( Vt1hrʹv͸<He!m Z#ӜnL[Lf9%I:U=6?{KԵƲm8j_XY[ie( ],V4 ;䜞}~-՝^ML#4k_e 8iPjzVLgYR(@tz]8"'B UdE+pʻkjtHAerBT5WnO$-x~$*L_&IXϹ}=U$^@#Wnc:Ȭ撏- P !kF ą&ZaŧBPoQEQEQEQEQE̓_:crYtM{m>eH\^nP:1/!-nG."4:bM{8ک7kXr!?_N*"r~O[fsgnO_ eioB*8nLյYtoH\81UDŽ]TP=CxE)T/ui-%ƌ$;ݑr5"cBϰxP;yqL}I5ZYX E}ɠ tQE?OP\oc- KT ((աY=BaEPEPiqwy n\z/F<'#P_Ǘk8Cy4dj?_ڊ5//yƻj(?<GF< =n(((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( J?Χ-ԯz( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( tSz((((((((((((((((*IU=A??ʀ'($Yi3I횞(((((((((((?OPGO((((((((((((((((((((#]'T*(>VIY}'ԞfKo@eG^EfxHwof^EǷZ>1ȿ/;ygTu?\&U?֦Kxh).*cQa󮞲}?/OȶkRQE!KVRP0"kxoÑi \r?tE\lr3%S%-nfjUjmGWabIbp)?{uD#rF}(R8!wx]@%O8>-TQEAsU\ox~ঀ(#(AD$('IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@C Ώ>Z5# ( ( ( ( ( ( ( ( ( ( tSz(((((((((((((((((((* o+:R 袊(((((((((((((((((((((((((((((((((((((((?OPGO((((((((((((((((#]'T*(((((((((((((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO 袊(((((((((K~ΫXR߇M-QLG(AMJ݊u57Z\<EѢG(4Vw(EFEHhYHX +;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFEHhYHX +;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFEHhYHX +;y"Uvy}WE=c -SQEQEX(izϑSU>ϥ]SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-YbG'SB¥<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋ61QAh"h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,QHb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SQQHbI <<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<Fdu#ȋ?ֿR^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MFFdu#Q'("h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+Kk`9R(~ঀ(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPuWj# ( (3ó߿=՟LJh?Zc`#>ӆʸʂp9c?Z,M۲K}ceEo$l:ހ4=֣jɞXnEÖ;Ү.\}:c?Z5/qISq@۷6czڴk?C@Q@Q@'*Z?ֿRE#2rI=.YDI8NA#EajM`*^W5; s V<'_Z__)kWPGj&jXZƬK%̗2gڒk/#;2c*z~PJQڤ OA?Z__)kY:E <XWy9pq + yFenDn Xn$([sDp(].{TlI!dGlRW?ͤ9 8)j Bڋ0OF98\um>O*P_Ђ3tdAh2<K4G*pTQEQEQEQEQEQEQEQETPZRQXZغM!$( +]KH\}kd`]MW3j:Zx`;INq=jm65 t.p1AEV\N=Oj硇\c0,n4Vf|څ *PڤPZcθmOoP^_HE{& 㯧}m;3s+ԤȎ 2I=W7]0OtW/ 꺻4bzn?v3YPCErۚ#nɎ0MݴyۼvshRo>_p% >خ >~<TS-<j 5(+r! ?u4QY;c_SEbh]immdW+jC["C& ?=]<D@QK$J[n5BV݃l":*vGϵ8A'Oa=Kgg/ d?IEsWj߸L۾1\} "8?TZ3 ŏUVڝE. $AF_Ҁ:+mpc Q擰ۿ\ya-2DTc{b:*(&[t(aREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPI OTQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETI OPQMD $u$5xE]eK^zP+6XӮ =g*kBC]HwA'4rg#77-Xl9?/PWIYVI ܘ2Y_4Λu(FF~ J( ( ( ( ( ( ( ("OT¥Oieڹ="-rߵ@*6?ꨮnV;k^v2I-"xMhVČ'tVVId6\*>S4+ዹfhb\"@pCMMۦTGQHK1rk}_Wy0Hvz@]%sٓ:{c늬ex`a1}ƀ:*rזQ\u{55gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF ޺z(=_T( o>U|uzLOC4͹d +ڄouG6no98]vmz׭sZ;_G+H?P]IXͿkg5mV=Y׏.Deu*_J[@G+isk?VG$vِ|ג}M-ƛ6m'+*3W?fBZ(60^@/&x8^((((OT€%(IW) $]5yU[SJ::(bd~ iy;/f:tAU OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq΍,Hʡz;*^AERQ^ek֝)eUu=I<Wuj<} SfmO;E$זQcP"4l" 6 JVvr8>*FQEE?STPM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPuWj# ( (9Xsk+l>ln.6cޢLfh Υ@ wSLu-HG_<2,$8Ҁ*\?oFz]Uą$E dE`Ũۣq%]>:ꖶJ!(K1P7M5XG͌`sgqyQ=\|KjYY[4MعdGdDݵp=ˍFM;Q>Ht>@-?ֺmEPEPI OTxtD?LҪ^C=:zD>Vzlῷki#vѵ Z^c1hI=63/ڛ 8ҵn4ĚkI#o-mO q׎RM";.#9pT7>4CJsX *tvL[trN<~5mImz."P5PX]섒@* 4rRqJnH;yj8ާر -s;8[IX{[;zuhks]8aPHlbԞx >hCwI%f0LFQOͬO)yF ~THRvabt*cgvMIV%k!9fIֳzЋ'&ќ?@EEF  G6!K}UmmLg#뚭>r.仰0(Y5EKm'Ӏ *I}Z5ulAy >lXi$D뵃yst58#6כ`$נ I$ {0Db@nH՝smF822B>֌$/.w<qIum97c;6p"iv?fIJ8HyGJE󤺝Ϝ 3qWjrj;6mN>Q:KEQEQEQEQEQEQEQEQETPZRi^WzZUyx\y-\.q'9^ uRc9HWt~Մfڃ0ZI/<n}z "g#+?Tf%yw'q(`=S]9 6вqvӮ19hFFDFyH I=0=k{`4men?W9Ks1w'hmF(UQTcgE^>k~qw'ګ kWc#6D`Pi%wn9P?jӬȶp %W=cej6s2\4~Qc??N -)n@/_P{8BJ!W}k^K L0SiaK q(njPy237mklhyq+`hז9.9(T0JaGfyfoC)ʞӭq#Ac6%kkKJ?:Uӿpvc|@ p[L~| ~tpvY_w[]ݙ-Џ. @O.hdx 3]E`;ۨJk5n>P Fzq]gGzf:c>ޔ\M^ɨ_G)E{m&xgc]W;A㞸*rkn8qZxWs{ғL͵619:dӴIh%14slC+p g'-(_J5+/ F߳q8CSdE)uЏ@ }XOH2J>E"{6 F$U@jEǔvs>e5$:_0de uwi5KeÌW:UOyzȷg+5Pv EZܙKr~dgigIs4?UѯmMsCcƌ<vo_iٖr~Jc?o5ymioxVJҀ9R4R ƻ]et cSKm<i>Xzk/UKk%8 tpvךФPB Z((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI 5-RfF ^zԭʹ[3iY+,99cR'⛕a=[E}x_@N:jg1NR_b1}8 ~$("BIZ1*p9L= .rgHUB⦼Ҥ_L`' =RD_8ǩ=굟f=.H|0{ބ6%Yc~sZ*'M&_MAH?ϭjxWOeG*̺2Kc ?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Zy?5S[q'n'1UPp5{lF#X/1Rx沊145vJ]QK)e8xtRϩ IU'rEތGTQm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4WLQf8$g-V}6{hYSn|8n-=9K+ܷP1yǦz\ieYs1+^Kbf"8n+;t1_|li/_YҌ "g6mJMKMMF5rFw#o>k(J0?]%`C\w:ǟ}MoSAͿAL NS^6[os8EZ`c?`xzhI'3bC!5>,-֟+z?JF,uي'9BkKNӣӢ(]&(j[(v;k[khQزqzO[;9In~}Tg8ր!VoVH:Vp5mHmXGS_5 a'9+zTZ_f[h&tT ќ=C>?iVs\Mш[,8~Vn!EgosfD#Y4ñ`PA=zg>f͌g$5壸nPfDy]̉ j;Ncӑc$֍QEQEQEQE¥k-Q@r>2|?+G_Tw#VAYmZEQՍh%'_ m'S‚[;v%6qu]xUz]4F5}X`(ܨG@9UckKcoݨF?] ʮRQɭ.[Vt#?֬W5Co]-fQEt]^܎G*êQ^K? k{DEmO;D$׵CxֈLjqb{֐DYׯ<C:ZZXcY""ܰwS^px_RI$@)^jڵ>̧CNz-4(MQCK?Z((AM3lNIQ? LbOҏ"OU)[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~{ʂK~΀E KT ((IUڑQ@Q@ڽו.qX:Ǘk8Cy4ej_ʊu/?yƻ*(ɿ_:Ǘk8/?yƻ*(H|ۻn9}+f((($ZKQ'*Z((((()i((((((((((((((RԵꖀ%((((((((((((((((i( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ("OT¥((((((((((((((((OT€%(dYY3I횚(((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI (>V.eDX:"n'cDqבڳl &p&kXxXj_x"+Qq\W7/_ZMlѴR]Ua:k3G4n(9>=Ƃ(xTF#d@~DxsÑi Xr?YAu#5%S'[kZ{OyDq(.NvE?j(u3'*Hg҅+ į"b*y⤢Q@O(~gT?pS@KES(AD$(~TQE (.Ŵ[ݟEsڝ3Dʬ3 23Z˾6I3ȿu|Χ8(!QN)0%#~57dǮ@@[OS ]ȹ1@W;5iU0{[/< P A#A`=+Ӛy]pG1Iz"e1 VT?(? _¶#fh՝v1p}3@S!9.}ƨ(Qr;uȩmBjyjz@h\-HmpA9] QEQEQEQEQEQEWjtxLQHc˱"m}vΪ.5a>PƫQk/׬ 6|B=Gp? +y{,J (3]-&(+NJ7yXn֚Wv=(0(.ԷzK~΀#)iJZQ@Q@>ϥ]K?ҮԌ((((((((((?ֿRIOTQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETPZR-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRIOPQEQEQEQEQEQEQEQEQEQEQEQEQED_j$['Z((((((((((((((((((((*$ZKQ'?@EQERQ@ IEQEQEQEQEQEQEꚢ M{PM-QLG(AD$(~TQE oOU%e$2L)A@x@}B5hŢxaGr =Pp19=B)t{E (tĈq%Tn_V5ɎbͥBx'lǬ7oJV}>nڏ4֬+H}>Y:o=)\ 'Tn.Ҵ &NKMnxQ.rz:?hHǐoz֤͟kᴸ^TYhuR@mngCֺ:ݪMw$m#Uy]FXZ *'sDW` Z`Z~F<?& t0_`kUIv1֡{BVUՔWOQnkGYWSYaD_wlW3e=⭴J]#w0?t秷M@Q@Q@Q@Q@Q@Q@J4.*'O_-wYio!?D#ȕS\~n|s)Ӷ5gKKI~ _k*x~PȄ}vzv:i I_[~q[o sH}YnF}Tטx-YHV$pOz>qᡪ>~:CKú跑)dn8 z6J)_sm<yp$w9uP\ZkeI-=53]ЬXR6;O@+kMCn2 QPXT?[u=As@-P(( Xdf=Bd?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMESHb2:*oCGOChw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SP of<ʂJ?΀w4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chdu#TftS?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fRp1PGO4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf i FGR8MhHIU=Ch>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh!G*_Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}) ie<S!\ox~ঀ(#(AD$(~TQE ((ޭFXKp=F;jC=6죵k@چgqyfUtnՠ,c{!2G4P5k&XDraGӊu?չEaRY_q4s=Zw4@"24P-Ɵ<(Ӕ#E<eq@7ӂcoQ@ѮEռiyOZӺ[& mv?hQ@v7|2"?Fsڡ]6C U9()wWMrJa0+IWj8~(((((((z 4%ɗqx\6OZg"Aꨓ(ڣtax@7QY?nc@J9U-[ΏKmrO*EI I |*8jFQExέ<S%ݲ ^؋F:z^cy|}6+m4}:gVI1=? ӫO/stNy|S yRHr9#oCj̻4٣4ear:5JNJET* -:R߇JZAҖAEPEP1=B{VHŠ(( CPϓ~1cY{G W7@'$?Q 0ǿDiq~ciIG \FA8h$?Q 0ǿՍgjnݗvXS(+y&g 0ǿCL?ce,7"aciWm[r.@>h$?Q 0ǿ՛/yƳ*JtCM19}iW7oPEPEPz?O@V15lRqGmQT5 ; ԁ7tMԬYrhw2yWp$}qҟ.M+r8 EaiatX$<n,rxb:֊_=/0*?\P+.Yn0.z Uk(ۧ{*c|JH C.B]d{b5hљ-\8}AkZe P8PU-ǔwF? NA wۻ mM;EMgAw2bnc#?EUO2?uu{b,g%L8RFzc#ꨬNłJ `e tR2'ns@%֘$[jszqm>B\Ip(Jս^uOQY_D_3g1@4U[[HDCja|]^EPEPEPEPEPP[_OEB"$ų>~ ۛ䜉no7Ӭ%cfGNOa}h 5ҵ dz`~?zhWZWHmdqvQUg4 >Ɠn>Tcsvu{F#ȍ=G&:X:ssjq. }kJhwP5 ,<6+0$h> Iw#z(((((((((((((((((((((((((((((((((IU=A??ʧwyme)8 gCu€6W@I?VW,94~̻<@~>OdVrOi&qТ,wW7w9<1kE/(mr`=g*~mӄS=rhBS%meG$rZ!.LFFr=@UKK[̖b>Un52Sè}p(Vזm;#Ccs?٠;݀OhBxb`Xb:eZB<t_G"՞Idchp3 F{TͪC.geeWal{5Y^=X̃w# t o>;ۇv隔 Nк&Ǒnϛg8J"EŦy*9sӶ>v ṈMFG5s>M6 gHKq]5QEQEQEQE*t@E2I$2HB{Pd$p F*"\Jۯ4r˷t۹&@Ad PPn Fje#X0rds3{@mavi0If9ӭ2Q 3#?L@QEQEQEQEQEQEQEQEA??ʧ#]'TQYZiM: !W=2k-vߵ@*1uW1y\Ioi =O;}_dZ< [kJUEdjZ#lVJr Ln'Ӗk.囓 +kw$*-mJY&ͷLmnoQj(Rp$)jƮ ob#](}joA;z=g]K/&y2qǷ@}GN7Q]0uס~d G`OҀ5Fu2v%F*1&;I|T##<WWݛ]tQXƩ5<PA#6|j$l3ۙOր4J]WYi.> s_V5rtݶ9C@TUk[{̶AG\Ƨ[ٱXUGqLOO€; + WH,lH\n?z<$S]\} cpW=@]Vk{y#gҝ9?a\riR OtQ\ͥ4D"nGzFU|˨.>bBN=@m_\\0gmGCVQEQEQEQE*t@ER▹I"鈈DpipgSEu'tMzoZZ? OUmv'V3.IgVrd%^^/\Pc G=M,X>hۇBQ\o<;s<^*O}(1)k˵Zӵb\Qꮧ''VEͱSi\ImO;D$ו^RcP"4l"xFݏ[h]@ܹjZC ( R߇V.Է?pS@KES(AD$(#g&2֍֐ѹnono)>fF@ѹnono)>fF@ѹnono)>fF@ѹnono)>fF@ѹnono)>fF@ѹnonoK~Υj &O@ )iJZQ@Q@C Ϗ>Z# ( (9nOn:=.ُOz}2ٙ2:M3PD-"4JCDȲpJsMH@9MuWKl-n-W=vTZ(<9,@4׉b61kI͜V1F|n_ s-9g9enߏ\ҋ6[Ghb[Ev^^.5q4niF#t]%s~]%QEQEA??ʧ#]'T@48؃q{+Q^hKh"L]gV_S`YL@6OבTHAzUQc?WO8 aU`@_"A 9 ZP#vI[}e1pX!ҤLgTG D./&yX1=@8j`5 c0*:WGK. 33Vlm&[E\z]lm@GZՋHt[xI$gBtO3OK),(+: N-F b*DEKE"2 :+DחNS PCK7S%ݴ 0z@Ũ˩ݵ|1!,3ҥ`MSP3, i3ou#@_±ll/泸0H0IҀ&o-f31} ޥ0,!%Anq>iPi'4}S]tZuي$*} eGŶw62FFAWG@ 3cXdQ.zdtns/-!$s­Ic!Ӗ)l$QЎ Zow(ҳ8)na`R_mZ+[88t^-wk~q[lI#'Zq]x]a@Q@ Ģ;brП*nozWwczDC`^*.$$l60; t:Dqw$W<d`4 đw:Dkk:!pT0>XizNewRc$}𵥹k@ FHCGCUiٖ-cMPGI JrT0Ϩg\o9?(umF;:~a`m/,{`#=VMe{zR>/q6`݃?zomgʟ'%"v?*]jVT6ln'?=j"-C q{lZMܷQ]jwwrtQEQEQEQEQEOP[_QEs^y]7G5mE}2Vg>53۩׺L  qޙ 7-[NY.%3O/ZYo<;JS 8'ڀ2M5=;F(<8qۨwP ncf :~bh-a{{tI SvQ-ޛ6cs@[ȲH7YqX_w긎8z5wQ\LKwsOQQ,qge@`jӢO'g3j x'a;I瞸Y_ws533`ߏ@t2[yO2AGE+"o2\?z((((((((((((((((((((((((((((((((?OPGO "i.q㻑rVZњ0ќDqVέl3"Ă8~4%ψpªDr@G=,"cvCqKgIѿ>6a@<82\^LLbzq"jA`,Tt &u ė]ϐ%9d*gf+k2M8;#=i3)Q9''2Dgȏ #n_rcH8jfSY9P0Wu?@Z  1UĈ1ڋ]A De=O<u<Vѯ.uE@snKiL`2"1QSkU*b$BYIgK 3fYH 7_gZ3F0 bO_gp`&a0 LZg*:c9KaYBK;:}+hOq!i 5.IT1\ʎ m)"T0ldGgY'tX$ӣsyi'#~m-s8O\}Y[^ZܐYeeLtvj<Y#CǽSGV`Frs8DuPBH[lyׯĂ1$'V˩ZGg6&y Z:wp"@pĖP,2fe6W5SR"vfҰk%LNO`}63\_ wp Pڶ2qP[8tu6hDʙ<uQEQEQEQETz?OX䖱0 'ln&mwbބ{P1aY),9ǥXK*)Vsh |T Jc>e4Ŀ<#ۊXb+$ȡJ:7/8ªq9L5˩\#Pr}N*{*In qJY ֿ҆l"78Q(Hؗ텏Ͽ=}="_Mz:g?ӼlaV#C!Y-0Agw2!.; P%$gA?\TQ@Q@Q@Q@Q@Q@Q@Q@GOIU=V h䀉?ҹqk6矼uS[q'n'n<uDi:jM|TZ(uQ2?5Q/i~]&(yY>WG{+< ۟DXJηd]ɜn~uKLδ[]I1&(k2Gjpo-~XX,3F(<noӾѨ||Rssڵ(ks4WH'857ʝ" :w[mт)NJm>*wPZjWs، yzg֮keo47,>_ ոkXI,7r޿P<cc=Z-/ t$ӭјxdħXUMxW-bKh~ nm%H;PGz4ۂ_yD_;qGc?ڬ۷zJ}RAo{z^P k451@P;CSի;W3m^z֝g M(zֵ.M)\F)6bv,c8y )B yUj|?=[%˓Jrɷ8Ӵ! bNcԓހ3gzt[ 29<wEmkmm";\n=^]:k(LS [;9Ig ~;uzPB_Yծ ^D@y?u)a;8? s%]wy(P^(^Kh&tdќ=A2T K8:v5nk)%3Ym{-&wP~p'QԜI; >oHu]=^0EsnJoyiNz P3Ǯ4kVtۯ*) %J4[ñ/of ۀb:'U :-:A,Iz{((((*IU=A??ʀ'(?vAt{l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆Rqrs*ރ߱5֥C~GC»-OAͿ\Ւ]@.m_|mjs?/]=fQEt]^\uaO#?ouֽyⷉ" k5j^#P9b{֐DZׯ<E:ZZ,doqi Xr?ƼWS𶦒Ȁ8U`zװZj.m={4#QYQEAsU\ox~ঀ(#(AD~OŠ Y'IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@C Ϗ>Z# ( (0K+]wg:ֱ5/mEq?Ǘh<]dj_#Q_vP/yƏCy5Q@OF<?5/mEaowm ϥnQEQEQEA??ʧ#]'TQEQEQEQEQET[A;āLs(((((((((((((* o+:R 袊(((((((((((((((((((((((((((((((((((((((?OPGO((((("w#5=QEQEQEQEQEQEQEQEQEQETz?OEPPIm $ g5=QEQEQEQEQEQEQEQEQEQEQE*tSEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOIT=Q@q3|?+={JV<NՃ=2)C$ˌͲao1b o/|c?~_jvΨM/LLtѴR]UùCo]=e^m'֥&(C<ŗ4$aDk߇""ܸwZ143 . g*J-,JZt]^\uaO%=_dS GYAdIP`qB+ȻJp}*Z(((K~ΫXR߇M-QLG(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE ?jЬաR0((((((((((IU=A?SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP[_OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPz?~ʧ((((((((((((((((tST=Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GOI* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGOPQEQEQEQEQEQEQEQEQEQEAsU\oxՊh hb?(AD$(~TQE ( ( (Zв/Shyi$Ls#I^*y5dq$W_ߋ;E @2 +>*hJ/l?j6Υ nd'979e2Luf8r-♊ &1I}2OEx}azq@<r2 !`z9I,pf13iP[ VN{3[4k.6?8@r2 "`z9%smxr;R3[:}tP6x>z* y-]f>]%ܻdg;ғ؋#yG};V%嶐Ue%G+{R*ps\~g$Po "jk5 Pq8Ҁ:TJk:&73q\P[ؑor*Np?Ecisq{}\kPcat 5\-byn, o==3cy k@}8bs'.`[ 8.yj0B13Cuss1 X}kku{dgUր;ʿxxuƳU Fz89*ޓm5HI<t4<̌{S 29첹.ZmN"Wb<v\ uw R6=}((((((.ԷzK~΀#)iJZQ@Q@4AM7ZAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJ`S(G(AD$(~TQE ( ( Wtvas~g5|]+y,{\Ğ68[[y 6F܌M^i- T?@ۺ,QU5]p12l8aMR,":=Ild@<;r/C#`~cUvcњ0W ڀ3m =<8eq8k6uöpҌ~A5hZ}͌\D~nJV6}P2:sڀ8suZ@~?m[PCY T3l,"0a9=N{֨' <n;V&S]`D@g= 5<`cuw'w\篽Mmm" uڋ @(hQ[d'<vjnۻ'ӥ-ͬ.P:Ҁ9:\Goa̒ʤu%rz׭K=O΂?$}3SzMzAP--׈ax<:o>C#q[VZmZIƢ/n@{["ؤw#=~mvK[K{(d~?M1'$@?swZ+\<śezu5?HⵊhbRE=@y#HG 0Cqiow `#7ݞ(Gh~xPM_nxd*g<kgnIx˙PmVހ2jҕ rryTo />h_3VetbK%Ē3@om]Qʪ1?*zҦҕ-;6&&g 7?+ZEӯ=YIj՝P =OR~( ( ( ( ( K~Χ.Է1ҖtQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE(AD$(~TQE ( ( ( ( ( ( ( ( +1.G{=؞b<4'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ T4#ǵ ة.ԷzK~΀#)iJZQ@Q@kGJtW$m1}k#u4%tZ1vlh+uȟӯDjh+u?0_'=;aNcG&4{ okEq_ӯ?kQ(J?plVE֩i/vsF}*crzfN͛V1ǿm{GOE`m{G1ǿ{)voQX?QLA}+oj?=֣K}fsz?ZcRoQX?QL]4V1ǿսS(i QEIQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE(AD$(~TQE (^[->[q6<X Ң֓w{G*g9pFs׊mxRŃ}yvVVګo:lW+bV}EwWX!m?7$d|ҴY.WV[DLI#u-~ B͟8:-uf-博\-u;+5-RPky$0w3N/mKov,䓌Z(=IMٸTJ9ITڞ*Kfcb{mERk8v^v ( ( ( )2)h(-Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R((|[a߿e>:<G}3HRbWreN*K}yl<~W I,}1ӚV-T=mH-995}9W OV+3XҋKҗPiIs~zo /GtFd_NڭhjώSA$g+nc1"0G xʅz)֗6pQimgeԌw͓*ʮz*ҶWq9\ tQnzQWW׵VFj'PI!LE4qOC5qv)]@K.ҢK{'xØ܌㓃Q>b^4!̭=9 ~U)kiI%{}܎(AgќF73d! ?7~?NzT0nƲ`cua+{3aYX&(mPt {y:Y-z<ipLVFkp}5^P$lΈt钢ō{aP9b~oh>}>m,զ@I{pGaHB96zcTjg*1fUwyYtzQ\ǠQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEyYXJ!$3 O;Vs7_3&MWM.ow8i[fg#݁dama_ݷ9W<<G'vsSctFihsJhu1>5v/{o^'8`8>c-Z 0@A@9<g+7LXinHNH}pjEjh65u$pJ횖VE9mw82k@}HB~Gۉ'w^qT?-5U1XuX>(\hNMYc |%=r3vnc>>Lzs] )L{g]Ҍ  qMZU%{jk X$FW`~TW_i9N} 퉫ʯ7 od2g>PGA|+H@ =*%k*o؈E,˂q> <I4gp}r/#"w^/A?Гn̽EVF(AD$(~TQE Go+r<kjI@8oĚηy nT’z~wãjKCN7>&ڥB#{qYFE,km+؝N~&PD/NýEMW5-)/,NO7~Oֶ<?_훏g\=Wލ5$Ԯncܑ:(8056u]^adJ}޹C4eaP30s\ _3]ֿ Q/*m$?8YzC"(]+V!1ְʛ2rOrsT<T-<8.<(qӚ${ji?AZz1Z^_(Ot@6urhL:d }3jtlS2dRCc1?\VEⰿv@鱦>}}": H[[7ج=}2K+4矩zϊT$xݜ|tȭ 7?dhU+-ĀGROUnn-ՠb+*=Vn"0ywJkKKV8?0Q\\إ4̖BJAZz|M< GՏ\62^J&ҢOh#6 + S2ck/vE'^/x#o2I]Iu&/~躱o -24, <rI*o33;GtkI%вr wguK¨'̙uw;V.2dՇ(&%e# ZȖwFQ.GpFvǽYP[.Be"/RqYɫ[.l"DgjE o$ikgr89o%د 6A`A<A46l;pcӎx-Mk,>P$\c>R)믤ʀ,0E6-XvSx~g  =ɬ{8L.$%¡G jj"H3Dpyz{ӮsK?l.(YUO]QEQEQEQEQE?OP\oc- KT ((o߃]tٻw c8R=+wXzg<i- 'KfFI WQkQYgذa?OWwXO񣖟q^bq:اcBI1?Jۗ^wvN`U!C ϰg9<???<JPljUj6?l?Om;yƏGu'֑#3g-ы^^_<? ;XE?BMؾ H*qT̾(%QƭΥ̛!N׊7Ŭ՗%ql'eG{<Q4!U[ؖPD1Pr=ͽ]07? }<Q4f?0}B26($RCץVRXn̾?/?ƅXnuo{ǩk,`У~᳐c;2yh̾Cb?{{VAo%QWmÞ?­jDxȣȪٗGeGJUWBXu\Yq*;PUNM'eG{<Q4҂w%rP/񮶲$cQ\pQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEW'ζ̡,G$z23296m$,c#<T_6% L }+>{(:mad;T ot-w7fc*.maas%w/9nlz鲍szҢ'(#}3P1QH/Z"L9$&W<7Bj*'#xCLr}}0h舎&dȗ_p=Qt8}?AY7`(+u=DI;w ((AD$(~TQE iPxg<ӨQE&(ҖLQ8R@Ob2)UB0 uE8K/BG#J)W#"E3bl6#H(((##n=+6繖Bg}z}sZPb")%@uR斊j€:(Wv ґ -UAjuPMeV`Q@ :REQEQEQEQEQE?OP\oc- KT (($XKD} J*VUQEEZVEjZEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEjCZ((AD$(~TQE ( ( ( ( *嵚 n"OL$hdp?:}OGO{-b3\8DOEA-f2(GRNeOP)e9K]Eas6?n<wM,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*$4nFp9jz(R߇ -:t)jQEQEUV~jaEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPHN9m=2fC?2&);+iG'ou¸ ▹}8#ҿ:G= ۰̎IO[+n2;+{o_o=H?Qou¸:(>#ҿ:G= ۰̎IO[+n2=T. C7  Pᔂ z[S6j9C%1>gm$&$պܫo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo++r :@4k>̨ 1_ $4܂I#8tWQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WS㸆S'')ƀ-\CRO@ o(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo)Eݻ4Eu*܃@*pAhK[nƛ8 41 H(~mo*WQo*WQo*WQo*WQo*WQo*WQo*r(g5%Tp2o 9tv`t϶?IfILI'tWQo*WQo*WQo*WQo*X]۱~LdWR5 -nEPT!~ঀ(#(AD$(~TQE ( ( ( (8 LȤplr*qﶾu!spNKm fQ}uV+SҭKyþz9GJ6ϧ@y<$׹kԧyu(tpw}X)5>I?c[|Id?5ZAIgx`Yz3`v鶚tFC;u"Ba<V<QcLq Bh:j͵E|h8v[عNzUn"Λ;sdժ^\;nZTq%&GS u b7z5Nm q $ϱ=VK,k Qesߕh g%OCҳ5<>lq nك#ֺ%h$kۃtk{{x^X7s02H SR-%ɇ!r1CWmԡRU^2.ކ"Nh^Yq Ǔұ6gPI(u5/dx,pfSKPԵ%7,|省ڛh|]Q/pO뚧3b<_J?3TŎj_ AN_\EpA9||-i}l_j5]NK7Dn,ia1' lG,nBMol0LzV\oQU%3Z3utV?X((((((R߇ -:t)jQEQEUV~jaEP5Kۛ("kW(Y8ǥs4PGǴYZgWN[S }SJoĢ]3j~uiׇdI'Qӵki"]BmD%7s=}i ٴ P084Quq o+ D+v&'w˜<g}?].=:`^[7iQEs^"QX$!]I82:PKEy-彘'Uk_j/}qu 1+gfk5 =FާSoXԴWIО8T4\dh ?{1wZOu{yg'=6o,Bgr+CDܠYOqZ-ex]NCn#_7_>v?{ʛ۫7R*W| "uc'ҐyOx%T*).uD$ >+;KвKa ?kF ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( 7BXfB " 8*( ( *ͽbOۛvW+r[8 zִ.t(ƪ4W4&Z[Nʸ bFG#%XxdLb ihX[4cv=OY-QpGStSn=ٽz61p׫Wtva?V{'taEV1k_^HAH=rJv΢jX5}:e Q`4K77:4KoUbAHgQ\D+oq*ݎFI Uypj7/$vm!v䜌c@e&k2]\QEDxon(ˆ:_~X H[݁=@<\߆漶ygk݂0tUXUV/>`*Ue?_ʭPEBQC+|2qP+2c!-Q$1ږj5KOΝs$$VwwK:7dF眊C:+zT%k۟'28Oӵ+Qy,l$-RWsJ+R\Bzy fFsӌbKvw; do\.7uP<44W1xV_ԟQI0\In (sT@]}Ɨh.R."q_ܫԼ89qX{bmbHK|gh=դ/:ڇimő@ErikK6.PUoV{?UdZ_쟏 TQEUK,a3N3$U}f)g[yݤj7 }4QU/.%ia"c''ӭ[@DY)d$Y<͸<Ixk35[a:}qzP\7<i Jc#|2;NK>[\4$ۖuDKTUY#pp<2\h\_9ydz(~( _쟏_d/@( VYcWyo3/1M+_Efi761Md v9:C +4e exg=+oh%afavK~uɠF~z}l[M{<gҳ|EZjv֩|,a6fs ^F/Ou{IB;5k3]_"2:wJ(*0Z/V{'UdZB@5+cc0!F;ݎ4'M]ZH=UFn?Vg =-n%$:((_쟏UV=tj(C_M-QLG(AD$(~TQE ( ( ( (8ƶSXBT_=E0Q|;58!W1 ~5jw.ƈA`8z*(w^К#eiBq]kOﱶ"pWU6>mwO͌u9W)F|޾ ZtU o-VMDEpTfEAg)iw4F׆ݷـ:A5o ksudZꨠ.[hv`mo9޴. )?,(+|".Os}sqpQ\qK;ף ilZ1FAWhnRmt@'otP=iM1pqHZSl, s8b<U),c; &%!'"BDPKEQEQEQEQEQEQET?[u=As@-P((~jO­T(<]K )ĒhQسr ZzGy{ 9ۻ<}EOXgZ-I9:ɠ bЈúII0/ϥt]xe.{l5r_wٿ>+Χ>)C_Oʺ?^ݛ}W3mᇴ[.Q>Nއ7&մiq{\+eK(+'$gӊϷ_=石y_nz:zUcET .D2@Vq.g̠t=j?I8(Q'?+SHJO+ێGC=q 9 A⫨;e`\68Zn\ WCO @z(䏩@OF8k—0Gc9Z-ɴy[vm\DŽrf“¸ \Es ݱ=rN?ZH+"~(=70L..e@Ziګ|/?û9Ǹ G?:]:$}J]ҳeyoYIi?K"gAq#ወY_1 <sZ]?e0._v=sԺa-f唌}}ʎ€4/Gnl>]Gikcj%QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE&o+bЅLDpTQEyM\H#dh _6cv˂A85~y $;3EiV!d#ttϽquvp+dkFNOn+''5Y4Րy]ce g,m(b$d:ս/0 ڹ֭Ֆ49cZPCd{ v 0ɖCĜ5PM*'aSua{ nXrNRvwDVwGZis Uc ^1\ϊ&AI=\Q 3y1fG޾fюzt/_vdQErkA^Pp׫hu;0J_쟏UV=ujN9#IQV u s#}=+V.~Tc_|m[WM~_Й^YE,Z4 )o4fN]ź~ Gh7q+9~Xve{?!Wږdd2\nb"d#QZSՁpݰ FխP<ށbs4F++siqx$w0G)AZj[J<-mutI{8$O |3Ǫ3HFߜ1@PhNh5;xb!IJ(?inhrY%G5 K;q9jzh:]ңBp uUb?ʭUX_U>`*@`횋5 -Oiԣx^62buԼQVl9(aErrsYTos NYl ~sL tA9TtW*} >{hg:r0+pdbYڦ{6H)ixo@?ϴZtbxn0WxzS\Xp gqU5o glrLSxATXGȀh?Cs 4*k J/ uY ""FA"SنFq{fu}2r=2Bgc.O?L;[/Qq26Y`'vlɣj_]]/!v1MVPƪ"-pَ[{POccm.ndvb_i6fZK4 Iv~ˮje(V(#^ {bEjsdWgfw(_C H~(tq Hu5\C^l0ji.ebA0y=574T`˓<\95e 37O;E';Bjáj\U1*}yS]ErV >+uhe 4V=ujdz΀-U[/Oժe:EP9ʖe`q^r*gkenJd,hi-ڝDA*@'5oU1A(5B5Ķ<Ìc''Ze#%9A gv#<0BR3ltWV #7fe=]f2鍫 .B0#]&$p٬,# r2{'uImNYKH%0>AaI zS>Ϫ4Zđ۠?)|*/Kԭka,^xo"p~MQTX#ҲcTկ-mǙ0`apy(ZM>h&PHCZ`B/FrxR;y_ν2#O@?Zѿ'ՂDRe?HGCrEP[/O/|TYDz~?Ή TQEAqqq1ڈ2Ms]qkO-}Zij"YylAbkY#cUGGn"[;w+MáMMVy802#ryS8Rkk]GS=s>zV=z4W kBczp<zWkx&M,\>_ }'ڪ/w:phqy$&c,|KY}TDVH-B.]kø󴞫FRnC+(''-@&[iEkwڷ<)qjnnwI-9Fx|c8>]_&J21vs\"4H7 `ovtQEU>`*Ue?_ʭP[/Oժe:@7V۫˩]ök}.+di(*~O{ -%,WRFk[DmCggj֛љst4.Sx<5{2eKau=bO<Pq]G4 nثz;U=#fJN5ɟȝyU!q$k~<nW6k~ݛ=+b ֟ϝ8U}3Z(Dz~?έU[/O( ~C4QE1(AD$(~TQE ( ( ( ( ( ( ( ( +14}:8d"KsswU4}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=[NO;FO@AsS?[tKH:R(( Y'V$*HŠ((((((M"n~Ғp@k(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((+_TVdh* je& 8 )Z(((((((c^: +ez]T:nk/Oժf@GJH#uuQ@Ϡ9vGOdiӥQYݱ1+Zwb (Š(((3ZM" _T Gn wY^=̣*q @_R`i}r= ~v+j.a@T` }P0((((((UR @ꭗ{'T B#%$(Q@Q@Q@Q@Q@SpAe:%?_ʖ@6rhdn$P(JZ(0)h ( ( ( (*0ZC]Fn*Dz~?έUK2"?RA[ah'] =GSQ@:M8v>1xIzZ(Q@Q@UdNΨ*@Vq4f(C_M-QLG(AD$(~TQE ( ( [}.5y~fcAЗgkVV}Yx{\@ v8JSM9 WWPrdc^tW84|κfKU0P`:}wLB©iF2c#&L1準x@F@ltX.]p1ߝwk\Ҭ1K;)x6kn_&l {^@j̅+N\%#r~@Z렙.!I@QTK܁i4-VTl}(S$"C$*'>MIA'~db_ZZ2%́ }@(}gMȂ`\@5 ;@I? fYVW,95 W&G>S>Oz~Yi fc:[.0.x3EPEPEPEPEPEPEPEPEPP\o?F:RB ( (?IU? R0((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((#<R@/r1vd 3J?lSȻ7<?47r.cI?OǛkf9`cI?OǛkf9`cI?OǛkf9`cI?OǛkf9`cI?OǛkf9aGm?A[ԒOkB)a2[)}E1~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mՅU@FQ@ eWXd+o~Q@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~m>;xb;p:* -uz(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حrƬ@5\aiP_[s4}EU?S4}EU?S4}EU?S4}EU?S4}EU?S4}EU?S4}EGQ1IEw:Tϱ[s?V bƏ[s?V bƏ[s?V bƏ[s?V bƏ[s?V NBs՚((C_M-QLG(AD$(~TQE ( (hAK~X =:'zHqu&NPrx?@[TF._1IxuZH .A#Zi:tЭ»a}@=j˧]፹g~#ƫe ( یdphRB10 :*ݼѯ/\v< ?]MM[Qhbܠ$cio\kD6ֺk,7 GOK} [S]i b?~Pfhڥ$}G~&ѯ9ȮQQB V~ps|uPڀ,]oon]Dݑ9E,֘qU[}5}6I@*嵴p-j.p2O_XmrKX^dbUҶk7TӓS;BeoB=^M0,ۂXcҬjq%ΕܫsչKLw>Pb}je1Nb_b`[,1EiJXPFBqfjsaU8ަ]kԮLʨP>=$Bc8a?j|,iCS{UH?_?[6zT]j`(GlKsߞTOi/= 3{֟`ip^6]pGSha rU 3jk^tq(z3⠟*Z(((((((((R߇ -:t)jQEQE$* j}*$*H_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J~C4QE1(AD$(~TQE ( ( ( ( ( ( ( ( +15:Hd%EkqvU4>w67t}A%2ȓH?Ol2cpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@h&lX0x2*z* -:R߇JZAҖAEPEP? U`Y'VFQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEV<p䎸j0bh?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5jN;b=*U>`*@".SΛ- R,?VحVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVO՜CgnR[e]S[/O( ~C4QE1(AD$(~TQE ( ( ( ( +ռA Q4V2bt}+pzUH-^I-̖( EEqKd p@Nz۟qWZkGoHw4\'y%pRė.-)t`hW۬Dacu?AV((((((((((((((.ԷzK~΀#)iJZQ@Q@$*UdZQEQEQEQY7ޗ6a,q07iي騮hx]uG-t1ȒFr= 1ܒ{zv>#aPF+9-*)ޣO |Oj@utVW*Wp@XF)oAF!Yv>!n.6FcԖuU;Ŀ%dY@q=zj@Q@Q@Q@U =:CQk&/Yz7hѿESE<bX:7!Uyu y SEΠD\IdJYIG=Oη?pТktE@ʒ{nCoa4FdD%Fyf6hj;OJ~a5n9cwDǨ9%Q@Q@Q@Q@Q((KVc/?)y >5R;+m҆ xzRZ6}Jм%Τgr&4-T<5gYgfYo%foN(Qj6J3Vd:q OmC :4\z)aM'v?-iO6[8|_&{ye!8`)o&I"gβlutr OhEPEPEPEN{[km}\#'%z{+"]鼶a6qT/7iيKEfiƝ`eRç'Y`Pen^nvY]; BHϽK5lnn#t4U u ( T \ƛXIogf!ʹTc\ZV&+qXnGˀy_.-ZL29l*٢WVFsw#q֮EwgHUf%dx@4Vƨg[RWuvB[M>\@W'} |*ẍ~`s\7=W )K(8GCH$HdU$>.Yi|STxؚݕ}U~QU-/-:U((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((* U/|Tj(+"]{JCs/]ϏPi5T0Źcd(-ᶌCnz☈o/̴d:*r]8ǫFrgzmiI] 3%OQҋ OX]]7ʱ²\o[oU?Ңo綗}Iq2.InMbڛ"-<M/@mCj6vv]$m\8[R˂93|3o8Cҹ8~h33%*ωD^]jF+tux+r $<PcXu{HR9fH/(֎Bf[wn=y쵓&fB"A^n{k-$*- Xt'E 1 H23qړLIY U&LqV&imɭ%H$ ?br߆v*M;2Cobzƀ;|Amik3aHڤ)w[ƒyUQ.K;D[,vEQl/IM2EN苐yӰ F񎨰K'hd~\z[F{{-D)k1J׫vnڅ@7NI xqFw8YhѐVFFݓp8wQEU>`*Ue?_ʭP[/Oժe:@a:V$<en>kleqyDyFpzSBf>"eAZ';D*ȡ8#^uVCU¬Ho·<8(.^;ivGjmufq%su7@$T|saoq&7I9ǫ(&k&}Qiguv@H6c:vTjh7\Yf8SSj:e4y#1 ''t=jӵgDFڇq淧Kf BB'-4OG,{&]a;[F<Or9k3eTWVW(DFBߊ9-՝N9@#{Ne?:ԯn>զF8i^9~5xҤ12#.\y<7o ֓lOr1U#W#}cmoيFN\߻gz4.ѭE2gZTՊmە8{Vb"&;_* \1~3֖<:]Ԍ4.T$9OKu=4e?7[ଶOK3߇54^Eqn  ~vqH99%kD̥,Es8xh,{8.%4 Vꭥ G$F.jV=ujDz~?΀-QEU~B)%)(AD$(~TQE ( ( ( (<hT>T-Cq-jP1r 7ۭ;p)l+f;M3QӅ<By_If壵% nidaL|#K -82t6m/!;s\babL8gqni)3\X<a;zsiNu"08Lcf~6sw⪛aGw~ȣ8kMгK7gzu i3EOjuaKEIb$UU$$v ھy `z'3MYmْi`yX} |<:W4꺁 7y^7#I"}}*J `\@F}Sv9݌v[" D "Kۥԣ ьvqi_HrX'YR\ZJI%s~?TZjVWċY9냊uy<K 43<֫݅qj2? e<o^2vIO*<~dccz[}][LI4r2ǵcO6b {?b0E%w۶hkS,8?21՛BC]HwNs\T2"!Lh-#ZF|=j[5 HptJu-1 =x{kVd>1ZVAmL{ljc;( qiB=~` zqYZ:/i3D-go7 GII 2U.; ԁ7tж[ddXd/^pQBK?Xϧր6 1VzUִ˙ 2+UYSWB. 2<ޔq4Wd#ӷ?D4I@Q[WHd0} 8x $?t<@$r4k,D2#IX~9ܠ(R߇ -:t)jQEQEUV~jaEPEPEPz"^ y,dg9@}k;LZ5Џq?.ck KSvqgy*|2,Sܜw+[hgɏ!?m_u~$z'?|~NՀ[8/?^1d݊VcX;@m}7WoFR%'@y`;sxuyf6*ǀLwߊ& EΥ".YY#@AExd&Q61SߑVުwQ1(o<(ǩ5O z&rڧ0|BxU]Xw=.l`@}.xWQ@HQ\N:#0E\6k ySMI»^OwZQ2G;#ʜ >bL䵊In$Ȥ$}hoOL1 S)OJѮJJS;,]qں (((+ՆK}~<UT1rx<{M5Y&it)-ь',qG^@O[_Uz"ԫ:+"ۼ@>$f_*Iy.<ͣp8PMqf[5~g?ŦY`Qr{;t ٮu&#lJ lN75} ֻpz<L#(.~ǏҺM7UM`~c X\"< A #YGؠ"(#S]f-l$̘Tz(>jVEۭͬs=Oht?Mνe'mojUkg8P\u"`X ?#^kgN[YѶf# ( ( ( (8gYեT0 ?~?:cm<AӶ?ƪ  丞i`QMg - ֈk‡],q{=]y?{M6!3vN8?ʽ>Ck$[t;%܄?wnlje۩ean+״弅nA<eOQ#5`j[_Bm &y!tԔlnk;ț[Qš(LNUA gZhUwkAٸ=qEPnt\"鰎(6jKׂ(A,@mvKφ6GدpfmspSjIb~ yǽrj\htcHio\PcM8D K;}5&pECF?xqiol㶋Dp:cD]00{ 9) oW_E+\ GV$?I:~f9n~xx,^Vk\PX@%ӯ/VKKV2ZMV]0yeڸxjtٝlIo4v?A-c&yZGILgd`q@%n j<I\IH<QEQEQEWdti]j|QoWJiFҜw4K h"u:U-ŴRظ$^4ҵfIo^8Vcolw;dϥkϩK/stD)AݫfRH8W'$o1y3#WWyh/#e9Gj[GcW{474ReNǎ21-(9_5}U5/[Ɠ{[;hAyi#- Nܼd5#:ˈN22Uzg?Jam῰ ]N'bO`:lm$>Ojt԰PUJ$0z~V.-<سcŽ+RC=?:i l[b1AW=esikxYbtm8 ڭi.P y<w*,i K<r 8L\iie>0,r@m .WCfjcpUJ -lt{i~wǨR i_6$ H"Q=< vǽpۣPa$JNQ:nkjR)R`!v#5cMJEW$U{&R}SU/#ѵ{U@2,Y7 qQ3. 3]yhgv"cP:Mryx *ϽjD+tZuuaha|Wǿֽ^^iGk(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((/V P(9}nuVY$1@@x-^q BkwЃk]JC!k7]ɟH"-Nto+,I'Umlm,S˴c:j!7w1*?7"u+{Ac Rtͫ~ON;kh^?FLs־t[mZ+ffXrr:=p)8كá#.6KtIlo$ӏƺ]I\R<gmJ+j=C_~v͈L$-?'{U'hv9=%zI<{.?1;ZND9} l];dr9@<&xgUԯ4"3 G w~ʽ.(/|Uj0Z _쟏UV=uj+L:NQ$dZaеk_1l/*7o=I47 ^`xP r9֗Q(t-f#֩2FWQxHOR_sMc+NC$.8}+Z{KK[=>MƎ`H-QRQ՞Ŗ$U-AֆhAr3.FIv W]Eyyjד7ٮ$+^*ڍ 5hrU(k;}pkq-|h՗iY }+Չs1rC^QOh*0"8M?ZӴkJRv(*`ֆtu=VVH\BN88+TL~# 4q9h'@F n$E^ER-5LO ;s9P=jPUl?V{'Q@P T!Z((AD$(~TQE ( ( ( (*gm;LsSPϥY*fq(-Kh<A\@0=^jz(-W]4ק<\Ugޒ? sV1,1$)QB(V.Wz8*4,&+qݑ4hn&LdץuP4,c<<Um]:Q4q$ZPCcj4>ilF1ei$`ƟtdcP}gbY$55͝@b9TPW5ǘ@:v`?jA Bm,q=*j(4 )A_+vF9$Nx,'8d"!99ִ ҬѬ "~XdNsV&WwӓfIpN0B3׎J}M$d3}P+Z.g5Ђ қyߐnS,E_)Cnm#s\X4M6U8r!~ֽ]-`KUĒN:RCiĻ|.Iy4P{khm!8'zEQET?[u=As@-P((~jO­T((њ5;=RnP26n1okjt&N:15UqXZSHU$`2>V`f :ecS)@Q0k6E0mUaGoZ4WtD=fkh Kh2I<}MX 鶱X6,g>IEg* |њgg F>j4QFhRf ( S/ >h>4 {[x_GsV<jɈ6br>VѴ~lYGOE!^Zl>:>r* 0$*IOnm{iAッV("PFO((((ռ=G-`84 h`H)݊}p$euEcɡiNn.bű#3(ϢVK$h X0OKE/8amP!fzEQӭ/6O0DIU$V(3 ((F =1RQ@Qh(dRȥ =*h8nH}!$vAPee?tpאm-ZĻ# ؎jei}@91_իK[Y`>fƃ@g[h&S3٢(((+X?gxqVN6?·6 ̨uDT)?Iխ-2N'{y^Us2yN?uvj" cvqQ]%.7lHV+cqW(Hiciciƿ쎿S5<*PXd*J)JNQvI>*Ѭ6$N9PnlkVc6ppy"YV24І28 Yرɭ*(ifKoW;u$]ȋDnI]=',k4mkpjJ(2G4XX3Va0]$Cه= Y ;`d^Bʜ=>ڶTqzTj:%3/ GEzh: чOOs]}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPUe_ʭTRIJ GPhZ*s=Gs=@MEMEZ7?y7?jotQotP*s=Gs=@MEMEZ7?y7?jotQotP*s=Gs=@MEME$ Uv.2X _쿏uTۺh\y#y7?jotQotP*s=Gs=@MEMEZ7?y7?jotQotP*s=Gs=@MEMEZ7?y7?jotQotPYDz~?ΐ3 LJ*ʨE @(W?pS@KES(AD$(~TQE ( ( ( ( ( ( ( (3Qhdw덉)ݓ=SK=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZE@3M"<{Qqx튞(.ԷzK~΀#)iJZQ@Q@~O­Vz2MKTETg(g(>jwmkw(<A\"Wywg+UQcXxݞM>T-Ϸ>Uzϛ?QG?QO2~ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ƕin w)ϨywlEg'wsxAEY語lElEIe*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[O2^CS@KES(AD~OŠlNV br(EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\oZԧ9&:RB ( (+/|JU>?ϥ[QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE94QUM'hXzDP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[p:'X(Vzd?>ofM-QLG(AMe ֝EAHdH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEAz(QEQEV_>n/|JR0(8C#0 )[RhOο@TW?gW[wn^N2ш##O *(dgK*R?gv )&nv(V=gq:U=?RK>fH1ڻv>E2A޴JlH 7| UJڙw6@U$ќ {P\}#)5"Ml=3ߢ6i>yϿFH@䒘΀6E"̹èaB3X+I̊H,{O~??:VeeF# @=;Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AtHy{TEU ~`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QEV@x?ZbEPs4Պ|2bZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPeVu# ( RqVL͸$x%H$܎\q,{R?.s$  L@#^1%OjQi%M78/?=H5JQcGw21ĖQA4r/A\$&]'<W-,ɨC8?Uqꭥgyo n80k< zg8G @}6_ ێbΛ,6u06Ryk hF7OzʖQA3Zݽ34ofBI+mPI(Ry>5/$Jڹ`aHQޢ+iƎ/h# o3Ar=u 2y_ v\CavrNP7xۜz4t뻹 hJqsRff]yQF3|Yٜ~G7$htdT2|sEVHTbIUd=k88U8TGS1@9vQvaXr?1ڮ5zȸ–Lqӊgm: :8-H Dr3| X2TQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PY\5mpg1ZM%_6OU}]$I&#P6Uʸ$8IR*pAfG˷qœg7F/FƟXaՕ(] ;{ g<sJݢ./fK3q?ƴ-Vs򏠠 e0[0* `CSk:khyU +; b+ ի;%U/.ZceuN}-4|KJKO@zQj$ 5)VR7Lr)'w;vע%q`Rh.LF` $S1;˕e?ϵiYI$Vѱ {>֝QEQEQEQEQEQEQEQEQEWP߅XQE2b7LX(#(AEYbuhRȓz~1($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?L`3EuQLAEPEPeVu# (+[% o)![pzQg>\{<qMP3͎7{ ~?Mz5A>vq[[4OTO(ePцh֑[ ,5}> nYY~Vc]\qE P;(~-?c=zt5ŤɕMv>Q@0nw!F>Ol mꨠ *e ~+/RԴ.# eڽKzVB-5 ?cFx #ߌDqirNHV$COPFAP:PV?j6!;ps]Atx9UF̪@B/(H,>Xv-GαUeT*Wl@#fP!Z[/j(n! bą5yqt~Tyqt~T.!́LcK@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PYpZ(  \ʪ[t&(]b-Єb7Z7bRyϧJ @J6w`gր0nUN|kQ3ߢSjoGrLn<pF=EmRV@8@Z~'*UdLk>%M>>镁%FOaY\tonV 4B(QYz$n*ֵud[e¨"T7~Bݥ$68(y,%tv<(5{T1ӿֈU^伜}89<ye_8tp+VkktQSW14 ;>Q s$Hb89bw" 9Պ(((((((( ^C~b (#YCSViE(AK))`Y'IER((((((((((((((((((((((.ԟ§.ԷQEP(( ҭEVFQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE^=ub*yUUTfʰ wڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭK U$`I?ҭEPs4Պ|2bZ((AK? JX?IRc,E5*nW8|Y#ѯ'[kyH(?Sb7(0 d\[ֵ|1?{JlGaEŠ(((((((((((((((((((R߇ -:eQT ((uO!g֩Hht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:Ώ֓ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt- (t~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G hi<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEG|hJ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G hi<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEG|hJ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀ofI,@<S@KES(AK? JX?IRc,7?'jU/Rڶ9!_3g +YjP]Nc d=>䭹΢dT{I' j Wk?$j/W ژc{/֦VvoZ+,"YO{q]WB *`ٲVAERQEF _ʆnך, ypbK(XvMVPW1 XWۜ'O&ُq pKY11VKd3m84"}y۷kf2D +H+]&8)9r0XP Kj9g/HK+psPԗO^L{W#?KEED13ɼvހgڲ'KxѭI|@#O5h8UOKI t(2[ӿF8AHsZ:/ZdjYb$QH'lVdڄjQ"@ ʘlV%݄rU YR'@xn Pǧu)5AhU\ ߇k wJWHHp84O)5\y }]GS<>^1p`19'EQEQEQEQEQEQEQEQEQET?[u=As@ *QEQEA}JѬգR0(((((((((( ?G*t/SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOT*((((((((((((((((((((((((((((((((((((((((#]'z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A?Sz( ( ( ( ( ( ( ( ( ( ( ( ( tIU=QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE?OPGO 袊(((((((((K~ΫU-:M-QLG(AK? JX?IRc,S1H]RGR7'RψOjZq[=:;a+#׊ݮ? uJ*:n]WP;9jI! ?Ot;(%aɻ˩txn.[| Vs^h6 I\; ERQE/_W>P|>o*HbB35LhZHƀ96Xl 6;1]}E$O1'S6ґʰ9R{v5@o@genl n*کIxT<]Ŵ7q.r7Q:sڳ?<@ MIno#98j\8cMѹ9'Ȋ"8d!G>@ݪ٥[%tGT'oنE O~ܽ܉;1A5)G= RX,!\H=2=%|5Gǡ6X'8jo+)d,ų"<:PO_X"[oH6_i-+@[qz((((((((((R߇ -:eQT ((գY=FaEPTo }:!5vmy9mX?1={v4vmQ!,.{~-FKp=kI FaIrx>7wi,~L2s$DAej:ݭK"1fan-F֘f!`p3ӌWhL׮,auNKNF~G[R 7*UԺH/R>ѱ€_]=MM1 dthڤQ^Ah2)u I4d/уҸEWV1Yc7~xn}Q#*œig?1Si )ϩ2XpGjaԆ/#׿CR!x-ǾG_€6m|֤W>n8&Sqsןi{g!Ѳb<eGnkoMAτZFz1`@Q@Q@I? ?GU=QEQEQEQEQEQE &`:8+ dB*r?:/lɎh󍡁?p J\UDfu>LoOa@W#/y],-dsׁitE8PGEbG6\l+;Si:hszԬRimt\uYZn?yq{bf}mKaHO{ot<+ ] <q{nB;ce{GcP}*J((((((*IU=A??ʀ'((((((((((((((((((̙X~-Qԭ~c-Rr?ZLHX:NAEF.gwNxZ 9;#T4GSqw܏0O</ƀ;Y]ƹX3' =ϴ-A~xw$7Qp(ၠ]]C dЊ}rkJӬ@"_0}kOWΗL#76gh^¾"vMLU? B q@]Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GOIU=QEQEQEQEQEQEPiaU#s`zZW$P; c8'yy؄./qx͐QI_=ʀ;& K6j\w [lήd-=q-tGIR¦>'%$Ccw?Ҥ2 q=a #~˫[I12䂽{?ʪjYIr.$r(GYdC`>Ɵ\~$]}@YUǮ+((((((tSz( øm+uؠIJ1*+5 -ԦHY{J?!}_(5(H!Ck?ܕj{hZU2JU\{.k WRlb7:vAMvõ]ʄNW<[U>hZ )0kb--乓c?_A=π?0]9x8 'ר=Nӿil63jm]:hKgNOr-o\K7 bEpN8,';"SA@6conRɈj52Uw;қJKOh\/N~fQWRU%ܞqP_ku{=)OJү4fF @ zO4@H,5%BCm$?h)w8U'W1Yq@Q@^0[ɵ)az v8=Kğu#](lzx1_RC}# %u EPz?O@Q@Q@Q@Q@:mhGP?[Y[5Df =\m! zkG:ոm=N;W=:7/$hyc]r q&:JO[*أCk.]A-l\>і5M<@AP8a=WX"ak=km>[<lkHFgH2Ȟu Y {h6P_5*jеo7M[0?^pˑӣiۆ2uGymWCr`vzGIuo*)nzXYT xpqX 47YϹaDdozEf\:moq.\dmcg^Iϲ,dq{5^eh\jgkwoylۓ8zvPZ3:q\vnX|ֻ瓞Ki@O#Js hCM RA;GS±׭&kDg 8gk 50 YAo5Muo\iV3;H SҀ/S|bIx~ylo6c׌s:/OIPd  +~\hO\>hA=BǩÆfO{*]<8P2qCZ:$Q6 9 s@QEQEQEQE*t@EQEQEVcHi g]۳~߅iם\MM|7y͐Ts]kMhA3RX6 mHqǹ=~zeurJ5&y^%َG7C ԏs@YIs'Dǩ?Y3l°Kjd"_(ڡU)oiNO@&Y1R9֑xyK"ˏ W}a Y&=RzhQ@Q@Q@\oxՊsUV)%)(AK? JX?IRc,E!NXaCQA->o<=UQS ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.ԷQEP((#{VgGCQ@bzևa mV443j-JŎ<#?6M4F B14RrAR{u TkhPAW9b{ɭ8<:dpàbuY>Fr6?PEBWeX$ahVo}E$H(`-?A]]rEG+eP 繨mmexA ;n|9 &+Ir Kt'Vx,|<.K-l [߁/ F2mƽo^ڄեd9E*[^[F@#oO*"_,"oKӣmD+˞]OzPPawkֶ^Xѱ󞤖 G~նJŪh@0AщO4hViqhr?#@m/<{ev2.;t,.uXc(䉎_ ;gF8 FW-?gf]dy#qzߢ(( ?GU=A'_ʧ((((((G y ܪ6mr622GC~3e5jmi9HHk]=N{H}:E2NC7~gpB}2c=+k@o3cz?Z۹д˩LņcT*p[̶T5iH Ҏ́^cl,"ָdյè<&(9Q:(w7g%ʿ)Z誝yA{( p8*j. .gs,UmWEӞ9/ݢ(((((((#]'T*((((((((((((((((((5/Q!B?.rҼ7l #.x.K8R4da3_h\=zUo]Bx{I0wnN>jl, .Ӯs@~v{y_*տVo r[qz w溹t9XD000s<?Fs[?s@$#c [-d[Ljo~]k4aPRCm%E\t,I4UBZ}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPz?O@Q@Q@Q@Q@Q@Q@Ks̡5&+xu+: ~^\hW{Vٜ"9iU\=`<F?]/6f`(×0ț[>]OM6bXW8 wwj M23 UqZMv& b1 طњ3׿RxrT1˨Hz PiZ^U&p#WY\v"j UPEPEPEPEPEPEPPGOIT=Q@ eWRJR_^*nP%`B}H^4fX^ Q\bng dh)SL[ڲ1iof,1 ~)Bg\zԲѤӮg9s}@1nG_]Z 2di Avw{~cwIo ]x<ɽ[weHMY\QiT܀t:75əc9;ÓZ:֟.hR-pZrѾ2HS0r+5eڗ<s#(=~w;)|Tl?ko'.Y&w?LԚ3<~ImosӭtXam+) ujP&fP7TCգs)Iտ>>x [W ^0#ڻ%-"[b0)ǭgYh6Vr9vnONj]{H-qO[\Li<}C>koyc̶hu'tLMAZ :~n'KO5xz hQ[K}i!9,oZޣn@`ww_Ca83n }kicP; <)Z I_71>h(IU=A??ʧ((((/:UC ck />Q]{G}tne@8ڠVlqt&Qr#1P9\H<aƿ.;ֺ:æ-` CӪyܿl?5q'=sǩ44ꩦEs$*'**K/Pj6eyW;DG?@wL:7.&A}#}Kkep8+b^anq[9\:UNM{yXg, Ҁ8ۿ2[!&[%#Ld]e݇#_GOB~-(;]D!B"86m: /x~]ճzeފ1m18,`{gW7c~]KfE?#(9Eďwo=q?SeZ Ww+ޥL{ ^:]]z]L`sx|<cQvd>8ݭ^iIy4?;L1ٽrӒpǿ9xtKּNTct%g]kR۞Hj;WVӥ<-|sG+TƄ'@};`5/equQ9 P{Tmjv2I2ICaps>x~ ; P$סJ2c;!.Z/t_kKEUl-x`zgGYvyc3P( ( ( ( ?OPGO 袊((+[Mqn !nI }2+ЫD=d\p@#}>R8܌ͷu~Tbq#,p!M\n{ThVl%%eQwDQ1H<qNkcWDM*` $׹6]JJ>?z[ݜ@g\zPavƃJ3۝ߎ]t<;?O«geAGJ@Q@Q@Q@\oxՊsUV)%)(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( ( >Z5}ڴjFQEQEQEQEQEQEQEQEQEQEA'_ʧ$] TQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPz?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A??ʧ#]'PQEQEQEQEQEQEQEQEQEQEQEQEQEA??ʧ#]'TQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEP?[u^b\oxՊh hb?(AL4G3S`Y'Iw١h4?MOE 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(CSCDYF \.ԷQEP(( HʌO­?UTWjF3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)PvC"gK<QM?ʥy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(l NN23ҬTIOP(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)PuA#dgK<QMO~ʥy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?TK$G!98JQ'?@e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yEWY$9 FzTl['Zg/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/EDH$rT6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@FL\aV*YޢX(#(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (+|JT>ϥ]QEQEQ\,_ҹ:+(CgtC 8&=Μ(7I_ ʀ ( ("ԵOƥ((()h(((((((((((((((*$ZKQ'(Z(8#i`hJ+?iRH#= U;KtwpRPۿk@TQYWZޝg)Y2PN>EWζp}ٕT@ EbE{im++t 2(h6l/Vq2n3P(U;=B1#8'W(e8QI <)<ygЌQT5 [koLp{s@h((((((((((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI (((+55[w[ $?g>EAmpP%`qZ ( ( ( ( ( ( ( ("OT¥d$HdUX)*@ *ݽ>}ÅO__*IA'H#?iHX(,uAiw "JG#(|C)*e9UM^_&63}hJ+&\mf0K'88P wFFr=++-'z€6訠;VxNQA"DIUQOA@״$?ֶ(,0'k}OPE2YRi$ ewP'*#<PTS-<j 4[ [s'osSր.QO<V4ӰD^e G!nyH"}F`:v +:Vl.0Gִ֣9 3IB@UkKkؼg@Q@Q@Q@Q@D_j$ZKEPEj}KUɣp58xY##K~}ֿW(v_^٭c^}wwLD>)X.utWjPY-. sk ;QHǹ״[Ӧ?~{{f)QEcuvWbI?%7bdtQ@O(ՊMQCS@KES(AK? JX?IRc,ELW(66Bf>ނ񈴔ie>Mi"[ا%\ܴ32 zGym8u>J4OA1G\{lSoWv=6(((dJ]Wy'Tj^UΥ"_q~n\2˞O .ڦ;X 0,b>+k+2ۃ8qҀ6W ndRawP7p@^':t[\ӵzAK\NCg9Ԛfl̬r'GF9 d2+UH#y#$V5nL-6GqO r>ojͶkV+ "<by?wusE(&'Wpps;ϻ7nt@w60?&g}ol+ڬA#=MEa&26lJ[ha0e*IiҊ((((((((((R߇ -:eQT ((I?UڑQ@Q@,_ҹcC׉c Ē!$ck"#V tUݝ͝>S~M#@ d`MEv Xkmڪ o7v~fehwDl󏩭Ԓ[a } ]PZȋ0L#w^b7[2V~ӛVZm6[v0poa: usYq*X}}띔ks끺k؊`#8\{]M_! A5WB?k((j~5-DSh)`lgbǮky (zo]T*@ pp+M {f~T 0ۥowV# upv='*Ϋ.b,#U {4+iDDO) Rv|qdsobX7I?6~u+-F KD2pݞ9eP#P0Ъ@f.Yn?:k˙5-^zvWzKg:r-5ȟSaX죎Vfd֣+*1>{co ]No"hV;qTZmƯsB+| πyz (66LMX?ʵt"4Csb98 [[Q\dӱϯj[d{#_CҸ%nm[6#9T N:WOnnբ(((((((((((((k-D_ k?SPn p3;Vd3[ş!{}f.8UfUp{Һuiv>kԵ  ,*m9V.ck ff .>-̈́fj1a g ְ O]Kuw³{c;F};R蟲HQYW0%< qӽuϬv /,iFzt<DE]Jdz{mevPὲ&D`_=r7c=ӊсR A' S}j̚\zXetl`I t4GTN",0ѷ$}&3ezt|A`i]6xӭIc)ѴXVGQ0H =Nl-Wc^ǧ\ݭ$m$4KLQXS Aln,HV<S fVwZ[]CfEV{hn.%HXE/aOA+$Ik%/!?ζ>zznCǩszϫE="m?]F o s<zlnh~L֎?Js_oF: սٮf裁{ 㤷olon&T1]ͬzeg=KOI `3u^G";z*+xV's!QԴQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-SW{T2KG׿W+ OrvmpW(>m_N]Ky#tE@wZ{kb@7dquz4cdɥIY(IUiˀ{`ۋ[Ix/&Yv(~7WwZtt+?SYX<3֦iHfŒ8@)߸eIq}굟fe%l .A'?UU5NivVրAi3j@KEu©:ogJUSRUt8^V":`t=)i5tPN(((((((k-D_h;U}F^XqVf-OP 5cj޽}%xNvy$V%c̼ZF\ǥ9y.6됑e>n*a E(uJ\Mi۩x!B3r[{ ,#`q@]TO~EWu?t*tz,^H09'ꎏh-mB ,3U=c/Q?5M s20G@HȎȌ A;mo3NX<htgR<0kM!ҭO$;9@Ym5[e",vW uffN?tS0fFz zTxK"L|g3@q^ٽw "owbx&+w %)*At4`#Iw}QLqitKIhֱgD*"]X`:n$HPICp1f_kp_3O6f:g?]-fQ@?\s@![{@7CRի oMK%ydQVOA5> ʪ)EȠ AWi3jI =Ejt9m,]Q`9LJ-KfW?upǥ\{+'K!'kyZTIPY<Jw$[N[RKUQO ~#5b]ulceɊNKh-~֤-&[;-qg&Byb  U"O̲;ЍȠoFQo+~D1[Xpk~m 9ؤcFMd_Io(.8Rr=&s;Z FJ}zQeg ʥ4cOYO["05j/uwyA3O쯉#1iEPEPEPEPQ'*Z?ֿ@EW#/]Һ|e UGq=?ki_Sķ:lHp6+8_^|S~$  jMNZgVn]jBq՘Q^ $vC [qXvJ+M8--w}5yF2jbxvJH:A[u4AERU, 2 Їx[٦Mӈ?ȟk:^G >d`I;{}+Hjڣ"`!\p?puo'v]V>tm J8I>>C+ `MHcXUEdXQEꚢXgT?4QE1(AK? JX?IRc,Ee4ZQdV9?(ϷJ{]:̎A` GA}x0/DYF@נ;BOrrqG]'YS BOּugаhQPOR6#t*N((M]jhAی=~&Me_ ?/? [WYoIDѾمSqں8NjN['OIZkЦ?\PD^D"ɞK/M,s,&̝v'Ǖ$iRwd+O& :.$u9,qϯZG 3?wZ꠳#'X"hXmA1y{*̈́'i<vsjƵi h2ܫ>4I̓±5 W8˫,pR+XgV5֚l\.e#ok:Uхe<aAs ;HWxc ]͹NfB`S4aFmxY`Ic.גWrA J 9'$Y[aYwJz⤷-(V үlRQL/J6D|uTQEQEQEQEQEQEQEQEQEQE?OP\o(Q@Q@>ϥ]I?ҮԌ((cwqiou]sH:Ǜh GK=O]'N<?t7'>gZtw7,j꿲t7?yƀ9Vx|?Pnlmdo'Ors\M9V(T5do'OsO#&*gX :\((j~5-DSh--iPMTDE=p)PEPMdG4(((o* zgEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@ XV,=H( 0 CH6 =Q@5CcfEQE7ˏvw9 cwP7 GRVhQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@6z ɽkI$%~8+^@g(eVX= -UFjZ( S((((((((k-D_h("p>(((#z)PM؁q:(hD \( {ΝEQEQEQEQESU3@ϠQ@#"ÀG4P((((((*$ZKQ'(Z( |e W]\c~2}TwvE@OMp_A%lȮs4VAdӿ+п~F͵FḿZ?*B}k)pY=Hf;DŽտtxMYt87 g'QEr#ZDf =e =_7w=X uC{!Xzz`+h" %6QbC}&G?;)7Rodƽ&Kz\۰79Guf+[TvTqDDǝIYQEE?V*Y5EM-QLG(AK? JX?IRc,EZ]lmy@V-Aa:N,b6{-hYXjq`zckV7o{m C"(U5VFEPEPrGRU #(J8>ԔQ@Q@F E #<ԔPEPEPj!?hA((((((((((* -:R߇QEB ( (+|JT>ϥ]QEQEQEQEQEQEQEQEQEQEOƥj~5-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@EQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@2H re=AS :gE|?t~w "N>"3}E_KE(()i(((T?K??EM-QLG(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (+9u?'?ZX>keO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`Pi lO$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@Uͳc?̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Zbٶ}w`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFQV;6Ͻ2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@t)U*?pS@KES(ALDGqS`Y'IwahL? OE L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(SMUNM\.?ԷQEP((~jO­T((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((*?pUE(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (?IU8CR2z*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&V>CUZ((AK? JX?IRc,E*&v2IK\s_SJoBݦL-gWs^Fq^+_}_@5US++* ( ( * 6@`ziu2)%!*F8 z+'{µ&f\U(ockE48=*QT# :}(qY9; \߶x4j56[ÞN =O@tUu" *~Z#K,P1h37n{}y QEQEQEQEQEQEQEQEQEQE?OP\o(Q@Q@U}*HŠ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((ijߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? SX4(b|Պ|2bZ((AK? JX?IRc,3OM<d uI`w_2A$ N?#ookE=p06Eu?Aubi=N;B=\'๹mOU tRA|WZ{:[.8[?k71[giW}p#8Z>gwuaK)tקVI= ZQRPQEgw}JH0ok3RՊ^[Rd֫3([0>=ڱB q{#Z_\SxE{IxCw=[VK!ˊ<XwvZpIѤr|e>4vΛ*Ҁ9q #/1cjӋL sѰ:U4Wdf _ZGT~8֠7ʎ;p޵=DdnT򭛟[Zd 2[e(xL's8o{8Aenb%2!p=s*ۢK;pZ3;BpofcJLg%t]Zˢd85%2K`dyP1A(jT[WUUTv=zSK[Ff]eϥC͢D%b+2p1ޣFȺo62;mEPEPEPEPEPEPEPEPEPEPP\o?2(QEQEYU}*HŠ(*)&vڋ4-Mg' <s!9Y9W$uu+˜;4f*WjpPP(tl>`]1u TW1Z@"8LwS$(W|}X?3Ul?/ƀ.QUEpNߧzoE})2"KOq#@h?zwG} Q.#€.EQKI@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@C;u{cUEI8tykG(Z>gykOZykG(Z>gykOZykG(Z>gykOZykG(Z>gykOZykG(Z>gykO)΂ &N U7QEG7LX!V)%)(AK? JX?IRc,EJS B-&ҧx?ҚOc<+!ohnIe=T0Ozu]Gw4ՐQYQEQE`ms.q{*؞\;^?55ՕK=Kȃ uQ@in3JSc}!N+*? ^TUtxA-5eqiB5@6z^0UoQ8<vfy `D?;(VI WC:~f=rO[K$9h?OJߢ3RN%WVݴ\v] BUr?#vx1ůJmE\c)t{a=FֽQEQEQEQEQEQEQEQEQEQET?[u=As@ *QEQEV_>n/|JR0( E/bң&j޽[Yyzxߚ.I3ny\i# Ҝ\I~- ?ħ~O^KSINE>b=J@$C)@NYQWq=}ooe!-FA,HWAd'@cj}1,2+2O"4u/eWE(ѤV$#J[+/ItxeYZgazo\ên}qW:W}*+O {.mQy>-֢tY?'z@gQCK"? t>ƭqGHÅ[; #G[$U ZOu ޙ%'*ѱpr(#u H: ?5=hlϦ]ȱldKhU@c8hNiXFt 8RӬ#HYPBAjkْ=BtN^,npr j˦jsa<icNY*$+P -,w1%o|We [B:\κ$ER6$9@owZc[Ϯ1}§`Ks-);_|~tVflbLRٜJЈ;s@DR<bXX:t)UFT)yӆT$}iv&60u:tzӭĻ Tu?ΗI[F;?V EsviZJmk[?S~5ΖzDqPn{(1› ` rj>}\*4ecu.. Y|A'${ Q/-6gM==*^i.,$ JPΝmBڧw+<W8]\߮i'<$m Ex^D `F:aJzhuZui6 OR;c.moBo ӯiwЎAdxs7)Ewm23 AST%1Kz)C_7-qWd3Rm"垧ܭñ%`z}Y#k[xD}a~5#լ&_?Ə6op~һ1(0|B#p UX_9ᵂK,OSU ̱ى՝1:,O&W&݋w_Bfᕸ*GPk?m_s[M4HpdP0qYm!d v; (bNP■ނ{m=QǕI=?JЖ4=w:z9AamͨX8>Q8} :tF8m*|}(j<W0 Y5=<|Hy}"숭 QGC}XYkVbog BCr6.U&qqo{9GR@ƺ p5MP٤Rw]S)_tl3{wǞ]% i>%]_l]ZM _t+F3N)1JN'YEVF&=kih\p {1G w*æz5KX+t .YpOjƽ{3̝2Qֺa94ԍF T'/VJ n9/+kuc%DÚo3YA p=~n:T8ٚFMs5M@)優sW"t0r9+ KH،<C&S1ZM YH׊jR˺=+32GA[Uq (dYLd0:ⱒCx7mKuK@m?cE޵$x,NzTv5#ma\ n]^\\RO<oH$U5-4\ӖePʸݴ4 vW^M&؂,T㧥i7,v8 `zO֜-jo+dR9E\QEEs]׹S* Zܸ2 ϰTc8jY.bhݷ[ ,ӱgg?I0*֧m#{gtd1{q߾kNE3uո6א**ZLZ%SIŤShߘkKw,QEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PU%)k;?(LX}RL{@ q?4hS SMPu9"?;[qݜ@!`rLRT7ZkU]z3n#qwc@V]ƥ/! `b%UQOQ4fYW2 Xdd^5[P)5i.5fcTU 7-x +.;饶 <?yO#WmYd=C=vZL(ǩ,nd`!>5_peEgO{!Z٨y?뫹btP8<=M_嬉C<뚰O純6B;hF{Kmb6sŽ^((((((((( ^C~b (#YCSViE(AK? JX?IRc,E(JZ(((((((((((((((((((((R߇ -:eQT ((uQUQ@sڥȼi6f|GE$xAg%%hQwİѪObiڃH Ncy+q4:?o:.tk26l`S 0zRHUg?~\ =m][Gw[HV[Ai(mFH/ֱ#N[jȥ'`~SM r R.f0c'ƓTFM0&|wϥtyhA NH>SbEc 1?Tmm,/$*%Vb300=k(D*: zVL%&i-ϵUvh<T* "PH1c㿭tW۵Q>\qKӕB32TrSm5҉x0sw7M&hY:1U ?N=7P=VByqflAk#kW_~DR@=;&kafk$t!i{o .Jd]f{vkbX}N U:4T5XZ}:$bX/*,<SSNjMk%r';D[6dbI{kNKf0;oAI>VmQ/sgm]_Z&ټFIs,u֘ya ;xך6X ˗d^ )jKeZս2$R dp>QϽ2YkgRbrvӀaFg%V{PsIIo`ՑtL խCC:wEnRr_s7Vl e<f:pdʢD.|203MuԁUFM+6+Oy ɝӒjTaz& 7H7c ttW7r94ReuHfAj0>+t`HpH@a}N~i2ߨ"BxݓFj-;PL[ʒ@$2 +*Qfjo&벥<Ž55ioj1hFBIqHt#Zs.}*VyU1\UH4d<mv&G2{kfdpKeRGgy!ekn\ڶ>M,E<^c+3A/12,zUE+as[ Ԓr~鴐3Ԟ#omXWN>t2p&iUxPҩI-lKz\-0j6|'5jl%)" ؒ1ūڃO4|n95324U ǭuaI1)<8J}ŬW>Y?q"t26r3׷l%o`,ÙNd.ߥh7 Ί?Έ %ڋRs54_9nXNi 6Ҷ\9<g8hcf6!=zۋx{ys*MnJbZkt&9⺆L#Gj▲o[4B 6;Qo*HI.rkN|&F .>tU֖jG#\-bҬZK=V$YGuԞkSI65G .{ڷ 0KM, F67Ksi&p@ܬ/`cHA,G8{3tK(' '",Ӆ "1tz@v}hsOt l-?U?6Yc,.&;cV=Wޤ 0G#]"i<x\wurꈠ@Vr]CDGyOVKzXQEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PYpZŭJ`ei|'@-)s*[fVFMKh#*2~~g zc`r9:~Ur 8-ѣe[cÚa;:'fʑ *!QS]%C%3""T#Ҧ yMT:X岈@RFAaTJr`c$gAdmBxS\$k>I.4F=8ᵋlK?5@]+HjՂ%z(f*Z5STֵ)apQ}GJX.ZOfh:Ge8bhREE%,^IǿZʽ5TgO*Φ F+ an XN5,:9PjWFhp86"{-?5PZ-#sSC1E`J>,Ī%zz}iQIǞqIP9cH#*p@=) PC ;Ƹ2'SPEPEPEPEPEPEPEP{ Uw @Q@!V)4Պh hb?(AK? Jdl#];v̛y2o @OEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOP\oM<QLd:(QEQEYU}*HŠ(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((ǻ~άT3xYGZtEASRPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP{ :UnHp!^YZ(Vi՚d?4QE1(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (+/|JU>?ϥ\R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E- ̼~o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(48OZ()՚d?>ofM-QLG(AK? JX?IRc,E(ɧY{(,u98zAޥљ3?›Mn$QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE?OP\o(Q@Q@eXj?R_*FR^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@רsnZ5*z>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@רоڴj -:z>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^۝woZz?O@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@רsnZ5*z>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^BjѨ.Է^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@sCc楇XƒbZ((AK? JX?IRc,ER/SO@Yc{Rs) !\'>g55->[!lSͿ8=ErՌ ~joE|S8A>O?ބBI-OC#űjd`1iݻ3±iSO`) (Ƹ䳽]EI<jZ1!??@J%EpmW=_jKG{$)c =v-ST5; AۉVv1p{sޟ4HW,Ak[[y.PN1[>YFd;v3]|댃JK!'ǵ$Ji+8w9c4nDz'\k{DHZ o[-*c,֮#Eq܀Ps$m+sP]{%NG<tm@j<6WO?WҮ@S qK`~Q\}~sz{՛bHuzcu@O?Җ][Y@o<J([b;{w<lOr?QQ\#pNQEaj:AP]cfP Z(ѣx>(fWS}:$s9@'<ia kX NӦt\ޡ|NQK"v~?,~4F5Weܬ4Q\ڝzR)p3:URUHWy#4ErZi A?.j_6u4EPEPEPEPP\o?2(QEQEF_+_*FQEQEQEQEQEQEQUo&{kI#јg@Z3Y7tPF~\ܞynj$%Y'TLgDr{vF3@ E zZcc')^=eqEgZ_6f3~T7vh$pN>xC]Q=ʷ7F%QGր;AҝXݵ 2r((((((#]'T*(((((((((((((((((((((NLXTdrA Џz{]<ߏ~/XZwC$*GIF`H4+ukMV5B lsҺ<IfPnr4) PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEPEPEPEPEPEPEPEPEk:t90:*6-T{r~uZ e_X :ߢY/MOc\2>e'ÚYU%1]'u4W[Z wI1/-g769Bv,QEQEQEQEQEQEQEQE*tSEPEp&" lW?W1c;_֙j Ecg:²G,3H>Q\H1.GZR29n(-~Zi?bZ{}5tKINsxJ(1u ;T*^78>_9XyaJ\` {Ǭ͞mk{p,'h>FU($BQXN&#@bUNCu8+b +[H23閮 sYZL\IeF N; \/?/mF;:A sڠ`0ZH"-cڸMK{I4C'9!z( ?OPGO 袊((((#^UHbDS%Qw>Vy=G \up mzUz[Xl9h'W~$=1Ŗ}Q ޟV?ʀ:+;QK; :|ǥr6&RYH >6pq;+ Hd;Vf\^Avv:JGr`{z{P]ͯCuTzK] vib{l؄9=@2rs('~r35ͮߋ?ր=&r+2HsYVzڍ^kY r#wW5HzR:qwkB;iP]NBpzYEp˨Yȵ2 k-lܒʀqq-<j/S}Smnb6'>"H]@3^[[ȑM VAVk̵KUnI6F@^a ܂F^}Q@Q@Q@AsS?[t=Q@Q@Q@Q@Q@GTf-"AsN[m7 >Vs{@_Vty;Oj<ÑG:73\[Xgd#֕-J>QT4 PqO_(((( 7CRIM-QLG(AK? JX?IRc,Fu)l3@[?Ti'˳^\s_Vnn ǒv'S?gqON=+߿ʹ ~i&)N3G<8Py#Z(mRERQEO4ڄd T8-)?c), {DQJ3w+~ 8ܯT s71 9b`wē ~MdlBm9OoikgbJ^@6˴1j]!O:},[KK^ g뚡j1liEm!R>i.t8>#>%VɿjF{?TVw[ڪAVֵV.W͓N€9]^4VG_F#[aĖT2O?uuA:F*,?I=yy@ݨ]8_<*RǠFj+]: n'Ğ)[yyFmn=GN$?!LlB'o::knde[B: &O~1bUx^ C-Ρ40ݻ VY 0ϋ\Ry29 ~@1i]m:j_mu0[uǰq]Mݕ~Unv Tmt-:Q2!fSXҀ2x`Db:SN./a;vΚm 7)|}99V՞c`Kt(9ɶ@ lq׊hE(|)sm=룻Ѭ/eCi,g }sϯ@:$W<dzf;XڦH?hi67Op8?*{K[1ڠ@z'hl͈/&w"ִtķ2$`9$ 2yLRNHS ӂ X6@(z( ( ( ( K~Χ.ԷQEP(( 25X5R0((((((n#Wo=2(q@T P|a54Fm"QQ4`ӥ#ǘ+r}+;Ou]'Qo!<v8'rcG#h [{BI9$'8UA4[[̌wc}[JME9{qyحm&_{MB1{s@|}k (k[_*xy/Z4zH:܅8:F*U_U-.-Od(Tt`z OxDT<9e~ҴUqqƯD7<kZ?s_*QEQEQEQEQEQE*t@EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEM(޿Uq\k9g6G͟8;t,&tr3ngP6%̰/W9f<㎸'W5;[K[Jzszm-1:gNk/Pu4&B1rrh}kyUCOl#G,.$uQjTHN 68TF+5y`NHkItj}V)ma@=1嚱yjV:Zb,߮GݭkWf8^\ޙ-ѹˌtc1> ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Էz( ( ( ( ( ( ( ( 5n r>wx=VNZ?9=:P1ȓud޿ZZe޻=ɴRvrD2>/y}͸->z~5Y5[Ww?'<S}HNNFqw}ִ᷒uH~%@c5bOH֞T%8/sҀ0MRKy#Kg3C]2bIJ.+5}6Hس@=EvWi}lQnP( ( ( ( ( ( ( ( tSz*ĭ ,MQM(S(.&K쐉cqUI!2HǞAW5tg.<G~uZm3쬌%B?Oj=בc.꩷#\z⟪ ޿ScHI`x“@˿/Ë>=UFAdy=!ՋT[G#BHr񧶥Y2ǿ7s |6Ƌ'Ui<Ĺ% $:cַY ZMy. ۂPH$,*02۩'<$]i<2μY\96([\KUkM l-U($q GGյ{$W@aӀ=j4 ]ixB:dUxIAm} j9 {Uy/"1oOր: n?9&zr\1ݏAYvm)˙^}gA߈nV|Xȟ=(f.mnxHϧ<CP4u Sm'?t+ُHs[\/?/mF2^qi"4帉Ҁ="_ YaŽKLYOŸq(tSz( ( ( Cq֖<P,E) (ᕝ*A1i-֧5WHn<qTญ--!ẰO@yjCi4J\FF@5P~C1%s3GԒMUd*DYOkUD%.T\sz~d>vC *ppGoƕr:!$wjm+WM{t@?֍SWR"dGL:DFol=wQ/Y㙠ifPI۵u"<V\VqZVi,*ڀ9шB1ə WR+ny7-;lg qwϭrv˛y</~$f,{neEa6MrsAgQDf|,ѶH7G鮦#')%}Ĭ 7:~T0;V/p?qi%e\lku &6I?=eA>I=>l(u+h1YcU}dsamgoJc8`=ѦKnLl17'JԷkre?:n8f\Goj6cؤ{t,_WǼ/PH9rIA' @j`RPʀ35\}*?E;K̶1@?yZKՌO+CҀ*xBkğu#]QEQEQE?OP\oQEQEQEQEQEpZ΢' [4fB0Â}Ee1i/1"T{w5ƹiIc~gK-ʹ1,rIf` F[stMFH̎eU8 +wsH(@_b Yé?i $##o=+װt2B)9ayjڔy9ڳtkmf[= {G[S=Bl;ȭ)q;K4ĒáVvVk%SnsV((((4CS@KES(AK? JX?IRc,E*bNDr*i]2/c&ޣ*Z)JQHaEPEPEPF( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.ԷQEP(( 25X5R0(((((((((^F$5QEb(((((((((#]'T*((((((((((((((((((((((QEQE((((((((((((((((((((((.ԷzK~΀'((((((((QYAe} IE5s* XOԔP` Z((((((((((#]'T* ( [ŏ*5\g@Zf,pq]N#(](E'q#^GԔPRC˶dWd~r`pFy(-PYUԫAҗP6&Iu֜-SvA#Ө(((tSz( ( ( ( [[,%uP +XTg.ђQ@1E)rrp1$)q梶ӑgRE #"G䲂8Ǧ*J(B0:(1 " :Nwo1E1$\fDm@{qO#<틿݁}jJ(h\HTgu%PEPEPEPEPEPP\o?OEPEPEPEPEPhP8ҕ <iP4BF$G*C f lzRGPUQ}?J(((((y?$?-4E(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( ((cՏTТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4*I*_Jjsqր4Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(BR߇ek=-ڀ4Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ,OTv\v}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4*I*_Jjsqր4Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek K~Ϋ}ҘsjӢG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(ןCT2c榇X(#(ALÆ,Scs7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AMa#aRQ@Q@(( 25Y5R0(((((((((((((((((((k-D_ h(((((((((((((((((((((((((((((((((((((((((((((STꚀ%((((((((((ZJ)i((ZJ( ( ( ( ( ("OT¥((((((((((((OT€%((((((((((((((ZJ( ( ( ( MRSj(((((*)<Q}X%A{guLc@Rn]r3@ EPEPEPEPEPKiaV).X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөVU7WpJ-g_ʵkb5KNP$ge:,cm3Ym:6& Szi9+5H%:݀=j&NF|-\ ,E\g+AypY 2NFQ$֙YnRA9(YQ /bߞwg>/#k')r0{yW03a#8G4ׂNhQ-SK Еu;} ((((((((((((((k-D_ jV6s7E: U/m-!QNhFőX9 E_ᵶxQo+RKp &>YܱDyh svڕ#g⦿Z,bqީxb'xJ1[!WBL c<-cyp7ơWkmbpu]u0?NᑺV1hKMԒ]JkJOķj @I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@E?j)5KEP/ꐭpNG\z)5-I0b)zԲ_D͵ab MwkE"NHcր2W7ZWI%8yJ>ͧ; ؃[t5ՍvEvwuڤ$WLB<lm`tܪv^ynNNkB;.!u xPmⱧQPULqd''֟a}80壕b4m(e1sQ꺄$1  *燿 B5OH`4#cϨ2Ié;;l#hIq3zJJ=5m+ma-,q4^C}u[Et`H6\T`Կ$ɺںSogӿȔtnf3Jb =*k?u?AX~{/9o^>.D]ie*OjYjo/XcuG_^^Ւv%nWS\Ǥũ`>k# A,?ʀ:}Jll' ǥcBuK hbGLwn<נ<Aa/ټ搘PKUUn*6Uwӊg{ oݽ5A-YI-ɏ~Mu"y)]e(ʏr{aw/~\86+E{Bg ?}id_9}:PIq,W1M+Hѫk9#fdrpǠ֬ ݥ+ ccΚecȻR7|zPv7hSV YyRXy09LmtMrXt<!5h\@(Ccnw'UϽ.ל#'=}?T͞Vg勏q h@OIu|Zm|Cd(bտmn4KFe PٓH{rܾe!؈bس '󇆓*?ttqҰ.$)LAqS1 dZLVRI `zek0A;߷=r6=Ic!}C&6h?ֿRI Lp"j&X29swWvtx!0|O€=ҹ]eӑ\JXpFqқXGzeep `}hdt^X5ymc{e(8_֚cClHPpG@#n5*襂uϵi\=՜W'+V֒Yl2'(.G]sҖOMHu 8o ܒ޺I:0EQEQEQEQEQEQETI OPV+fIZאwC(w\t4֣ bȬ"E<jeisYԕ) y?GU[}XӬX<_W;mJN3qZWwJZ@ cxb'xJ1ؽ6yGeC;4-(BIƳS iZ'֯|l,DX*}Ou vq{v~X<VdY%!{aZ4VÈ@$S<Q݌?Vowfo>w$ Ub }Ds;m]S(_kP&n ?ugu\\t=ֹ]z\BѤk+2JuHneB]8 : $$2JTu$VDWZح%Ǩ*ͥݮnZ<!NkaĞ\|F@ڈ:Ѭ^jVTrUuǟV P(M?TZ9u&p OVuka|2<ۏZ5Z[Ig<m g@.Mw,K}qYrjs\Io3?u>thuOkVЋHP90flPMjCP!HkkJk.{{TÕךc;>231ٻ}8?QV+8; qpw16<$N+vjj%\p#jBs@MifՆ ^C?@g[Ķ6ZͤpH4}lKub[+6r?ڕ1 qiu_YGtxĊTy&20 5q}B4ڵԷRZqbp3ս3RzȯXkuiN.Yd8zZ%inV#e:f7h((*)5KQOZ( ( ( ( (#TBGӼgqh@=T]]iz!_WiI&`YjVG_qު+,[-,L[FeԬC!8q5h:4\b@Joe${-ӧN=+ CСu%1Ύ~oQ-[fV Lc޹} {IoL/L#ca=ڨ/OHǩޮVET((((u?,?%4E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөW*j: b WUEsvWSjwChv=>=_NRێ%,[Erm6ztVL1a2=:H~Lcb<N+9^m ?g9 :LqlYKaٸwiq&ktV r88lEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-c^\}wa>^[P5o&k =WuyoR u%20sgKW^AA n`NKM{k{mjX'vpN;(F#]ry3Pu3Y&;Rk14+4Qڶ袀 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( MRSj( V(k1vqܓɫW=;ҴcN?F-D4a5ZlQ.HI#QOVF(:$^Fh-d۩#njmfO/GT\pr1Ҷ@8MdG4ihpE%`2q:o~'rYP͒y8^)UZ,n]. C Vn%YzU"d77Ά+HqM~qP,_eϑ$8Eݏu> b@fqǭ>9_:_-cX`QVH[lq'ZIe@N_O,V)=YǩMof%JL20=pkpHOЅgk6yO"Fc`@I]CH$P{@0€ǩ?ruXjIBrUCRm.G>i#a[x4Վ4" >^[ZE(9-&FKðe $@"Wl <8Jnt4L+]:P>.- -!?ҪsksXGdbŽ uG 5Q;.}(&(ZS{ss[@d 7Fe[씃-~ u*m# 4\ulP cO6[ڸwtتҺN%mʠP` $Z$68ĒypU}$w:Cnwvf#s@rw,`fxTj7ѱ[b( ✪0(h?ֿRI 1)fflv8}Yj6F-V-v:(/PkIG:“W=@jzmK; ڹK.0@js6Zj6Q*89SPH<5@Z}ǩ& c#qߎ9tcg, _$`&(MSX k-٢ lºp)h(((((((OT€%}r ˛/.7r׹b֭b5-[.FzQ@éj0<!m b?U-JO2tKYvf8=OCgqwZÖ- u+r)CF`Z(M_HWFI1@}G՛Mf?%pzh^95-ŰfUز}+gLϲKbAa'__\no::Y\NY`nra}ZcnrXq~Q@U沚YрU(|PN]WuXjz93nB3QEci670&lx'ۭ@:cx'߽kQ@ΥB8oߩV4UFHA(Bꐴp;.qs[-}eDBr:r;f@cyl1x@#[GN kr8=XեEsChK hr*OUR}{4(((STꚀ%(((((GCuB?tu;[ֵuKZ)n;jKڢxrID͘ =2**ܶvM)7w5z|֥φ> WZ#si]E63JtXywq >L{WtmbfwBzH=ECEtQEHŠ(((( _R]KM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETI OPQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEꚥT-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETSjSPQEQEQEQEQEVI)#mkD6=DZP; ;Ktaml=ٻ5E#9gE|CY$ZfYmHaX(Q@Q@Q@Q@.XƖbZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬ)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>O~ʝK=?AQ,rc'h*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(S?;ʗz~92Y=1@(yROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPSlj!~F2q֥Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(IOS*%C#dXK=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROP)ޝK=?AQM, S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<( _S.n׶)E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEPEPEPEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEA??ʧ#]'TQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEPEPEPEPEPEPEPEPEPEPEPEPEPi!V)o?X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةSI:; Vs$ $gh_=@&Fq\S;GN,M9kN֞d7|gz5&GJ/ns )oR`ՍKE[ #{n#;vf]bvvQsh/dh-8<PoJ \>uioE#526p3Kg_-ð9SO'($O}uiN~ҷ448|;:s@QEQEQEQEQEQEQEQEQEQEQEQEQE*t@rIHdI%G$Q̆9T2@WZح%Ǩ+rX`p"9ŒʺsykfdX\i:mT}0Wg#Y6~pptՋV|m3Ҷ\KhC,))ޡ 1zTs_S)V`@[ YD`x-o]efjZztJL!ڈ:k4W'nyofg;?W=y<!eB-0TV,w`0npklt$n=GcI5ٰ89 =m3*f8kQW3 Q9'5KDuS4ήu]> =tF-Jό e=gKY1`iFBƹ8$SY[\Z}\͒ޣnȤ}Gm-n v2wp;/WFt2 <9}@Dr$%W[[Gn| \ @Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[t=Q@@@E:3qIjO'5s)U5fmj27?mf7CmëNJ:ڵ+o_ǎpq/>˧; ؃[:&SlЈw^zT#hUUcgsmeShnNNqW㹻Ig[0 FN:4s3]j1 vĞZ~M87WgGHУJKd˒19mF䑢!K;^E]Fh8' yI"Hu7ucmm9Hq4"_5ҨR@'YvTq VԵ?i ֭sm с"@? Y7_?w_ڽ0~]?vJ%7Wv3X:OJ}ZvA7Z~}9o^>.D]iy,A%A@::5a}~_w%nO}+xtoÒF`>k# Cؑ@FxR\ ǥcBu[ XbI qy sUK_9&x"IbOҬjȦY%*.BSwE$Xno-YI5ɏ~߾k6&u)`V<FxMHt)FX! qܾ\93Ln^ж~^;V~|58w♦}dx@&%ı]E4!f\?ֳ=JmE젽vH2>U,OovĬm3#\ ucN]crJ^AD=XPX_-9T |I&98#v`:S=+>[]9-/'fܾV@Ks$ձ! '@EQ@Sݮ'8O`*fXKiڝ͞VgˏqV >f,i/&_! ]}OoʛiQYe?B?ƀ4M`z+!܈bس .<J.sw\߄f163{mO[e3 N~^[&s I!|LrB&i1w\skΣl@tQEA??ʧ#]'TRdڳ]@3v;}+:46Ɣ&7שO€="\~\iQ,F@? u;EQ)W w?vD29VX5mnG VkAjHP@#?Zp1TD,8^}OO{($3H+NƒYlt2'(.G]tچ)ktPKF0$W]#YFt( ( ( ( ( ( ( ?OPGO Vs7EROAW*>])Ԏ1Zԡ]Y +BX)S+O-GVfj) W_5[}YӬX<4!.cS0F kNPRnd qV/x ~Fom-g$vU8,"#үQ[P09Yjy8?S3 y[/HOP]7W{Ym,|vp}:VcYA%%#O\'<``q:mb e]*O\fiPOҹoZZfE+,ִFXi\B)voE6 ]—U#cqm +TNk3]=hHC$GRN{}f+KVt vjWvE-8=9x`p"9Œʀ5MA"y \UP՞TIlJ+0 ?7[(>[,aO$wU'#Dm@ TPWYia|2<ۏzӬ}^K+$i6208,]݂]:zV_@} u-ἴz@ͩI*I"[/"F!T NqZ9>ltlГ2;;VZS[lHI.qURTO199 Aoh5I€yݭѶJ M0H= #ufU p~~;gHd. bϦrCnz7C@/5ic&ysSE$fd 05%L_v7^r[51O8Ьj~ugz{ngӟf+X[kkOm'؝"]䳰f8ηt{f{[UF7Z(((* -:R߇ 袊((((((((((((y?$?-4E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةW4jw#@o!0G94Y 7DE.ӑޞ ̊]nvu :m2<":gKME ʸ*~]&z>XTG I$_Zwk}iR10vșWGE`Z\),8iVWLViK!9<[P7#wS$A)|m<Sk&1FؔWCEQEQEQEQEQEQEQEQEQEQEQEQEQE*t@E;וvG__Ү_I ϻb(+K8&KZRÐx zVj FeېŻӯ׵C[Mwv+:{ֵ^^;XЏP=4ڌk PڭkZY=Ū2rwt~⴪ ArL絛mB-D0<('9 ԉsF#EP0u~Q@ɨȒ(ۑ=Aڰn-u_i/G\;ƺ(Xu[E3pqǦ}i&v$WnER2q~Eqt:ΝXUYˮSi+n̿p!?ֵkTUbk2'ޛݴK z"(_񮞊Fv9r8>5PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEP=E-f"P;qZc+QG Z}qz.mwb&s +85ƱiĤF<8#HljzCƒ (af9ڥEt\s{CCuq'壪.89+h:wh}Ccf9.m (&6Kdsq3;HS. rO#WOk"7pr3'ekurqnKԳZL9v4~_nk]3g(kk^Xwcj>D \( N985K_˱cX`jgO r DV,Hi<ǫ2FrzieַdIV -(ԃ׽uҠӥcx@?!Y͞Sȑ8#{5<i"C)FE 0@1qrzuăVHw2ە6#4|~ƀP98ր+[ kHDqaiv~ b0y=9E.y#z]iƚlFY}TuvأΡK.!ђ` zfsisXGdb mk  5cD>}{ym[E)f Ods[U\2ߝX+K)noc,FNM*azkλ`x2c~Ե9$p(=%mʊ $Z8T?CsVM\ ޲b$tlJ5cE''r`^>$큚(*4w:'tlb)Q(m=9QPaڀEPz?O@B;|GF?Z˼MgR6j$lv_EqZM3l~]†“Wr-SX;{`۱bl b |օsw6ZV1*H~_΋{kI5 q''>Q"=QY0n|9~:K 9`\#g]U\F, 8+ PEPEPEPEPEPEPEPPGOIT=bk^K30/G|VɭZ!{_u ;!@PS#=]ʼ:sB?YhWTg # > ޫh3oY#u{ ޢ (0Ags}fZ# p֍Ij3zQ@:evsr}Iv1Xcny[wduu+rԄ^i[݀5qIWP}sea𮮊*O=2Ό{W( * m`v T]Krۯҷ5 fcX^p9{( 9,[^/-:ۯN!Ku1-;-V\ŪF;y%'ں{^2ؔGl֍\Z_ A:=w?kZNwjs z[4P+:$ۋyza*Oc\,NG?ջEQEQEQE?OP\oQEQEQEQEQEQEQEQEQEQEQEQEQEQƒbHՊh hb?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?~ʀ'((((((((((((((((((((((((((((((((((((((((((((((.ԷzK~΀'((((((((((((((((((((IU=A?SEPEPEPEPEPEPEPEPEPEPEPEPPGOI*(((((((((((((((((((R߇ -:((((((((((((( 7CS?S@KES(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPeU{2UϳCXգR2Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4}) ie"V.Է?4QE1(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP=F{VHŠ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((.Է?XR߇E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP=FYdY7Z_2J4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX W?[u^b;x5$k4 $)(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP0((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((QEQE
JFIFHHdExifMM*(i> X8Photoshop 3.08BIM8BIM%ُ B~ ICC_PROFILE applmntrRGB XYZ  'acspAPPLAPPL-appldescPbdscmcprt#wtptrXYZgXYZbXYZrTRC aarg $ vcgt D0ndin t>chad ,mmod (bTRC gTRC aabg $ aagg $ descDisplaymluc& hrHRkoKRnbNOidhuHUcsCZdaDKnlNLfiFIitITesESroROfrCAarukUAheILzhTWviVNskSKzhCNruRUenGBfrFRmshiINthTHcaESenAUesXLdeDEenUSptBRplPLelGRsvSEtrTRptPTjaJPDELL P2415QtextCopyright Apple Inc., 2020XYZ XYZ q8XYZ _YnXYZ % curv #(-26;@EJOTY^chmrw| %+28>ELRY`gnu| &/8AKT]gqz !-8COZfr~ -;HUcq~ +:IXgw'7HYj{+=Oat 2FZn  % : O d y  ' = T j " 9 Q i  * C \ u & @ Z t .Id %A^z &Ca~1Om&Ed#Cc'Ij4Vx&IlAe@e Ek*Qw;c*R{Gp@j>i  A l !!H!u!!!"'"U"""# #8#f###$$M$|$$% %8%h%%%&'&W&&&''I'z''( (?(q(())8)k))**5*h**++6+i++,,9,n,,- -A-v--..L.../$/Z///050l0011J1112*2c223 3F3334+4e4455M555676r667$7`7788P8899B999:6:t::;-;k;;<'<e<<="=a==> >`>>?!?a??@#@d@@A)AjAAB0BrBBC:C}CDDGDDEEUEEF"FgFFG5G{GHHKHHIIcIIJ7J}JK KSKKL*LrLMMJMMN%NnNOOIOOP'PqPQQPQQR1R|RSS_SSTBTTU(UuUVV\VVWDWWX/X}XYYiYZZVZZ[E[[\5\\]']x]^^l^__a_``W``aOaabIbbcCccd@dde=eef=ffg=ggh?hhiCiijHjjkOkklWlmm`mnnknooxop+ppq:qqrKrss]sttptu(uuv>vvwVwxxnxy*yyzFz{{c{|!||}A}~~b~#G k͂0WGrׇ;iΉ3dʋ0cʍ1fΏ6n֑?zM _ɖ4 uL$h՛BdҞ@iءG&vVǥ8nRĩ7u\ЭD-u`ֲK³8%yhYѹJº;.! zpg_XQKFAǿ=ȼ:ɹ8ʷ6˶5̵5͵6ζ7ϸ9к<Ѿ?DINU\dlvۀ܊ݖޢ)߯6DScs 2F[p(@Xr4Pm8Ww)Kmparaff Y [vcgtndin6UM&@ P@T@333333sf32 W)mmod0U6Bs X" }!1AQa"q2#BR$3br %&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz w!1AQaq"2B #3Rbr $4%&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyzC    ) )1))))))11111111;;;;;;EEEEEMMMMMMMMMMC ""Q7-7QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ ?Z( ( ( i!FI /RԞqDi ݜ'jfB?_ 8{\6\6TغL: }frƵdWK 6T}/SxA1dj.5.cE&iiQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEZ( ( (1 82z`&HSWC,OVvϡRެjX Pҷ@@xXo,wh/W%]l/|EdT=nH)'꤃T^ BBt'Zz)#RfsGO%-'jW?OM~US)lQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( y,c$gIsAURݙOKa<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(;&y4d?տƴh a<VѢ3l?GM[kFɰ6o(X<`NFYگxIЅhEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPZ( ( (XeF}h7X7d,p+C*ʜ9U']M[+/Z TGQ}EpZwyHtck[XK» F=B$!=EjHq+{zDv = -x&] R+<;>#RH~RX)DP BsRO摻oS?Zъxg]:P"Z( (Ψ܀d^W'K3yVcvNvt5ä4q%?/ӊ|!{*@)#?@떆t=ܯܚ&?(.;n׵PESӡE8?JÿtTV>%ЮGdRnZ) \;) ^auTW'gMAǏ κA4ܟcy 1n3?(SzGGW)2z |eHb2XuGҀ:+w b'0?:ꕃrB(QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEsAιOiS$fTfU@$_jA,l \? G(dZN#r†\=*SYM+#JCfS3@e )ʐuA!hs!!G5K˅Tf9.$$!Tu'*SyWw,fQ-'}z7EUle[G $ܹ]r袿{,߻P۱8zJ =e9^FH=Ao(H)b0'@(M.E^(Ьij)i gnmttw\ݞk(?*+y/5 a})ڽ[I*㯿P]K<O&H=pɭFmꭌ=hZ*WvӱXdW# s\@UU*2A `zUxn2!\]#G&7(FP+&U19r mEQEVY &w+]ek.+9b?`ln Кh^04rwy%8Bch_Wi"5xݞ( 1iʐ>vsWw_(V&7$ڀ:hdD5%smdm- 26?Njގ.-5ӳp;4Ec<Œ_2{zؠ((((((((((((((((((((+4Pr-3NPz5E1Q DŽVgj'B@Q@Q@Q@"CK! 2IqW+1q~tjn^;XА%b[.8k@mw'HpqӰZm⫸ {eav06n}2)G>1r3U?ܿ59R <8"i8D' ik*"el`2s[R@<p+koPlb c\׾h^ӑEfq!`6gަmoh`Hea^o1vgHOH]n1>g;t>JM6C6B]FK)/>dhђ9`[>cnqکA RʓJn lqsoŒ 0f2(Qhh{vtQEQEQETr(d(X~%`@WBSzN_s_*&dǬuj`m}8^ke6 JA]=84EajMxl/-ͼw('p#L[strb}:ߢ-uպ%ad:n! r= ϷY%ݛs`׏JEb1K62r6':uMe 8ʾՠ` 6<^͓[K7`A_j謍CUr1瓐vzKub2ƀ6袊((((λ,eHn_k?Oa}s^%I l0O~HVGuKmA8`Yڶ-dmNe#%(f-gNma3O}kRxMUҾ`rezFkҠ.!IP>ji(]~2gK`2zJ_ Hel*pp+8#.X4d PSoM2hQ[$ׁWeby%%Âsr21@Z6I3ۭBi 5#3vg81-Iw )'!ݳll9ҹ纵âl{7Vjj G nր:+o3h%y9ZW3݄]UO->q<f/mT S)ڀ5hsE0(k^t."23\\KD`T<zWKKo%qI,_!lC gtiL3̨qsIj[۞5b{G߳g!egngV.k1u✖dT@5/OЅ7#% Km\%#a%m7;E֤ɭfYjzPmEPEPEPEPEPEP +!gib2Iz\Ckvaq\F ά0Djxd!8V'zmUB-: =>wmK&' o31V5 hX^%ҳey$@V'4p>>W.Ulܪ Sb3nКQy3x(9\?-^ޫ+r u`ɩej ʊ5xSbfKԭm>QEQEQEQEQEZ( IYHUQO`*JOZzL-0ouxiq7JoXؑqݗf-#K/߫rOWk? ơ4˟ [۠5#!YMhjZmQzR_i͐|=-̛Y} >w; עf} 3u8_OpU6@ ?[Sa#v.3oV--$[HcaW~-G%ʤԴ+ ?Mݵ~}W@$Zg{7^XxdY#%YA"JWC~@4QY4.k7*4˭tnDl!OWZEci?r% =k6jHe,2zuxy?@|{5Z?/vuIu].~b\z2ƼRZ;Ȕ GlxS6i,2糏POUxk:r=FK2(==kZO;{ㄽϘgk.3oo?I*r#Yy+^^)/TtPhZѰXHAIxYfm33k [+"so+ڨ͵[y .$Qr=s]WU#+ԫrֿtܹ2r~G_go+ t;1@Fbe#EMpIn63k]"?ldWȠGj]%H;75[9.#/wU#שWZ!~@EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPY?im?Ѭ hRʰҿDz H }r\\Kh*BGKwR;!\kR ګOt^ 3x|/ހ {yZ9n%%Y0~PõtA.ݶ@9~W, {wmB &2A~i y+d!֊޽q{0m)H*u?Tm%7Q3 8DH kHhn( D3'9{VdRGr0Qy')Mxoȳ77ґ38ZۍI# XIy?Zl/-5X5IbKj[/U*03zPkA!Y{Pp3W r?PǪJ$r(]^i/m"CW+?ZځzRH: KY׺I)+VC#thP-Bğ+6t3cӟUwFgklfHX,涎I.F%y@ dDssgPKjd97Ub[Qd9_³o -%a;N1r3@խ!H-up8xROlz@J GM$Ws 9ɨ.~5{E Viwj6| w"կ3ARbrIv\ #MTԵKWOg l`UqEX,I~Q}FPx*4QY{[\2wz5j;Vx>,QEUK1rǥfiF2ZvץeddH&l ~:nK7<Q$vk%Qkm=J2LVQA.$X_AƟ[I+&p:۴O?ت7:tѢFxY5;.!6,H\`w:+b3O8XW:DΛ\uu 5Ja-e ϴ7ʣ$@<D5ͬ9U?]ݢhF5E?Ul&3Qcaڀ.{IV>өZگ"((((((((((((((((((((((Rww'KEDŽVgj'B@Q@Q@Q@lKKcwJC& Y?|uWV4 ٌ;_Gx!ip,s[x{<>&_Oq$#co] K&1BgKNd\ uK#TWeT,3؟:Fj?fghfF˸qdIa$ 6 \:M8nB| hsU+lahc,س9$aRٵ 縼{P$7qިzؒiieb9[@r)><t&/%|K '?Ҁ)jq`^2ZeGw\ P@'nPEPEPEPX^$<UЅn{X/!6 #=հP=eқkK6ZRHm٫_htmѢ#$'#=yhX57yJpz@$>go'|3׭_)ԉ6O;P%g7jg(n`ʳ1`x8[glIx˙cUx=wVZQY6~G6vPk$wWz4GFw=ƍKƇI!W{ $My#92v~(k * rGN໏M2_y@UnGP:t6"?ܞI?9xI0x>^3,WZDEsT&`d2`u >oV9,#84gDW ϯJqI.>F66 R= ^;4w*+:PPIoCЏTvZUK[&X~4%n`êQ^y;}4P > :AyV>QEQEQEQEp^)&-#䒫ݻu?WĺS" 9^UIH{VUƏosG SMqz4k6QH a9"%UQBڻn3?.$ݳ85C3P q>˞޽jye%2k6=&#TthfQ[KjGZ9mVT܌Nx*m<J">zzb$fV}}(}!-Yjh-(O+&,u]kpm8PYGD7߷f,tqր/+[ݭ1TQs.d$okrY@ yTHu y){T&s%23J0OvIGwU]:tDhcj$egyi++ܴW0?w Z?2N 9M?Q9k7cL:<Cxi60RRW=jaXQ. 0T1{P5L[ӷNWJ^"zWkɶ]'ԚqD\imf= KyP܀sFJ=:ƫ#n`N1늒<Ug}LHpƺEMO6\49?[PEPEPEPU.mbn\(}u:ٹ7ۜcj7q~X_s2'cWZC;e@SE<bXX:7B^kI]2ޟJ2~cq֕ݝF ޹@^o/L1G+b֯)yXi'sI$YWd ژ[y:@묲^Xs/drhYcdVp\kRG$2LJ<dH٥,/Iq7uh++?9DDz"!jTOB 'M0iv lb?Hۙry<w{ C,:,#[*^$+(g:gmiwP-D(#WѴ<#3Hf5jn`êQW.vj; > :AyV>Q@Q@Q@Q@Z( _HIպF^^' ɠVx?/l|6Mde>WyyIgv:W .@OMɮS&f܌sjLBt 7 49q֦}4]ΑJfhDF|O_aD,p5|<o3h݆ݎqǭ3S?'}V}kb7x=T0k׼ [ }b #\@i^o"`y4FI|Lm5džu DAQ_= R R$Px1ٴR y21oקxN*0ebA'iq#XriReg=IPM29.Co"0M[T>gG^/{I4/a$a2c??׵y-qM7q@?.Wq?\t[b u9qp|G Q*zuΈ@9verǺ&cp%ʵU"5=yW}᷍QW<kojvJZHGRJѼs=R=k׫=Vzb<Wp5Er>t֟;=ZJ FV?^wFq% ζGGy_+>e}O39݁ad}†Lvs@O|=5bau*:+GMJ#0 ]cxG28?=ռ{5L_r>p>MlV]Ԛl;ظ~b?:QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEsAͻ!/-dnaiRR@bU(OPUAv("pfZ('HiXqRE&) XQNT@8dGR<i"C)ȧʮXdЪQ@Ƣ푶Wk}O]*oKqv׿W ,j }ۏW((6 =>(cH6ȡbc"%NF{F7*ΡTPLx@E #4(ј;(,9J}Shn=N9P(,fc U((((((((((((((((((((((( [<$Bk7U ٴ@"((((((((((((((((((Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Z( |K.5T>tTP˓=c3]J1 ^'k~|*kzn]"ּޭg$sl?Zh|Jsa_ ~^}j{vWGE#mxz~5i-]g$C^hu{Q7WS4 }<:a>ՙMQ ıǧק_i^Mnqw ŬeW_ 7gl۽ ~xST/uSb1W{ AݏOP7ijApDJr51Ƒ"ƃ }*+kX-"[D(((jp}7AǸ`i0IZEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE <f)FA<TPhO;tܡKmC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍mC~mC~֍B+"%Heu鑀>EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE7ڏ7ڢKQTTQ`%}}*(yooEE;/GQQE`%}}*) |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`%}}*(yX |j<j,ooEE_7ڏ7ڢ/GQQEKQTTQ`?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEgvv,n9^OHU(%+Fͺ+-{EuŸ$ GEbEuHQ={tV'$Z?_(G=ͺ+-{IŭRO`}k |0?ŽWؗR ~e=?CiO;v_?GQ.aܿEPӲ ?ŽG=;v_?GQ.aܿEPӲ ?ŽIvk*Qe=?Cr˰{Xw/T?¯iʌԶaER((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((QEQE ( (?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP ߿e>?-qPW٩\ VEW:}ɌNjttHYBas;VS+`1 &\6+ٖ\9$ȍKc5u[ʹz_h1kxl2< }A4E$+5U+T+ɚ w<lԂ**K5ENK+GEVjG+ګkګu9-O??S?* XEBĀU78j+hEoeZ4n5Fpz 63\HSkޜTXyb[)aj Bcw0墔ҏk{ V]C12cҙefR<=GyĢWm#ܤ}j텵rE'yO‡Y-4v]d,`wڥ])$o5x/W稭})XH Fp'ީ^El"}=G֩TM*2yJ뼬:]B(c ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( cI;})Vx ܍n5QWܙCzRʸ#JsJkU2 dw`9އd IKI+mI Vikou~*m3~cfڵs,XԞW8k9gilEi>P" z{}*TNV;oʂdv<MNE #<?shv@ O9)nϽް{_v^֫$M~4q 88# 4wH#R@9V6j6K!D%#w|?StW{dN-|;UWVeΙa1.ƫ0|A|8{m"3;1DUqx'Y6Ee2S9,ۂXں/A? m2QY(AEܳ6ԚuDȓz~1($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?L`QE1Q@Q@/~?<[ץCG麜vW""#SO9?VZ[]>P>Qf?t9We*h56S(fy9s]&7Y^Gu\tWT覕UZ-Ťl6K&zu=QEiN<s3WW׵W6+ׄrZI!I__iu?BG#HtJ'jK k.]ϙ|v罊M>HĎݳץe+!C=j:Iu.Xdm=՚Zܹ}q֫QC-䔈jWA,G ծMMpLWI1Ӄ]G.ǖ9?SMUcx'c-Jvl簪ZU6125EWVMl x,MͼZ_h2c\$X.Ao{hff#JCpcAc5E5M're^N<wyYt຅Q\ǠQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE^2YDy<vj֛cxK\]N-WQg}CPY|E܊۬V)F 1#/9xUZ N[LGidѰy?8-[kBGVw4,s?D&6<uţ$;u Z( ,i:ё%ԏԞ¤ӡ RJsk!RSfm2oY8@CNzbu|w`7_]. oS-/v03ƐƱF0 N>((AD$(~TQE ( ( ($@ E&i"!'EQEQHHihhel րEPEPEPEPEPEPEPEPEPEPEPEA5\HY{},xQ`EC )E}T?J ( K~Χ.Է1ҖtQEQE¥CHҕbRZ.+V6-UFŧp^bRZW^bQ}(AEO}(ؾ l_J6/ ҍEz*bQp^}(ؾ\,Wؾl_J. lZMJcbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾl_J.z*bQp+V6/ҋ^}(ؾ\ UFWl_J6/cbQ}(ҍEEXؾN2Y<.QE1(AD$(~TQE ξL5  Z5~Hwo$c ,u-G~t3rOQ?M1l6N֩x[{c\4ر8 >gob39-ZD]>Y&&'ڨZZ-90>1ש+Y渙IM" y7i$7 Q &]j3Iou~m b?*҆>ByV ,3Y[IP$</ )6Qu6 y!۟mֹa_iqmjVmŒFўs[:)3H6ƣ }>K3+"bN{օMi03avs3{-(YZ4˒Xބgx,¦6P10?ր.k ZɏSq k^-EXdb5oBɌFNgg-*?|SpdjlH i"BvKahF.]@+Fh]X̾e.W;r[Ydnm'i韭uTQEQEQEQEQEQEQEQEQEW7-~=m'Sϵt#kbBrU7dؒTFQ.fo?@+_Ok:^mr# aIaTcPּFe2VP8vwI; tElwj԰9Awy/ZX+F7̮4QEdh?OP\oc- KT ((dZU# ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ~C4QE1(AD$(~TQE {YٮۙI?6q#(,8ƀ95#ӭ"rcPXOUJ k{qd'#$?T[h c=8 .lc,CR:ݽM!idrbRʔƅąAa89Cu3nbAlcVsͷ:YvŅnw㩮 Ry6Z̐W_?ʦᲁ.Iwcbz@OmVF$,TA+1A$s3(;[ٽ+]'UK3$ӻVgo1%_*0jĹu*pïF!x_j)%, *pX-j̟SSv3=@+kd`kB]aGP/ݪ귒oGLF$t4Zs}j>Bk>UV9MZnxT?LJP.|* S-6ijFY݉'(?K.q0#$Qswf%cs3coõnZ( ( ( ( ( ( ( ( ( Q."~#6dVr>?~Ț8 Coxtr̍++ǫ|?s//\Gxv̈NMury<*=GDj'VGTV$?ڳ#!3MވKVzQ\P\o?F:RB ( (?IU? R0((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((W?pS@KES(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( H Rua"<Sr9LF;$jkʼnnl` =TI,bvO*<LqSH; WpƱDQFjM4QE!AsS?[tKH:R(( Y'V$*HŠ((( 0Z.4,jaQ S?TAIj`{e{ Ky5 dB{[KEbZI6VA =z۩ʳYڐ3G=\fky ^'d2xnMDCiB@s|}?hv͟w<hҿQj$-ɴ+/9R ֫FI'<JpUZkSTԀcMu*y mb0NUK/z5H!ee9Pt5lNfJ򕲌=ufbg Ar/۬$\+")*hsT{2VsrvD6/x裚NBhvD ߽jum+lTs ;-,^kDžfᡕXn{f[2"6pĥA#hQEQEQEQEdU^\;i^=0 њ14O8/|<e\Y9őתJlZ+ZEд \@ϩ[`SauM<+]1P^'k"EcϧZ"Tz:-^2I_SIFx+$?'ZVyY3+ ^LńW3mCnr\(G* (qȠ ^-IqԷ6=_T%唦 K#|1Yn޵Ϯq'VxveB+(VǙi4qͩ20 v#:X7m$)pv*T0Mf]1XFa$Jޏa%RI<LJ r8\ᵎ}Bko\v s(66Vh`B|H=a}zYզa̻`W5e` "Y )%Y:qհVխ%BHZF#Ԛ{hdBʲuh+,_pI㚷uaHZwQz\$]ܬB1ma>_nCj G /w15ͤ+unvLftaȮcP00EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEU~B)%)(AI !=)i wϵ&2o3ڏ3ڥhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jhj<jban=?Yy-o@ )iJZQ@Q@$*UdZQEQEQE=@ﴤbذ8rһf#j%$CRbh_ [BEO!Sӽzey~]^YK,Q1;<רQ&(B\ƒr?s柧%-s8E:t{LϻHI=oF?_ͿƤ4AY!ĖQٞMǏ'F?__NB[c?.M.*t(,ϴp=UqZEbح"lt{_q]\Գa[p*K=>?ٓif<ry Z:Dc8}cYiڼ'bF_Z۶,kT;r;ڮnXٳp`r݁`tǭji::EVɓHBz=bVfs#dVhh(((+Ku@]n#ki-dziNK!,q$K!#{f6(Q$K-˨or?z^z(b#cO*3SZ;]-I&lG=v7B[uoZ?*Tz>eMDĀA GJe [<rǣ4CR&KiY$w\oAg 0ԑjH9ea qYtP5q8f㌂L@3hӶn"X6XnUk+bܶG:g>\iI9 Gs} g3Fvioch8$ޕkkqm3,ں][oU*T)ϱ5;֯clvmh/g,$pnU%T~ax#DEq pFzk|hh%1d3đI>bNxLLd0#djZ cLldn#VnV "[),)|giUY!d[z.K0wmbwW۴ 5„,f ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ~C4QE1(AD~OŠ Y'IER(((@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R(( Y'V~O­T(Lё\cSSmc\FI ׿O*PM]UdOcȣ"s]{}W^o}?fQ^9>T+Ϸ>Uwo/=2+?׿O*EuٮQ^9>T+Ϸ>Uwo/="Eu]{}k{y)ydW+Ϸ>UG]Ocȣ"s]{}W^o}?=_{EG"QpS(ȯW^o}??׿O*fǑFk?׿O*ic{ з?`N:w.ⓦVEVGHQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEU~B)%)(AD$(~TQE ( (9 -W_m %AIk˭<ؿ$<5h2k fO'9/{WQi6.ƨ2 gsɠ W^mEtP `q^]Gb6ɻ 綽{6tNC÷jQX M``v8un>Qmy53O ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE]qҬo~^~jcvJMҟE3kzцOQSmo~mo~([ߥ[ߥ>fFOQSmo~mo~([ߥ[ߥ>fFOQSmo~aiP6J]ҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6J\QSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:4[ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~mo~([ߥ[ߥ:nFNQSo~J*P h hb?(AD$(~TQE ( (0|=gscd]&2 ;}*}n+Z74^OZP+k{x#"p9z˱o97^{@_cn[wdug5EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQET?[u=As@-P((~jO­T((((((ڕ1z}(:㞸@ NQĐ#kB ( ( *[4Rʅm 3ǵVtІ䑿8JѢwÒb ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( (9]cXsii*f#=yoW{k?ͮ)\۞uJz_:W(:YT˹]/W{l_(pil_gUfG<sKgU:W+69=_:W(:YQ.%:GΫ= ͢ywi.ΫWS- @F@lt9k~kJS|fjI͝42mH *{㢉Uw|<EUn:(n:*WɹɹTP_&{㢏&{㢭Q@|<EUn:(n:*Wɹ3OoCV=tj+Oq'AIV=ty7?y7?jotQotU(s=Gs=V MEMEZ*7?y7?jotQotU(s=Gs=V MEMEZ*7?y7?jotSJ] $ } ʮQ@ 1 Q#&ԏ9Md?/@s=Gs=V MEMEZ*7?y7?jotQotU(s=Gs=V MEMEZ*7?y7?j*J!ݝ8V U=^6'ޟotQe:@|<EUn:(n:*WɹɹTP_&{㢏&{㢭Q@] $ } ʬE 1 RU[/O( ~C4QE1(AD$('IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@$*UdZQEj6l>m<:\& VFi|n\ڔ3X;K WC04FRη'5-w #r}*ZЭ"R9QAb=qPGi6"n0+~Pߨ#?s^&ӭ 5m!@aUsMhZ;M8 Ԛak[Ʉy'<VOkHU =OEg ڮ?*ܶ4+uk-BY$cc+uu,? ?t\m늓P%`ܦT]ߒYPcr7R<r>hU#06wǦ+kPm|Qԟjʿݭh[UF U4蠀jlUL4& [+ZIɨD:0$(f6v@* a85%WQ fAw kU*JfOOkkqu3(VێbXx* ~խTKUQ7@-qK1Ÿlm2("v2^P6V</cm%J\3xQavrr ϭ[uxxqckVZ6`uH%?S@mag$dg5;IGU4=2ʹXPK<:gষ)L((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((5 OEf֖!i?.Š)@,pI J0Om('>Z{[-t0ۓמ+UMRm]\62?w늧]Vs Dma8ǭ($b'fdfC(IqUX0:o|S%!XmF她2N=Ex$X] 8i0F _pkP_ް‰ _zK{V ;WV/+OX3EEZ:|̍#άdy+0~k~j|H҇Ǝ_U>`*]^ H A}N*q7<mڄg4&ξ~˭G~X.lNi%E,8zS{!g^f\g^1HdX+BxMid3:ƥe Tl.I6Z dr~V#5gOq5Q#1 |sPWw[^ivL>Y'fMI\DXy{]rpF~=*mYO6o,%ڏ\6xl3ҹKˋ}[}?nHv!fr;~uF&+,F68u=+8V+i3 r1\G Ǡz*{?Ug?Z_쟏UV=tj*ro<`Uss0Q9) &B\u{mgm38fDWQ}PlD?Es$b}LIfszR \un?! X`kq!N Ґ&5;̀IqRaNwN3:MIRcos.Lcs88ɨMA/w#MO@±}DxF=+RIvG3 4q$3Kgcsnr訪 01qHI\LN70h"KQWSg=wvF"ȩԣU6 (YH%H\魥ˤ BS>N?̂Xm[,$RSm>wn}}iXܩʸ;Ꚛbetz|j14,A[n%R{Pum,u/4IukD1,66?yyK}-"բCr=ހ;}/Z~cnϜ.F ץm$s &єWhC-B(k&%_)X0Fh({'>`*,?D P( (Z]`Iwqq,`Hȉm u'ހ:+GDǷǿ9f^jBȦﵳnNq∭&>Kmf}nbOӡ쮮8y jqӟJSkhĒ#8W0sP[q-6a,"RpedSԅN;u]HivrS̈>z$ey|!saeɸAFri<qp,41 U^Ĝ`;MG_$] d~JĺmvQ$6Pv%6~i,ks3x x8cqxO+6g!@]Q@e?_ʭUYTV=ujDz~?έPP<VдA>n~i-RZq^B޷+i<h<JV=F]ҵg6q^4v]C`\qgֺ k׷R1ܭ:)P3 NJO|8>AXxk~MfYQY~egs$`qVQmg *{'UdZ(W?pS@KES(AXt3=m eiEJI3*qh:;Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>;K[}ƏK[}Ƹ(;'-o?-o㨣Xshkð}b}:>%>cSx[Svz ǵpF/j'B -\+&I)iJZH(( Y'V$*HŠ( ŐMpLe6 Mj[;:n#U8"dZbEcQ1@O$A5D̪Gg?W9\\ Q^^weMO.cuWQǀB.I-[VMaᇂO}K? 8В=p1Y> Vm"e@I;x 4RKV|Npsnc{ @0^NkDY̲F*" Aq~,A6EL(G]R5&T""{䌯=}z1I8Q/UmCGU%ZhdN^5Gʓ]qGcSa{5nK}OTdvjτdA5D̪@$Q1%y|KkopRF`=K\lg8+eV( bu G} /1}+ӵk-9() L)F%Uay/|Eoہ$tE9Njc5血 UUQ@S'CMָC'k((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((<-?AZZ"k< 쭀kQB]uOʧ֩8OҰ n8 Igw'3ZV6kUY*I8WF].$]28z9'Yc8e9E]$C=!$:qesw =zW*sם +.܌rj6Mn9ݞs罹EIp^)iSOcKΒ}&YfiG'M,<G-FI.~U;U)$67$(،UT܉J]?1]?$ U/|UjOD)AiPR;`@rO 2=b*@T'ƬBx-Qi%ċA!Fr; M gbr8j['N.o I5* cEh6v}8,ry95R4;'LKʲf$S]>6?˜t r-H:Ȍ^G+ ij\Zh)BCA'X72G6Q[KI7˺P$X//#yXڋèlyO/?w9:uך6\% +6쑌C gY(RG`|c:5鵟wֿbZqO¯ (V=ujdz΀-U[/Oժe:YtF-k F,vr> ! NPcVkT'C,n</pU?GTIszo[{/@|;- {  Ցm6<+PJpWoPOֵͥ& VȤG%ƿ4p̱ES%o˨ˬ5E1V pP$?ӌzƉ- $Ww*93Uจ<k$g~F,[C85cE{PЀ'[:~cXG嫶2O=8*ր8?RҟT- (;KspaPҶS-()p.ͷȮxy )vv h:~-mn0ih֟غ*%aZIX?3sү.`pscҫ_N8pN)xA?ڇrG\ֱiw:dJ䁏R;>{ [3Șfp@1ҙcbyv0@ r~Mc{QƝۿ8=k+2Fymq79iE~Zs@TQEUd/E{'>`*EP+m@[ 1ֹ}#Uc-)1 R~k~]nIc)G=FE>g¸dfs] dFK1جrGlֵ jUNu25Ēow/ʙ皥}&Udm7H@>6ucn?Ymg=:9Un} !J]^$ˊ1@<SV<A h%s$0'QXaGOuW wqQRH#j퍽BYC+r#s啥]K-B½Y펞"3ܳ7pOqbȴ(.忊%͍߁{tEe<z(*0Z/V{'UdZ w[B[hTYŲ}ރڽF r:4X<Sp2pi %"IQO^"'$5p:wggwdF00AxR_խe9=5~cI9<ӷ=M' 0zk?_goz CmnG@MEU[/Oժe:EPT!~ঀ(#(A\g?/:<O쵵>rQEzgQEQEQEQEQEQEQRIّ0襧G%,ǰ41Xe$I )L-`( L vQE((((((vhS=ޠF9?ҹbT]O Vl͉qA[Uhiw 1Mg#OyWUh76^uSUp0=xkU^TnbbxIa~AO3Y!:;3>&֔*NΦ]+ # A5Zz?b&iHҖt$Š((~jO­T(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((gBY<L1`)8<\SS3͢_/yƧ]rfZ_گǗh<G$c6<G6<?9%=V6<??_/.͢_/yƎIvg.myƏmWx4rK{9v3k߹Zs%t}9!c)I-iJ Jڍ9)]B_W6}C֛xWYZ?y?f?y?j\xQ\xP*s<Gs<@uDžuDžZ?y?jdzΏ:x˜=EO9'ڀ.[/Oժ=R5G8#ڀ.U| < EUn<(n<(-Un<(<(Wι?ι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| i{DaO`qP?D TF"F;Tsϵr3*s<Gs<@uDžuDžZ?y?j\xQ\xP*s<Gs<@uDžuDžZ?y?K0Zi]ڣj*Dz~?έU%Yt9:x€-QU|۟ <۟ KU|۟ < EU<(<(Wι?ι? UV=tN6ŸRF"F;PQEB*P h hb?(A\g?/:<O쵵>rQEzgQEQEQEQEQEVv%ڿ&I8~EE]:1#&?Lae%jܶHF~OtȞ"dm>Y'&v(xmCjgcg?ҭrAy7f@c8MI#ӿ~P~NŃ!y+yX!N1u)IŦ8)tӎy;<{zgGdYq.k./wȈv`[IcJQnQ;>U*[=4֫sOص Xt{ڃLn?kR7jTCvK$Q3N*ԏfJxW&؃(#;zW=C W% m4Vhϑ?M /B[tQEvaEPEPEPEPEPK=u- m(HAnO{mP.qǯ_\^4NWFڶ-?zXȮc1lyG$yӎ#>Xn3zaܬp=8(Frtq+K)8@ROUuؤ{HD.sg<b/KxWyw<5]V]4[%1=;z<K$ D1'$_ʸ*|CIi/4a$YFIҸ02jvDɤ(O+OG_/ei 5#GJZAҖ ( (?IU "GJԌu֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhSrhwLw-րE3-іhS2ޟoOրE3-іhS2ޟoOրE3-іhSrhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swswLhhS77Z77Z}֍րE3swsw~ૻR h hb?(A\g?/:<O쵵>rQEzgQEQEQEQEQEQE6W_$IӍߝQei 1T*q["I=ٸ|C0ҳm.m%i}pAj*qZXe-FObm2 Z|c*ƢN/VT3NW!~A˝R3ěV}o{<k%Xciȥ.ʛݰ``(%Š($(((((7m:SF(/;38ҙޝEGؿO618g>IN\e?ΐ QE\i;"%VR݅QVdF/k2MEO#- K^IQ@Q@~O­UX?IUQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@J $Ԛι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| ë gs@f+ -QU| < EU<(<(Wι?ι? TU_:x:x€-QU| < EU<(<(Wι?ι? TU_:x:x€-QU| < EU<) ($$(A-MViʱ('$RhZ*s<Gs<@uDžuDžZ?y?j\xQ\xP*s<Gs<@uDžuDžZ?y?j\xQ\xP*s<Gs<@uDžuDžZ>J7\V(kp[BgpͻhϷ5Kg?֪ީ:Z6wW ϟDh"4 ù\&>g?'=;l??6ȟ}ù\&>g?'=;l??6ȟ}ù\&>g?'=;l??6ȟ}ù\&>g?'=;l??6ȟ}ù\,~5RMjU{}~C4w, CQ(J?.5#/(,*?pUE(A\g?/:5 #*oٻ<ڵҚlƺn #_/yƽiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȢ_/yƏiȭ=B1Raj_v[^$ŵ9;j*TԺt䤴;qҖt0B((~jO­T((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((/|Uj0Z+?P=ڤ,M<\hQ\ 1%/LLFfE.Xf7VZL˸&~m,QEUKi.dG̸̱<@wl+f(pL}qO5,U(u 43f6'=8Dڎm'qqn9"h5})V㷭*jd#f8H{ТYk120\xۚ/[ԢtD6PREb{Ҵ(߇uV=tjYDz?έ[/O( ( (3)w!UFI<s@?o4moShN<YT7#ȩ@ EU-GCK,AwXzMKEfl_: w̋ߑހ4h`<iE20Uۃ]ShRg14#te "&ih _쟏_d/@((-Ussnи ܨ4\]hpk=ٺƀ,QEUX<3@8"y;Qf>u<RA<W0 92J.!kQת# _J hFO ]ۢ'\ِ/'܏14rw'ksGV8@/|UkV>`*ڀ<)I+ޝMO)-QE1Q@UKU]*CA[̭EO"wuI 2`lez*u'LMr:RG^tI3.rcߥ.e9YJ(&b#Hg 8*n> 9%)QWFm)7Ufeda&@AOA)'9Z#fj?7Gf> |JVVF(SJBS?fSm\x_Q^yP T!Z((AD?IRc-QE((((((((((((((((((((((* -:R߇JZAҖAEPEP? U`Y'VFQEQEQE&ik<MmVS{ 9.1%{\gHȸ??rGR׉VoTྑvRATZ+ S3 {+3X^%vmbqM=H~?֓*J=2")eXUw73N2~nIuin5`ۅps@ 8# ˬ.uTMeeC;_OZ?-\DF )~=KZYEoq#K"ؒI<Oaj@Q@Q@Q@Wj!]N[=&9cT4h1GE2GؠYBA|;+3GMOT]Ynlw`#6ڇjO\a׵ mh2.eaOy5bИlI@fj)fi* 'JeXZL~y`rZ'GVHU'8X0 NKNnV>[g +7,,k&zFIhQ@Q@Q@Q@BT[2*|Kǽ;0Eai^!dаhpi5`"iSA$S~o= Mpcֱn4ɗSZ)u vv@mB*;(c-tU1屰gv n7k@U ܧPJz ri,:%ΦEC1o\8.[\&`^I2,zP{MޞԸD[d{d]<H,A$u{RC;Ak4`}뤰Ӭ6qր4jI^`^<oQn;oC1TFGQԛV/]|ݕ`cڀ;j+dMJ6RUWg?w]QEQEQEQ\u[6mH7Ơv  aczn]P@#cyޫzcQnGP6+gXkxgViP3Fp3*ZI3M<dڤV )<\Uݴ0Jp?%iBsVlԒybEأ(B5pdPpCYzg,e:CC ?JZhtLy$m6GӸzCp6nqθ(WHK v:#'B[^=I'V#+}pݖmvRb]Gn3бvcIat6ok=G%k qPU,C`"{JfK1I䟔ֶ vS`jy-0l.Ǡ̵6"ԇi<9?7kCSJSqs1 3ܝ(Bp1Zֵe @i_P6ɒf'8bD2%8$$ctW!]H,N\}uQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEV_U>`*@UK;kvTP:Ε>~SQֺx?ڗk8X6mĥCwRHvZ,QäGQ p=HhR=zM y[]CG"C}+S d !3zmzMe"v_1a6&q5k&e2yw ǭuz_Y8 fi70^xPu?*W<Pno8k{BUCW7wg%Ʋl>czW[ݘ䲱8un 3cvZGm"_o<F2Y :`+iȖ$-H_{cZ>-"K $ZWq̛>%.b:m-ЉcF!W ֓]b*9 FXcd>v3@<8-gZnKiS*K[a'ۡϓv3. DIs9X%l+Ubdxz5J!T}timE19h;-qܛUWN!&]oN{}/_m6)cɸZ,1/ rdɯN;US`:4/HZJ*{?Ug?Z_쟏UV=tj*!cy}paXynw#4i<oTUWi|;q ƜOo'9$nGOK< :(u\dMeiV7),H6 Aa1 u\dM hlir[C?sZy&D}+LHݷi8@YW}I ,2yinsbIB2=]7Loܣd;Ě51\|ژ<c#Zoc;]sj}-B@ rp:-Έz-ީ{m&[1e0HsֻqS7-l-# 'qۀOJƲҴ4ӠFўIPw ~r@9=kբ Cu!U`xqJuh X2HSXG zסB᲎I"F(0Fy:W)S,%ʰaH9˷ƶ<?ac}89ZޡhS$]ܶdEbEFx Nk{7ZN 0C 2GzV.i]r#^}sIj%bU/#@%Ƥds ? \vF)c*' +7ykMTrvQ@l?D Qe:%?_ʀ-QE6^D6q'L!/Zi4XX$ϻt~ G7{6y[T,u_p[9[dRk6ԕcDGmL tHhk=n[Ҫk6Wm Ф7P IlO#uz?))Bd\xs9Hey>?rfʲJ|`S<99@OX8Up37J^K@~܂@id/%张@2%SAm5t^ ]P~lr,1JdD/IX=Ÿ%c'G&ѢWAk,b IԚF{{vhfs2## ?ͯu[KTT9< ':O+ŷ3IG ]tcZxH-gZʅ}gLz{Yp2kWPgm;K,W ۂqmn:}+j{m F~l]QZ8_ӚΟjn96N(e2ɥ'8i[-??#}+ax/*#ҳ/z. <E섨 wQEU>`*ګK0Y@tSE:x)_Z~؟mS1>m,\!}nGvJ5O읱ht\Ρ76+*54S*{*m.Ϝ}̌vuukyԡtrzj4kHDN6*Gh>ȏ,̨$o`ӎsךοUK5R@'0eW:ejǩαÆfݻ g=kMخWiHwoҰfXQ'hiӸN[=z۴s0~» *̓E[UuP6$YOao¨2*})[-`.hLA,W`J*pA`{3~q<+ڌlgV.Z[YI G˩ `wG?9:<L Ɍ9yl8hSזXd$)8[n$}4k&s g<=( <~l v<sIpH kIS@E nJ+C50쮮1|8JEY$y݅zoڼSm\X_Q^yP T!Z((AD$(~TQE ( ( ( ( ( ( )3Y:EڄK0PRVAOkIREPEPEPEPEPEPEPEPEPKkOeg*2K8N?_\~~A;=kV4Y cvNxVYfqssU?1_X_)vx߆8_NIo gn-E_9 iW] =ͻѢLcAg|=~=ŝ4sK?F2O!loee[ipַ-/-:VYA)|>rZ5_#rDZuW(.ԷzK~΀#)iJZQ@Q@$*UdZQEQEQE4mD;@ZAcX,jW_kksc#=).HK|>B:}İt|#"эQIa;(PK GoCjOaxWwWZ\b7 ~$s闺żp\y+[ \g^p8w]hmC8\<:c<XUbUc$(~&69*[x0$rp۲kԣZã!%G.IMmOH*%lMɎo{fIf%3 p~8M6Ff)ILwf(RGhcu4ulY,2%1wsOmbr'澹ecc.$I68=8t'ҢvH rmPEPEPEPL IYf8MyuIh_^eɡVzk+%4Ef8ڭ[⪠Œj`ub]k ;[iʡ 95{'K:b|ԟBsJҬ^؉|ұVvaUH<?jw˩M(<Q#P /-H8GB>}m@n.hv>w5ݲɧj"Dph:.?O'޺x/ 2/g3YƓi5kNH`qc>FY=OOtjΪ8eQWKkwo{ڸxۡUm4 uXIUG<Aimj\Ʃ6s@h(((ZiyY*d/>ƶW  ϗG6aU؂ѭey Z,mfVT֞?Sׁ]LG#(A%ޅ]2͌}=+[%mVI V7v_$/fYG#R2dϲе]09%e *PEVHIJfMZ=<Yyˁ5R\V +!=F)Pc_CKY_i=ŹذX``t84%O]\f`;`F0o7 w(ZHY]ɕ3N$c~t1w!яMwP4<~Ux=`)gPp}Z/$ʓa>mGU~dolp1zM IӮ,>=d#ȡp{c]iK ]tVn.4ȨuUNxJN 81#K`*ĹVxe'z8Xݏ8?_:V/'Kˠor2N9Wnmumv1KgjNXVLv_*XSJA2?gNN  *+ M4(V p;Zլ[{QX jbȮ85@Q@Q@Q@kEu]*cI;W~J4eƍ"iKlӎ{Z)#'7+RK?}\=jGߤv I7K<u66(PFx+USoD|leq۶!q\G4F0L=ww{hN$4+s^=t2FIl'U5dRBxZSHu߯9-=i&9_-+QR2#֬e V@<Cg^Ykb%IJJ?ʄƻ+ `0Hi ڰՠӍ{%y>wb'v;PimF-SR?(ns0kYv/ZiZiDP! ܞ5a_n-CCn P4]X呲e_,tAjJ]ޥ:{zۄK-rWQ+8v ~uв#!*FAx?ZZv]jh8$U;lb{xmY 1\@@Ikϧ %XzdP ]i%W7Z#bGAm<p k&aIۉ\ {Voa Ƹ,߼s[ӮRnP1y1,[71sӚHj΍5UFIaI%2Pq\WL GOϥbi݃vr3[0[o1\LUc05Ph†:s̓'F ?^^QX=&>D!ߏJz((((((((((((((((((((((((((((((((((((((((((/|Uj0Z( KI|6vc} S/t8u=Anu`=C}x[P&|; FRt#4;Sbuuo@BZ3먠wPКK2kt~n9U ڛkxe$c玙YEro˻!L4u<TkL_hE[c19'zbZ(o Vy[vͽ,AぎxoRl MwF!Ej(sZo5{yV1jܩwdU@m/b!n0zGNihdzέU[e:Ul?@1KE`i}ap:`Y#;~nOb{Hzˆ[-%u`>rMoNCOK<݉gs՘55&k`v>*Qm 6 *dq SuoWN`6K2zb( }K}.͠y|$vn2+5\ : br+1J-$gw;}OUJ+l3!Mǜgگ@|gk+Le0e:cOl//ځs qIpZ<W]EsZ5͔%.]ܰfu 'Nў[/cI2[F܁3~Q@<& [Xr+m/m#1}`M}:֝QEV=tK0_쟏_Q@.!OmqlYxm3iNGһZw>"$İ8b;:q^F)hn^mCR[y-ؼE2IvҢvo$dI|zgi;ka<?s-KnDBxN=+C[[V%fB1 z(4)[6y[ۜy$f'o4yZPGbtP/qƹ5F>psU;ҵyWu1sGvtP+O ꚓ\(D嗦Jj ^dY# G$:k8En?l<9}\qo~LPȋ*ǥuPEPY= UIE:tSGŸe<QkGX˙ܿ߾#T')?hw r[~7zN[6ڱX]Ne;U ;( -VY s*)D54Al/<jZr,O 1IӋwcUVFZqkj~Y*wm<@\,gngkrCι):Q{%e4{d&hP a!^ƫ鹻@rqӐ>E Aԓ:<M m uˊ#41VC`6G\>-]m4a۸>?ʪElFM+<- +uCj(L(@*?pUE(AD$(~TQE ( ( ( ( ( {9uD$}q[.`[y-߁"@ppwFk D8PB@ɭ+CXB .܏o™kܶ5Fp w:"ڙ!`n|ܿ_닉ZO׏COq?\δ ψYq͸c_ZXcXccݺ^~ߪZ/Lv>7vKX*/ T{+((((((((&g1St@HmALgQh2]Hol\=}ǽbwZ6o(g+}4 uXL!b<)3\kdF@sJ?Tl1|=sD͛ƒY}LP]`CCs1L.ɂUI e_9/-$c'*yZ4mic)`.T،umPj~IٰƸ>>kM,N"ɍIO5pLv ?[֯[H1 =]k p>D>ET?[u=As@-P((~jO­T(JZ&:[|e~mcךϟDj$FRtWx"4x"4 u.{DTV">oU`v"4v"47DŽ>~8$XPpȟȟ/g Ey'|'cG'|'cGaxw=>>K{xw=OOƏOOƏe.:+?<???<??=s<ϟDhϟDhRXs_C"k3e]ݑ+id)D rA(/F8?OoXZ9b1P]QEQEQEQEQEQEQEQER@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@&2/-/SM}0~UD<=>UNV34Nҷ//;sOiE!Q@Q@Q@Q@&)h(Ǎ%C2iP'u;I\{cp:֡ T/]R/&/SM[((((((((((((((((((((((((((((((((((((((((((p^9r\>mժ(mU(mU(mU(mU(mU(mU(mU(mU(mU(m𨥕.Sɇ-WE*['6Wi888"@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~mm­Q@~m!FK7`tPTn.+0N@V mhmCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjβ ;Or}*PXϦ @lpñKz׻b ) ޾o_ZlQOoxNz׻`QG`;֍^F[}g_Z7{}my}h޾`Q>xNz׻`QG`;֍^F[}g_Z7{}my}h޾}my#Kɯ]l ($$jVUk9mJEU~B)%)(AD$(~TQE ( ( ( ( ( ( ( ( QEQEQEQEQEQEQEQEQEQEQEQEQEQET?[u=As@-P((V7PUW \4?MH_Z73w4f H]E;tW}<?Mgd8E/F<?>T1߳Ch9pqa1Ͽ>UnCc Ͽ>Ux}ww4}g={_x}c[fw4s>cG#}4?Mfg#}?V١h4?Mϸ{80QLJ*~SG١h}DZLJ*F<?>Uh>SG3=MH\Q#;&7VHc2:*_Cn$ě֍L4?Mf1֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳC0IF}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F fGR8S}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳC) fGR8@w֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zdu#~U7١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?Mf_Z73w4}}h޾ϳCh~z>SG١h֍L4?MBdu#~Tgzѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}C֙h>S@޾o_Zg١h4?M?zѽ}ifw4F}CS |ƑQ>~ঀ(#(AD~OŠHA2>:Rc-M())[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@.Է]Ҡ "ltҖtQEQE ?jЬաR0QUpOPUU{Wj ?Ɲ*^Ċ <EVkkycg (@(un j 2iykIpS3hđ$A$lH }UK{k-qn_[+ Rֿ۱t *9$H2HB{VFj>zn(#]'T* ( ( ( ( ( ( (4QEQEQEQEcTqo$cvc4ECt 1wlzdf ztY3@QEQEQEQEQEQEQEOP[_QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEA??ʧ#]'TQEQEQEQEQEQEQEUA%˄Rp3P)NC vhhRhdv3!y\ )8 4QEQEQEQEQEQEQE*t@EQEU'1<jèf:ER/Ƨx'dTj)3Q3#rKERMFYDL+ڭI"D$ }P%4xxR[][0u2=h-Y.pdOY*v/$p8fy EPEajZ}VV0v15$fIUQOjMBw@Q_mEPz?O@Q@Q@Q@Q@ 0Nbj-?~bhQ/qSzպ(EUQe`nIQdVw[w9+hWi<go|U(=jv֡MÄp3( (["C+y8PzXBTd +i1 g;*-?BIEP袰kRi",g;q(vX4ȃ;}֫W_w( ( ( ( ?OPGO 袊(((qp- 5BY{g r0bA*;+qP*9$HTOVMJ(R_- E Z(((K~ΫXR߇M-QLG(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE ?jЬաR0/Vun6y9BJ+ _f(S@ΟL/norvN{=AH`Uh%K_<{nxpMq44b'΀4u[kovmD85[_[qFXtՆ60-.㎹oǯ?iϢ˨3t @mր5luktPm22[cԬpp,MMjj`qLgmld DijEN FNct5VVգe d7hhW uOp喋\~% #mqI phl'Ӛc% ZSP~nvs eBU]{gh|= $/p<8vIҼP'λ-*'Q $3UtFr,coTzmaX'o[\7?/mF@5HUd`*䃟4^9m?Z|?aԢR)SkDf6 =AqˏwTQEA??ʧ#]'TQEQEQEQEQEQEW⫛soy^=秥vx[}e Ʊ43K$ >3[Z}ů'iĪ=(Ew觐W^qЏQ].D0ݲ=::<Ey_qޫce`H2AQ\<vW銑YUa6?*ͅyH'A>vw1_j j)RxhU`zpkgm\i yC?z*QWʻ <Y$o rtQ@ZdPHHWApq\=k&{)`9灑wz|* @>Y'kb(0I 1rRQEQEQEQEQEQEQEOP[_QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEp4=DCoTSDu*~o]ŌJR0k#Soo)8cX w%ޖ38v< .!Pݫ1U;Ic (U<GH*@\@-gs kH +ol\Nt4vjVv)i3I1`suRdK_W/+2h[uj'j O*;-^[ɗ;H iC,bbB6N:[d.U@8=((((((((((((((((((#]'T* ( ( ( ( ( (1n`8yo',E?ɮۼ2)n<FHOc< Gavb&o8I;hxQ'& ͨ#+81VDžUyvʳ.'do*ozX_JA8cװY>I{8ʞ#]5e1xd1ڀ,X:f"vOJMwʶm }uQEQEQEQEQEQETz?OEP^uE'Õ;N0|xx^ :י W0T$_€$q]'xs'qƄZëw)~ohVڛ# ?>ម8@Ea^WͷV?/_9lV |Gg#*/>ݓ8jK{ [82A'ɫ%Ԓ;1idul`A)8 Sa qg{O ޽T/Q[6$,9Or9ǯ`8rJ͆f`qmob`3l1lީ8P9DQGr_Ѵ;: Yd.B9 c޹^բfقX}*oő\ҚfD^,÷dXJoj3$C, cu{ u0$ HEKkLWQ<8?޻m>vQ[O' xjt摃O֦P?\@.Agߨ%& 2 dO mp#}Vّt$1ah?aԢR)Sk~\k(#]'T* ( ( ( (9YD#RH: 5d8OZW̅'p,|@<e1 mYUO~sNέlh</gc]g?C 4D].%'vKMID[6c87)-s}Ze22‡^~<S-i沷TQpjص4հyH`=p>Y_]G?ۢ Lb˂v#~UGmn&B ߕq6 ʵ)Gpv9n bpG;WMxPE,* G`l-` H8IJ6>;C'9\:?JQie-Ndʲ䑯v r@=}W4]JK~SKUKCݑ]m[>[o+&`pjw UR \uy:`-m봹8U00U.&4d\;U}BMeZ4YC~.0NG^OztfW<=]W$w(CP*y6WY.V%Ιre7`9?9"&Nh2+?Ooφ?{RNIs+c _C\/?]c20_p8 H׊,`H~xV ;>a>-AVPQ@Q@Q@Q@A??ʧ#]'PQEQEQEͬm#B!ڙJA5Sh YJBO^^Koy<2P,p`;%Ŭ:|#WWwǭe `bIR  aA9HK)-_g1#M4N^L@kP ;.aZ^$[ok^U]`,(6=z.RT8.#Dq$0yktkR>`?^l"NP"'b(((.Է?pU-:E(AD$(~TQE ( (!xg]:Ƞ*A(xbeI]QC >ֹ 5V]]e8QCq–EH?ʳ5kɷu3XDOjO<j9ه@1t$5@u?_OIӒuCfj IӮ4fg`rN}MuQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE?OP\oc- KT ((աY=Ba\iځUQ4:=k8mKW\"aU@>䚒 }{I+onWa(9̍ihsYV=] Ţ]C$ W<'=EtRi֓G S&AQ@U5Kɬ80pv[ZLiR}>bt=R <d?{Z>uV<d`:` ([wcY]6od63֝5ͽu~8B5wW!\z vp (ܞ=6i.خ0AMuPEPz?O@Q@Q@Q@Q@Q@Q@bk7_wg8EP,"-Z^3ʷp}k:C-%ΆNnҧ(;{ylo#9ۃx3N<d(s;kVZwp9+–{d#mR}O_{Po b("TW#}UNkk222N\±@!%l(((((((* o+:R 袊(((((((((((((((((<9ޡ&bns+CUSle;+R3f >w^Z[4M8D%WA9}5,kyϦ2k0M=BE3/qk/s;z$qںj(((((((((((((((((((IU=A??ʧ((((((I,/R;4Y^=@}@u2n9|xr{m<py8a+~moΣwN Dqӏƫ/omkx¾3s쨠FݼOm[oTP3 (((((((tSz("NzgↃ$ȶbvN wTPXjbl|ϟca^[Z5Y"G_ʧO=k9->f_Jxon}+7LOZڈmP'Ԋh(CϫTɭ?s`ۣ; AŒ`EEsAo)ǘ77^H?+6WyXa>T}2IP&Ks-d="흮 I 1vWcErKZC8…螟Vl-WMF(4-YT׶}]qC2G Ը9k OK@KG$?]A\Q@F{{,,RǨܚEr~olnf=YEQE*tSEPEPEPEP+麞v/*ݞrr9+ iEEW8@z ɣJ5E2#~njvwJ, h> Q5uŻ-zsIn-dh ':(;IH#J=EaZXkXI +8Eӵ+ۆ+dėl3>U|yS(2 H5ԕ:_^ΐi:g=M9=sҊ䆛^4[@dc?5~9 +1ҴenOSX^jV[y)dWcEsF}3VtM:v vN: zֽ\˦FϤU1NpkCDOH'_$>կERPky{؊ <WF[2F~@9O= ;7p}j 0# (((((#]'T*((($.||dRy5@]΋x3=ۅ p~֬E^ۭޚ)fFx$?P5;{xVg"L=֦.<q)fdkFҴQ.oA|UUP0)PEPEPEP?[u^*?W h hb?(AD$(~TQE ( (9? ʐ$|,!8=QKޱamh{ kh}l) IeYXdG<<zvV# 7~[UmDz10qgemo4ĘyN\}? h"nF"(j<Gʼ%Њn O5ulAsܞs xaX Qx ((((((((((((((((* -:R߇JZAҖAEPEP1=BCo0{5#'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahtS41+<bL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=AmGaj(f" }hahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4GOM؞1R~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'#]'Q&JO Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4GOM؞1R~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'L? iߡ >CGahz*0{4}~'#]'Q&JO Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? OEA>C@P}~Tiߡ0{4=ahL? ?[u^)MUNI!Z((AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQEX(i Y"j#""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥+,QHcjO"/OքZK@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-Qmf?YTyz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@(̎p1'B¥?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?Z<?Zȋȋh?ZbGVj$ZD^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEEEEԴP^D^D^KEVX2::ԞD^ ""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""h"jZ(/"/O֏"/O֥""j53# cYkyz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@yz~yz~-GR@5ƒ*Y5EE(AI #ږ?IRc,o_Z7:@7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7zѽ}iPw֝E7z :P\oc- KT ((IUڑQ@Q@aoߞj?ZXso{G1ǿLiq~ciIG \FA8h1ǿo{Yvwl>1"i6y@?QLde,7"aciWm[r.@>h1ǿo{YǗk88M1=sZ5hk((k-D_hC>̘l8pF}zio n?PC|͎Wt4U;iʻ9{T+mL'WA@U;=Bk&F#8nu}:O&y@~qiQQCq p{u(Iy9pqEV4g\R2rO#: H 8'Ҁ'KYK[ I0'GoJDYX@׊fLmӃU/_.YKڮq8Z/_uϗ7oąl\ y3hZ4ÄAw)~9 Kk58u8L yMv@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Ej(?-KE]^:mym €7+Y3PEpp20A$w.no'dR|dGE`X]A6~C|n2=1U`S%kYm0#4\(m3RڝE. $AF_Ҁ:+?Kв[n (((((((((((((((((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI )H!BTd@^ҤFO@ȫ֖s B۞JEfuԾD 2MwYبkn9$&.QT;@u†ū#-g'=? +*#afK1&Yn(z4EPEPEPEPEPEPEPEPI OTQYiM: ;W>d\EYڛ<eFw@Uj[Gbw_I6O JXԵ),ؠV+TeGԊfq5֜1w,ܟlQ\MjAi7,K7z6S? )f<Mrϫ [ s_hrY2y\lv098qU=qlZ 13YESZ+.~ΟdӠڹ@tW)7ޟl/H`olWIR[-v |'K-RYQ 5EahA{ۭ[f}:m$h\sxO_+GE#Xt4Ec^kG= 0v}~,:彡kΫ1@UNnll eW=mkq`U滷8})y<z}kRO@]I>\4"nGm_̹!.IǭuTV.{srAvCI,:ڠ((((OT€%(IW) $]5yU[SJ::(bd~ iy;/f:tAU OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq΍,Hʡz;*^AERQ^ek֝)eUu=I<Wuj<} SfmO;E$זQcP"4l" 6 JVvr8>*FQEE?STPM-QLG(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE]Uڤ}*HŠ(({_?/\tZJh[K-+3P>uKr#D~Q4G *)(wq9 |1O4Uq!ID7?QX1j6`e|jNm3}}?T Mx/*c&i^cg"l?zlڳsV(Smyoƀ6.meY7m\jrQN&m8aEo[t4QEQE¥k-bLOQB:xG[I-YGlmymaq@hA&>j `LΚg܀c mQٷNsHu6wٷNs@1n<xE XA>5ӮSmG~w&͸szU{i>Lr*@Lz}d,Uemqu eg *_q=6rS729OcߧQT'_m?g1Ǧzu Vwo9q}j)K`{ի"}=t%1Ϯy^~QFySU:9cvau1<_*HUN߅jFn`[q@5VK{|cvVi!hd1zݮcAHE;Q{hmbLc@}:E;KJ,0faƣOԭ_n4uc}ϵsxC^5quxC^5vtQEQEQEQEQEQEQEQEQEQEꖥT-U{vb랟ZCK7SGwm)xGqm>M)>|\rjڊ7.d.$S\A⤽ҤS&!N<IX> *O :?^*杦Id<0=UGy&.|1)p j@<#]Vn'9Xڽ!>c7gYw֖mܟ }(iǀұL]Akm[CPcQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-dkrZ ̌@ IZ[}irgU{4$KxWn `Xs r*ƥOs7*Ð{?.{y3؜u< Jc>e4<<cq@I QZEs9)QߏNE2bU8r?zt{]JΑ ϩMyI-п>0N2{zi$+Hp;S{UH?k??[6z\]ټ`( lKsߞTNM$БZ$&+˰UtdS!A$Cws"NΎ3BnYF~A?\S袀 ( ( ( ( ( ( ("OT¥ SmOr@D+af<k_UӎnO,N3 c?:j-| Gm"F_ɀbGeciFj֕XSE9qת/uΥq?qqS@S_ O䋽3Ωi?֢~su9m'L[[`!-ܚbv7Ze3sߎ3քM=ޛp`i~ Vt0Y4K!iyw?P!64SGynTs;ìI??ʶ:- n1JrS]2 [Fv[yeMgU{XӉ,7r޵CS~m^pI[e H:c kY Aqׂ}뫵-j s4Ho؊p[L~| nn$[++ d#Zw[]ݙ-Џ. @OEPFNuncE8|yzWn@>4wd{6Ѡ :n?*MnDօ?i;|+Gej,Զ3P)ijI-Lm@HǟҴ<4Ug<tkFu.c.}3ZZn|l7$w=I ,tg}Kaj:E5u'8?Rh˧nɓyvc෯=iXz8 *%u2Jߎ9/Z.mqR,QGn)!cC+yfRێ|˞D SBG#<u-qy.3tջI'Xh&(dGfK5䷐^S3a:t6y_{e\i-tgY'ig(Wc񪋣^;uD; 4[Kq:[;gֺjt$zҠ((((OT€%(G_uAt{d+7VխSqpy: DbͤxP\yGn„#SksrrO @+߆Ư ; ?w-uam+q\U] =Y5ݽ qjngՊ# (~륬٢ (kڛ{XuS+g=Ouhhi`$?o N#\|Ozk:gKKT+ ,c7wZDBy{ku/ I$ߕe=pk״VV6ٔSiEQYQ@O(~gT?pS@KES(AD$(~TQE ( (9-S^"3[EPyzۆ#T?Cޱ4J6[;Q2y,9+VRRԑb)si\ZG , AI.ieԭcўGMR-Z0 ,q֢uPjݜe xꚤzt |$8E=e9O?ʇ9%l>E*;dnF.98t=Z[(1|u4QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQET?[u=As@-P(( ?Ү%WjFQEQEcj^W uǭcd_ʊu/?yƻ*(?<GV<쨠7&y4d_ʊo<GN<쨠 m"n(((k-D_h(((((<zs2 <q*#Ǘkih?<G#ǗkӨ1{Xu. y9?oPEPEPEPEPEPEPEPEPEPEPQAjZK@EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@C%2Ȓȁ?OlPEPEPEPEPEPEPEPEPEPEPEPI OTQEQEQEQEQEQEQEQEQEQEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@D_j$ZKEP\wJ^V"pIT1mH YZa |5,<^,o/ؼ_?~_jvʨm?/Q˦h).*cRhG@Ptٚ|vesZtAER<W{^#J ?"k9ȴ,9?J,̠\K˭WJխMVڼ8 @'"WToR:$r3BpWJ1<qRQEHŠ(T?pTj)%)(AD$(~TQE ( (0|?gscd]&2AvVPgso*mIX9=iMp᱐:}knԴ]C ֠O(؃&>5Q@zF-sv&9b;{VPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?F:RB ( (+|JT>ϥ]QEQEQEQEQEQEQEQEQEQE¥lh(((((((((((((((((((T-E=Z( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ("OTU-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥l h((((((((((((?ֿRIOTQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETI O~ʀ%((h((((((()5E,Z((AD$('IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@U6?W>SUc{VH~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chdu#TftS?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@ 2y/١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55M!GSI??ʧ~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SP1Hcrt@ h>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@p1w4zw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw5 CԎ1W*ITfw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMES"0xCXR߇M-QLG(AI&GJZ Y'IQSvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{k{Q@ ()PvJ6JuݭҍҝE7k{.'=?Y.Է1ҖtQEQE ?jЬաR0((7P>߿=co$?QaI 0ǿCL?Ql_pQyWPN=? 0ǿCL?cYڛeݰ"$T4Ig<tiCL?{XK ȶrGpzU}܋cP8 ϧZ 0ǿCL?fdj_ ;]?P~fwsaZU{[tQEQE*tSE`iL;#oQ85u}kd>rI4rFC6.|3V6Ab?. c>QU`On O,Lb?<PR{KxViANOwJ<n:g~EVκpdZkiײy6@Ads@QUHm (U/-y-$@\USZdh9w4 >9 J+Ai3;9Y Ĝ8(((((((((((* o+:R 袹Fk).2BQހ::+2Xӯ%- g3Yk(6__jb\R.bl~St]8F9lQU:2?%f[Wޠ$g@h.y.eɇ~SޠgK5)YID\U8:KEsZ6u}s炊vZ(mWSJC6SNLiػƀ5袸kZy6IVZ(ӬtrBzd\EZ<eF1ߟ테W-嬀u *+է7Vv2m1bN j[[=Z9/ @yE <Ld֬Xj[]۹e94ErVIumqxU6z­Yk}@ WA(ƽ=)*]b0Wz5 $ pЎ(B((((((((((((((((((((((((((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO 袙$$!UFI=V2kLp 8#vё.d_%sךEe:mD 2OyY(7RrI]5BRd GQ?nn Z29r~_ȰHno$ 3iޙu(s@ Z( ( ( ( ( ( ( ( tSz(b&\5qejo{ ~€:+ծ$' 2I-xZqq]I}5-JK+y%bFT}Hh7i5r˴چ}4s}dwaԣk[*cd@TQ\~]<h+ OvU;eg%2?Zv{1 Wzc@ڀ:+3ImB.\aCcE7X:uN.HTO[4ErSniPK"*0?cKedc4bl[iG)n `]@hfkCQeȊ8$ilu3H& F:\\\qhU8W[{;[vXwoQXWI=݁Zn?jͻMsO{!\BqEuW7j"Y$ۂyې?ɩ@\)_k)P@mVkky#gҝ9?G^alrz*yA@sW?ic&0@z5٠Gڀ($n{ HoEPEPEPEPPGOIT=Q@! )k.TI*Wu>t__Ώ:/\x7J*܏w!W=ի= P[=&mN}c2~ug&LaYXZ5oo 108{ ztRUt QZUc÷:,q m*@kh(C_;[V+Nz+uk]^\OU>ęIQM<V4DAMyU5+V1#F'|n *(ZFZU ˜f0( -:bK~Ϋ4QE1(AD$(~TQE ( ( ( ( ( ( (h]\T3KE%`:8IEE΂XX:r*Z(()1:ӃqREPEPEPEPEPEPEr%{]'Il}'9PsEr6fǸ?ʰu-->Av$2IM-3G":぀H<Ub/*F1d=ߎޟvTW 6&<7*V۵VzKˑ?(R߇ -:t)jQEQEC}ڴ+>?hT((C,?_ҹ<C,?_ҹnV>Rf==+yffT4ϧ]Aܴ(_u c"ʲJJs}(5S6 !g5\HRDQ.OV Z<"Y_ڟSkdp_OUC$^%ʸ| '6qZG5ޛ'Ķ啻~?sJ/AlA[' {Yn&DyDMWxڹzܸmӼ C0CXtx{[t{[tQEQE*tS;ֳtu(hA=GXiZm_q#es6p2GngQU-onlb$v"ә5#+_noةW }MV6֒>E vFj̺})㵱X;`N1縭tH#ع-UD/ZgsznU@$vNh'իg]Du5QݼtF[Mt9>7lߏ=8 #7"-UK}NK ɁǑ[7z;m綛ʞBAcUЮtl Q:O\։!Kը,x7 P.;sPG]\ |m >]S<1ioFs1^ӴoM,qʸ;9sւNq4W_Һ:Ӵwd/n(((((((((((-ԯzJ?΀'[U;r)F!9gB C (#Y8:H)2$ q/$?V߳A^:T7dm7B۝"np8ۏʠʹ 졜W'154cP}&7u{E,L-0*0G^o_[CCi\~|`ҴɞDcn454|YsԚ4Yn` NI`6NJt}-~P#OZm`[kxפjVk ُ{Ҵh?9-t_\^1|Oknv#3?M{s6F|9 x~ך?:8ޥsu}Zo߳?61ԓӚ\ϊv_խmg43O$"rsr];N`pz1zU䀉?ޟqMĎcfR&GNKJ6摗%ր(0ԵۏY<󮁬mZ-$4hbFeWn,.KUdH&U} oǾi0b\n#ׯ Vv}9Gֽ3Gym1x7c qQԧCЪiUycY2ʧN3OR麛p<3B̪;Nyo1n2imm;]Jg7_,JPC0?`N 7nG.L )&joifgLx4'ipO!S . *"6Q^lJ5[k[00?ϽX((((((((((((((((((((((((((IU=A??ʧ((((((((((((((((tSz$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ=[Dx_ '֨jVS)%q(PV\ġ%E T`'i֨>!y&P=eѮ]JΑ qSRKt/f0O WȐxHV0p8?TNճgIѿ>6aDzFĽO7?l,~}@DoБ?iFeG{ 6 o%Q?֠ƻuG(PO?€7,#?* ⥢(((((((?OPGO[@$Ny0ԵۏY<WN:ۉ<q;wg㨪#IRo GkX"F_0T)~L0;5zI7E4C9j:=Gu\y`g$t*Su"FLp#Zeu߂Nq4Z rNB6),zWZKc0==Ϥ\-iCKԨe'ךiŤY ~w<~Ҁ#Y}xFxAeM]5ewc qL@E9\\ژlȵ?)p?ַuF{U/~>lgLɏEԢE=ET`P!-"bm|WaRb+p8Sx'޺8'Gq1N1sEWm7n= ӪWlbEWZ5R$pUy2ْ1 q؟]tʪF@)-WY8X۷zWvYϧR#ٳҴT.>arܐ:/ӴmCPIptQ*p^͓gwjmKK|ҮS$pz 5fS/L|n]e;O5o^ڡIwZԹ71gp!G|cV6\I[;pze%1ɪͣjwk @?qmaf䏹 QyЉ&xrk~Fc/ooUyu"RΎ3Aܖ fBz׊䧿G[1*A`yc+x%vbṃ8qpy@nDobry4Axyzօ9neH_6<ueA^)[{@qu>z4t3 JdAZcgyl7Mpp :((((*IU=A??ʀ'(?vAt{l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆Rqrs*ރ߱5֥C~GC»-OAͿ\Ւ]@.m_|mjs?/]=fQEt]^\uaO#?ouֽyⷉ" k5j^#P9b{֐DZׯ<E:ZZ,doqi Xr?ƼWS𶦒Ȁ8U`zװZj.m={4#QYQEAsU\ox~ঀ(#(AD$(~TQE ( ( ( ( ( k2cIU Q]녏PRJkk72R?A]Cqw)ڋ31-Ű}V%!G\:<9;D>Qq?PArqny߸gqj.{8D(ZXIpO n<אF1ׯj}EY1uaw?΀6Q]:%H^ypQjp`Owq}>Ԥo -?OYWIb<@yր:xu7ROُ%Cn\zc֔jΛ{g?eZn Ƹ|[&CnG#4 E13 hޮBytє +k@tWAt|s Ԣ((((((敦X&K=u- m(5tc]nv|3n@}p mbى+G<CHrGNxZQgDF|&ݽgTϵKc, ùXǯ6VSLq򀤟֪7I|7\+=xM_-֖[k"y[UM pdeC)%1D`I<cZdk%cXфgsu8_F{L|C9QE?OP\oc- KT ((աY=BaEPEPiqwy n\z/F<'#P_Ǘk8Cy4dj?_ڊ5//yƻj(?<GF< =n(((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( J?Χ-ԯz( ( h- z=QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE*tSEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOIT=Q@A%2ȓH?OlPEPEPEPEPEPEPEPEPEPEPEPz?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A??ʧ#]'PQEAt°*MZ8GVȦ5 b[(.2:+6E |5,<`.=ԿaEW;::7g>1ȿ/2]3FIwW;‹揄?տtz|VEsZ ) _^ڐ҄l\u~HO8rak0,̀+c*)ks3Uҭu{Smr=ՇU>8 k JKݑO+۪')du$r3B į"b*yh( -:bK~Ϋ4QE1(AD$(~TQE ( ( ( ( ( (1@Ҟo<sH\*6<nIe䃞_W( 1$Iy]ҹbMʌFHTP 6PU[ݷ~"J'9N9+f̻4ҭqYF I`r ES4JIpI9-IgX+%ry'(((((((ݝ^M^ޣ%% (eWeEq?mmݜg麙w=?ʻj(uRx@=@N ln' A}WiEr=ˎ:`I/&/SM[ ( K~Χ.Է1ҖtQEQE ?jЬգR0((((((((((IU=A??ʧ(((((((((((((((((((R o+:((((((((((((((((((((((((((((((((((((((((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO 袊((((((((((((?OPGO((((((((((((((((((((#]'T*((((((((((.Է?pU-:E(AD$(IE7zѽ}i)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾)֍@}h޾K~Υ޾)>΀:RB ( (+ >OY"j#""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,QHb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw5QFц#Vj(?-D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴPe3# TD_M ""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""j53# U?ֿ@SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@(̎p1Ryw4'*Zȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋ(̎p1Vj$ZD_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴPibc,"*Y5EE(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE]Uڤ}*HŠ(( 7|tǵgo{F,_ҹ迷=֣j414ᤣ#rz~4kj?=֬;Sv컶RğjF[4<玀w c?Zgl0屴-˹ƠpANgj?=֬Cy5ARTPca&͘mEPEPI OTQH̨܀O@+.=sKQN7@jXZGX$nʮ0FW:Nł\ I@誖Z6)Ie88@V%k %3 g |vʞERl1rO)֗Z@z~-A I5Ho<qmXE4xnԐ]Ģ#? Z*bKS%mÒ F/UlG֘H![[]Ҕ3g{N[y}#PFy,`gq<{U+}cMC #?LҢj6V7ms*;MVCstEsvsj@e"O,q=sַ+hyj(<ԕzR[5yi< hm;dr@Ys@;zƝu/#?L@TU[Ku @zjw@94r(((RԵꖀ%o oR- 2(um>O*P_Ђ3rF˵6A Nz@V?$G[*j0O۫΄S:P%szVu{\,EPV3<:I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@E6I$2HBhVBkT` vѕ.d_;sy@}cNȂP\@ ; u M$d*g#XPbds{@]%eX]$zL77r`lf=:mԢe@Af5((((((((?ֿRI +3Wm>ɧA'j;S~{gێZK{H@Yy~&Դ7s [k0TYZ%Jr LЮ&Ӗ[.囓 +ks$6ss+7nPpPME#0U,ǁɮZ}\=x"5qMuTW;k<*<cUrk1}kޱP3Vvz)p r2=*gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF ޺z(=_T( o>U|uLOC4͹rOր4(VMSY.a4!z5= -cp?Ƞ +YOՄm:͐kvQ{a"<b:+UY۵3=.]9ct ${{{PMEWH9[S8 fC/^I@4Vf<dS۝eYϪ>e7f1A'QX="kkk((((*$ZKQ'(Z( dEr0EQUq4Cb:+Ol?ӿ/i SWGPK=&]8u'V;.+Ig d%b]}3[Pc tz4RUϴl}EhW\-ā¥4QE!ZiҖ_.(uWSԟwZVkZs)8Q&iQO<V4DQMymV1#F'<P`ݏXi%iWk7.s隒aEPSj*Y5EE(AD$(~TQE ( ( ( ( ( (9x_R/&*v9l}?ϽZ;.Nc̣p+хoQXv5弁B۾9#$sNoӬRۀtעWvc&/^JD'4QU/o"{I+^(?Ҁ:+NեB?&r=:m2Oo@V&fZ(fSSֶxA[hQEQEQEQEQETιpXqx[qahҬc$u7| Tÿֻ]lLa%F7n;PoHŖa85Suȟue!gcM4d;vhZaӝvuA0ۿi||(t1x?) SYjk3G4Xc .OQJH[FX =kr/:ïQE`ki4AYGszW%_>~G!\{Zz( K~Χ.Է1ҖtQEQE]Uڤ}*HŠ(({_?/\tZJh[K-+3P>uKr#D~Q4G *)(wq9 |1O4Uq!ID7?QX1j6`e|jNm3}}?T Mx/*c&i^cg"l?zlڳsV(Smyoƀ6.meY7m\jrQN&m8aEo[t4QEQE¥k-s'w]=Q:<ObmN"q޺;8onkmBtW( @?p%h67ML ;ip33[1&H[S9`uTHK>\ ϨPҼ\V&1ʝݨ!x/-ܓ$t_ih[^/H8z*8F4{!$ F} g\fRNc*,CKm5\s9?g+dޠtZcr74XT=R+[''gO0F18PRIu87S4k$SeQG =*RBy G1"n ild囨鎤Y~ێgҀ142啷x[K=01@tHLOy 1V@0A$@=,(s(tF7[+،ܖjQ\ 8 M$w6&aX zLҤjm ? 7B؆ՈsC$Wf(m̻rFz榵%ȟ tcF;Ku-rqz|4X Ɍ8wm if~~4v?\f9kזK=*`nv0Z @P$Anյ.Yd`;Uyt5;:(B۟()s UPAdn.E [p8Oߩ#ٷ^sJ.>yowoIی>3l"p=2#5dS:Hs qYyvelIPlZM 1s ~UCag7|g?jl4W[am>dwn! H#~R.&*}S% $r(R֓]70n(Xu= .rgHUB3&{<A)p vy' {eCw zZ[rr'i8a),c}yPQ@Q@Q@Ej(?-K\ƣ SqL.pzdQ w+1\ 4O^8Q2T-M;]%֣pg1}۴R&( ay^sJɾ۪]eتhs4zvuEm EmJ[_1vGq)'q(F+ : ?fߟ81((((((((((((((((((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI 5-RfF ^zԭʹ[3iY+,99cR'⛕a=[E}x_@N:jg1NR_b1}8 ~$("BIZ1*p9L= .rgHUB⦼Ҥ_L`' =RD_8ǩ=굟f=.H|0{ބ6%Yc~sZ*'M&_MAH?ϭjxWOeG*̺2Kc ?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Zy?5S[q'n'1UPp5{lF#X/1Rx沊145vJ]QK)e8xtRϩ IU'rEތGTQm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4Χq!/39=8,M skJa_"Vçj2&l2rFI9銯ċz*: / inwn {稫_K6pԖpoyL͓5f9%+7QVL͸sIiƣqHqGeciFktRϩ64OAuzIob\g⢳6Ih@l~ ;F1Sz ^ѧ̖S5oڧo|Ȥ;Uciwl\ܛWOZ j-A0bNV֨4ˆ'~J?af9dfaI\^R>P$$34zTAeǷF*$ë!2t6^GD:ɞ8B@/9@̟2 Mq<;D6Udpyb[vW=qn Fm!4+V-~*>f8rId٤]:ʊCs^޼t-N+:}Z}2XcԟZ@Q@Q@Q@Q@D_j$ZKEP\wJ뫑U:կVn[iTucZ(@IyŇ'I݅ j FjFGEWm $_V 7*w7oAZRØj9яWa:򫔺"zkK{շxG@P[KYDQE 3u]*W6#ʰWz^<[DI=ǵf%F; uΖV2@XVoz<9ȴ,9?ל*^ԒI*zׯiZj.m)ӞAG}M*(4 ("STPR(~ঀ(#(AD$(~TQE ( ( ( ( ( iXh'?C@Z~n\4OVu#--7[Nr9z׾*4d6o%[瞿m/5$B "ztegy~o3>bm}?nVw6׷NVi7!9oC:K&wq8CH*nO),%-g<Gqcsw[4nG-Zwv\IԀp8=@^#g $b8 8 nQ߯$g9#6+~1֢rVOj oOh<]Zl[q}=ΧrGz~y%uL 1so-F2(Pwec?]EehZi[.]fh(((((扡T(b-4s`qk R!#O_qX]֫g |cwVXO#o ?f,党%Qҹ3dg9\.qsfqFB9_X)S r`Rr9`Kk, ʞF7[m>Xy v#=*[Tvl1OvSKHc`2sy14$)ƫvuĖ'$ Lc'OlC2Z/oF==ϽuQE?OP\oc- KT ((IUڑQ@Q@ڽו.qX:Ǘk8Cy4ej_ʊu/?yƻ*(ɿ_:Ǘk8/?yƻ*(H|ۻn9}+f((($ZKQ'*Z((((()i((((((((JrS˷@ Kxe&<t ( ( ( ( KRPZ((((((((((((((((((((((((((((((((((((((((k-D_h((((((((((((((((k-D_ h*-DD {f ( ( ( ( ( ( ( ( ( ( ("OT¥((((((((((((((((((((OT€%(G_uՋioYy8GVȪ[jĶQ$\duv-I?c/wZ^/ȿ/; eTu?\6U֨|[4mqpA)Xw4|# (_κZ>;2ۊO:Oq)+/uuZDBykkhbifP]Ag IT奉fZ֦{wS^Qzuu KݑO+ڪ7)du ʒ9JqB+ȥJp}8(aEPSj*Y5EE(AD$(~TQE ( ( ( ( ( ( ( QEQEQEQEb(((((((((((R߇ -:t)jQEQEW_>v/|JR0(((((((((($ZKQ'?REPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQAjZK{QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQED_j$['Z((((((((((((((((*$ZKQ'?@EQEQEQEQEQEQEQEQEQEQEQEQE¥lh((((((((((((((((((((k-Dd?KEPEPIE-%PEPEPEPEPEPEPSj*Y7QC4QE1(AD~OŠHA2>:Rc-M())[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@QPo~mo~)[ߥ[ߥ:nF@.Է]Ҡ "ltҖtQEQE]U^k sw5V?hTw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf i FGR8MhHIU=Ch>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١ja 'P[_CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@p1w4zw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw5 CԎ1W*ITfw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55M!GSI??ʧ~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SP1Hcrt@ h>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP9",d?pU-:E(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE ?jЬաR0((7P>߿=co$?QaI 0ǿCL?Ql_pQyWPN=? 0ǿCL?cYڛeݰ"$T4Ig<tiCL?{XK ȶrGpzU}܋cP8 ϧZ 0ǿCL?fdj_ ;]?P~fwsaZU{[tQEQE*tSE1cRB$eǮR!Ip2 z+զ=COHݕ^B@?wh^j6 @F@'hQT//?T]Ҡ$r@?P(^Y-lV[Y/12gۥ$זOو7xʞTo5++> R$RZ@z}A.HH y^xq~x@4Ve9bTfHm (Y.{Tl14 1 +5yÌk F 0Np#C]-u:O&PF~4[ Y) A Ѣh"Y9W|ޗbc@U[[kgǦ5BM{IC88 ٢I}kAqz5SsJD>z?\~xkQY#[gCq֮E\E@hMViC0A8((((* o+:R 被\[G\E?Ҁ,Y֚v҆a؂qIyXXs&<OҢ[^ڸuo<@6A)$ >l^BIeO PEEVvن]pz}zPvrlؕ<NfɸYLM8TաNM?nY6 t@6=~5.Q S(Zqik"q F`Xg='ڟkyo{lۓ$gt( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( tSz((((((((((((((((*IU=A??ʀ'd$HdU$Xɯ2H#Y$̌UۋKFD!|Ϸ^hosyL 3=g`HwA'v =J?e1G Fa1jg~OO€:+""a`,s[kzeԢfF~5h(((((((?OPGOӬtrBzd=Z합k3Tc hbV;{v4'Դyk%v'Ե),Fح䕊Q"Ou, ]7'@TW8:ITZڕ̲M?n@@ޣQMf IR\=0FA=P[Esv̟ٳtϵ;\z=jCf5wXŒc{P[Efi7Xˌ1ltȫ}c>v ZT֌N B3`֥4W"W9>EqwMAuwIehP0 @5Rk4xFm>sIIg3)$i\][\}m=k=lr;6;f/K:qk:hu{C5UѕR?Ƞo5+Y˖ENr_z;idV226Gq@UY)kJvssa/#2>2r{@5X^^68c#MoY7c!e# ױ"Z$cԨ&((((tSz( B@<R#)$]1US 4 |迾t__ιDnT1i4C4M}z SWGzzM.9$ e#i,L³dk"ߥbaq(g麥-pA>LJntY@U ЁeIQE%-yvZvWˊ?U$W{ֺ<} 7k3Rxi`$jWڬcJFO(tTP9KHaEP?[u^*?W h hb?(AD$(~TQE ( ( ( ( ( (9Z=l ht uuSW_]ig;Ʒ,k݃٤\2O>ݿ^#2Ḟ K,uEbkҮmu-G2,{qpZWW)@p9T)qo#QȬHl忁2>~uX$eݝH><CO<1poZoBzgu?hXC$GRt9- ß`Oζ֓{a?ʵn42xLKq/l\f[[fO<E@Q@Q@Q@Q@Q@Ik!8p>wWI~j%{~M+M3yرMw {pZ2r>P=G43bc|`zpX:o}S\$|f$'ޱ2+ F[! dQk99GAh7V^uSUp08状]LEH,'{3ZYNF%1Z%ZB#p<VmM7Jy nUޭjh:R +ӗ#_cGdUȒ"Rv$1W 2}`4QE?OP\oc- KT ((աY=BaEPEP7aIaCrg7E1Q[Ϧ[34VgR;)}:FBhURPs@tbɷi#=?ɮB"vo ~bmjuK[%ۇg%&,^U#0Mi98(ύDٮ~>%g,,Qx bq?l\q2#Ȳ"nڸ ƣn&M($q:zàkok((#]'T*9맪'I$ } Taڝ9"U+y5_YClt<:;mP1kwz^S9 Q&'ML ;i֭q8df`q~sZIykhr玕NM;.#P 'Ubc,}֢PKg$B2GOmIk{/JdzڣGԭd$4tRiJ'c*#Jm5\qr9ݜ1HDl@@Qnug,*=R+K7hCy%g0LF8{OͬO)QdxqjHS o(U ?wdRA{ɚHNYqONt+քYIzM8Ҁ"t=WL#T`r8qSԿmWJCwkql[e*9"K ր+[mZWvcURMkiR؃z ,䝞S(va?x=hFl>zԚOjB #d~ug]R!*xsZShplnWiHiLv,Bw,`>@zϕ'pU-<u F~Qk<r>zr(ϩ_O٪IoϘ6cNsoJ Q:\m :q3($g&㳙5 /vhvڧG8ޛa3 3۩ M?ȵC|. 7JK-> r畇>q[ }v0F1|Kr^6*H=ր2rO{?WKx46@'jhR:]52pr{ҿc->͌l&io4Qf<}IWD.6FH]o~lgdT7P),1@qjS\5۴n>o1>aQ"K;<r(׊ߠ((((R o+:a\"rIO?AWaY:/Z9<GqGz»Rݣqy :ՉﭵIR; x2]Guy#P@>Q>vr^iI( Z8ft[ yīe ݺ ;MkI$<c tY*gjttWU"U%Ϯ}24lc[n$db(* U4X6B2[VFyb{p;BjK=_`WnqEEiI\d@Ci3[1bF{i2xzq·̬rU=Et{Gu.Q;n3MYE4lY4s[zKeV];wzvug6V3K}c!R n P6uB v=O)ACLn-\u'uq.Ȕ*`V|p_hr1<b((((((((((((((((((((((((((((((((IU=A??ʧ((((((((((((((((tSz$fF ^ =@+fuM95;o V#ڀ9U-M%a=*Ƨ\\QMʰ=[Dx_ '֨jVS)%q(PV\ġ%E T`'i֨>!y&P=eѮ]JΑ qSRKt/f0O WȐxHV0p8?TNճgIѿ>6aDzFĽO7?l,~}@DoБ?iFeG{ 6 o%Q?֠ƻuG(PO?€7,#?* ⥢(((((((?OPGO[@$Ny0ԵۏY<WN:ۉ<q;wg㨪#IRo GkX"F_0T)~L0;5zI7E4C9j:=Gu\y`g$t*Su"FLp#Zeu߂Nq4C_;Umyk_HAd5As{MG>F&:snթ@[)H*A9 6T븚ݮhV nJrSnq4ѭΧq!/79=8,M skja_"Vá?Z wNA<dzbǢQ"ʪ0N̐i[i1 v6zrKbf"XwNF09jK8'Gq1N1sVWC, m, >ÚO-f?\Tyi% nx<du 68b]%W)ȍBq67zRУUc`?ZԺ6[osX;]Ҁ2|2t 3TZ7ͪj2/rnG.L )&kONӭ%;ROzVK6jz~ukmԟI\KnɓyvRN1yo^z4P@ Zζ"q^:^`Gi2pr>sͼ!o@r^?֡5ıɪ\3B}*ڒ 9e@ܤSE`h&}O׻x%vblANI[c1|a24REvBKSAO:imi,wnjAV5;Ck8Olt*EN@> ( ( ( ( ?OPGO 袊+]q3|?*[ յkm\jBJO7ذ i"Q۰=H8OTծxUz 5ᔂ?}\`(ܨG@9 7wMum߻QSusoW)tD(dv Wt<Z\DŽ? OYDQE 2]*W6#XuS+g-Oujxi`${ZWkhƭX; ֵN#lc7wZDBy{6U- X5:VkڋcF^} 9h빩EVEQ@\ox~?[u^)%)(AD$(~TQE ( ( ( ( ( Vt1hrʹv͸<He!m Z#ӜnL[Lf9%I:U=6?{KԵƲm8j_XY[ie( ],V4 ;䜞}~-՝^ML#4k_e 8iPjzVLgYR(@tz]8"'B UdE+pʻkjtHAerBT5WnO$-x~$*L_&IXϹ}=U$^@#Wnc:Ȭ撏- P !kF ą&ZaŧBPoQEQEQEQEQE̓_:crYtM{m>eH\^nP:1/!-nG."4:bM{8ک7kXr!?_N*"r~O[fsgnO_ eioB*8nLյYtoH\81UDŽ]TP=CxE)T/ui-%ƌ$;ݑr5"cBϰxP;yqL}I5ZYX E}ɠ tQE?OP\oc- KT ((աY=BaEPEPiqwy n\z/F<'#P_Ǘk8Cy4dj?_ڊ5//yƻj(?<GF< =n(((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( J?Χ-ԯz( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( tSz((((((((((((((((*IU=A??ʀ'($Yi3I횞(((((((((((?OPGO((((((((((((((((((((#]'T*(>VIY}'ԞfKo@eG^EfxHwof^EǷZ>1ȿ/;ygTu?\&U?֦Kxh).*cQa󮞲}?/OȶkRQE!KVRP0"kxoÑi \r?tE\lr3%S%-nfjUjmGWabIbp)?{uD#rF}(R8!wx]@%O8>-TQEAsU\ox~ঀ(#(AD$('IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@C Ώ>Z5# ( ( ( ( ( ( ( ( ( ( tSz(((((((((((((((((((* o+:R 袊(((((((((((((((((((((((((((((((((((((((?OPGO((((((((((((((((#]'T*(((((((((((((#]'T* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGO 袊(((((((((K~ΫXR߇M-QLG(AMJ݊u57Z\<EѢG(4Vw(EFEHhYHX +;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFEHhYHX +;y"Egy"$Q`4h$Q,<EѢG(4Vw(EFEHhYHX +;y"Uvy}WE=c -SQEQEX(izϑSU>ϥ]SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-YbG'SB¥<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋ61QAh"h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+,QHb"hOTSGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SGSR@yw4yw5-SQQHbI <<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<ȋȋh<Fdu#ȋ?ֿR^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MD_MKEEEEԴP^D_MFFdu#Q'("h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/""h"jZ(/"/"/+Kk`9R(~ঀ(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPuWj# ( (3ó߿=՟LJh?Zc`#>ӆʸʂp9c?Z,M۲K}ceEo$l:ހ4=֣jɞXnEÖ;Ү.\}:c?Z5/qISq@۷6czڴk?C@Q@Q@'*Z?ֿRE#2rI=.YDI8NA#EajM`*^W5; s V<'_Z__)kWPGj&jXZƬK%̗2gڒk/#;2c*z~PJQڤ OA?Z__)kY:E <XWy9pq + yFenDn Xn$([sDp(].{TlI!dGlRW?ͤ9 8)j Bڋ0OF98\um>O*P_Ђ3tdAh2<K4G*pTQEQEQEQEQEQEQEQETPZRQXZغM!$( +]KH\}kd`]MW3j:Zx`;INq=jm65 t.p1AEV\N=Oj硇\c0,n4Vf|څ *PڤPZcθmOoP^_HE{& 㯧}m;3s+ԤȎ 2I=W7]0OtW/ 꺻4bzn?v3YPCErۚ#nɎ0MݴyۼvshRo>_p% >خ >~<TS-<j 5(+r! ?u4QY;c_SEbh]immdW+jC["C& ?=]<D@QK$J[n5BV݃l":*vGϵ8A'Oa=Kgg/ d?IEsWj߸L۾1\} "8?TZ3 ŏUVڝE. $AF_Ҁ:+mpc Q擰ۿ\ya-2DTc{b:*(&[t(aREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPI OTQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETI OPQMD $u$5xE]eK^zP+6XӮ =g*kBC]HwA'4rg#77-Xl9?/PWIYVI ܘ2Y_4Λu(FF~ J( ( ( ( ( ( ( ("OT¥Oieڹ="-rߵ@*6?ꨮnV;k^v2I-"xMhVČ'tVVId6\*>S4+ዹfhb\"@pCMMۦTGQHK1rk}_Wy0Hvz@]%sٓ:{c늬ex`a1}ƀ:*rזQ\u{55gϷPd bT|V1l0~k06VXNp @tW1$ږ<&A+mbF ޺z(=_T( o>U|uzLOC4͹d +ڄouG6no98]vmz׭sZ;_G+H?P]IXͿkg5mV=Y׏.Deu*_J[@G+isk?VG$vِ|ג}M-ƛ6m'+*3W?fBZ(60^@/&x8^((((OT€%(IW) $]5yU[SJ::(bd~ iy;/f:tAU OT`E`R}cpLaYXZ-uo5 108{MG=M-5X<F=GVq΍,Hʡz;*^AERQ^ek֝)eUu=I<Wuj<} SfmO;E$זQcP"4l" 6 JVvr8>*FQEE?STPM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPuWj# ( (9Xsk+l>ln.6cޢLfh Υ@ wSLu-HG_<2,$8Ҁ*\?oFz]Uą$E dE`Ũۣq%]>:ꖶJ!(K1P7M5XG͌`sgqyQ=\|KjYY[4MعdGdDݵp=ˍFM;Q>Ht>@-?ֺmEPEPI OTxtD?LҪ^C=:zD>Vzlῷki#vѵ Z^c1hI=63/ڛ 8ҵn4ĚkI#o-mO q׎RM";.#9pT7>4CJsX *tvL[trN<~5mImz."P5PX]섒@* 4rRqJnH;yj8ާر -s;8[IX{[;zuhks]8aPHlbԞx >hCwI%f0LFQOͬO)yF ~THRvabt*cgvMIV%k!9fIֳzЋ'&ќ?@EEF  G6!K}UmmLg#뚭>r.仰0(Y5EKm'Ӏ *I}Z5ulAy >lXi$D뵃yst58#6כ`$נ I$ {0Db@nH՝smF822B>֌$/.w<qIum97c;6p"iv?fIJ8HyGJE󤺝Ϝ 3qWjrj;6mN>Q:KEQEQEQEQEQEQEQEQETPZRi^WzZUyx\y-\.q'9^ uRc9HWt~Մfڃ0ZI/<n}z "g#+?Tf%yw'q(`=S]9 6вqvӮ19hFFDFyH I=0=k{`4men?W9Ks1w'hmF(UQTcgE^>k~qw'ګ kWc#6D`Pi%wn9P?jӬȶp %W=cej6s2\4~Qc??N -)n@/_P{8BJ!W}k^K L0SiaK q(njPy237mklhyq+`hז9.9(T0JaGfyfoC)ʞӭq#Ac6%kkKJ?:Uӿpvc|@ p[L~| ~tpvY_w[]ݙ-Џ. @O.hdx 3]E`;ۨJk5n>P Fzq]gGzf:c>ޔ\M^ɨ_G)E{m&xgc]W;A㞸*rkn8qZxWs{ғL͵619:dӴIh%14slC+p g'-(_J5+/ F߳q8CSdE)uЏ@ }XOH2J>E"{6 F$U@jEǔvs>e5$:_0de uwi5KeÌW:UOyzȷg+5Pv EZܙKr~dgigIs4?UѯmMsCcƌ<vo_iٖr~Jc?o5ymioxVJҀ9R4R ƻ]et cSKm<i>Xzk/UKk%8 tpvךФPB Z((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI 5-RfF ^zԭʹ[3iY+,99cR'⛕a=[E}x_@N:jg1NR_b1}8 ~$("BIZ1*p9L= .rgHUB⦼Ҥ_L`' =RD_8ǩ=굟f=.H|0{ބ6%Yc~sZ*'M&_MAH?ϭjxWOeG*̺2Kc ?֡ǻsG@A7b,#?R)Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿR{ඁ "s0u Zy?5S[q'n'1UPp5{lF#X/1Rx沊145vJ]QK)e8xtRϩ IU'rEތGTQm~ 9:s@u뗎m [r?caY(f~Px{MG>03c9ӷjҠ|MM[hb| )b,ONu4ۣ Rq4WLQf8$g-V}6{hYSn|8n-=9K+ܷP1yǦz\ieYs1+^Kbf"8n+;t1_|li/_YҌ "g6mJMKMMF5rFw#o>k(J0?]%`C\w:ǟ}MoSAͿAL NS^6[os8EZ`c?`xzhI'3bC!5>,-֟+z?JF,uي'9BkKNӣӢ(]&(j[(v;k[khQزqzO[;9In~}Tg8ր!VoVH:Vp5mHmXGS_5 a'9+zTZ_f[h&tT ќ=C>?iVs\Mш[,8~Vn!EgosfD#Y4ñ`PA=zg>f͌g$5壸nPfDy]̉ j;Ncӑc$֍QEQEQEQE¥k-Q@r>2|?+G_Tw#VAYmZEQՍh%'_ m'S‚[;v%6qu]xUz]4F5}X`(ܨG@9UckKcoݨF?] ʮRQɭ.[Vt#?֬W5Co]-fQEt]^܎G*êQ^K? k{DEmO;D$׵CxֈLjqb{֐DYׯ<C:ZZXcY""ܰwS^px_RI$@)^jڵ>̧CNz-4(MQCK?Z((AM3lNIQ? LbOҏ"OU)[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~yOҬ@?G'*[ȓz~{ʂK~΀E KT ((IUڑQ@Q@ڽו.qX:Ǘk8Cy4ej_ʊu/?yƻ*(ɿ_:Ǘk8/?yƻ*(H|ۻn9}+f((($ZKQ'*Z((((()i((((((((((((((RԵꖀ%((((((((((((((((i( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ("OT¥((((((((((((((((OT€%(dYY3I횚(((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI (>V.eDX:"n'cDqבڳl &p&kXxXj_x"+Qq\W7/_ZMlѴR]Ua:k3G4n(9>=Ƃ(xTF#d@~DxsÑi Xr?YAu#5%S'[kZ{OyDq(.NvE?j(u3'*Hg҅+ į"b*y⤢Q@O(~gT?pS@KES(AD$(~TQE (.Ŵ[ݟEsڝ3Dʬ3 23Z˾6I3ȿu|Χ8(!QN)0%#~57dǮ@@[OS ]ȹ1@W;5iU0{[/< P A#A`=+Ӛy]pG1Iz"e1 VT?(? _¶#fh՝v1p}3@S!9.}ƨ(Qr;uȩmBjyjz@h\-HmpA9] QEQEQEQEQEQEWjtxLQHc˱"m}vΪ.5a>PƫQk/׬ 6|B=Gp? +y{,J (3]-&(+NJ7yXn֚Wv=(0(.ԷzK~΀#)iJZQ@Q@>ϥ]K?ҮԌ((((((((((?ֿRIOTQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETPZR-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRIOPQEQEQEQEQEQEQEQEQEQEQEQEQED_j$['Z((((((((((((((((((((*$ZKQ'?@EQERQ@ IEQEQEQEQEQEQEꚢ M{PM-QLG(AD$(~TQE oOU%e$2L)A@x@}B5hŢxaGr =Pp19=B)t{E (tĈq%Tn_V5ɎbͥBx'lǬ7oJV}>nڏ4֬+H}>Y:o=)\ 'Tn.Ҵ &NKMnxQ.rz:?hHǐoz֤͟kᴸ^TYhuR@mngCֺ:ݪMw$m#Uy]FXZ *'sDW` Z`Z~F<?& t0_`kUIv1֡{BVUՔWOQnkGYWSYaD_wlW3e=⭴J]#w0?t秷M@Q@Q@Q@Q@Q@Q@J4.*'O_-wYio!?D#ȕS\~n|s)Ӷ5gKKI~ _k*x~PȄ}vzv:i I_[~q[o sH}YnF}Tטx-YHV$pOz>qᡪ>~:CKú跑)dn8 z6J)_sm<yp$w9uP\ZkeI-=53]ЬXR6;O@+kMCn2 QPXT?[u=As@-P(( Xdf=Bd?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMESHb2:*oCGOChw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SP of<ʂJ?΀w4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chdu#TftS?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fRp1PGO4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}!4?Mf i FGR8MhHIU=Ch>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh>SSQ@CP?fw55١h4?MMECh!G*_Chw4}!4?Mf~SG١jj(Chw4}!4?Mf~SG١jj(Chw4}) ie<S!\ox~ঀ(#(AD$(~TQE ((ޭFXKp=F;jC=6죵k@چgqyfUtnՠ,c{!2G4P5k&XDraGӊu?չEaRY_q4s=Zw4@"24P-Ɵ<(Ӕ#E<eq@7ӂcoQ@ѮEռiyOZӺ[& mv?hQ@v7|2"?Fsڡ]6C U9()wWMrJa0+IWj8~(((((((z 4%ɗqx\6OZg"Aꨓ(ڣtax@7QY?nc@J9U-[ΏKmrO*EI I |*8jFQExέ<S%ݲ ^؋F:z^cy|}6+m4}:gVI1=? ӫO/stNy|S yRHr9#oCj̻4٣4ear:5JNJET* -:R߇JZAҖAEPEP1=B{VHŠ(( CPϓ~1cY{G W7@'$?Q 0ǿDiq~ciIG \FA8h$?Q 0ǿՍgjnݗvXS(+y&g 0ǿCL?ce,7"aciWm[r.@>h$?Q 0ǿ՛/yƳ*JtCM19}iW7oPEPEPz?O@V15lRqGmQT5 ; ԁ7tMԬYrhw2yWp$}qҟ.M+r8 EaiatX$<n,rxb:֊_=/0*?\P+.Yn0.z Uk(ۧ{*c|JH C.B]d{b5hљ-\8}AkZe P8PU-ǔwF? NA wۻ mM;EMgAw2bnc#?EUO2?uu{b,g%L8RFzc#ꨬNłJ `e tR2'ns@%֘$[jszqm>B\Ip(Jս^uOQY_D_3g1@4U[[HDCja|]^EPEPEPEPEPP[_OEB"$ų>~ ۛ䜉no7Ӭ%cfGNOa}h 5ҵ dz`~?zhWZWHmdqvQUg4 >Ɠn>Tcsvu{F#ȍ=G&:X:ssjq. }kJhwP5 ,<6+0$h> Iw#z(((((((((((((((((((((((((((((((((IU=A??ʧwyme)8 gCu€6W@I?VW,94~̻<@~>OdVrOi&qТ,wW7w9<1kE/(mr`=g*~mӄS=rhBS%meG$rZ!.LFFr=@UKK[̖b>Un52Sè}p(Vזm;#Ccs?٠;݀OhBxb`Xb:eZB<t_G"՞Idchp3 F{TͪC.geeWal{5Y^=X̃w# t o>;ۇv隔 Nк&Ǒnϛg8J"EŦy*9sӶ>v ṈMFG5s>M6 gHKq]5QEQEQEQE*t@E2I$2HB{Pd$p F*"\Jۯ4r˷t۹&@Ad PPn Fje#X0rds3{@mavi0If9ӭ2Q 3#?L@QEQEQEQEQEQEQEQEA??ʧ#]'TQYZiM: !W=2k-vߵ@*1uW1y\Ioi =O;}_dZ< [kJUEdjZ#lVJr Ln'Ӗk.囓 +kw$*-mJY&ͷLmnoQj(Rp$)jƮ ob#](}joA;z=g]K/&y2qǷ@}GN7Q]0uס~d G`OҀ5Fu2v%F*1&;I|T##<WWݛ]tQXƩ5<PA#6|j$l3ۙOր4J]WYi.> s_V5rtݶ9C@TUk[{̶AG\Ƨ[ٱXUGqLOO€; + WH,lH\n?z<$S]\} cpW=@]Vk{y#gҝ9?a\riR OtQ\ͥ4D"nGzFU|˨.>bBN=@m_\\0gmGCVQEQEQEQE*t@ER▹I"鈈DpipgSEu'tMzoZZ? OUmv'V3.IgVrd%^^/\Pc G=M,X>hۇBQ\o<;s<^*O}(1)k˵Zӵb\Qꮧ''VEͱSi\ImO;D$ו^RcP"4l"xFݏ[h]@ܹjZC ( R߇V.Է?pS@KES(AD$(#g&2֍֐ѹnono)>fF@ѹnono)>fF@ѹnono)>fF@ѹnono)>fF@ѹnono)>fF@ѹnonoK~Υj &O@ )iJZQ@Q@C Ϗ>Z# ( (9nOn:=.ُOz}2ٙ2:M3PD-"4JCDȲpJsMH@9MuWKl-n-W=vTZ(<9,@4׉b61kI͜V1F|n_ s-9g9enߏ\ҋ6[Ghb[Ev^^.5q4niF#t]%s~]%QEQEA??ʧ#]'T@48؃q{+Q^hKh"L]gV_S`YL@6OבTHAzUQc?WO8 aU`@_"A 9 ZP#vI[}e1pX!ҤLgTG D./&yX1=@8j`5 c0*:WGK. 33Vlm&[E\z]lm@GZՋHt[xI$gBtO3OK),(+: N-F b*DEKE"2 :+DחNS PCK7S%ݴ 0z@Ũ˩ݵ|1!,3ҥ`MSP3, i3ou#@_±ll/泸0H0IҀ&o-f31} ޥ0,!%Anq>iPi'4}S]tZuي$*} eGŶw62FFAWG@ 3cXdQ.zdtns/-!$s­Ic!Ӗ)l$QЎ Zow(ҳ8)na`R_mZ+[88t^-wk~q[lI#'Zq]x]a@Q@ Ģ;brП*nozWwczDC`^*.$$l60; t:Dqw$W<d`4 đw:Dkk:!pT0>XizNewRc$}𵥹k@ FHCGCUiٖ-cMPGI JrT0Ϩg\o9?(umF;:~a`m/,{`#=VMe{zR>/q6`݃?zomgʟ'%"v?*]jVT6ln'?=j"-C q{lZMܷQ]jwwrtQEQEQEQEQEOP[_QEs^y]7G5mE}2Vg>53۩׺L  qޙ 7-[NY.%3O/ZYo<;JS 8'ڀ2M5=;F(<8qۨwP ncf :~bh-a{{tI SvQ-ޛ6cs@[ȲH7YqX_w긎8z5wQ\LKwsOQQ,qge@`jӢO'g3j x'a;I瞸Y_ws533`ߏ@t2[yO2AGE+"o2\?z((((((((((((((((((((((((((((((((?OPGO "i.q㻑rVZњ0ќDqVέl3"Ă8~4%ψpªDr@G=,"cvCqKgIѿ>6a@<82\^LLbzq"jA`,Tt &u ė]ϐ%9d*gf+k2M8;#=i3)Q9''2Dgȏ #n_rcH8jfSY9P0Wu?@Z  1UĈ1ڋ]A De=O<u<Vѯ.uE@snKiL`2"1QSkU*b$BYIgK 3fYH 7_gZ3F0 bO_gp`&a0 LZg*:c9KaYBK;:}+hOq!i 5.IT1\ʎ m)"T0ldGgY'tX$ӣsyi'#~m-s8O\}Y[^ZܐYeeLtvj<Y#CǽSGV`Frs8DuPBH[lyׯĂ1$'V˩ZGg6&y Z:wp"@pĖP,2fe6W5SR"vfҰk%LNO`}63\_ wp Pڶ2qP[8tu6hDʙ<uQEQEQEQETz?OX䖱0 'ln&mwbބ{P1aY),9ǥXK*)Vsh |T Jc>e4Ŀ<#ۊXb+$ȡJ:7/8ªq9L5˩\#Pr}N*{*In qJY ֿ҆l"78Q(Hؗ텏Ͽ=}="_Mz:g?ӼlaV#C!Y-0Agw2!.; P%$gA?\TQ@Q@Q@Q@Q@Q@Q@Q@GOIU=V h䀉?ҹqk6矼uS[q'n'n<uDi:jM|TZ(uQ2?5Q/i~]&(yY>WG{+< ۟DXJηd]ɜn~uKLδ[]I1&(k2Gjpo-~XX,3F(<noӾѨ||Rssڵ(ks4WH'857ʝ" :w[mт)NJm>*wPZjWs، yzg֮keo47,>_ ոkXI,7r޿P<cc=Z-/ t$ӭјxdħXUMxW-bKh~ nm%H;PGz4ۂ_yD_;qGc?ڬ۷zJ}RAo{z^P k451@P;CSի;W3m^z֝g M(zֵ.M)\F)6bv,c8y )B yUj|?=[%˓Jrɷ8Ӵ! bNcԓހ3gzt[ 29<wEmkmm";\n=^]:k(LS [;9Ig ~;uzPB_Yծ ^D@y?u)a;8? s%]wy(P^(^Kh&tdќ=A2T K8:v5nk)%3Ym{-&wP~p'QԜI; >oHu]=^0EsnJoyiNz P3Ǯ4kVtۯ*) %J4[ñ/of ۀb:'U :-:A,Iz{((((*IU=A??ʀ'(?vAt{l+3Vխ{Sqprz"}I)>b3ͤjxP\yGn l5=RV77'9TtQ+׆Rqrs*ރ߱5֥C~GC»-OAͿ\Ւ]@.m_|mjs?/]=fQEt]^\uaO#?ouֽyⷉ" k5j^#P9b{֐DZׯ<E:ZZ,doqi Xr?ƼWS𶦒Ȁ8U`zװZj.m={4#QYQEAsU\ox~ঀ(#(AD~OŠ Y'IER((((((((((((((((((((((.ԷzK~΀#)iJZQ@Q@C Ϗ>Z# ( (0K+]wg:ֱ5/mEq?Ǘh<]dj_#Q_vP/yƏCy5Q@OF<?5/mEaowm ϥnQEQEQEA??ʧ#]'TQEQEQEQEQET[A;āLs(((((((((((((* o+:R 袊(((((((((((((((((((((((((((((((((((((((?OPGO((((("w#5=QEQEQEQEQEQEQEQEQEQETz?OEPPIm $ g5=QEQEQEQEQEQEQEQEQEQEQE*tSEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOIT=Q@q3|?+={JV<NՃ=2)C$ˌͲao1b o/|c?~_jvΨM/LLtѴR]UùCo]=e^m'֥&(C<ŗ4$aDk߇""ܸwZ143 . g*J-,JZt]^\uaO%=_dS GYAdIP`qB+ȻJp}*Z(((K~ΫXR߇M-QLG(AD$(~TQE ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Է1ҖtQEQE ?jЬաR0((((((((((IU=A?SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP[_OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPz?~ʧ((((((((((((((((tST=Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GOI* ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?OPGOPQEQEQEQEQEQEQEQEQEQEAsU\oxՊh hb?(AD$(~TQE ( ( (Zв/Shyi$Ls#I^*y5dq$W_ߋ;E @2 +>*hJ/l?j6Υ nd'979e2Luf8r-♊ &1I}2OEx}azq@<r2 !`z9I,pf13iP[ VN{3[4k.6?8@r2 "`z9%smxr;R3[:}tP6x>z* y-]f>]%ܻdg;ғ؋#yG};V%嶐Ue%G+{R*ps\~g$Po "jk5 Pq8Ҁ:TJk:&73q\P[ؑor*Np?Ecisq{}\kPcat 5\-byn, o==3cy k@}8bs'.`[ 8.yj0B13Cuss1 X}kku{dgUր;ʿxxuƳU Fz89*ޓm5HI<t4<̌{S 29첹.ZmN"Wb<v\ uw R6=}((((((.ԷzK~΀#)iJZQ@Q@4AM7ZAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJPJOEAJ`S(G(AD$(~TQE ( ( Wtvas~g5|]+y,{\Ğ68[[y 6F܌M^i- T?@ۺ,QU5]p12l8aMR,":=Ild@<;r/C#`~cUvcњ0W ڀ3m =<8eq8k6uöpҌ~A5hZ}͌\D~nJV6}P2:sڀ8suZ@~?m[PCY T3l,"0a9=N{֨' <n;V&S]`D@g= 5<`cuw'w\篽Mmm" uڋ @(hQ[d'<vjnۻ'ӥ-ͬ.P:Ҁ9:\Goa̒ʤu%rz׭K=O΂?$}3SzMzAP--׈ax<:o>C#q[VZmZIƢ/n@{["ؤw#=~mvK[K{(d~?M1'$@?swZ+\<śezu5?HⵊhbRE=@y#HG 0Cqiow `#7ݞ(Gh~xPM_nxd*g<kgnIx˙PmVހ2jҕ rryTo />h_3VetbK%Ē3@om]Qʪ1?*zҦҕ-;6&&g 7?+ZEӯ=YIj՝P =OR~( ( ( ( ( K~Χ.Է1ҖtQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE(AD$(~TQE ( ( ( ( ( ( ( ( +1.G{=؞b<4'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ U)gO;˷߳o=~D'ٷߞL{ T4#ǵ ة.ԷzK~΀#)iJZQ@Q@kGJtW$m1}k#u4%tZ1vlh+uȟӯDjh+u?0_'=;aNcG&4{ okEq_ӯ?kQ(J?plVE֩i/vsF}*crzfN͛V1ǿm{GOE`m{G1ǿ{)voQX?QLA}+oj?=֣K}fsz?ZcRoQX?QL]4V1ǿսS(i QEIQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE(AD$(~TQE (^[->[q6<X Ң֓w{G*g9pFs׊mxRŃ}yvVVګo:lW+bV}EwWX!m?7$d|ҴY.WV[DLI#u-~ B͟8:-uf-博\-u;+5-RPky$0w3N/mKov,䓌Z(=IMٸTJ9ITڞ*Kfcb{mERk8v^v ( ( ( )2)h(-Q@Q@Q@Q@Q@Q@Q@Q@AsS?[tKH:R((|[a߿e>:<G}3HRbWreN*K}yl<~W I,}1ӚV-T=mH-995}9W OV+3XҋKҗPiIs~zo /GtFd_NڭhjώSA$g+nc1"0G xʅz)֗6pQimgeԌw͓*ʮz*ҶWq9\ tQnzQWW׵VFj'PI!LE4qOC5qv)]@K.ҢK{'xØ܌㓃Q>b^4!̭=9 ~U)kiI%{}܎(AgќF73d! ?7~?NzT0nƲ`cua+{3aYX&(mPt {y:Y-z<ipLVFkp}5^P$lΈt钢ō{aP9b~oh>}>m,զ@I{pGaHB96zcTjg*1fUwyYtzQ\ǠQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEyYXJ!$3 O;Vs7_3&MWM.ow8i[fg#݁dama_ݷ9W<<G'vsSctFihsJhu1>5v/{o^'8`8>c-Z 0@A@9<g+7LXinHNH}pjEjh65u$pJ횖VE9mw82k@}HB~Gۉ'w^qT?-5U1XuX>(\hNMYc |%=r3vnc>>Lzs] )L{g]Ҍ  qMZU%{jk X$FW`~TW_i9N} 퉫ʯ7 od2g>PGA|+H@ =*%k*o؈E,˂q> <I4gp}r/#"w^/A?Гn̽EVF(AD$(~TQE Go+r<kjI@8oĚηy nT’z~wãjKCN7>&ڥB#{qYFE,km+؝N~&PD/NýEMW5-)/,NO7~Oֶ<?_훏g\=Wލ5$Ԯncܑ:(8056u]^adJ}޹C4eaP30s\ _3]ֿ Q/*m$?8YzC"(]+V!1ְʛ2rOrsT<T-<8.<(qӚ${ji?AZz1Z^_(Ot@6urhL:d }3jtlS2dRCc1?\VEⰿv@鱦>}}": H[[7ج=}2K+4矩zϊT$xݜ|tȭ 7?dhU+-ĀGROUnn-ՠb+*=Vn"0ywJkKKV8?0Q\\إ4̖BJAZz|M< GՏ\62^J&ҢOh#6 + S2ck/vE'^/x#o2I]Iu&/~躱o -24, <rI*o33;GtkI%вr wguK¨'̙uw;V.2dՇ(&%e# ZȖwFQ.GpFvǽYP[.Be"/RqYɫ[.l"DgjE o$ikgr89o%د 6A`A<A46l;pcӎx-Mk,>P$\c>R)믤ʀ,0E6-XvSx~g  =ɬ{8L.$%¡G jj"H3Dpyz{ӮsK?l.(YUO]QEQEQEQEQE?OP\oc- KT ((o߃]tٻw c8R=+wXzg<i- 'KfFI WQkQYgذa?OWwXO񣖟q^bq:اcBI1?Jۗ^wvN`U!C ϰg9<???<JPljUj6?l?Om;yƏGu'֑#3g-ы^^_<? ;XE?BMؾ H*qT̾(%QƭΥ̛!N׊7Ŭ՗%ql'eG{<Q4!U[ؖPD1Pr=ͽ]07? }<Q4f?0}B26($RCץVRXn̾?/?ƅXnuo{ǩk,`У~᳐c;2yh̾Cb?{{VAo%QWmÞ?­jDxȣȪٗGeGJUWBXu\Yq*;PUNM'eG{<Q4҂w%rP/񮶲$cQ\pQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEW'ζ̡,G$z23296m$,c#<T_6% L }+>{(:mad;T ot-w7fc*.maas%w/9nlz鲍szҢ'(#}3P1QH/Z"L9$&W<7Bj*'#xCLr}}0h舎&dȗ_p=Qt8}?AY7`(+u=DI;w ((AD$(~TQE iPxg<ӨQE&(ҖLQ8R@Ob2)UB0 uE8K/BG#J)W#"E3bl6#H(((##n=+6繖Bg}z}sZPb")%@uR斊j€:(Wv ґ -UAjuPMeV`Q@ :REQEQEQEQEQE?OP\oc- KT (($XKD} J*VUQEEZVEjZEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEj.Z*\ U(hTQp*VUQEEZVEjCZ((AD$(~TQE ( ( ( ( *嵚 n"OL$hdp?:}OGO{-b3\8DOEA-f2(GRNeOP)e9K]Eas6?n<wM,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*JX/6o_}Q,yw7@vc>*$4nFp9jz(R߇ -:t)jQEQEUV~jaEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPHN9m=2fC?2&);+iG'ou¸ ▹}8#ҿ:G= ۰̎IO[+n2;+{o_o=H?Qou¸:(>#ҿ:G= ۰̎IO[+n2=T. C7  Pᔂ z[S6j9C%1>gm$&$պܫo(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo++r :@4k>̨ 1_ $4܂I#8tWQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WQo*WS㸆S'')ƀ-\CRO@ o(mCjo(mCjo(mCjo(mCjo(mCjo(mCjo)Eݻ4Eu*܃@*pAhK[nƛ8 41 H(~mo*WQo*WQo*WQo*WQo*WQo*WQo*r(g5%Tp2o 9tv`t϶?IfILI'tWQo*WQo*WQo*WQo*X]۱~LdWR5 -nEPT!~ঀ(#(AD$(~TQE ( ( ( (8 LȤplr*qﶾu!spNKm fQ}uV+SҭKyþz9GJ6ϧ@y<$׹kԧyu(tpw}X)5>I?c[|Id?5ZAIgx`Yz3`v鶚tFC;u"Ba<V<QcLq Bh:j͵E|h8v[عNzUn"Λ;sdժ^\;nZTq%&GS u b7z5Nm q $ϱ=VK,k Qesߕh g%OCҳ5<>lq nك#ֺ%h$kۃtk{{x^X7s02H SR-%ɇ!r1CWmԡRU^2.ކ"Nh^Yq Ǔұ6gPI(u5/dx,pfSKPԵ%7,|省ڛh|]Q/pO뚧3b<_J?3TŎj_ AN_\EpA9||-i}l_j5]NK7Dn,ia1' lG,nBMol0LzV\oQU%3Z3utV?X((((((R߇ -:t)jQEQEUV~jaEP5Kۛ("kW(Y8ǥs4PGǴYZgWN[S }SJoĢ]3j~uiׇdI'Qӵki"]BmD%7s=}i ٴ P084Quq o+ D+v&'w˜<g}?].=:`^[7iQEs^"QX$!]I82:PKEy-彘'Uk_j/}qu 1+gfk5 =FާSoXԴWIО8T4\dh ?{1wZOu{yg'=6o,Bgr+CDܠYOqZ-ex]NCn#_7_>v?{ʛ۫7R*W| "uc'ҐyOx%T*).uD$ >+;KвKa ?kF ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( 7BXfB " 8*( ( *ͽbOۛvW+r[8 zִ.t(ƪ4W4&Z[Nʸ bFG#%XxdLb ihX[4cv=OY-QpGStSn=ٽz61p׫Wtva?V{'taEV1k_^HAH=rJv΢jX5}:e Q`4K77:4KoUbAHgQ\D+oq*ݎFI Uypj7/$vm!v䜌c@e&k2]\QEDxon(ˆ:_~X H[݁=@<\߆漶ygk݂0tUXUV/>`*Ue?_ʭPEBQC+|2qP+2c!-Q$1ږj5KOΝs$$VwwK:7dF眊C:+zT%k۟'28Oӵ+Qy,l$-RWsJ+R\Bzy fFsӌbKvw; do\.7uP<44W1xV_ԟQI0\In (sT@]}Ɨh.R."q_ܫԼ89qX{bmbHK|gh=դ/:ڇimő@ErikK6.PUoV{?UdZ_쟏 TQEUK,a3N3$U}f)g[yݤj7 }4QU/.%ia"c''ӭ[@DY)d$Y<͸<Ixk35[a:}qzP\7<i Jc#|2;NK>[\4$ۖuDKTUY#pp<2\h\_9ydz(~( _쟏_d/@( VYcWyo3/1M+_Efi761Md v9:C +4e exg=+oh%afavK~uɠF~z}l[M{<gҳ|EZjv֩|,a6fs ^F/Ou{IB;5k3]_"2:wJ(*0Z/V{'UdZB@5+cc0!F;ݎ4'M]ZH=UFn?Vg =-n%$:((_쟏UV=tj(C_M-QLG(AD$(~TQE ( ( ( (8ƶSXBT_=E0Q|;58!W1 ~5jw.ƈA`8z*(w^К#eiBq]kOﱶ"pWU6>mwO͌u9W)F|޾ ZtU o-VMDEpTfEAg)iw4F׆ݷـ:A5o ksudZꨠ.[hv`mo9޴. )?,(+|".Os}sqpQ\qK;ף ilZ1FAWhnRmt@'otP=iM1pqHZSl, s8b<U),c; &%!'"BDPKEQEQEQEQEQEQET?[u=As@-P((~jO­T(<]K )ĒhQسr ZzGy{ 9ۻ<}EOXgZ-I9:ɠ bЈúII0/ϥt]xe.{l5r_wٿ>+Χ>)C_Oʺ?^ݛ}W3mᇴ[.Q>Nއ7&մiq{\+eK(+'$gӊϷ_=石y_nz:zUcET .D2@Vq.g̠t=j?I8(Q'?+SHJO+ێGC=q 9 A⫨;e`\68Zn\ WCO @z(䏩@OF8k—0Gc9Z-ɴy[vm\DŽrf“¸ \Es ݱ=rN?ZH+"~(=70L..e@Ziګ|/?û9Ǹ G?:]:$}J]ҳeyoYIi?K"gAq#ወY_1 <sZ]?e0._v=sԺa-f唌}}ʎ€4/Gnl>]Gikcj%QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE&o+bЅLDpTQEyM\H#dh _6cv˂A85~y $;3EiV!d#ttϽquvp+dkFNOn+''5Y4Րy]ce g,m(b$d:ս/0 ڹ֭Ֆ49cZPCd{ v 0ɖCĜ5PM*'aSua{ nXrNRvwDVwGZis Uc ^1\ϊ&AI=\Q 3y1fG޾fюzt/_vdQErkA^Pp׫hu;0J_쟏UV=ujN9#IQV u s#}=+V.~Tc_|m[WM~_Й^YE,Z4 )o4fN]ź~ Gh7q+9~Xve{?!Wږdd2\nb"d#QZSՁpݰ FխP<ށbs4F++siqx$w0G)AZj[J<-mutI{8$O |3Ǫ3HFߜ1@PhNh5;xb!IJ(?inhrY%G5 K;q9jzh:]ңBp uUb?ʭUX_U>`*@`횋5 -Oiԣx^62buԼQVl9(aErrsYTos NYl ~sL tA9TtW*} >{hg:r0+pdbYڦ{6H)ixo@?ϴZtbxn0WxzS\Xp gqU5o glrLSxATXGȀh?Cs 4*k J/ uY ""FA"SنFq{fu}2r=2Bgc.O?L;[/Qq26Y`'vlɣj_]]/!v1MVPƪ"-pَ[{POccm.ndvb_i6fZK4 Iv~ˮje(V(#^ {bEjsdWgfw(_C H~(tq Hu5\C^l0ji.ebA0y=574T`˓<\95e 37O;E';Bjáj\U1*}yS]ErV >+uhe 4V=ujdz΀-U[/Oժe:EP9ʖe`q^r*gkenJd,hi-ڝDA*@'5oU1A(5B5Ķ<Ìc''Ze#%9A gv#<0BR3ltWV #7fe=]f2鍫 .B0#]&$p٬,# r2{'uImNYKH%0>AaI zS>Ϫ4Zđ۠?)|*/Kԭka,^xo"p~MQTX#ҲcTկ-mǙ0`apy(ZM>h&PHCZ`B/FrxR;y_ν2#O@?Zѿ'ՂDRe?HGCrEP[/O/|TYDz~?Ή TQEAqqq1ڈ2Ms]qkO-}Zij"YylAbkY#cUGGn"[;w+MáMMVy802#ryS8Rkk]GS=s>zV=z4W kBczp<zWkx&M,\>_ }'ڪ/w:phqy$&c,|KY}TDVH-B.]kø󴞫FRnC+(''-@&[iEkwڷ<)qjnnwI-9Fx|c8>]_&J21vs\"4H7 `ovtQEU>`*Ue?_ʭP[/Oժe:@7V۫˩]ök}.+di(*~O{ -%,WRFk[DmCggj֛љst4.Sx<5{2eKau=bO<Pq]G4 nثz;U=#fJN5ɟȝyU!q$k~<nW6k~ݛ=+b ֟ϝ8U}3Z(Dz~?έU[/O( ~C4QE1(AD$(~TQE ( ( ( ( ( ( ( ( +14}:8d"KsswU4}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=J]>o;L|O;zwKMy?ooNcڀ.T&ϟ~1D}wv=[NO;FO@AsS?[tKH:R(( Y'V$*HŠ((((((M"n~Ғp@k(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((+_TVdh* je& 8 )Z(((((((c^: +ez]T:nk/Oժf@GJH#uuQ@Ϡ9vGOdiӥQYݱ1+Zwb (Š(((3ZM" _T Gn wY^=̣*q @_R`i}r= ~v+j.a@T` }P0((((((UR @ꭗ{'T B#%$(Q@Q@Q@Q@Q@SpAe:%?_ʖ@6rhdn$P(JZ(0)h ( ( ( (*0ZC]Fn*Dz~?έUK2"?RA[ah'] =GSQ@:M8v>1xIzZ(Q@Q@UdNΨ*@Vq4f(C_M-QLG(AD$(~TQE ( ( [}.5y~fcAЗgkVV}Yx{\@ v8JSM9 WWPrdc^tW84|κfKU0P`:}wLB©iF2c#&L1準x@F@ltX.]p1ߝwk\Ҭ1K;)x6kn_&l {^@j̅+N\%#r~@Z렙.!I@QTK܁i4-VTl}(S$"C$*'>MIA'~db_ZZ2%́ }@(}gMȂ`\@5 ;@I? fYVW,95 W&G>S>Oz~Yi fc:[.0.x3EPEPEPEPEPEPEPEPEPP\o?F:RB ( (?IU? R0((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((#<R@/r1vd 3J?lSȻ7<?47r.cI?OǛkf9`cI?OǛkf9`cI?OǛkf9`cI?OǛkf9`cI?OǛkf9aGm?A[ԒOkB)a2[)}E1~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mՅU@FQ@ eWXd+o~Q@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~mbƭQ@~m>;xb;p:* -uz(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حrƬ@5\aiP_[s4}EU?S4}EU?S4}EU?S4}EU?S4}EU?S4}EU?S4}EGQ1IEw:Tϱ[s?V bƏ[s?V bƏ[s?V bƏ[s?V bƏ[s?V NBs՚((C_M-QLG(AD$(~TQE ( (hAK~X =:'zHqu&NPrx?@[TF._1IxuZH .A#Zi:tЭ»a}@=j˧]፹g~#ƫe ( یdphRB10 :*ݼѯ/\v< ?]MM[Qhbܠ$cio\kD6ֺk,7 GOK} [S]i b?~Pfhڥ$}G~&ѯ9ȮQQB V~ps|uPڀ,]oon]Dݑ9E,֘qU[}5}6I@*嵴p-j.p2O_XmrKX^dbUҶk7TӓS;BeoB=^M0,ۂXcҬjq%ΕܫsչKLw>Pb}je1Nb_b`[,1EiJXPFBqfjsaU8ަ]kԮLʨP>=$Bc8a?j|,iCS{UH?_?[6zT]j`(GlKsߞTOi/= 3{֟`ip^6]pGSha rU 3jk^tq(z3⠟*Z(((((((((R߇ -:t)jQEQE$* j}*$*H_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J6/:nbS_J~C4QE1(AD$(~TQE ( ( ( ( ( ( ( ( +15:Hd%EkqvU4>w67t}A%2ȓH?Ol2cpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@hRcpxӷ9]B;|y|v>v.i><g;sj%-!Ǒns@h&lX0x2*z* -:R߇JZAҖAEPEP? U`Y'VFQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEV<p䎸j0bh?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5j+o~h?S5jN;b=*U>`*@".SΛ- R,?VحVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVOժ(حVO՜CgnR[e]S[/O( ~C4QE1(AD$(~TQE ( ( ( ( +ռA Q4V2bt}+pzUH-^I-̖( EEqKd p@Nz۟qWZkGoHw4\'y%pRė.-)t`hW۬Dacu?AV((((((((((((((.ԷzK~΀#)iJZQ@Q@$*UdZQEQEQEQY7ޗ6a,q07iي騮hx]uG-t1ȒFr= 1ܒ{zv>#aPF+9-*)ޣO |Oj@utVW*Wp@XF)oAF!Yv>!n.6FcԖuU;Ŀ%dY@q=zj@Q@Q@Q@U =:CQk&/Yz7hѿESE<bX:7!Uyu y SEΠD\IdJYIG=Oη?pТktE@ʒ{nCoa4FdD%Fyf6hj;OJ~a5n9cwDǨ9%Q@Q@Q@Q@Q((KVc/?)y >5R;+m҆ xzRZ6}Jм%Τgr&4-T<5gYgfYo%foN(Qj6J3Vd:q OmC :4\z)aM'v?-iO6[8|_&{ye!8`)o&I"gβlutr OhEPEPEPEN{[km}\#'%z{+"]鼶a6qT/7iيKEfiƝ`eRç'Y`Pen^nvY]; BHϽK5lnn#t4U u ( T \ƛXIogf!ʹTc\ZV&+qXnGˀy_.-ZL29l*٢WVFsw#q֮EwgHUf%dx@4Vƨg[RWuvB[M>\@W'} |*ẍ~`s\7=W )K(8GCH$HdU$>.Yi|STxؚݕ}U~QU-/-:U((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((* U/|Tj(+"]{JCs/]ϏPi5T0Źcd(-ᶌCnz☈o/̴d:*r]8ǫFrgzmiI] 3%OQҋ OX]]7ʱ²\o[oU?Ңo綗}Iq2.InMbڛ"-<M/@mCj6vv]$m\8[R˂93|3o8Cҹ8~h33%*ωD^]jF+tux+r $<PcXu{HR9fH/(֎Bf[wn=y쵓&fB"A^n{k-$*- Xt'E 1 H23qړLIY U&LqV&imɭ%H$ ?br߆v*M;2Cobzƀ;|Amik3aHڤ)w[ƒyUQ.K;D[,vEQl/IM2EN苐yӰ F񎨰K'hd~\z[F{{-D)k1J׫vnڅ@7NI xqFw8YhѐVFFݓp8wQEU>`*Ue?_ʭP[/Oժe:@a:V$<en>kleqyDyFpzSBf>"eAZ';D*ȡ8#^uVCU¬Ho·<8(.^;ivGjmufq%su7@$T|saoq&7I9ǫ(&k&}Qiguv@H6c:vTjh7\Yf8SSj:e4y#1 ''t=jӵgDFڇq淧Kf BB'-4OG,{&]a;[F<Or9k3eTWVW(DFBߊ9-՝N9@#{Ne?:ԯn>զF8i^9~5xҤ12#.\y<7o ֓lOr1U#W#}cmoيFN\߻gz4.ѭE2gZTՊmە8{Vb"&;_* \1~3֖<:]Ԍ4.T$9OKu=4e?7[ଶOK3߇54^Eqn  ~vqH99%kD̥,Es8xh,{8.%4 Vꭥ G$F.jV=ujDz~?΀-QEU~B)%)(AD$(~TQE ( ( ( (<hT>T-Cq-jP1r 7ۭ;p)l+f;M3QӅ<By_If壵% nidaL|#K -82t6m/!;s\babL8gqni)3\X<a;zsiNu"08Lcf~6sw⪛aGw~ȣ8kMгK7gzu i3EOjuaKEIb$UU$$v ھy `z'3MYmْi`yX} |<:W4꺁 7y^7#I"}}*J `\@F}Sv9݌v[" D "Kۥԣ ьvqi_HrX'YR\ZJI%s~?TZjVWċY9냊uy<K 43<֫݅qj2? e<o^2vIO*<~dccz[}][LI4r2ǵcO6b {?b0E%w۶hkS,8?21՛BC]HwNs\T2"!Lh-#ZF|=j[5 HptJu-1 =x{kVd>1ZVAmL{ljc;( qiB=~` zqYZ:/i3D-go7 GII 2U.; ԁ7tж[ddXd/^pQBK?Xϧր6 1VzUִ˙ 2+UYSWB. 2<ޔq4Wd#ӷ?D4I@Q[WHd0} 8x $?t<@$r4k,D2#IX~9ܠ(R߇ -:t)jQEQEUV~jaEPEPEPz"^ y,dg9@}k;LZ5Џq?.ck KSvqgy*|2,Sܜw+[hgɏ!?m_u~$z'?|~NՀ[8/?^1d݊VcX;@m}7WoFR%'@y`;sxuyf6*ǀLwߊ& EΥ".YY#@AExd&Q61SߑVުwQ1(o<(ǩ5O z&rڧ0|BxU]Xw=.l`@}.xWQ@HQ\N:#0E\6k ySMI»^OwZQ2G;#ʜ >bL䵊In$Ȥ$}hoOL1 S)OJѮJJS;,]qں (((+ՆK}~<UT1rx<{M5Y&it)-ь',qG^@O[_Uz"ԫ:+"ۼ@>$f_*Iy.<ͣp8PMqf[5~g?ŦY`Qr{;t ٮu&#lJ lN75} ֻpz<L#(.~ǏҺM7UM`~c X\"< A #YGؠ"(#S]f-l$̘Tz(>jVEۭͬs=Oht?Mνe'mojUkg8P\u"`X ?#^kgN[YѶf# ( ( ( (8gYեT0 ?~?:cm<AӶ?ƪ  丞i`QMg - ֈk‡],q{=]y?{M6!3vN8?ʽ>Ck$[t;%܄?wnlje۩ean+״弅nA<eOQ#5`j[_Bm &y!tԔlnk;ț[Qš(LNUA gZhUwkAٸ=qEPnt\"鰎(6jKׂ(A,@mvKφ6GدpfmspSjIb~ yǽrj\htcHio\PcM8D K;}5&pECF?xqiol㶋Dp:cD]00{ 9) oW_E+\ GV$?I:~f9n~xx,^Vk\PX@%ӯ/VKKV2ZMV]0yeڸxjtٝlIo4v?A-c&yZGILgd`q@%n j<I\IH<QEQEQEWdti]j|QoWJiFҜw4K h"u:U-ŴRظ$^4ҵfIo^8Vcolw;dϥkϩK/stD)AݫfRH8W'$o1y3#WWyh/#e9Gj[GcW{474ReNǎ21-(9_5}U5/[Ɠ{[;hAyi#- Nܼd5#:ˈN22Uzg?Jam῰ ]N'bO`:lm$>Ojt԰PUJ$0z~V.-<سcŽ+RC=?:i l[b1AW=esikxYbtm8 ڭi.P y<w*,i K<r 8L\iie>0,r@m .WCfjcpUJ -lt{i~wǨR i_6$ H"Q=< vǽpۣPa$JNQ:nkjR)R`!v#5cMJEW$U{&R}SU/#ѵ{U@2,Y7 qQ3. 3]yhgv"cP:Mryx *ϽjD+tZuuaha|Wǿֽ^^iGk(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((/V P(9}nuVY$1@@x-^q BkwЃk]JC!k7]ɟH"-Nto+,I'Umlm,S˴c:j!7w1*?7"u+{Ac Rtͫ~ON;kh^?FLs־t[mZ+ffXrr:=p)8كá#.6KtIlo$ӏƺ]I\R<gmJ+j=C_~v͈L$-?'{U'hv9=%zI<{.?1;ZND9} l];dr9@<&xgUԯ4"3 G w~ʽ.(/|Uj0Z _쟏UV=uj+L:NQ$dZaеk_1l/*7o=I47 ^`xP r9֗Q(t-f#֩2FWQxHOR_sMc+NC$.8}+Z{KK[=>MƎ`H-QRQ՞Ŗ$U-AֆhAr3.FIv W]Eyyjד7ٮ$+^*ڍ 5hrU(k;}pkq-|h՗iY }+Չs1rC^QOh*0"8M?ZӴkJRv(*`ֆtu=VVH\BN88+TL~# 4q9h'@F n$E^ER-5LO ;s9P=jPUl?V{'Q@P T!Z((AD$(~TQE ( ( ( (*gm;LsSPϥY*fq(-Kh<A\@0=^jz(-W]4ק<\Ugޒ? sV1,1$)QB(V.Wz8*4,&+qݑ4hn&LdץuP4,c<<Um]:Q4q$ZPCcj4>ilF1ei$`ƟtdcP}gbY$55͝@b9TPW5ǘ@:v`?jA Bm,q=*j(4 )A_+vF9$Nx,'8d"!99ִ ҬѬ "~XdNsV&WwӓfIpN0B3׎J}M$d3}P+Z.g5Ђ қyߐnS,E_)Cnm#s\X4M6U8r!~ֽ]-`KUĒN:RCiĻ|.Iy4P{khm!8'zEQET?[u=As@-P((~jO­T((њ5;=RnP26n1okjt&N:15UqXZSHU$`2>V`f :ecS)@Q0k6E0mUaGoZ4WtD=fkh Kh2I<}MX 鶱X6,g>IEg* |њgg F>j4QFhRf ( S/ >h>4 {[x_GsV<jɈ6br>VѴ~lYGOE!^Zl>:>r* 0$*IOnm{iAッV("PFO((((ռ=G-`84 h`H)݊}p$euEcɡiNn.bű#3(ϢVK$h X0OKE/8amP!fzEQӭ/6O0DIU$V(3 ((F =1RQ@Qh(dRȥ =*h8nH}!$vAPee?tpאm-ZĻ# ؎jei}@91_իK[Y`>fƃ@g[h&S3٢(((+X?gxqVN6?·6 ̨uDT)?Iխ-2N'{y^Us2yN?uvj" cvqQ]%.7lHV+cqW(Hiciciƿ쎿S5<*PXd*J)JNQvI>*Ѭ6$N9PnlkVc6ppy"YV24І28 Yرɭ*(ifKoW;u$]ȋDnI]=',k4mkpjJ(2G4XX3Va0]$Cه= Y ;`d^Bʜ=>ڶTqzTj:%3/ GEzh: чOOs]}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPUe_ʭTRIJ GPhZ*s=Gs=@MEMEZ7?y7?jotQotP*s=Gs=@MEMEZ7?y7?jotQotP*s=Gs=@MEME$ Uv.2X _쿏uTۺh\y#y7?jotQotP*s=Gs=@MEMEZ7?y7?jotQotP*s=Gs=@MEMEZ7?y7?jotQotPYDz~?ΐ3 LJ*ʨE @(W?pS@KES(AD$(~TQE ( ( ( ( ( ( ( (3Qhdw덉)ݓ=SK=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZER{}68~K=y]| ǿZE@3M"<{Qqx튞(.ԷzK~΀#)iJZQ@Q@~O­Vz2MKTETg(g(>jwmkw(<A\"Wywg+UQcXxݞM>T-Ϸ>Uzϛ?QG?QO2~ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ɿ׿O*EYg(g(>ƕin w)ϨywlEg'wsxAEY語lElEIe*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[ywywnQP*?QG?Q@語lElE[O2^CS@KES(AD~OŠlNV br(EPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\oZԧ9&:RB ( (+/|JU>?ϥ[QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE94QUM'hXzDP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[}_DP*%_ZK<_[p:'X(Vzd?>ofM-QLG(AMe ֝EAHdH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEA<S@y"$TPH=(EOEAz(QEQEV_>n/|JR0(8C#0 )[RhOο@TW?gW[wn^N2ш##O *(dgK*R?gv )&nv(V=gq:U=?RK>fH1ڻv>E2A޴JlH 7| UJڙw6@U$ќ {P\}#)5"Ml=3ߢ6i>yϿFH@䒘΀6E"̹èaB3X+I̊H,{O~??:VeeF# @=;Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AtHy{TEU ~`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QE`QEV@x?ZbEPs4Պ|2bZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPeVu# ( RqVL͸$x%H$܎\q,{R?.s$  L@#^1%OjQi%M78/?=H5JQcGw21ĖQA4r/A\$&]'<W-,ɨC8?Uqꭥgyo n80k< zg8G @}6_ ێbΛ,6u06Ryk hF7OzʖQA3Zݽ34ofBI+mPI(Ry>5/$Jڹ`aHQޢ+iƎ/h# o3Ar=u 2y_ v\CavrNP7xۜz4t뻹 hJqsRff]yQF3|Yٜ~G7$htdT2|sEVHTbIUd=k88U8TGS1@9vQvaXr?1ڮ5zȸ–Lqӊgm: :8-H Dr3| X2TQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PY\5mpg1ZM%_6OU}]$I&#P6Uʸ$8IR*pAfG˷qœg7F/FƟXaՕ(] ;{ g<sJݢ./fK3q?ƴ-Vs򏠠 e0[0* `CSk:khyU +; b+ ի;%U/.ZceuN}-4|KJKO@zQj$ 5)VR7Lr)'w;vע%q`Rh.LF` $S1;˕e?ϵiYI$Vѱ {>֝QEQEQEQEQEQEQEQEQEWP߅XQE2b7LX(#(AEYbuhRȓz~1($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?G'( E/'($($D%Dȓz~\ȓz~yOҋROҏ"OQp_"OQI=?J.QKI=?J<?EJ)|?L`3EuQLAEPEPeVu# (+[% o)![pzQg>\{<qMP3͎7{ ~?Mz5A>vq[[4OTO(ePцh֑[ ,5}> nYY~Vc]\qE P;(~-?c=zt5ŤɕMv>Q@0nw!F>Ol mꨠ *e ~+/RԴ.# eڽKzVB-5 ?cFx #ߌDqirNHV$COPFAP:PV?j6!;ps]Atx9UF̪@B/(H,>Xv-GαUeT*Wl@#fP!Z[/j(n! bą5yqt~Tyqt~T.!́LcK@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PYpZ(  \ʪ[t&(]b-Єb7Z7bRyϧJ @J6w`gր0nUN|kQ3ߢSjoGrLn<pF=EmRV@8@Z~'*UdLk>%M>>镁%FOaY\tonV 4B(QYz$n*ֵud[e¨"T7~Bݥ$68(y,%tv<(5{T1ӿֈU^伜}89<ye_8tp+VkktQSW14 ;>Q s$Hb89bw" 9Պ(((((((( ^C~b (#YCSViE(AK))`Y'IER((((((((((((((((((((((.ԟ§.ԷQEP(( ҭEVFQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE^=ub*yUUTfʰ wڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭEWUCGڭK U$`I?ҭEPs4Պ|2bZ((AK? JX?IRc,E5*nW8|Y#ѯ'[kyH(?Sb7(0 d\[ֵ|1?{JlGaEŠ(((((((((((((((((((R߇ -:eQT ((uO!g֩Hht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:Ώ֓ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt- (t~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G hi<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEG|hJ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G hi<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEGt-ΏT^t~Ώ:?_@Qy:<KEEG|hJ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀%ty:ΏGZ*/:?_G ht~΀ofI,@<S@KES(AK? JX?IRc,7?'jU/Rڶ9!_3g +YjP]Nc d=>䭹΢dT{I' j Wk?$j/W ژc{/֦VvoZ+,"YO{q]WB *`ٲVAERQEF _ʆnך, ypbK(XvMVPW1 XWۜ'O&ُq pKY11VKd3m84"}y۷kf2D +H+]&8)9r0XP Kj9g/HK+psPԗO^L{W#?KEED13ɼvހgڲ'KxѭI|@#O5h8UOKI t(2[ӿF8AHsZ:/ZdjYb$QH'lVdڄjQ"@ ʘlV%݄rU YR'@xn Pǧu)5AhU\ ߇k wJWHHp84O)5\y }]GS<>^1p`19'EQEQEQEQEQEQEQEQEQET?[u=As@ *QEQEA}JѬգR0(((((((((( ?G*t/SEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPPGOT*((((((((((((((((((((((((((((((((((((((((#]'z?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A?Sz( ( ( ( ( ( ( ( ( ( ( ( ( tIU=QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE?OPGO 袊(((((((((K~ΫU-:M-QLG(AK? JX?IRc,S1H]RGR7'RψOjZq[=:;a+#׊ݮ? uJ*:n]WP;9jI! ?Ot;(%aɻ˩txn.[| Vs^h6 I\; ERQE/_W>P|>o*HbB35LhZHƀ96Xl 6;1]}E$O1'S6ґʰ9R{v5@o@genl n*کIxT<]Ŵ7q.r7Q:sڳ?<@ MIno#98j\8cMѹ9'Ȋ"8d!G>@ݪ٥[%tGT'oنE O~ܽ܉;1A5)G= RX,!\H=2=%|5Gǡ6X'8jo+)d,ų"<:PO_X"[oH6_i-+@[qz((((((((((R߇ -:eQT ((գY=FaEPTo }:!5vmy9mX?1={v4vmQ!,.{~-FKp=kI FaIrx>7wi,~L2s$DAej:ݭK"1fan-F֘f!`p3ӌWhL׮,auNKNF~G[R 7*UԺH/R>ѱ€_]=MM1 dthڤQ^Ah2)u I4d/уҸEWV1Yc7~xn}Q#*œig?1Si )ϩ2XpGjaԆ/#׿CR!x-ǾG_€6m|֤W>n8&Sqsןi{g!Ѳb<eGnkoMAτZFz1`@Q@Q@I? ?GU=QEQEQEQEQEQE &`:8+ dB*r?:/lɎh󍡁?p J\UDfu>LoOa@W#/y],-dsׁitE8PGEbG6\l+;Si:hszԬRimt\uYZn?yq{bf}mKaHO{ot<+ ] <q{nB;ce{GcP}*J((((((*IU=A??ʀ'((((((((((((((((((̙X~-Qԭ~c-Rr?ZLHX:NAEF.gwNxZ 9;#T4GSqw܏0O</ƀ;Y]ƹX3' =ϴ-A~xw$7Qp(ၠ]]C dЊ}rkJӬ@"_0}kOWΗL#76gh^¾"vMLU? B q@]Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@GOIU=QEQEQEQEQEQEPiaU#s`zZW$P; c8'yy؄./qx͐QI_=ʀ;& K6j\w [lήd-=q-tGIR¦>'%$Ccw?Ҥ2 q=a #~˫[I12䂽{?ʪjYIr.$r(GYdC`>Ɵ\~$]}@YUǮ+((((((tSz( øm+uؠIJ1*+5 -ԦHY{J?!}_(5(H!Ck?ܕj{hZU2JU\{.k WRlb7:vAMvõ]ʄNW<[U>hZ )0kb--乓c?_A=π?0]9x8 'ר=Nӿil63jm]:hKgNOr-o\K7 bEpN8,';"SA@6conRɈj52Uw;қJKOh\/N~fQWRU%ܞqP_ku{=)OJү4fF @ zO4@H,5%BCm$?h)w8U'W1Yq@Q@^0[ɵ)az v8=Kğu#](lzx1_RC}# %u EPz?O@Q@Q@Q@Q@:mhGP?[Y[5Df =\m! zkG:ոm=N;W=:7/$hyc]r q&:JO[*أCk.]A-l\>і5M<@AP8a=WX"ak=km>[<lkHFgH2Ȟu Y {h6P_5*jеo7M[0?^pˑӣiۆ2uGymWCr`vzGIuo*)nzXYT xpqX 47YϹaDdozEf\:moq.\dmcg^Iϲ,dq{5^eh\jgkwoylۓ8zvPZ3:q\vnX|ֻ瓞Ki@O#Js hCM RA;GS±׭&kDg 8gk 50 YAo5Muo\iV3;H SҀ/S|bIx~ylo6c׌s:/OIPd  +~\hO\>hA=BǩÆfO{*]<8P2qCZ:$Q6 9 s@QEQEQEQE*t@EQEQEVcHi g]۳~߅iם\MM|7y͐Ts]kMhA3RX6 mHqǹ=~zeurJ5&y^%َG7C ԏs@YIs'Dǩ?Y3l°Kjd"_(ڡU)oiNO@&Y1R9֑xyK"ˏ W}a Y&=RzhQ@Q@Q@\oxՊsUV)%)(AK? JX?IRc,E!NXaCQA->o<=UQS ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.ԷQEP((#{VgGCQ@bzևa mV443j-JŎ<#?6M4F B14RrAR{u TkhPAW9b{ɭ8<:dpàbuY>Fr6?PEBWeX$ahVo}E$H(`-?A]]rEG+eP 繨mmexA ;n|9 &+Ir Kt'Vx,|<.K-l [߁/ F2mƽo^ڄեd9E*[^[F@#oO*"_,"oKӣmD+˞]OzPPawkֶ^Xѱ󞤖 G~նJŪh@0AщO4hViqhr?#@m/<{ev2.;t,.uXc(䉎_ ;gF8 FW-?gf]dy#qzߢ(( ?GU=A'_ʧ((((((G y ܪ6mr622GC~3e5jmi9HHk]=N{H}:E2NC7~gpB}2c=+k@o3cz?Z۹д˩LņcT*p[̶T5iH Ҏ́^cl,"ָdյè<&(9Q:(w7g%ʿ)Z誝yA{( p8*j. .gs,UmWEӞ9/ݢ(((((((#]'T*((((((((((((((((((5/Q!B?.rҼ7l #.x.K8R4da3_h\=zUo]Bx{I0wnN>jl, .Ӯs@~v{y_*տVo r[qz w溹t9XD000s<?Fs[?s@$#c [-d[Ljo~]k4aPRCm%E\t,I4UBZ}PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPz?O@Q@Q@Q@Q@Q@Q@Ks̡5&+xu+: ~^\hW{Vٜ"9iU\=`<F?]/6f`(×0ț[>]OM6bXW8 wwj M23 UqZMv& b1 طњ3׿RxrT1˨Hz PiZ^U&p#WY\v"j UPEPEPEPEPEPEPPGOIT=Q@ eWRJR_^*nP%`B}H^4fX^ Q\bng dh)SL[ڲ1iof,1 ~)Bg\zԲѤӮg9s}@1nG_]Z 2di Avw{~cwIo ]x<ɽ[weHMY\QiT܀t:75əc9;ÓZ:֟.hR-pZrѾ2HS0r+5eڗ<s#(=~w;)|Tl?ko'.Y&w?LԚ3<~ImosӭtXam+) ujP&fP7TCգs)Iտ>>x [W ^0#ڻ%-"[b0)ǭgYh6Vr9vnONj]{H-qO[\Li<}C>koyc̶hu'tLMAZ :~n'KO5xz hQ[K}i!9,oZޣn@`ww_Ca83n }kicP; <)Z I_71>h(IU=A??ʧ((((/:UC ck />Q]{G}tne@8ڠVlqt&Qr#1P9\H<aƿ.;ֺ:æ-` CӪyܿl?5q'=sǩ44ꩦEs$*'**K/Pj6eyW;DG?@wL:7.&A}#}Kkep8+b^anq[9\:UNM{yXg, Ҁ8ۿ2[!&[%#Ld]e݇#_GOB~-(;]D!B"86m: /x~]ճzeފ1m18,`{gW7c~]KfE?#(9Eďwo=q?SeZ Ww+ޥL{ ^:]]z]L`sx|<cQvd>8ݭ^iIy4?;L1ٽrӒpǿ9xtKּNTct%g]kR۞Hj;WVӥ<-|sG+TƄ'@};`5/equQ9 P{Tmjv2I2ICaps>x~ ; P$סJ2c;!.Z/t_kKEUl-x`zgGYvyc3P( ( ( ( ?OPGO 袊((+[Mqn !nI }2+ЫD=d\p@#}>R8܌ͷu~Tbq#,p!M\n{ThVl%%eQwDQ1H<qNkcWDM*` $׹6]JJ>?z[ݜ@g\zPavƃJ3۝ߎ]t<;?O«geAGJ@Q@Q@Q@\oxՊsUV)%)(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( ( >Z5}ڴjFQEQEQEQEQEQEQEQEQEQEA'_ʧ$] TQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPz?O@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@A??ʧ#]'PQEQEQEQEQEQEQEQEQEQEQEQEQEA??ʧ#]'TQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEP?[u^b\oxՊh hb?(AL4G3S`Y'Iw١h4?MOE 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(CSCDYF \.ԷQEP(( HʌO­?UTWjF3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)PvC"gK<QM?ʥy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(l NN23ҬTIOP(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)PuA#dgK<QMO~ʥy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?TK$G!98JQ'?@e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yEWY$9 FzTl['Zg/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/El(ly?Sy?Q<QO<QG/E>g/EDH$rT6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@ e͗yE3͗y6_}6_<)P<(e@FL\aV*YޢX(#(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (+|JT>ϥ]QEQEQ\,_ҹ:+(CgtC 8&=Μ(7I_ ʀ ( ("ԵOƥ((()h(((((((((((((((*$ZKQ'(Z(8#i`hJ+?iRH#= U;KtwpRPۿk@TQYWZޝg)Y2PN>EWζp}ٕT@ EbE{im++t 2(h6l/Vq2n3P(U;=B1#8'W(e8QI <)<ygЌQT5 [koLp{s@h((((((((((((((((((((((((((((?ֿRI ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ?ֿRI (((+55[w[ $?g>EAmpP%`qZ ( ( ( ( ( ( ( ("OT¥d$HdUX)*@ *ݽ>}ÅO__*IA'H#?iHX(,uAiw "JG#(|C)*e9UM^_&63}hJ+&\mf0K'88P wFFr=++-'z€6訠;VxNQA"DIUQOA@״$?ֶ(,0'k}OPE2YRi$ ewP'*#<PTS-<j 4[ [s'osSր.QO<V4ӰD^e G!nyH"}F`:v +:Vl.0Gִ֣9 3IB@UkKkؼg@Q@Q@Q@Q@D_j$ZKEPEj}KUɣp58xY##K~}ֿW(v_^٭c^}wwLD>)X.utWjPY-. sk ;QHǹ״[Ӧ?~{{f)QEcuvWbI?%7bdtQ@O(ՊMQCS@KES(AK? JX?IRc,ELW(66Bf>ނ񈴔ie>Mi"[ا%\ܴ32 zGym8u>J4OA1G\{lSoWv=6(((dJ]Wy'Tj^UΥ"_q~n\2˞O .ڦ;X 0,b>+k+2ۃ8qҀ6W ndRawP7p@^':t[\ӵzAK\NCg9Ԛfl̬r'GF9 d2+UH#y#$V5nL-6GqO r>ojͶkV+ "<by?wusE(&'Wpps;ϻ7nt@w60?&g}ol+ڬA#=MEa&26lJ[ha0e*IiҊ((((((((((R߇ -:eQT ((I?UڑQ@Q@,_ҹcC׉c Ē!$ck"#V tUݝ͝>S~M#@ d`MEv Xkmڪ o7v~fehwDl󏩭Ԓ[a } ]PZȋ0L#w^b7[2V~ӛVZm6[v0poa: usYq*X}}띔ks끺k؊`#8\{]M_! A5WB?k((j~5-DSh)`lgbǮky (zo]T*@ pp+M {f~T 0ۥowV# upv='*Ϋ.b,#U {4+iDDO) Rv|qdsobX7I?6~u+-F KD2pݞ9eP#P0Ъ@f.Yn?:k˙5-^zvWzKg:r-5ȟSaX죎Vfd֣+*1>{co ]No"hV;qTZmƯsB+| πyz (66LMX?ʵt"4Csb98 [[Q\dӱϯj[d{#_CҸ%nm[6#9T N:WOnnբ(((((((((((((k-D_ k?SPn p3;Vd3[ş!{}f.8UfUp{Һuiv>kԵ  ,*m9V.ck ff .>-̈́fj1a g ְ O]Kuw³{c;F};R蟲HQYW0%< qӽuϬv /,iFzt<DE]Jdz{mevPὲ&D`_=r7c=ӊсR A' S}j̚\zXetl`I t4GTN",0ѷ$}&3ezt|A`i]6xӭIc)ѴXVGQ0H =Nl-Wc^ǧ\ݭ$m$4KLQXS Aln,HV<S fVwZ[]CfEV{hn.%HXE/aOA+$Ik%/!?ζ>zznCǩszϫE="m?]F o s<zlnh~L֎?Js_oF: սٮf裁{ 㤷olon&T1]ͬzeg=KOI `3u^G";z*+xV's!QԴQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-SW{T2KG׿W+ OrvmpW(>m_N]Ky#tE@wZ{kb@7dquz4cdɥIY(IUiˀ{`ۋ[Ix/&Yv(~7WwZtt+?SYX<3֦iHfŒ8@)߸eIq}굟fe%l .A'?UU5NivVրAi3j@KEu©:ogJUSRUt8^V":`t=)i5tPN(((((((k-D_h;U}F^XqVf-OP 5cj޽}%xNvy$V%c̼ZF\ǥ9y.6됑e>n*a E(uJ\Mi۩x!B3r[{ ,#`q@]TO~EWu?t*tz,^H09'ꎏh-mB ,3U=c/Q?5M s20G@HȎȌ A;mo3NX<htgR<0kM!ҭO$;9@Ym5[e",vW uffN?tS0fFz zTxK"L|g3@q^ٽw "owbx&+w %)*At4`#Iw}QLqitKIhֱgD*"]X`:n$HPICp1f_kp_3O6f:g?]-fQ@?\s@![{@7CRի oMK%ydQVOA5> ʪ)EȠ AWi3jI =Ejt9m,]Q`9LJ-KfW?upǥ\{+'K!'kyZTIPY<Jw$[N[RKUQO ~#5b]ulceɊNKh-~֤-&[;-qg&Byb  U"O̲;ЍȠoFQo+~D1[Xpk~m 9ؤcFMd_Io(.8Rr=&s;Z FJ}zQeg ʥ4cOYO["05j/uwyA3O쯉#1iEPEPEPEPQ'*Z?ֿ@EW#/]Һ|e UGq=?ki_Sķ:lHp6+8_^|S~$  jMNZgVn]jBq՘Q^ $vC [qXvJ+M8--w}5yF2jbxvJH:A[u4AERU, 2 Їx[٦Mӈ?ȟk:^G >d`I;{}+Hjڣ"`!\p?puo'v]V>tm J8I>>C+ `MHcXUEdXQEꚢXgT?4QE1(AK? JX?IRc,Ee4ZQdV9?(ϷJ{]:̎A` GA}x0/DYF@נ;BOrrqG]'YS BOּugаhQPOR6#t*N((M]jhAی=~&Me_ ?/? [WYoIDѾمSqں8NjN['OIZkЦ?\PD^D"ɞK/M,s,&̝v'Ǖ$iRwd+O& :.$u9,qϯZG 3?wZ꠳#'X"hXmA1y{*̈́'i<vsjƵi h2ܫ>4I̓±5 W8˫,pR+XgV5֚l\.e#ok:Uхe<aAs ;HWxc ]͹NfB`S4aFmxY`Ic.גWrA J 9'$Y[aYwJz⤷-(V үlRQL/J6D|uTQEQEQEQEQEQEQEQEQEQE?OP\o(Q@Q@>ϥ]I?ҮԌ((cwqiou]sH:Ǜh GK=O]'N<?t7'>gZtw7,j꿲t7?yƀ9Vx|?Pnlmdo'Ors\M9V(T5do'OsO#&*gX :\((j~5-DSh--iPMTDE=p)PEPMdG4(((o* zgEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@ XV,=H( 0 CH6 =Q@5CcfEQE7ˏvw9 cwP7 GRVhQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@6z ɽkI$%~8+^@g(eVX= -UFjZ( S((((((((k-D_h("p>(((#z)PM؁q:(hD \( {ΝEQEQEQEQESU3@ϠQ@#"ÀG4P((((((*$ZKQ'(Z( |e W]\c~2}TwvE@OMp_A%lȮs4VAdӿ+п~F͵FḿZ?*B}k)pY=Hf;DŽտtxMYt87 g'QEr#ZDf =e =_7w=X uC{!Xzz`+h" %6QbC}&G?;)7Rodƽ&Kz\۰79Guf+[TvTqDDǝIYQEE?V*Y5EM-QLG(AK? JX?IRc,EZ]lmy@V-Aa:N,b6{-hYXjq`zckV7o{m C"(U5VFEPEPrGRU #(J8>ԔQ@Q@F E #<ԔPEPEPj!?hA((((((((((* -:R߇QEB ( (+|JT>ϥ]QEQEQEQEQEQEQEQEQEQEOƥj~5-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@EQEQEQEQEQEQEQEQEQEQEQEQE¥k-QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-Q@2H re=AS :gE|?t~w "N>"3}E_KE(()i(((T?K??EM-QLG(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (+9u?'?ZX>keO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`Pi lO$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@Uͳc?̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Z<?V( d̓yo I<Zbٶ}w`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFT$dx`PO2OI<ZFQV;6Ͻ2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('h$[*y?֏2Oռ 0('ifү`Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@<?G'jS̓yy?֭Q@t)U*?pS@KES(ALDGqS`Y'IwahL? OE L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(0{4}~ L? iߡ>CGajz(SMUNM\.?ԷQEP((~jO­T((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((*?pUE(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (?IU8CR2z*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&D? hߡ ~CG!hj*C{4}~&V>CUZ((AK? JX?IRc,E*&v2IK\s_SJoBݦL-gWs^Fq^+_}_@5US++* ( ( * 6@`ziu2)%!*F8 z+'{µ&f\U(ockE48=*QT# :}(qY9; \߶x4j56[ÞN =O@tUu" *~Z#K,P1h37n{}y QEQEQEQEQEQEQEQEQEQE?OP\o(Q@Q@U}*HŠ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((ijߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? UAjߡ EWTQ? SX4(b|Պ|2bZ((AK? JX?IRc,3OM<d uI`w_2A$ N?#ookE=p06Eu?Aubi=N;B=\'๹mOU tRA|WZ{:[.8[?k71[giW}p#8Z>gwuaK)tקVI= ZQRPQEgw}JH0ok3RՊ^[Rd֫3([0>=ڱB q{#Z_\SxE{IxCw=[VK!ˊ<XwvZpIѤr|e>4vΛ*Ҁ9q #/1cjӋL sѰ:U4Wdf _ZGT~8֠7ʎ;p޵=DdnT򭛟[Zd 2[e(xL's8o{8Aenb%2!p=s*ۢK;pZ3;BpofcJLg%t]Zˢd85%2K`dyP1A(jT[WUUTv=zSK[Ff]eϥC͢D%b+2p1ޣFȺo62;mEPEPEPEPEPEPEPEPEPEPP\o?2(QEQEYU}*HŠ(*)&vڋ4-Mg' <s!9Y9W$uu+˜;4f*WjpPP(tl>`]1u TW1Z@"8LwS$(W|}X?3Ul?/ƀ.QUEpNߧzoE})2"KOq#@h?zwG} Q.#€.EQKI@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@C;u{cUEI8tykG(Z>gykOZykG(Z>gykOZykG(Z>gykOZykG(Z>gykOZykG(Z>gykO)΂ &N U7QEG7LX!V)%)(AK? JX?IRc,EJS B-&ҧx?ҚOc<+!ohnIe=T0Ozu]Gw4ՐQYQEQE`ms.q{*؞\;^?55ՕK=Kȃ uQ@in3JSc}!N+*? ^TUtxA-5eqiB5@6z^0UoQ8<vfy `D?;(VI WC:~f=rO[K$9h?OJߢ3RN%WVݴ\v] BUr?#vx1ůJmE\c)t{a=FֽQEQEQEQEQEQEQEQEQEQET?[u=As@ *QEQEV_>n/|JR0( E/bң&j޽[Yyzxߚ.I3ny\i# Ҝ\I~- ?ħ~O^KSINE>b=J@$C)@NYQWq=}ooe!-FA,HWAd'@cj}1,2+2O"4u/eWE(ѤV$#J[+/ItxeYZgazo\ên}qW:W}*+O {.mQy>-֢tY?'z@gQCK"? t>ƭqGHÅ[; #G[$U ZOu ޙ%'*ѱpr(#u H: ?5=hlϦ]ȱldKhU@c8hNiXFt 8RӬ#HYPBAjkْ=BtN^,npr j˦jsa<icNY*$+P -,w1%o|We [B:\κ$ER6$9@owZc[Ϯ1}§`Ks-);_|~tVflbLRٜJЈ;s@DR<bXX:t)UFT)yӆT$}iv&60u:tzӭĻ Tu?ΗI[F;?V EsviZJmk[?S~5ΖzDqPn{(1› ` rj>}\*4ecu.. Y|A'${ Q/-6gM==*^i.,$ JPΝmBڧw+<W8]\߮i'<$m Ex^D `F:aJzhuZui6 OR;c.moBo ӯiwЎAdxs7)Ewm23 AST%1Kz)C_7-qWd3Rm"垧ܭñ%`z}Y#k[xD}a~5#լ&_?Ə6op~һ1(0|B#p UX_9ᵂK,OSU ̱ى՝1:,O&W&݋w_Bfᕸ*GPk?m_s[M4HpdP0qYm!d v; (bNP■ނ{m=QǕI=?JЖ4=w:z9AamͨX8>Q8} :tF8m*|}(j<W0 Y5=<|Hy}"숭 QGC}XYkVbog BCr6.U&qqo{9GR@ƺ p5MP٤Rw]S)_tl3{wǞ]% i>%]_l]ZM _t+F3N)1JN'YEVF&=kih\p {1G w*æz5KX+t .YpOjƽ{3̝2Qֺa94ԍF T'/VJ n9/+kuc%DÚo3YA p=~n:T8ٚFMs5M@)優sW"t0r9+ KH،<C&S1ZM YH׊jR˺=+32GA[Uq (dYLd0:ⱒCx7mKuK@m?cE޵$x,NzTv5#ma\ n]^\\RO<oH$U5-4\ӖePʸݴ4 vW^M&؂,T㧥i7,v8 `zO֜-jo+dR9E\QEEs]׹S* Zܸ2 ϰTc8jY.bhݷ[ ,ӱgg?I0*֧m#{gtd1{q߾kNE3uո6א**ZLZ%SIŤShߘkKw,QEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PU%)k;?(LX}RL{@ q?4hS SMPu9"?;[qݜ@!`rLRT7ZkU]z3n#qwc@V]ƥ/! `b%UQOQ4fYW2 Xdd^5[P)5i.5fcTU 7-x +.;饶 <?yO#WmYd=C=vZL(ǩ,nd`!>5_peEgO{!Z٨y?뫹btP8<=M_嬉C<뚰O純6B;hF{Kmb6sŽ^((((((((( ^C~b (#YCSViE(AK? JX?IRc,E(JZ(((((((((((((((((((((R߇ -:eQT ((uQUQ@sڥȼi6f|GE$xAg%%hQwİѪObiڃH Ncy+q4:?o:.tk26l`S 0zRHUg?~\ =m][Gw[HV[Ai(mFH/ֱ#N[jȥ'`~SM r R.f0c'ƓTFM0&|wϥtyhA NH>SbEc 1?Tmm,/$*%Vb300=k(D*: zVL%&i-ϵUvh<T* "PH1c㿭tW۵Q>\qKӕB32TrSm5҉x0sw7M&hY:1U ?N=7P=VByqflAk#kW_~DR@=;&kafk$t!i{o .Jd]f{vkbX}N U:4T5XZ}:$bX/*,<SSNjMk%r';D[6dbI{kNKf0;oAI>VmQ/sgm]_Z&ټFIs,u֘ya ;xך6X ˗d^ )jKeZս2$R dp>QϽ2YkgRbrvӀaFg%V{PsIIo`ՑtL խCC:wEnRr_s7Vl e<f:pdʢD.|203MuԁUFM+6+Oy ɝӒjTaz& 7H7c ttW7r94ReuHfAj0>+t`HpH@a}N~i2ߨ"BxݓFj-;PL[ʒ@$2 +*Qfjo&벥<Ž55ioj1hFBIqHt#Zs.}*VyU1\UH4d<mv&G2{kfdpKeRGgy!ekn\ڶ>M,E<^c+3A/12,zUE+as[ Ԓr~鴐3Ԟ#omXWN>t2p&iUxPҩI-lKz\-0j6|'5jl%)" ؒ1ūڃO4|n95324U ǭuaI1)<8J}ŬW>Y?q"t26r3׷l%o`,ÙNd.ߥh7 Ί?Έ %ڋRs54_9nXNi 6Ҷ\9<g8hcf6!=zۋx{ys*MnJbZkt&9⺆L#Gj▲o[4B 6;Qo*HI.rkN|&F .>tU֖jG#\-bҬZK=V$YGuԞkSI65G .{ڷ 0KM, F67Ksi&p@ܬ/`cHA,G8{3tK(' '",Ӆ "1tz@v}hsOt l-?U?6Yc,.&;cV=Wޤ 0G#]"i<x\wurꈠ@Vr]CDGyOVKzXQEQ@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Wv?X߇ PYpZŭJ`ei|'@-)s*[fVFMKh#*2~~g zc`r9:~Ur 8-ѣe[cÚa;:'fʑ *!QS]%C%3""T#Ҧ yMT:X岈@RFAaTJr`c$gAdmBxS\$k>I.4F=8ᵋlK?5@]+HjՂ%z(f*Z5STֵ)apQ}GJX.ZOfh:Ge8bhREE%,^IǿZʽ5TgO*Φ F+ an XN5,:9PjWFhp86"{-?5PZ-#sSC1E`J>,Ī%zz}iQIǞqIP9cH#*p@=) PC ;Ƹ2'SPEPEPEPEPEPEPEP{ Uw @Q@!V)4Պh hb?(AK? Jdl#];v̛y2o @OEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOEAM<G7DžOP\oM<QLd:(QEQEYU}*HŠ(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((ǻ~άT3xYGZtEASRPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP{ :UnHp!^YZ(Vi՚d?4QE1(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( (+/|JU>?ϥ\R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E-R@ E- ̼~o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(m>o՚(48OZ()՚d?>ofM-QLG(AK? JX?IRc,E(ɧY{(,u98zAޥљ3?›Mn$QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE?OP\o(Q@Q@eXj?R_*FR^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@רsnZ5*z>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@רоڴj -:z>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^۝woZz?O@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@רsnZ5*z>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^BjѨ.Է^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@ףzER^Kz>׫P/^@sCc楇XƒbZ((AK? JX?IRc,ER/SO@Yc{Rs) !\'>g55->[!lSͿ8=ErՌ ~joE|S8A>O?ބBI-OC#űjd`1iݻ3±iSO`) (Ƹ䳽]EI<jZ1!??@J%EpmW=_jKG{$)c =v-ST5; AۉVv1p{sޟ4HW,Ak[[y.PN1[>YFd;v3]|댃JK!'ǵ$Ji+8w9c4nDz'\k{DHZ o[-*c,֮#Eq܀Ps$m+sP]{%NG<tm@j<6WO?WҮ@S qK`~Q\}~sz{՛bHuzcu@O?Җ][Y@o<J([b;{w<lOr?QQ\#pNQEaj:AP]cfP Z(ѣx>(fWS}:$s9@'<ia kX NӦt\ޡ|NQK"v~?,~4F5Weܬ4Q\ڝzR)p3:URUHWy#4ErZi A?.j_6u4EPEPEPEPP\o?2(QEQEF_+_*FQEQEQEQEQEQEQUo&{kI#јg@Z3Y7tPF~\ܞynj$%Y'TLgDr{vF3@ E zZcc')^=eqEgZ_6f3~T7vh$pN>xC]Q=ʷ7F%QGր;AҝXݵ 2r((((((#]'T*(((((((((((((((((((((NLXTdrA Џz{]<ߏ~/XZwC$*GIF`H4+ukMV5B lsҺ<IfPnr4) PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEPEPEPEPEPEPEPEPEk:t90:*6-T{r~uZ e_X :ߢY/MOc\2>e'ÚYU%1]'u4W[Z wI1/-g769Bv,QEQEQEQEQEQEQEQE*tSEPEp&" lW?W1c;_֙j Ecg:²G,3H>Q\H1.GZR29n(-~Zi?bZ{}5tKINsxJ(1u ;T*^78>_9XyaJ\` {Ǭ͞mk{p,'h>FU($BQXN&#@bUNCu8+b +[H23閮 sYZL\IeF N; \/?/mF;:A sڠ`0ZH"-cڸMK{I4C'9!z( ?OPGO 袊((((#^UHbDS%Qw>Vy=G \up mzUz[Xl9h'W~$=1Ŗ}Q ޟV?ʀ:+;QK; :|ǥr6&RYH >6pq;+ Hd;Vf\^Avv:JGr`{z{P]ͯCuTzK] vib{l؄9=@2rs('~r35ͮߋ?ր=&r+2HsYVzڍ^kY r#wW5HzR:qwkB;iP]NBpzYEp˨Yȵ2 k-lܒʀqq-<j/S}Smnb6'>"H]@3^[[ȑM VAVk̵KUnI6F@^a ܂F^}Q@Q@Q@AsS?[t=Q@Q@Q@Q@Q@GTf-"AsN[m7 >Vs{@_Vty;Oj<ÑG:73\[Xgd#֕-J>QT4 PqO_(((( 7CRIM-QLG(AK? JX?IRc,Fu)l3@[?Ti'˳^\s_Vnn ǒv'S?gqON=+߿ʹ ~i&)N3G<8Py#Z(mRERQEO4ڄd T8-)?c), {DQJ3w+~ 8ܯT s71 9b`wē ~MdlBm9OoikgbJ^@6˴1j]!O:},[KK^ g뚡j1liEm!R>i.t8>#>%VɿjF{?TVw[ڪAVֵV.W͓N€9]^4VG_F#[aĖT2O?uuA:F*,?I=yy@ݨ]8_<*RǠFj+]: n'Ğ)[yyFmn=GN$?!LlB'o::knde[B: &O~1bUx^ C-Ρ40ݻ VY 0ϋ\Ry29 ~@1i]m:j_mu0[uǰq]Mݕ~Unv Tmt-:Q2!fSXҀ2x`Db:SN./a;vΚm 7)|}99V՞c`Kt(9ɶ@ lq׊hE(|)sm=룻Ѭ/eCi,g }sϯ@:$W<dzf;XڦH?hi67Op8?*{K[1ڠ@z'hl͈/&w"ִtķ2$`9$ 2yLRNHS ӂ X6@(z( ( ( ( K~Χ.ԷQEP(( 25X5R0((((((n#Wo=2(q@T P|a54Fm"QQ4`ӥ#ǘ+r}+;Ou]'Qo!<v8'rcG#h [{BI9$'8UA4[[̌wc}[JME9{qyحm&_{MB1{s@|}k (k[_*xy/Z4zH:܅8:F*U_U-.-Od(Tt`z OxDT<9e~ҴUqqƯD7<kZ?s_*QEQEQEQEQEQE*t@EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEM(޿Uq\k9g6G͟8;t,&tr3ngP6%̰/W9f<㎸'W5;[K[Jzszm-1:gNk/Pu4&B1rrh}kyUCOl#G,.$uQjTHN 68TF+5y`NHkItj}V)ma@=1嚱yjV:Zb,߮GݭkWf8^\ޙ-ѹˌtc1> ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.Էz( ( ( ( ( ( ( ( 5n r>wx=VNZ?9=:P1ȓud޿ZZe޻=ɴRvrD2>/y}͸->z~5Y5[Ww?'<S}HNNFqw}ִ᷒uH~%@c5bOH֞T%8/sҀ0MRKy#Kg3C]2bIJ.+5}6Hس@=EvWi}lQnP( ( ( ( ( ( ( ( tSz*ĭ ,MQM(S(.&K쐉cqUI!2HǞAW5tg.<G~uZm3쬌%B?Oj=בc.꩷#\z⟪ ޿ScHI`x“@˿/Ë>=UFAdy=!ՋT[G#BHr񧶥Y2ǿ7s |6Ƌ'Ui<Ĺ% $:cַY ZMy. ۂPH$,*02۩'<$]i<2μY\96([\KUkM l-U($q GGյ{$W@aӀ=j4 ]ixB:dUxIAm} j9 {Uy/"1oOր: n?9&zr\1ݏAYvm)˙^}gA߈nV|Xȟ=(f.mnxHϧ<CP4u Sm'?t+ُHs[\/?/mF2^qi"4帉Ҁ="_ YaŽKLYOŸq(tSz( ( ( Cq֖<P,E) (ᕝ*A1i-֧5WHn<qTญ--!ẰO@yjCi4J\FF@5P~C1%s3GԒMUd*DYOkUD%.T\sz~d>vC *ppGoƕr:!$wjm+WM{t@?֍SWR"dGL:DFol=wQ/Y㙠ifPI۵u"<V\VqZVi,*ڀ9шB1ə WR+ny7-;lg qwϭrv˛y</~$f,{neEa6MrsAgQDf|,ѶH7G鮦#')%}Ĭ 7:~T0;V/p?qi%e\lku &6I?=eA>I=>l(u+h1YcU}dsamgoJc8`=ѦKnLl17'JԷkre?:n8f\Goj6cؤ{t,_WǼ/PH9rIA' @j`RPʀ35\}*?E;K̶1@?yZKՌO+CҀ*xBkğu#]QEQEQE?OP\oQEQEQEQEQEpZ΢' [4fB0Â}Ee1i/1"T{w5ƹiIc~gK-ʹ1,rIf` F[stMFH̎eU8 +wsH(@_b Yé?i $##o=+װt2B)9ayjڔy9ڳtkmf[= {G[S=Bl;ȭ)q;K4ĒáVvVk%SnsV((((4CS@KES(AK? JX?IRc,E*bNDr*i]2/c&ޣ*Z)JQHaEPEPEPF( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( K~Χ.ԷQEP(( 25X5R0(((((((((^F$5QEb(((((((((#]'T*((((((((((((((((((((((QEQE((((((((((((((((((((((.ԷzK~΀'((((((((QYAe} IE5s* XOԔP` Z((((((((((#]'T* ( [ŏ*5\g@Zf,pq]N#(](E'q#^GԔPRC˶dWd~r`pFy(-PYUԫAҗP6&Iu֜-SvA#Ө(((tSz( ( ( ( [[,%uP +XTg.ђQ@1E)rrp1$)q梶ӑgRE #"G䲂8Ǧ*J(B0:(1 " :Nwo1E1$\fDm@{qO#<틿݁}jJ(h\HTgu%PEPEPEPEPEPP\o?OEPEPEPEPEPhP8ҕ <iP4BF$G*C f lzRGPUQ}?J(((((y?$?-4E(AK? JX?IRc,E((((((((((((((((((((((* -:R߇QEB ( ((cՏTТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4*I*_Jjsqր4Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(BR߇ek=-ڀ4Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ,OTv\v}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4*I*_Jjsqր4Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek K~Ϋ}ҘsjӢG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(B/_ek +?~}Ҁ4(Q_JТG(ןCT2c榇X(#(ALÆ,Scs7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AFf)Ps7AMa#aRQ@Q@(( 25Y5R0(((((((((((((((((((k-D_ h(((((((((((((((((((((((((((((((((((((((((((((STꚀ%((((((((((ZJ)i((ZJ( ( ( ( ( ("OT¥((((((((((((OT€%((((((((((((((ZJ( ( ( ( MRSj(((((*)<Q}X%A{guLc@Rn]r3@ EPEPEPEPEPKiaV).X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөVU7WpJ-g_ʵkb5KNP$ge:,cm3Ym:6& Szi9+5H%:݀=j&NF|-\ ,E\g+AypY 2NFQ$֙YnRA9(YQ /bߞwg>/#k')r0{yW03a#8G4ׂNhQ-SK Еu;} ((((((((((((((k-D_ jV6s7E: U/m-!QNhFőX9 E_ᵶxQo+RKp &>YܱDyh svڕ#g⦿Z,bqީxb'xJ1[!WBL c<-cyp7ơWkmbpu]u0?NᑺV1hKMԒ]JkJOķj @I@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@E?j)5KEP/ꐭpNG\z)5-I0b)zԲ_D͵ab MwkE"NHcր2W7ZWI%8yJ>ͧ; ؃[t5ՍvEvwuڤ$WLB<lm`tܪv^ynNNkB;.!u xPmⱧQPULqd''֟a}80壕b4m(e1sQ꺄$1  *燿 B5OH`4#cϨ2Ié;;l#hIq3zJJ=5m+ma-,q4^C}u[Et`H6\T`Կ$ɺںSogӿȔtnf3Jb =*k?u?AX~{/9o^>.D]ie*OjYjo/XcuG_^^Ւv%nWS\Ǥũ`>k# A,?ʀ:}Jll' ǥcBuK hbGLwn<נ<Aa/ټ搘PKUUn*6Uwӊg{ oݽ5A-YI-ɏ~Mu"y)]e(ʏr{aw/~\86+E{Bg ?}id_9}:PIq,W1M+Hѫk9#fdrpǠ֬ ݥ+ ccΚecȻR7|zPv7hSV YyRXy09LmtMrXt<!5h\@(Ccnw'UϽ.ל#'=}?T͞Vg勏q h@OIu|Zm|Cd(bտmn4KFe PٓH{rܾe!؈bس '󇆓*?ttqҰ.$)LAqS1 dZLVRI `zek0A;߷=r6=Ic!}C&6h?ֿRI Lp"j&X29swWvtx!0|O€=ҹ]eӑ\JXpFqқXGzeep `}hdt^X5ymc{e(8_֚cClHPpG@#n5*襂uϵi\=՜W'+V֒Yl2'(.G]sҖOMHu 8o ܒ޺I:0EQEQEQEQEQEQETI OPV+fIZאwC(w\t4֣ bȬ"E<jeisYԕ) y?GU[}XӬX<_W;mJN3qZWwJZ@ cxb'xJ1ؽ6yGeC;4-(BIƳS iZ'֯|l,DX*}Ou vq{v~X<VdY%!{aZ4VÈ@$S<Q݌?Vowfo>w$ Ub }Ds;m]S(_kP&n ?ugu\\t=ֹ]z\BѤk+2JuHneB]8 : $$2JTu$VDWZح%Ǩ*ͥݮnZ<!NkaĞ\|F@ڈ:Ѭ^jVTrUuǟV P(M?TZ9u&p OVuka|2<ۏZ5Z[Ig<m g@.Mw,K}qYrjs\Io3?u>thuOkVЋHP90flPMjCP!HkkJk.{{TÕךc;>231ٻ}8?QV+8; qpw16<$N+vjj%\p#jBs@MifՆ ^C?@g[Ķ6ZͤpH4}lKub[+6r?ڕ1 qiu_YGtxĊTy&20 5q}B4ڵԷRZqbp3ս3RzȯXkuiN.Yd8zZ%inV#e:f7h((*)5KQOZ( ( ( ( (#TBGӼgqh@=T]]iz!_WiI&`YjVG_qު+,[-,L[FeԬC!8q5h:4\b@Joe${-ӧN=+ CСu%1Ύ~oQ-[fV Lc޹} {IoL/L#ca=ڨ/OHǩޮVET((((u?,?%4E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөW*j: b WUEsvWSjwChv=>=_NRێ%,[Erm6ztVL1a2=:H~Lcb<N+9^m ?g9 :LqlYKaٸwiq&ktV r88lEQEQEQEQEQEQEQEQEQEQEQEQEQEQE¥k-c^\}wa>^[P5o&k =WuyoR u%20sgKW^AA n`NKM{k{mjX'vpN;(F#]ry3Pu3Y&;Rk14+4Qڶ袀 ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( ( MRSj( V(k1vqܓɫW=;ҴcN?F-D4a5ZlQ.HI#QOVF(:$^Fh-d۩#njmfO/GT\pr1Ҷ@8MdG4ihpE%`2q:o~'rYP͒y8^)UZ,n]. C Vn%YzU"d77Ά+HqM~qP,_eϑ$8Eݏu> b@fqǭ>9_:_-cX`QVH[lq'ZIe@N_O,V)=YǩMof%JL20=pkpHOЅgk6yO"Fc`@I]CH$P{@0€ǩ?ruXjIBrUCRm.G>i#a[x4Վ4" >^[ZE(9-&FKðe $@"Wl <8Jnt4L+]:P>.- -!?ҪsksXGdbŽ uG 5Q;.}(&(ZS{ss[@d 7Fe[씃-~ u*m# 4\ulP cO6[ڸwtتҺN%mʠP` $Z$68ĒypU}$w:Cnwvf#s@rw,`fxTj7ѱ[b( ✪0(h?ֿRI 1)fflv8}Yj6F-V-v:(/PkIG:“W=@jzmK; ڹK.0@js6Zj6Q*89SPH<5@Z}ǩ& c#qߎ9tcg, _$`&(MSX k-٢ lºp)h(((((((OT€%}r ˛/.7r׹b֭b5-[.FzQ@éj0<!m b?U-JO2tKYvf8=OCgqwZÖ- u+r)CF`Z(M_HWFI1@}G՛Mf?%pzh^95-ŰfUز}+gLϲKbAa'__\no::Y\NY`nra}ZcnrXq~Q@U沚YрU(|PN]WuXjz93nB3QEci670&lx'ۭ@:cx'߽kQ@ΥB8oߩV4UFHA(Bꐴp;.qs[-}eDBr:r;f@cyl1x@#[GN kr8=XեEsChK hr*OUR}{4(((STꚀ%(((((GCuB?tu;[ֵuKZ)n;jKڢxrID͘ =2**ܶvM)7w5z|֥φ> WZ#si]E63JtXywq >L{WtmbfwBzH=ECEtQEHŠ(((( _R]KM-QLG(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬөQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETI OPQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEꚥT-Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@'*Z?ֿREPEPEPEPEPEPEPEPEPEPEPEPQ'*Z?ֿ@EQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETSjSPQEQEQEQEQEVI)#mkD6=DZP; ;Ktaml=ٻ5E#9gE|CY$ZfYmHaX(Q@Q@Q@Q@.XƖbZ((AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPӬ)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>O~ʝK=?AQ,rc'h*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(S?;ʗz~92Y=1@(yROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPSlj!~F2q֥Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(IOS*%C#dXK=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROPyROQK=?A@K=?AG/>g/T)TyROP)ޝK=?AQM, S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<(Lʗz~E3ʗz~*_ }*_ <(S<( _S.n׶)E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEPEPEPEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEA??ʧ#]'TQEQEQEQEQEQEQEQEQEQEQEQETz?OEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEPEPEPEPEPEPEPEPEPEPEPEPEPi!V)o?X(#(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةSI:; Vs$ $gh_=@&Fq\S;GN,M9kN֞d7|gz5&GJ/ns )oR`ՍKE[ #{n#;vf]bvvQsh/dh-8<PoJ \>uioE#526p3Kg_-ð9SO'($O}uiN~ҷ448|;:s@QEQEQEQEQEQEQEQEQEQEQEQEQE*t@rIHdI%G$Q̆9T2@WZح%Ǩ+rX`p"9ŒʺsykfdX\i:mT}0Wg#Y6~pptՋV|m3Ҷ\KhC,))ޡ 1zTs_S)V`@[ YD`x-o]efjZztJL!ڈ:k4W'nyofg;?W=y<!eB-0TV,w`0npklt$n=GcI5ٰ89 =m3*f8kQW3 Q9'5KDuS4ήu]> =tF-Jό e=gKY1`iFBƹ8$SY[\Z}\͒ޣnȤ}Gm-n v2wp;/WFt2 <9}@Dr$%W[[Gn| \ @Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@Q@AsS?[t=Q@@@E:3qIjO'5s)U5fmj27?mf7CmëNJ:ڵ+o_ǎpq/>˧; ؃[:&SlЈw^zT#hUUcgsmeShnNNqW㹻Ig[0 FN:4s3]j1 vĞZ~M87WgGHУJKd˒19mF䑢!K;^E]Fh8' yI"Hu7ucmm9Hq4"_5ҨR@'YvTq VԵ?i ֭sm с"@? Y7_?w_ڽ0~]?vJ%7Wv3X:OJ}ZvA7Z~}9o^>.D]iy,A%A@::5a}~_w%nO}+xtoÒF`>k# Cؑ@FxR\ ǥcBu[ XbI qy sUK_9&x"IbOҬjȦY%*.BSwE$Xno-YI5ɏ~߾k6&u)`V<FxMHt)FX! qܾ\93Ln^ж~^;V~|58w♦}dx@&%ı]E4!f\?ֳ=JmE젽vH2>U,OovĬm3#\ ucN]crJ^AD=XPX_-9T |I&98#v`:S=+>[]9-/'fܾV@Ks$ձ! '@EQ@Sݮ'8O`*fXKiڝ͞VgˏqV >f,i/&_! ]}OoʛiQYe?B?ƀ4M`z+!܈bس .<J.sw\߄f163{mO[e3 N~^[&s I!|LrB&i1w\skΣl@tQEA??ʧ#]'TRdڳ]@3v;}+:46Ɣ&7שO€="\~\iQ,F@? u;EQ)W w?vD29VX5mnG VkAjHP@#?Zp1TD,8^}OO{($3H+NƒYlt2'(.G]tچ)ktPKF0$W]#YFt( ( ( ( ( ( ( ?OPGO Vs7EROAW*>])Ԏ1Zԡ]Y +BX)S+O-GVfj) W_5[}YӬX<4!.cS0F kNPRnd qV/x ~Fom-g$vU8,"#үQ[P09Yjy8?S3 y[/HOP]7W{Ym,|vp}:VcYA%%#O\'<``q:mb e]*O\fiPOҹoZZfE+,ִFXi\B)voE6 ]—U#cqm +TNk3]=hHC$GRN{}f+KVt vjWvE-8=9x`p"9Œʀ5MA"y \UP՞TIlJ+0 ?7[(>[,aO$wU'#Dm@ TPWYia|2<ۏzӬ}^K+$i6208,]݂]:zV_@} u-ἴz@ͩI*I"[/"F!T NqZ9>ltlГ2;;VZS[lHI.qURTO199 Aoh5I€yݭѶJ M0H= #ufU p~~;gHd. bϦrCnz7C@/5ic&ysSE$fd 05%L_v7^r[51O8Ьj~ugz{ngӟf+X[kkOm'؝"]䳰f8ηt{f{[UF7Z(((* -:R߇ 袊((((((((((((y?$?-4E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةW4jw#@o!0G94Y 7DE.ӑޞ ̊]nvu :m2<":gKME ʸ*~]&z>XTG I$_Zwk}iR10vșWGE`Z\),8iVWLViK!9<[P7#wS$A)|m<Sk&1FؔWCEQEQEQEQEQEQEQEQEQEQEQEQEQE*t@E;וvG__Ү_I ϻb(+K8&KZRÐx zVj FeېŻӯ׵C[Mwv+:{ֵ^^;XЏP=4ڌk PڭkZY=Ū2rwt~⴪ ArL絛mB-D0<('9 ԉsF#EP0u~Q@ɨȒ(ۑ=Aڰn-u_i/G\;ƺ(Xu[E3pqǦ}i&v$WnER2q~Eqt:ΝXUYˮSi+n̿p!?ֵkTUbk2'ޛݴK z"(_񮞊Fv9r8>5PEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPP\o?OEP=E-f"P;qZc+QG Z}qz.mwb&s +85ƱiĤF<8#HljzCƒ (af9ڥEt\s{CCuq'壪.89+h:wh}Ccf9.m (&6Kdsq3;HS. rO#WOk"7pr3'ekurqnKԳZL9v4~_nk]3g(kk^Xwcj>D \( N985K_˱cX`jgO r DV,Hi<ǫ2FrzieַdIV -(ԃ׽uҠӥcx@?!Y͞Sȑ8#{5<i"C)FE 0@1qrzuăVHw2ە6#4|~ƀP98ր+[ kHDqaiv~ b0y=9E.y#z]iƚlFY}TuvأΡK.!ђ` zfsisXGdb mk  5cD>}{ym[E)f Ods[U\2ߝX+K)noc,FNM*azkλ`x2c~Ե9$p(=%mʊ $Z8T?CsVM\ ޲b$tlJ5cE''r`^>$큚(*4w:'tlb)Q(m=9QPaڀEPz?O@B;|GF?Z˼MgR6j$lv_EqZM3l~]†“Wr-SX;{`۱bl b |օsw6ZV1*H~_΋{kI5 q''>Q"=QY0n|9~:K 9`\#g]U\F, 8+ PEPEPEPEPEPEPEPPGOIT=bk^K30/G|VɭZ!{_u ;!@PS#=]ʼ:sB?YhWTg # > ޫh3oY#u{ ޢ (0Ags}fZ# p֍Ij3zQ@:evsr}Iv1Xcny[wduu+rԄ^i[݀5qIWP}sea𮮊*O=2Ό{W( * m`v T]Krۯҷ5 fcX^p9{( 9,[^/-:ۯN!Ku1-;-V\ŪF;y%'ں{^2ؔGl֍\Z_ A:=w?kZNwjs z[4P+:$ۋyza*Oc\,NG?ջEQEQEQE?OP\oQEQEQEQEQEQEQEQEQEQEQEQEQEQƒbHՊh hb?(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPجyةQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQETz?~ʀ'((((((((((((((((((((((((((((((((((((((((((((((.ԷzK~΀'((((((((((((((((((((IU=A?SEPEPEPEPEPEPEPEPEPEPEPEPPGOI*(((((((((((((((((((R߇ -:((((((((((((( 7CS?S@KES(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPeU{2UϳCXգR2Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4} 4?Mf>SG١jz(Chw4}) ie"V.Է?4QE1(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP=F{VHŠ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((.Է?XR߇E(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP=FYdY7Z_2J4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX +;̹Q\(4Vws̹Q`4h2GshYeϯ?2EѢ˟_eϯ?‹Egy> <˟_F.}Ay> ,\(.}AX W?[u^b;x5$k4 $)(AEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEPEP0((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((QEQE
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./.git/hooks/pre-receive.sample
#!/bin/sh # # An example hook script to make use of push options. # The example simply echoes all push options that start with 'echoback=' # and rejects all pushes when the "reject" push option is used. # # To enable this hook, rename this file to "pre-receive". if test -n "$GIT_PUSH_OPTION_COUNT" then i=0 while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" do eval "value=\$GIT_PUSH_OPTION_$i" case "$value" in echoback=*) echo "echo from the pre-receive-hook: ${value#*=}" >&2 ;; reject) exit 1 esac i=$((i + 1)) done fi
#!/bin/sh # # An example hook script to make use of push options. # The example simply echoes all push options that start with 'echoback=' # and rejects all pushes when the "reject" push option is used. # # To enable this hook, rename this file to "pre-receive". if test -n "$GIT_PUSH_OPTION_COUNT" then i=0 while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" do eval "value=\$GIT_PUSH_OPTION_$i" case "$value" in echoback=*) echo "echo from the pre-receive-hook: ${value#*=}" >&2 ;; reject) exit 1 esac i=$((i + 1)) done fi
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./apollo-configservice/src/test/resources/integration-test/test-release.sql
-- -- Copyright 2021 Apollo Authors -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. -- You may obtain a copy of the License at -- -- http://www.apache.org/licenses/LICENSE-2.0 -- -- Unless required by applicable law or agreed to in writing, software -- distributed under the License is distributed on an "AS IS" BASIS, -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. -- INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('someAppId','someAppName','someOwnerName','someOwnerName@ctrip.com'); INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('somePublicAppId','somePublicAppName','someOwnerName','someOwnerName@ctrip.com'); INSERT INTO Cluster (AppId, Name) VALUES ('someAppId', 'default'); INSERT INTO Cluster (AppId, Name) VALUES ('someAppId', 'someCluster'); INSERT INTO Cluster (AppId, Name) VALUES ('somePublicAppId', 'default'); INSERT INTO Cluster (AppId, Name) VALUES ('somePublicAppId', 'someDC'); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'application', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'someNamespace', true); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'someNamespace.xml', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'anotherNamespace', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('somePublicAppId', 'application', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('somePublicAppId', 'somePublicNamespace', true); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('somePublicAppId', 'anotherNamespace', true); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'application'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'someNamespace.xml'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'anotherNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'someCluster', 'someNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('somePublicAppId', 'default', 'application'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('somePublicAppId', 'someDC', 'somePublicNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'somePublicNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('somePublicAppId', 'default', 'anotherNamespace'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (990, 'TEST-RELEASE-KEY1', 'INTEGRATION-TEST-DEFAULT','First Release','someAppId', 'default', 'application', '{"k1":"v1"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (991, 'TEST-RELEASE-KEY2', 'INTEGRATION-TEST-NAMESPACE','First Release','someAppId', 'someCluster', 'someNamespace', '{"k2":"v2"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (992, 'TEST-RELEASE-KEY3', 'INTEGRATION-TEST-PUBLIC-DEFAULT','First Release','somePublicAppId', 'default', 'somePublicNamespace', '{"k1":"default-v1", "k2":"default-v2"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (993, 'TEST-RELEASE-KEY4', 'INTEGRATION-TEST-PUBLIC-NAMESPACE','First Release','somePublicAppId', 'someDC', 'somePublicNamespace', '{"k1":"someDC-v1", "k2":"someDC-v2"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (989, 'TEST-RELEASE-KEY5', 'INTEGRATION-TEST-PRIVATE-CONFIG-FILE','First Release','someAppId', 'default', 'someNamespace.xml', '{"k1":"v1-file", "k2":"v2-file"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (988, 'TEST-RELEASE-KEY6', 'INTEGRATION-TEST-PRIVATE-CONFIG-FILE','First Release','someAppId', 'default', 'anotherNamespace', '{"k1":"v1-file"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (987, 'TEST-RELEASE-KEY7', 'INTEGRATION-TEST-PUBLIC-CONFIG-FILE','First Release','somePublicAppId', 'default', 'anotherNamespace', '{"k2":"v2-file"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (986, 'TEST-GRAY-RELEASE-KEY1', 'INTEGRATION-TEST-DEFAULT','Gray Release','someAppId', 'gray-branch-1', 'application', '{"k1":"v1-gray"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (985, 'TEST-GRAY-RELEASE-KEY2', 'INTEGRATION-TEST-NAMESPACE','Gray Release','somePublicAppId', 'gray-branch-2', 'somePublicNamespace', '{"k1":"gray-v1", "k2":"gray-v2"}');
-- -- Copyright 2021 Apollo Authors -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. -- You may obtain a copy of the License at -- -- http://www.apache.org/licenses/LICENSE-2.0 -- -- Unless required by applicable law or agreed to in writing, software -- distributed under the License is distributed on an "AS IS" BASIS, -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. -- INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('someAppId','someAppName','someOwnerName','someOwnerName@ctrip.com'); INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('somePublicAppId','somePublicAppName','someOwnerName','someOwnerName@ctrip.com'); INSERT INTO Cluster (AppId, Name) VALUES ('someAppId', 'default'); INSERT INTO Cluster (AppId, Name) VALUES ('someAppId', 'someCluster'); INSERT INTO Cluster (AppId, Name) VALUES ('somePublicAppId', 'default'); INSERT INTO Cluster (AppId, Name) VALUES ('somePublicAppId', 'someDC'); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'application', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'someNamespace', true); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'someNamespace.xml', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('someAppId', 'anotherNamespace', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('somePublicAppId', 'application', false); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('somePublicAppId', 'somePublicNamespace', true); INSERT INTO AppNamespace (AppId, Name, IsPublic) VALUES ('somePublicAppId', 'anotherNamespace', true); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'application'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'someNamespace.xml'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'anotherNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'someCluster', 'someNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('somePublicAppId', 'default', 'application'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('somePublicAppId', 'someDC', 'somePublicNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('someAppId', 'default', 'somePublicNamespace'); INSERT INTO Namespace (AppId, ClusterName, NamespaceName) VALUES ('somePublicAppId', 'default', 'anotherNamespace'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (990, 'TEST-RELEASE-KEY1', 'INTEGRATION-TEST-DEFAULT','First Release','someAppId', 'default', 'application', '{"k1":"v1"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (991, 'TEST-RELEASE-KEY2', 'INTEGRATION-TEST-NAMESPACE','First Release','someAppId', 'someCluster', 'someNamespace', '{"k2":"v2"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (992, 'TEST-RELEASE-KEY3', 'INTEGRATION-TEST-PUBLIC-DEFAULT','First Release','somePublicAppId', 'default', 'somePublicNamespace', '{"k1":"default-v1", "k2":"default-v2"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (993, 'TEST-RELEASE-KEY4', 'INTEGRATION-TEST-PUBLIC-NAMESPACE','First Release','somePublicAppId', 'someDC', 'somePublicNamespace', '{"k1":"someDC-v1", "k2":"someDC-v2"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (989, 'TEST-RELEASE-KEY5', 'INTEGRATION-TEST-PRIVATE-CONFIG-FILE','First Release','someAppId', 'default', 'someNamespace.xml', '{"k1":"v1-file", "k2":"v2-file"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (988, 'TEST-RELEASE-KEY6', 'INTEGRATION-TEST-PRIVATE-CONFIG-FILE','First Release','someAppId', 'default', 'anotherNamespace', '{"k1":"v1-file"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (987, 'TEST-RELEASE-KEY7', 'INTEGRATION-TEST-PUBLIC-CONFIG-FILE','First Release','somePublicAppId', 'default', 'anotherNamespace', '{"k2":"v2-file"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (986, 'TEST-GRAY-RELEASE-KEY1', 'INTEGRATION-TEST-DEFAULT','Gray Release','someAppId', 'gray-branch-1', 'application', '{"k1":"v1-gray"}'); INSERT INTO RELEASE (id, ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES (985, 'TEST-GRAY-RELEASE-KEY2', 'INTEGRATION-TEST-NAMESPACE','Gray Release','somePublicAppId', 'gray-branch-2', 'somePublicNamespace', '{"k1":"gray-v1", "k2":"gray-v2"}');
-1
apolloconfig/apollo
3,850
feat: public namespace basic function
## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
youabcd
2021-07-26T14:44:38Z
2021-10-09T01:20:18Z
982a01f9bb7ce5eed4c9370bc94e7d78f125d24d
3d0925fb8312c3fd2d09ec18d970b96727920963
feat: public namespace basic function. ## What's the purpose of this PR Created a basic administration page for public namespaces. All public namespaces are displayed on the page and click items to jump to the actual editing page.As shown in the figure below: ![image](https://user-images.githubusercontent.com/63175220/127105345-b57921ad-2b3d-4738-a722-e5e278df49d8.png) The original left column of the page in English mode was not aligned, now it is modified to be aligned. ![image](https://user-images.githubusercontent.com/63175220/127105246-c0d741ca-beaf-47a8-b464-23a03c9aa7a1.png) ## Which issue(s) this PR fixes: Fixes #1926 ## Brief changelog **first commit** The function in namespaceController is called to take out and display all the public namespaces in the database. **second commit** Make simple changes to the page style. **third commit** Based on the suggestions to make changes.
./doc/images/local-development/apollo-demo-app-properties.png
PNG  IHDR6wV iCCPICC ProfileHT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&62z,@؜LGhh@53Uhrm:Y߯Ws29@('r39(B#es\2]6ININ;Ss"¼P@aE)?yf6'Cl!({ᱹ(ltlOuRR3QZNL񿕑.y? դ- q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,,܃ӟ1C9^7g:3H@$pĢf$toӁ2PgvB@@l@9p -,  (!CT)C.d YA+AaP,@H CP Tj_ =F` L`=v=@8^<UQ߀<0Mq@$IFDj)E Bn#50L)㏉p0011L36f3bUX', M` jl2.v1p8{?.[یۋkuzq1<7ƻCl|߇& +/! #> 8QKt"ĭ6Mq$O'"H2R21=L";|r8*y@1xQ)bJ=JգSY-ZESg K+FBYO,QVWCvllIٛrzr^rlrri!+|  .* 6͋ơ] qt}:J/Gms+)JCb32N01Q1'iΦ9 s|R䮔TԨtW2SG9Myr}*U^ϥu˙[4܇j Cݪcjj~jB=j^3Swh4\5;5kd*2=2%樦Xf渖V:F'$mdڝڣ:::+uuutyut?EmkWg?6,32c3t0L3kx65U4{{M&&*~Sii,lYs8]?,l--[<T \gfȊcUauǚjkƺM>4`ۍDv v#: tPWk:~qsr:ss<yItrat2]\J4nUnܵݹ/< =R=zy6y~rZxyy(D<M[RcqXU)ςDAmpp@u 淄VȎ'B,-]PyeʰpZ[#ED#;dj>E{GDKbcV܈UǶ,ܵp(60"E-VY%%' u !*X"+2qyu$$$HvI.INqIّ2s^S?IHNo d$d(/]+4 %˜Z6* UgB2[7]+?D̕v/7Zi<߼_V`VpVt\v*UWCWw^Sf(/f-imY+Ya} ~ e E7 M֛lQ-^lQ\Zm3g-.ybK򖞭v[mmlm{M|I^;;v~صd׵RIŻ%eAe{tlW~³RrS姽ܽ}5W_6WU>p_~V.~DpDRVs־Nnk=\/91c q&zDΓ'N鞪l55C˛G[x-;ۜۚΘ9rVl9s[IΏu;^_H0عŘw.-s9+W.vytr5k;\oaw۶7ߚzzolxw^o{[߅޷aݹqw{Ks?HaG=)}w%vsŸ= #oCϩK_h>;;r—C_Moo ޜјѡ6W~͇αб3>*×__|+nGB=e4d#;5-H2yJд"xGO u.D1i,DZPft-r jMJ'&ޣo񖉉hQqڛOJ*,,64UeES'IDATx} TWA() "A1qIw%ytJ{eeuV:vw:ˤ71ɍq"Q2C1P,@\TS>kUgg}Sl9UF#/F`$ر`k?7])U,LF`A`9V/;5'}'Cq\Ɯ[bp'zpT]"8<α &>«יʶ}ܳ~2\"i[{.t^bfkxYc!`c{,"sHkj,̨!ƠE-Cw=jmȖzY#X~)v? թY;3'ۖcah 2eW+*~á,Ln9FzbItJ؟]"# .R 2Ph,ǹcpex'oĆU$;:/Y YV,|Pv¹8O<}k@5o}0)]q)K k*1vvv&{̟ T?J7 k"V4 ?_/#.El%VC!J!>+FS/[SƥŨGuX߷xrjԷ%-ʷS ]tL'2N1gl'~iЩMD"pMxE`W#냹⏟Lhř>j _be/#5Ei;Gxa{(BH\Ew䆁R|E3e1 TWG>IxWejur@]돠0Vӷ~.rZR:ۊ?@`:^|"?ĽgوZ(13Q961cS* ?Uxw4Q_{]OK^ *]73ӊI!dG;jȩ},gϒ: ntE€*g!f=qKae7y: ^uO3wg#_~xTm qUvtWҲ~~ݠzpD[E% 0*&Bs#mJHIJZ]QjRQ?tq&gyyHv],U{z}pDgx.@o2R8ɻ*CN5/7*l{{shFGg\GilSWW̸ّl54#00[/UUħ_췲Ĉi\z,R Ydnv{oQMqIme{n4bf{`h uf@Ťby.C{R^t*M֭yj<h2MJڪF` ``G]<{^V62yDĞzfXA/USQ{b`e3*:(KRUd#Ґ^=WB4=sܱxAUv /z:d44LwT_Ps @Shh"4qulW]TiL| mѪ4X}*ڪF` pT{sh$ǶU& BЯ=>%xp|n2;hlVh,l"=t3eudC}nRѴ5՚Xif íy~M(9SI5Jvtئ<N coku4ƚ-l l6!~i0hýR46FLٌm;ߎKcYZNe#L,Vy0fvF`l;6aɚF` m 0CdM#0M枋4n#8v?c[A7΁`Y2TAaS8`/S4 !栱;qs|F9Sئ%8|9w$qAxɍhsx! {蕸o258H89XdAb#0:̱iƝoMո,)?7Cvsv$Z@4Lk t·2yǾO>CF`B2&z3T ϮctpNʙ(=H!;q-͗)1S$ڤor"1o/@-LĎ'^Ƴ;Wkyt٨IWmHdЁ<H:1 0MXPkTS ;gJDz'I9 舁W&(90tB`CP0T!s} "oQ1;XHgBI22: HO&Jr#0LA5i RN.Bl$'"І"|凭P(;BGF`IsTt}<*o5̵DM7nHq9#ql3 0-N #LرMQ`Fc)`ئ( #`SرNV0vlaF)]F=T60F .S0gɧï<S| sFfT7Qu*. uro1"`7mzR J-p)ST:bŋ8Ta7щӋ?;:ȰvfIClDn(,ED©R,PD2yC||滔/Fn4T㦆tʨgwݛ9B9_F$ԜE|[0a+xcBLT(@x(T:3[33h1b#Ԓ|aqlb(ոq ~IKK␗NtA#qŇ3/Qn3~5r ҂:Nv \oq:<J &e9pDf)*OC5Mk<uRqA'G%wgN7eG*-!)MEBZ*SQ:ZT%jaEle& h"|e]DոɀR\yo 95x@36O!k& iFGDiC5>_l"_:j KZ]-E50}iyLF(ŇNQ,6o *$ޓh)ڌ,;6bC^^j0+#H06Jqmpqm!uB Z"$,Y`c#vfwbQ!mTp0#ر̈́QbF`Tc\,03vl3aFFF 3L@.Н'?I Oj)e0cCglcf31/a"FxfW Xy~,H(hy&T(|e |q5k_s``ǦGwItHM"MmhFչ\^Z3uF`#͊rrr?KtwwXQü ̼=9E@vMKrlN<;'/THX:},RsF`&!{lٳgC,O7o0Zu2/ 9:t[K"n>)>D=\m-d]"31( ]]]8Wp~ YtD*:qĪKlN .Cl\JFl?QEUDAn8-A( ~&J<xۥ T<  #<fn] 1_gdd#JPғ#O'Sڎ^xMנa?АhyGA>2G;6+z{\tnZ# #> JUHa(h+sc0xG $F_dn@u5*ZӐ0eR##֑c0~vjHwVTAP St*88}:gf&L >M㻔e|FF`d#>ˑ ?([kWZVEa9(sC<p2;6Ge##`cs2;6Ge##`]I~0lezTa)F<c|㯼z/_k`-<cB1u rnc*ylc c3 BuM%.c)B~)v? 3~30{rAxɍhsI*qa_'.31fB~tlDzbh-F#E}W⾌dD.\ 6@NōږO<v?JBתe T:[K㝃E]Lx`fNqށqxwl.1}2{ bSTZ3-P#ڹ=ޕJn ~lt9E#⇓~!s컢C(/:պjٞzl_"f޼c'gMA?Zl"+tTرYyq28E?d[l<ckd(= \R|O=' Ҫv(=Hy!ȩ108vA1)xg1J,Ou95 (s?|uux;TgeD4Mj.M|eƋ;6 J%$^iǜCpph"tp:DfaHu]~+jZ0(;-ca"VŁCR:ZZ;pW ]hi95ʠ6oƮ6Ufƍ; |Xk 繋p2TyMqg?;C#5D,t0 E?GQA2Vjb]Xbigct3ІA5!5< Ubx#]f|:EcF UUR?bu*: z >򽞳0zcm#Z@mX&Ӫh_-9BV)tWEgLSFr ")c-}|h. 14)lCcw/-Vh掊V$0G' =9cḰ<c#Yaz3ߊ"v^ArjYw^OxҩYYR=t'{ [*麌 ʼnTX+#%fdebTJZ,Q)MZp9(+@gadd>%WDna쒪#0nmZC항&o/0y3ꃐ0eӃv.q,ѝFZBiӮ$Fu&jХ}jt]:cƂ;6u>|sϕn\xEjA<pww¿3-JF~`fc=c։gC)pxر9O`vl7#F`??:枋;ET㧙j|*m+xf+$5ƧhSئ lW871 .eIg6P+r>r]cS|JڻrrAsׁ^7'/ e2l v{PrڔI=K]އ ~ ϽǠ#ID٨폾B!I?;IiI5欦) DDT9R5qXDNM3u TGaMxM/J;: zybA#\<\0xS{ *TNMPighޚukN*J49̕$ D mxH2t"^uUzΊ5{/hwWZOR|h $c15L[U3ᰄ&TA&i5T㦚/xSGsK_s CS-CW6Ob,&N5 1PU}$KJ9*Hߠ8#cjiftj8<XI.,&J$U[¥gQ@d$% T'*;=e%*'wx= q` qg7PT;_D \ 8AI *+tHCp,O@RZKoF!4@iA9ΖcbbK$%'!)?O.Ąߓ|؍RMƦ t2 ×Îc>xiFε/x):9TכGߣ)¦XF%\z%T rW,| 1Cn/RQHCcH l7ށ-%h[*k\]Q)\ 'f *6q!_!m|"O}y V}QɩrlY;T|<WyWHeG*K@,L6:o!!. Q (:u6*RЌC"4ZS55Ai|uXرM H؊j>xm=g(֢n2Z2*iFw,S S<ion3Ӭn \R|$/Vc<2vuFa-6R}m^Z,gchq4[$|[x-\i4yE9%eCꃦ(1lI{W;V7ȱ a0$)SgD`!4(뜚(R\4]=S)*QGGDk0 usTtGrF`"m0=c%#0C`6Cfc3 0 E;PlF`L#Qns _N7^U*sz8hx):ۑ6$0QǸ+vnHߡ _%|3Ə4k(x6Qڡ^܄S37tFtidřM#)^ӻxkӬin}KQIŏms'ݐ~k;+&Չs9L4&a;d Gez聗 Ik I/Y \k>ŗW)T}Y/ >s- ƊQr]ůg$}DngXv) ]Bw/l@1zŀ]P<f6?ԣH9X/Eʱ<3U={t'ji B`R?-p.^9-xX;+U\JyOo8i+ׅys?Ux~T,Ou_y:ګ[r\4ݰ+ \AJ:Nw#z7OΒy~xZwx=9\є䯑wkI1 '`+&u1O|¯Sf!&רZEHUqI o^a=퇭~H:Iuozpi;Ĥ>mFO-7 f;[t ??wш7΋"m9?`r vHllV|^U(~< Mzݶ[c%0WBmr"ud$yg:ڠeHr =:ϒ>>ƆHk6qj;>ξYזѢfUEرY Gɩ9c{?LXe``.]^Tٓ:T\GwumqQ;᧥wyѹ4 S!`7=CuA[zâugW[+wZBaF\_R8.lUtE8/UCWfawb!ʏ=8eU~Kp`X%һ5(q;!m+6eލ Z2_..m[r7*ip<_ݴE]fݤtE]2 R5W5[FglQ e; Oӟn }Y0ٍ_ '~mKTZ[:W-QUzٳ=F VZZ%/rP#_цyxs<)U)i̢}W¿}<9٭?uS<SЃnG?j]Ic}Dc >?#zX6AǒvKyuwvmdzz'~hǍw=(H[䄆iS=iڤ8=~Gh6wuar*6ZyHZ@]՜`>W$-X yy2 յo9]+9pWOGBgl#!DJr vgU F*7~9 ]J}r67keLCfe.جƋi vGMюTnhmX?'vl60FL\fWv2FpC<q <ZTå\*Ѣ 2/EqT}ZKÁp4xf#~2b6}x]R܆AvxpsYo2o23ȅF 4O]_ Ĥ 3Iyb)4X3K]lVFpdFSG^ڊ 'WAk>׾ȣ<<4tzJsq@.tYu_'DVi3ر WrUU-0݆bbmR布>ENfTE{PEY|s 巐a ,OG|y NDu"dݶ@-P&:^猿Ry#%Npr;6Y*oJܗHycwqqF;MP^sq>{T }a/ꚽ#2̋nG^vS|U6#cyL[x6\cPd <P| j@:X:̧nVg'PG598f'cDw TA6R?e P"р_Nw"6uvA) ۷S+(RYDéar8J:;fen?dY#;2/;P/7*Q% "7FBP/.NpvGܽ阣(ęe[4sDY4 pa,LL;F GfD(&,`b95 ˑu:$,A e9p_T(JOb?ͨ\GZT3ICʖǰ:W;媜f:xd~A:w:J㝯NtA#H0>:x9P۔Svuz;txgC1Ha*hi%7 guYZ,e4#x_"#1ii1ngP\1%k̀7;JpNމ&--*YbEe8uJͪۮ`f'kFV~DH ˴+LYPh+CB\CMu[iv4Q'vϱ6Eġ|e&-WLM XwK2KbMe&<_jn"X۽6Z )c-Z3& 1?pɓ[DhbY쫻k13!SEI*k L%DWhކ*| zٲ2},bţ"7, WMs m׷JkY3dTi=*URZY%R![ 'iٙQt9KF%lW,Pd7c&/_rt~֯g޺ג;rw= Qat‚!R6A,Coھj jܱj[ff4N9ue YTM4k<:?I^>FwA 3G#FPIYЮ 3ukm'flҞ؅ElHz2.Zrj:Zc*GÔ7iFffPڷxA \o'VJnRA,y@ZR%a.cl;6F`: >U/7IENDB`
PNG  IHDR6wV iCCPICC ProfileHT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&62z,@؜LGhh@53Uhrm:Y߯Ws29@('r39(B#es\2]6ININ;Ss"¼P@aE)?yf6'Cl!({ᱹ(ltlOuRR3QZNL񿕑.y? դ- q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,,܃ӟ1C9^7g:3H@$pĢf$toӁ2PgvB@@l@9p -,  (!CT)C.d YA+AaP,@H CP Tj_ =F` L`=v=@8^<UQ߀<0Mq@$IFDj)E Bn#50L)㏉p0011L36f3bUX', M` jl2.v1p8{?.[یۋkuzq1<7ƻCl|߇& +/! #> 8QKt"ĭ6Mq$O'"H2R21=L";|r8*y@1xQ)bJ=JգSY-ZESg K+FBYO,QVWCvllIٛrzr^rlrri!+|  .* 6͋ơ] qt}:J/Gms+)JCb32N01Q1'iΦ9 s|R䮔TԨtW2SG9Myr}*U^ϥu˙[4܇j Cݪcjj~jB=j^3Swh4\5;5kd*2=2%樦Xf渖V:F'$mdڝڣ:::+uuutyut?EmkWg?6,32c3t0L3kx65U4{{M&&*~Sii,lYs8]?,l--[<T \gfȊcUauǚjkƺM>4`ۍDv v#: tPWk:~qsr:ss<yItrat2]\J4nUnܵݹ/< =R=zy6y~rZxyy(D<M[RcqXU)ςDAmpp@u 淄VȎ'B,-]PyeʰpZ[#ED#;dj>E{GDKbcV܈UǶ,ܵp(60"E-VY%%' u !*X"+2qyu$$$HvI.INqIّ2s^S?IHNo d$d(/]+4 %˜Z6* UgB2[7]+?D̕v/7Zi<߼_V`VpVt\v*UWCWw^Sf(/f-imY+Ya} ~ e E7 M֛lQ-^lQ\Zm3g-.ybK򖞭v[mmlm{M|I^;;v~صd׵RIŻ%eAe{tlW~³RrS姽ܽ}5W_6WU>p_~V.~DpDRVs־Nnk=\/91c q&zDΓ'N鞪l55C˛G[x-;ۜۚΘ9rVl9s[IΏu;^_H0عŘw.-s9+W.vytr5k;\oaw۶7ߚzzolxw^o{[߅޷aݹqw{Ks?HaG=)}w%vsŸ= #oCϩK_h>;;r—C_Moo ޜјѡ6W~͇αб3>*×__|+nGB=e4d#;5-H2yJд"xGO u.D1i,DZPft-r jMJ'&ޣo񖉉hQqڛOJ*,,64UeES'IDATx} TWA() "A1qIw%ytJ{eeuV:vw:ˤ71ɍq"Q2C1P,@\TS>kUgg}Sl9UF#/F`$ر`k?7])U,LF`A`9V/;5'}'Cq\Ɯ[bp'zpT]"8<α &>«יʶ}ܳ~2\"i[{.t^bfkxYc!`c{,"sHkj,̨!ƠE-Cw=jmȖzY#X~)v? թY;3'ۖcah 2eW+*~á,Ln9FzbItJ؟]"# .R 2Ph,ǹcpex'oĆU$;:/Y YV,|Pv¹8O<}k@5o}0)]q)K k*1vvv&{̟ T?J7 k"V4 ?_/#.El%VC!J!>+FS/[SƥŨGuX߷xrjԷ%-ʷS ]tL'2N1gl'~iЩMD"pMxE`W#냹⏟Lhř>j _be/#5Ei;Gxa{(BH\Ew䆁R|E3e1 TWG>IxWejur@]돠0Vӷ~.rZR:ۊ?@`:^|"?ĽgوZ(13Q961cS* ?Uxw4Q_{]OK^ *]73ӊI!dG;jȩ},gϒ: ntE€*g!f=qKae7y: ^uO3wg#_~xTm qUvtWҲ~~ݠzpD[E% 0*&Bs#mJHIJZ]QjRQ?tq&gyyHv],U{z}pDgx.@o2R8ɻ*CN5/7*l{{shFGg\GilSWW̸ّl54#00[/UUħ_췲Ĉi\z,R Ydnv{oQMqIme{n4bf{`h uf@Ťby.C{R^t*M֭yj<h2MJڪF` ``G]<{^V62yDĞzfXA/USQ{b`e3*:(KRUd#Ґ^=WB4=sܱxAUv /z:d44LwT_Ps @Shh"4qulW]TiL| mѪ4X}*ڪF` pT{sh$ǶU& BЯ=>%xp|n2;hlVh,l"=t3eudC}nRѴ5՚Xif íy~M(9SI5Jvtئ<N coku4ƚ-l l6!~i0hýR46FLٌm;ߎKcYZNe#L,Vy0fvF`l;6aɚF` m 0CdM#0M枋4n#8v?c[A7΁`Y2TAaS8`/S4 !栱;qs|F9Sئ%8|9w$qAxɍhsx! {蕸o258H89XdAb#0:̱iƝoMո,)?7Cvsv$Z@4Lk t·2yǾO>CF`B2&z3T ϮctpNʙ(=H!;q-͗)1S$ڤor"1o/@-LĎ'^Ƴ;Wkyt٨IWmHdЁ<H:1 0MXPkTS ;gJDz'I9 舁W&(90tB`CP0T!s} "oQ1;XHgBI22: HO&Jr#0LA5i RN.Bl$'"І"|凭P(;BGF`IsTt}<*o5̵DM7nHq9#ql3 0-N #LرMQ`Fc)`ئ( #`SرNV0vlaF)]F=T60F .S0gɧï<S| sFfT7Qu*. uro1"`7mzR J-p)ST:bŋ8Ta7щӋ?;:ȰvfIClDn(,ED©R,PD2yC||滔/Fn4T㦆tʨgwݛ9B9_F$ԜE|[0a+xcBLT(@x(T:3[33h1b#Ԓ|aqlb(ոq ~IKK␗NtA#qŇ3/Qn3~5r ҂:Nv \oq:<J &e9pDf)*OC5Mk<uRqA'G%wgN7eG*-!)MEBZ*SQ:ZT%jaEle& h"|e]DոɀR\yo 95x@36O!k& iFGDiC5>_l"_:j KZ]-E50}iyLF(ŇNQ,6o *$ޓh)ڌ,;6bC^^j0+#H06Jqmpqm!uB Z"$,Y`c#vfwbQ!mTp0#ر̈́QbF`Tc\,03vl3aFFF 3L@.Н'?I Oj)e0cCglcf31/a"FxfW Xy~,H(hy&T(|e |q5k_s``ǦGwItHM"MmhFչ\^Z3uF`#͊rrr?KtwwXQü ̼=9E@vMKrlN<;'/THX:},RsF`&!{lٳgC,O7o0Zu2/ 9:t[K"n>)>D=\m-d]"31( ]]]8Wp~ YtD*:qĪKlN .Cl\JFl?QEUDAn8-A( ~&J<xۥ T<  #<fn] 1_gdd#JPғ#O'Sڎ^xMנa?АhyGA>2G;6+z{\tnZ# #> JUHa(h+sc0xG $F_dn@u5*ZӐ0eR##֑c0~vjHwVTAP St*88}:gf&L >M㻔e|FF`d#>ˑ ?([kWZVEa9(sC<p2;6Ge##`cs2;6Ge##`]I~0lezTa)F<c|㯼z/_k`-<cB1u rnc*ylc c3 BuM%.c)B~)v? 3~30{rAxɍhsI*qa_'.31fB~tlDzbh-F#E}W⾌dD.\ 6@NōږO<v?JBתe T:[K㝃E]Lx`fNqށqxwl.1}2{ bSTZ3-P#ڹ=ޕJn ~lt9E#⇓~!s컢C(/:պjٞzl_"f޼c'gMA?Zl"+tTرYyq28E?d[l<ckd(= \R|O=' Ҫv(=Hy!ȩ108vA1)xg1J,Ou95 (s?|uux;TgeD4Mj.M|eƋ;6 J%$^iǜCpph"tp:DfaHu]~+jZ0(;-ca"VŁCR:ZZ;pW ]hi95ʠ6oƮ6Ufƍ; |Xk 繋p2TyMqg?;C#5D,t0 E?GQA2Vjb]Xbigct3ІA5!5< Ubx#]f|:EcF UUR?bu*: z >򽞳0zcm#Z@mX&Ӫh_-9BV)tWEgLSFr ")c-}|h. 14)lCcw/-Vh掊V$0G' =9cḰ<c#Yaz3ߊ"v^ArjYw^OxҩYYR=t'{ [*麌 ʼnTX+#%fdebTJZ,Q)MZp9(+@gadd>%WDna쒪#0nmZC항&o/0y3ꃐ0eӃv.q,ѝFZBiӮ$Fu&jХ}jt]:cƂ;6u>|sϕn\xEjA<pww¿3-JF~`fc=c։gC)pxر9O`vl7#F`??:枋;ET㧙j|*m+xf+$5ƧhSئ lW871 .eIg6P+r>r]cS|JڻrrAsׁ^7'/ e2l v{PrڔI=K]އ ~ ϽǠ#ID٨폾B!I?;IiI5欦) DDT9R5qXDNM3u TGaMxM/J;: zybA#\<\0xS{ *TNMPighޚukN*J49̕$ D mxH2t"^uUzΊ5{/hwWZOR|h $c15L[U3ᰄ&TA&i5T㦚/xSGsK_s CS-CW6Ob,&N5 1PU}$KJ9*Hߠ8#cjiftj8<XI.,&J$U[¥gQ@d$% T'*;=e%*'wx= q` qg7PT;_D \ 8AI *+tHCp,O@RZKoF!4@iA9ΖcbbK$%'!)?O.Ąߓ|؍RMƦ t2 ×Îc>xiFε/x):9TכGߣ)¦XF%\z%T rW,| 1Cn/RQHCcH l7ށ-%h[*k\]Q)\ 'f *6q!_!m|"O}y V}QɩrlY;T|<WyWHeG*K@,L6:o!!. Q (:u6*RЌC"4ZS55Ai|uXرM H؊j>xm=g(֢n2Z2*iFw,S S<ion3Ӭn \R|$/Vc<2vuFa-6R}m^Z,gchq4[$|[x-\i4yE9%eCꃦ(1lI{W;V7ȱ a0$)SgD`!4(뜚(R\4]=S)*QGGDk0 usTtGrF`"m0=c%#0C`6Cfc3 0 E;PlF`L#Qns _N7^U*sz8hx):ۑ6$0QǸ+vnHߡ _%|3Ə4k(x6Qڡ^܄S37tFtidřM#)^ӻxkӬin}KQIŏms'ݐ~k;+&Չs9L4&a;d Gez聗 Ik I/Y \k>ŗW)T}Y/ >s- ƊQr]ůg$}DngXv) ]Bw/l@1zŀ]P<f6?ԣH9X/Eʱ<3U={t'ji B`R?-p.^9-xX;+U\JyOo8i+ׅys?Ux~T,Ou_y:ګ[r\4ݰ+ \AJ:Nw#z7OΒy~xZwx=9\є䯑wkI1 '`+&u1O|¯Sf!&רZEHUqI o^a=퇭~H:Iuozpi;Ĥ>mFO-7 f;[t ??wш7΋"m9?`r vHllV|^U(~< Mzݶ[c%0WBmr"ud$yg:ڠeHr =:ϒ>>ƆHk6qj;>ξYזѢfUEرY Gɩ9c{?LXe``.]^Tٓ:T\GwumqQ;᧥wyѹ4 S!`7=CuA[zâugW[+wZBaF\_R8.lUtE8/UCWfawb!ʏ=8eU~Kp`X%һ5(q;!m+6eލ Z2_..m[r7*ip<_ݴE]fݤtE]2 R5W5[FglQ e; Oӟn }Y0ٍ_ '~mKTZ[:W-QUzٳ=F VZZ%/rP#_цyxs<)U)i̢}W¿}<9٭?uS<SЃnG?j]Ic}Dc >?#zX6AǒvKyuwvmdzz'~hǍw=(H[䄆iS=iڤ8=~Gh6wuar*6ZyHZ@]՜`>W$-X yy2 յo9]+9pWOGBgl#!DJr vgU F*7~9 ]J}r67keLCfe.جƋi vGMюTnhmX?'vl60FL\fWv2FpC<q <ZTå\*Ѣ 2/EqT}ZKÁp4xf#~2b6}x]R܆AvxpsYo2o23ȅF 4O]_ Ĥ 3Iyb)4X3K]lVFpdFSG^ڊ 'WAk>׾ȣ<<4tzJsq@.tYu_'DVi3ر WrUU-0݆bbmR布>ENfTE{PEY|s 巐a ,OG|y NDu"dݶ@-P&:^猿Ry#%Npr;6Y*oJܗHycwqqF;MP^sq>{T }a/ꚽ#2̋nG^vS|U6#cyL[x6\cPd <P| j@:X:̧nVg'PG598f'cDw TA6R?e P"р_Nw"6uvA) ۷S+(RYDéar8J:;fen?dY#;2/;P/7*Q% "7FBP/.NpvGܽ阣(ęe[4sDY4 pa,LL;F GfD(&,`b95 ˑu:$,A e9p_T(JOb?ͨ\GZT3ICʖǰ:W;媜f:xd~A:w:J㝯NtA#H0>:x9P۔Svuz;txgC1Ha*hi%7 guYZ,e4#x_"#1ii1ngP\1%k̀7;JpNމ&--*YbEe8uJͪۮ`f'kFV~DH ˴+LYPh+CB\CMu[iv4Q'vϱ6Eġ|e&-WLM XwK2KbMe&<_jn"X۽6Z )c-Z3& 1?pɓ[DhbY쫻k13!SEI*k L%DWhކ*| zٲ2},bţ"7, WMs m׷JkY3dTi=*URZY%R![ 'iٙQt9KF%lW,Pd7c&/_rt~֯g޺ג;rw= Qat‚!R6A,Coھj jܱj[ff4N9ue YTM4k<:?I^>FwA 3G#FPIYЮ 3ukm'flҞ؅ElHz2.Zrj:Zc*GÔ7iFffPڷxA \o'VJnRA,y@ZR%a.cl;6F`: >U/7IENDB`
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./CHANGES.md
Changes by Version ================== Release Notes. Apollo 1.9.0 ------------------ * [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552) * [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553) * [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561) * [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563) * [slim docker images](https://github.com/ctripcorp/apollo/pull/3572) * [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574) * [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575) * [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585) * [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593) * [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594) * [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602) * [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609) * [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611) * [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617) * [update known users](https://github.com/ctripcorp/apollo/pull/3619) * [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620) * [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627) * [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628) * [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632) * [update known users](https://github.com/ctripcorp/apollo/pull/3633) * [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634) * [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646) * [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656) * [update known users](https://github.com/ctripcorp/apollo/pull/3657) * [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658) * [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660) * [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667) * [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668) * [fix unit test](https://github.com/ctripcorp/apollo/pull/3669) * [解决日志系统未初始化完成时,apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677) * [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679) * [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670) * [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682) * [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692) * [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695) * [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699) * [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713) * [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720) * [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666) * [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757) * [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766) * [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789) * [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765) * [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754) * [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647) * [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786) * [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797) * [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803) * [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812) * [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808) * [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804) * [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822) * [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832) * [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816) * [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831) * [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
Changes by Version ================== Release Notes. Apollo 1.9.0 ------------------ * [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552) * [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553) * [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561) * [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563) * [slim docker images](https://github.com/ctripcorp/apollo/pull/3572) * [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574) * [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575) * [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585) * [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593) * [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594) * [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602) * [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609) * [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611) * [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617) * [update known users](https://github.com/ctripcorp/apollo/pull/3619) * [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620) * [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627) * [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628) * [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632) * [update known users](https://github.com/ctripcorp/apollo/pull/3633) * [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634) * [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646) * [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656) * [update known users](https://github.com/ctripcorp/apollo/pull/3657) * [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658) * [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660) * [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667) * [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668) * [fix unit test](https://github.com/ctripcorp/apollo/pull/3669) * [解决日志系统未初始化完成时,apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677) * [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679) * [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670) * [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682) * [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692) * [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695) * [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699) * [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713) * [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720) * [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666) * [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757) * [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766) * [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789) * [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765) * [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754) * [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647) * [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786) * [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797) * [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803) * [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812) * [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808) * [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804) * [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822) * [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832) * [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816) * [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831) * [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819) * [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/README.md
# 使用方法 ## 一、构建镜像 ### 1.1 获取 apollo 压缩包 从 https://github.com/ctripcorp/apollo/releases 下载预先打好的 java 包 <br/> 例如你下载的是: <br/> apollo-portal-1.0.0-github.zip <br/> apollo-adminservice-1.0.0-github.zip <br/> apollo-configservice-1.0.0-github.zip <br/> ### 1.2 解压压缩包, 获取程序 jar 包 - 解压 apollo-portal-1.0.0-github.zip <br/> 获取 apollo-portal-1.0.0.jar, 重命名为 apollo-portal.jar, 放到 scripts/apollo-on-kubernetes/apollo-portal-server - 解压 apollo-adminservice-1.0.0-github.zip <br/> 获取 apollo-adminservice-1.0.0.jar, 重命名为 apollo-adminservice.jar, 放到 scripts/apollo-on-kubernetes/apollo-admin-server - 解压 apollo-configservice-1.0.0-github.zip <br/> 获取 apollo-configservice-1.0.0.jar, 重命名为 apollo-configservice.jar, 放到 scripts/apollo-on-kubernetes/apollo-config-server ### 1.3 build image 需要分别为alpine-bash-3.8-image,apollo-config-server,apollo-admin-server和apollo-portal-server构建镜像。 以 build apollo-config-server image 为例, 其他类似 ```bash scripts/apollo-on-kubernetes/apollo-config-server$ tree -L 2 . ├── apollo-configservice.conf ├── apollo-configservice.jar ├── config │   ├── application-github.properties │   └── app.properties ├── Dockerfile ├── entrypoint.sh └── scripts └── startup-kubernetes.sh ``` build image ```bash # 在 scripts/apollo-on-kubernetes/apollo-config-server 路径下 docker build -t apollo-config-server:v1.0.0 . ``` push image <br/> 将 image push 到你的 docker registry, 例如 vmware harbor ## 二、Deploy apollo on kubernetes ### 2.1 部署 MySQL 服务 你可以选用 MySQL-Galera-WSrep 来提高你的 MySQL 服务的可用性 <br/> MySQL 部署步骤略 ### 2.1 导入 MySQL DB 文件 由于上面部署了分布式的 MySQL, 所有 config-server、admin-server、portal-server 使用同一个 MySQL 服务的不同数据库 示例假设你的 apollo 开启了 4 个环境, 即 dev、test-alpha、test-beta、prod, 在你的 MySQL 中导入 scripts/apollo-on-kubernetes/db 下的文件即可 如果有需要, 你可以更改 eureka.service.url 的地址, 格式为 http://config-server-pod-name-index.meta-server-service-name:8080/eureka/ , 例如 http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/ ### 2.2 Deploy apollo on kubernetes 示例假设你有 4 台 kubernetes node 来部署 apollo, apollo 开启了 4 个环境, 即 dev、test-alpha、test-beta、prod 按照 scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh 文件的内容部署 apollo 即可,注意需要按照实际情况修改对应配置文件中的数据库连接信息、eureka.service.url、replicas、nodeSelector、镜像信息等。 ```bash scripts/apollo-on-kubernetes/kubernetes$ cat kubectl-apply.sh # create namespace kubectl create namespace sre # dev-env kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record # fat-env(test-alpha-env) kubectl apply -f apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.yaml --record && \ kubectl apply -f apollo-env-test-alpha/service-apollo-config-server-test-alpha.yaml --record && \ kubectl apply -f apollo-env-test-alpha/service-apollo-admin-server-test-alpha.yaml --record # uat-env(test-beta-env) kubectl apply -f apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.yaml --record && \ kubectl apply -f apollo-env-test-beta/service-apollo-config-server-test-beta.yaml --record && \ kubectl apply -f apollo-env-test-beta/service-apollo-admin-server-test-beta.yaml --record # prod-env kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record # portal kubectl apply -f service-apollo-portal-server.yaml --record ``` ~~你需要注意的是, 应当尽量让同一个 server 的不同 pod 在不同 node 上, 这个通过 kubernetes nodeSelector 实现~~ 去掉nodeSelector 改为POD反亲和性[podAntiAffinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) ### 2.3 验证所有 pod 处于 Running 并且 READY 状态 ```bash kubectl get pod -n sre -o wide # 示例结果 NAME READY STATUS RESTARTS AGE IP NODE deployment-apollo-admin-server-dev-b7bbd657-4d5jx 1/1 Running 0 2d 10.247.4.79 k8s-apollo-node-2 deployment-apollo-admin-server-dev-b7bbd657-lwz5x 1/1 Running 0 2d 10.247.8.7 k8s-apollo-node-3 deployment-apollo-admin-server-dev-b7bbd657-xs4wt 1/1 Running 0 2d 10.247.1.23 k8s-apollo-node-1 deployment-apollo-admin-server-prod-699bbd894f-j977p 1/1 Running 0 2d 10.247.4.83 k8s-apollo-node-2 deployment-apollo-admin-server-prod-699bbd894f-n9m54 1/1 Running 0 2d 10.247.8.11 k8s-apollo-node-3 deployment-apollo-admin-server-prod-699bbd894f-vs56w 1/1 Running 0 2d 10.247.1.27 k8s-apollo-node-1 deployment-apollo-admin-server-test-beta-7c855cd4f5-9br65 1/1 Running 0 2d 10.247.1.25 k8s-apollo-node-1 deployment-apollo-admin-server-test-beta-7c855cd4f5-cck5g 1/1 Running 0 2d 10.247.8.9 k8s-apollo-node-3 deployment-apollo-admin-server-test-beta-7c855cd4f5-x6gt4 1/1 Running 0 2d 10.247.4.81 k8s-apollo-node-2 deployment-apollo-portal-server-6d4bbc879c-bv7cn 1/1 Running 0 2d 10.247.8.12 k8s-apollo-node-3 deployment-apollo-portal-server-6d4bbc879c-c4zrb 1/1 Running 0 2d 10.247.1.28 k8s-apollo-node-1 deployment-apollo-portal-server-6d4bbc879c-qm4mn 1/1 Running 0 2d 10.247.4.84 k8s-apollo-node-2 statefulset-apollo-config-server-dev-0 1/1 Running 0 2d 10.247.8.6 k8s-apollo-node-3 statefulset-apollo-config-server-dev-1 1/1 Running 0 2d 10.247.4.78 k8s-apollo-node-2 statefulset-apollo-config-server-dev-2 1/1 Running 0 2d 10.247.1.22 k8s-apollo-node-1 statefulset-apollo-config-server-prod-0 1/1 Running 0 2d 10.247.8.10 k8s-apollo-node-3 statefulset-apollo-config-server-prod-1 1/1 Running 0 2d 10.247.4.82 k8s-apollo-node-2 statefulset-apollo-config-server-prod-2 1/1 Running 0 2d 10.247.1.26 k8s-apollo-node-1 statefulset-apollo-config-server-test-beta-0 1/1 Running 0 2d 10.247.8.8 k8s-apollo-node-3 statefulset-apollo-config-server-test-beta-1 1/1 Running 0 2d 10.247.4.80 k8s-apollo-node-2 statefulset-apollo-config-server-test-beta-2 1/1 Running 0 2d 10.247.1.24 k8s-apollo-node-1 ``` ### 2.4 访问 apollo service - server 端(即 portal) <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30001 - client 端, 在 client 端无需再实现负载均衡 <br/> Dev<br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30002 <br/> Test-Alpha <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30003 <br/> Test-Beta <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30004 <br/> Prod <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30005 <br/> # FAQ ## 关于修改的 Dockerfile 添加 ENV 和 entrypoint.sh, 启动 server 需要的配置, 在 kubernetes yaml 文件中可以通过 configmap 传入、也可以通过 ENV 传入 关于 Dockerfile、entrypoint.sh 具体内容, 你可以查看文件里的内容 ## 关于 kubernetes yaml 文件 具体内容请查看 `scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml` 注释 <br/> 其他类似。 ## 关于 eureka.service.url 使用 meta-server(即 config-server) 的 pod name, config-server 务必使用 statefulset。 格式为:`http://<config server pod名>.<meta server 服务名>:<meta server端口号>/eureka/`。 以 apollo-env-dev 为例: ```bash ('eureka.service.url', 'default', 'http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/', 'Eureka服务Url,多个service以英文逗号分隔') ``` 你可以精简 config-server pod 的 name, 示例的长名字是为了更好的阅读与理解。 ### 方式一:通过Spring Boot文件 application-github.properties配置(推荐) 推荐此方式配置 `eureka.service.url`,因为可以通过ConfigMap的方式传入容器,无需再修改数据库的字段。 Admin Server的配置: ```yaml --- # configmap for apollo-admin-server-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8 spring.datasource.username = root spring.datasource.password = test eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/ ``` Config Server的配置: ```yaml --- # configmap for apollo-config-server-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8 spring.datasource.username = root spring.datasource.password = m6bCdQXa00 eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/ ``` ### 方式二:修改数据表 ApolloConfigDB.ServerConfig 修改数据库表 ApolloConfigDB.ServerConfig的 eureka.service.url。
# 使用方法 > Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的[Helm Chart部署模式](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_241-%e5%9f%ba%e4%ba%8ekubernetes%e5%8e%9f%e7%94%9f%e6%9c%8d%e5%8a%a1%e5%8f%91%e7%8e%b0),由于不再使用内置的Eureka,所以在整体部署上有很大简化,如无特殊需求,建议使用该模式部署。 ## 1. 创建数据库 具体步骤请参考 [2.1 创建数据库](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_21-%e5%88%9b%e5%bb%ba%e6%95%b0%e6%8d%ae%e5%ba%93),需要注意的是 ApolloPortalDB 只需要在生产环境部署一个即可,而 ApolloConfigDB 需要在每个环境部署一套,示例假设你的 apollo 开启了 4 个环境, 即 dev、fat、uat、prod,那么就需要创建 4 个 ApolloConfigDB。 ## 2. 调整部署配置 ### 2.1 ApolloConfigDB 数据库连接信息 以 dev 环境为例,需要修改: 1. `apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`spring.datasource.url`,`spring.datasource.username`和`spring.datasource.password`配置 2. `apollo-env-dev/service-mysql-for-apollo-dev-env.yaml`中 mysql endpoint 地址信息 ### 2.2 eureka.service.url 以 dev 环境为例,默认是以 replica 为 3 做的样例配置,如果 replica 数量改变了,那么也要对应修改`apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`eureka.service.url`配置。 如果该配置希望以数据库中为准,那么在 yaml 中直接删除该配置项即可。 ### 2.3 ApolloPortalDB 数据库连接信息 1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`spring.datasource.url`,`spring.datasource.username`和`spring.datasource.password`配置 2. 修改`service-apollo-portal-server.yaml`中 mysql endpoint 地址信息 ### 2.4 ApolloPortal 的环境信息 1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`apollo.portal.envs`配置 * 如果该配置希望以数据库中为准,那么在 yaml 中直接删除该配置项即可。 2. 修改`service-apollo-portal-server.yaml`中`apollo-env.properties`的各环境 meta server 地址信息 ## 3. Deploy apollo on kubernetes 示例假设 apollo 开启了 4 个环境, 即 dev、fat、uat、pro 按照 scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh 文件的内容部署 apollo 即可。 ```bash scripts/apollo-on-kubernetes/kubernetes$ cat kubectl-apply.sh # create namespace kubectl create namespace sre # dev-env kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record # fat-env kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record # uat-env kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record # prod-env kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record # portal kubectl apply -f service-apollo-portal-server.yaml --record ``` ## 4. 验证所有 pod 处于 Running 并且 READY 状态 ```bash kubectl get pod -n sre -o wide # 示例结果 NAME READY STATUS RESTARTS AGE IP NODE deployment-apollo-admin-server-dev-b7bbd657-4d5jx 1/1 Running 0 2d 10.247.4.79 k8s-apollo-node-2 deployment-apollo-admin-server-dev-b7bbd657-lwz5x 1/1 Running 0 2d 10.247.8.7 k8s-apollo-node-3 deployment-apollo-admin-server-dev-b7bbd657-xs4wt 1/1 Running 0 2d 10.247.1.23 k8s-apollo-node-1 deployment-apollo-admin-server-prod-699bbd894f-j977p 1/1 Running 0 2d 10.247.4.83 k8s-apollo-node-2 deployment-apollo-admin-server-prod-699bbd894f-n9m54 1/1 Running 0 2d 10.247.8.11 k8s-apollo-node-3 deployment-apollo-admin-server-prod-699bbd894f-vs56w 1/1 Running 0 2d 10.247.1.27 k8s-apollo-node-1 deployment-apollo-admin-server-uat-7c855cd4f5-9br65 1/1 Running 0 2d 10.247.1.25 k8s-apollo-node-1 deployment-apollo-admin-server-uat-7c855cd4f5-cck5g 1/1 Running 0 2d 10.247.8.9 k8s-apollo-node-3 deployment-apollo-admin-server-uat-7c855cd4f5-x6gt4 1/1 Running 0 2d 10.247.4.81 k8s-apollo-node-2 deployment-apollo-portal-server-6d4bbc879c-bv7cn 1/1 Running 0 2d 10.247.8.12 k8s-apollo-node-3 deployment-apollo-portal-server-6d4bbc879c-c4zrb 1/1 Running 0 2d 10.247.1.28 k8s-apollo-node-1 deployment-apollo-portal-server-6d4bbc879c-qm4mn 1/1 Running 0 2d 10.247.4.84 k8s-apollo-node-2 statefulset-apollo-config-server-dev-0 1/1 Running 0 2d 10.247.8.6 k8s-apollo-node-3 statefulset-apollo-config-server-dev-1 1/1 Running 0 2d 10.247.4.78 k8s-apollo-node-2 statefulset-apollo-config-server-dev-2 1/1 Running 0 2d 10.247.1.22 k8s-apollo-node-1 statefulset-apollo-config-server-prod-0 1/1 Running 0 2d 10.247.8.10 k8s-apollo-node-3 statefulset-apollo-config-server-prod-1 1/1 Running 0 2d 10.247.4.82 k8s-apollo-node-2 statefulset-apollo-config-server-prod-2 1/1 Running 0 2d 10.247.1.26 k8s-apollo-node-1 statefulset-apollo-config-server-uat-0 1/1 Running 0 2d 10.247.8.8 k8s-apollo-node-3 statefulset-apollo-config-server-uat-1 1/1 Running 0 2d 10.247.4.80 k8s-apollo-node-2 statefulset-apollo-config-server-uat-2 1/1 Running 0 2d 10.247.1.24 k8s-apollo-node-1 ``` ### 2.4 访问 apollo service - server 端(即 portal) <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30001 - client 端, 在 client 端无需再实现负载均衡 <br/> Dev<br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30002 <br/> Fat <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30003 <br/> Uat <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30004 <br/> Prod <br/> &nbsp;&nbsp;&nbsp;&nbsp;kubernetes-master-ip:30005 <br/> # FAQ ## 关于 kubernetes yaml 文件 具体内容请查看 `scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml` 注释 <br/> 其他类似。 ## 关于 eureka.service.url 使用 meta-server(即 config-server) 的 pod name, config-server 务必使用 statefulset。 格式为:`http://<config server pod名>.<meta server 服务名>:<meta server端口号>/eureka/`。 以 apollo-env-dev 为例: ```bash ('eureka.service.url', 'default', 'http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/', 'Eureka服务Url,多个service以英文逗号分隔') ``` 你可以精简 config-server pod 的 name, 示例的长名字是为了更好的阅读与理解。 ### 方式一:通过Spring Boot文件 application-github.properties配置(推荐) 推荐此方式配置 `eureka.service.url`,因为可以通过ConfigMap的方式传入容器,无需再修改数据库的字段。 Admin Server的配置: ```yaml --- # configmap for apollo-admin-server-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8 spring.datasource.username = root spring.datasource.password = test eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/ ``` Config Server的配置: ```yaml --- # configmap for apollo-config-server-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8 spring.datasource.username = root spring.datasource.password = m6bCdQXa00 eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/ ``` ### 方式二:修改数据表 ApolloConfigDB.ServerConfig 修改数据库表 ApolloConfigDB.ServerConfig的 eureka.service.url。
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.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-admin-server-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/DevApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-admin-server-dev labels: app: service-apollo-admin-server-dev spec: ports: - protocol: TCP port: 8090 targetPort: 8090 selector: app: pod-apollo-admin-server-dev type: ClusterIP sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-admin-server-dev labels: app: deployment-apollo-admin-server-dev spec: replicas: 3 selector: matchLabels: app: pod-apollo-admin-server-dev strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-admin-server-dev spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-admin-server-dev topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-admin-server-dev configMap: name: configmap-apollo-admin-server-dev items: - key: application-github.properties path: application-github.properties initContainers: - image: alpine-bash:3.8 name: check-service-apollo-config-server-dev command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-dev.sre:8080"] containers: - image: apollo-admin-server:v1.0.0 securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-admin-server-dev ports: - protocol: TCP containerPort: 8090 volumeMounts: - name: volume-configmap-apollo-admin-server-dev mountPath: /apollo-admin-server/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_ADMIN_SERVICE_NAME value: "service-apollo-admin-server-dev.sre" readinessProbe: tcpSocket: port: 8090 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8090 initialDelaySeconds: 120 periodSeconds: 10 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-admin-server-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-admin-server-dev labels: app: service-apollo-admin-server-dev spec: ports: - protocol: TCP port: 8090 targetPort: 8090 selector: app: pod-apollo-admin-server-dev type: ClusterIP sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-admin-server-dev labels: app: deployment-apollo-admin-server-dev spec: replicas: 2 selector: matchLabels: app: pod-apollo-admin-server-dev strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-admin-server-dev spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-admin-server-dev topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-admin-server-dev configMap: name: configmap-apollo-admin-server-dev items: - key: application-github.properties path: application-github.properties containers: - image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-admin-server-dev ports: - protocol: TCP containerPort: 8090 volumeMounts: - name: volume-configmap-apollo-admin-server-dev mountPath: /apollo-adminservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_ADMIN_SERVICE_NAME value: "service-apollo-admin-server-dev.sre" readinessProbe: tcpSocket: port: 8090 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8090 initialDelaySeconds: 120 periodSeconds: 10 dnsPolicy: ClusterFirst restartPolicy: Always
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.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-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/DevApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-meta-server-dev labels: app: service-apollo-meta-server-dev spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-dev type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-dev labels: app: service-apollo-config-server-dev spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30002 selector: app: pod-apollo-config-server-dev type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-dev labels: app: statefulset-apollo-config-server-dev spec: serviceName: service-apollo-meta-server-dev replicas: 3 selector: matchLabels: app: pod-apollo-config-server-dev updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-dev spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-dev topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-dev configMap: name: configmap-apollo-config-server-dev 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-dev ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-dev mountPath: /apollo-config-server/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-dev.sre" readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8080 initialDelaySeconds: 120 periodSeconds: 10 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-dev kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-dev data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-meta-server-dev labels: app: service-apollo-meta-server-dev spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-dev type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-dev labels: app: service-apollo-config-server-dev spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30002 selector: app: pod-apollo-config-server-dev type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-dev labels: app: statefulset-apollo-config-server-dev spec: serviceName: service-apollo-meta-server-dev replicas: 2 selector: matchLabels: app: pod-apollo-config-server-dev updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-dev spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-dev topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-dev configMap: name: configmap-apollo-config-server-dev items: - key: application-github.properties path: application-github.properties containers: - image: apolloconfig/apollo-configservice:1.9.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-config-server-dev ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-dev mountPath: /apollo-configservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-dev.sre" readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8080 initialDelaySeconds: 120 periodSeconds: 10 dnsPolicy: ClusterFirst restartPolicy: Always
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.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-admin-server-prod kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-prod data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-admin-server-prod labels: app: service-apollo-admin-server-prod spec: ports: - protocol: TCP port: 8090 targetPort: 8090 selector: app: pod-apollo-admin-server-prod type: ClusterIP sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-admin-server-prod labels: app: deployment-apollo-admin-server-prod spec: replicas: 3 selector: matchLabels: app: pod-apollo-admin-server-prod strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-admin-server-prod spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-admin-server-prod topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-admin-server-prod configMap: name: configmap-apollo-admin-server-prod items: - key: application-github.properties path: application-github.properties initContainers: - image: alpine-bash:3.8 name: check-service-apollo-config-server-prod command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 50 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-prod.sre:8080"] containers: - image: apollo-admin-server:v1.0.0 securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-admin-server-prod ports: - protocol: TCP containerPort: 8090 volumeMounts: - name: volume-configmap-apollo-admin-server-prod mountPath: /apollo-admin-server/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_ADMIN_SERVICE_NAME value: "service-apollo-admin-server-prod.sre" readinessProbe: tcpSocket: port: 8090 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8090 initialDelaySeconds: 120 periodSeconds: 10 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-admin-server-prod kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-admin-server-prod data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-admin-server-prod labels: app: service-apollo-admin-server-prod spec: ports: - protocol: TCP port: 8090 targetPort: 8090 selector: app: pod-apollo-admin-server-prod type: ClusterIP sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-admin-server-prod labels: app: deployment-apollo-admin-server-prod spec: replicas: 2 selector: matchLabels: app: pod-apollo-admin-server-prod strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-admin-server-prod spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-admin-server-prod topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-admin-server-prod configMap: name: configmap-apollo-admin-server-prod items: - key: application-github.properties path: application-github.properties containers: - image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-admin-server-prod ports: - protocol: TCP containerPort: 8090 volumeMounts: - name: volume-configmap-apollo-admin-server-prod mountPath: /apollo-adminservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_ADMIN_SERVICE_NAME value: "service-apollo-admin-server-prod.sre" readinessProbe: tcpSocket: port: 8090 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8090 initialDelaySeconds: 120 periodSeconds: 10 dnsPolicy: ClusterFirst restartPolicy: Always
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.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-prod kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-prod data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-meta-server-prod labels: app: service-apollo-meta-server-prod spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-prod type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-prod labels: app: service-apollo-config-server-prod spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30005 selector: app: pod-apollo-config-server-prod type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-prod labels: app: statefulset-apollo-config-server-prod spec: serviceName: service-apollo-meta-server-prod replicas: 3 selector: matchLabels: app: pod-apollo-config-server-prod updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-prod spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-prod topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-prod configMap: name: configmap-apollo-config-server-prod 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-prod ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-prod mountPath: /apollo-config-server/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-prod.sre" readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8080 initialDelaySeconds: 120 periodSeconds: 10 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-prod kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-prod data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-meta-server-prod labels: app: service-apollo-meta-server-prod spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-prod type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-prod labels: app: service-apollo-config-server-prod spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30005 selector: app: pod-apollo-config-server-prod type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-prod labels: app: statefulset-apollo-config-server-prod spec: serviceName: service-apollo-meta-server-prod replicas: 2 selector: matchLabels: app: pod-apollo-config-server-prod updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-prod spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-prod topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-prod configMap: name: configmap-apollo-config-server-prod items: - key: application-github.properties path: application-github.properties containers: - image: apolloconfig/apollo-configservice:1.9.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-config-server-prod ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-prod mountPath: /apollo-configservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-prod.sre" readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8080 initialDelaySeconds: 120 periodSeconds: 10 dnsPolicy: ClusterFirst restartPolicy: Always
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # create namespace kubectl create namespace sre # dev-env kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record # fat-env(test-alpha-env) kubectl apply -f apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.yaml --record && \ kubectl apply -f apollo-env-test-alpha/service-apollo-config-server-test-alpha.yaml --record && \ kubectl apply -f apollo-env-test-alpha/service-apollo-admin-server-test-alpha.yaml --record # uat-env(test-beta-env) kubectl apply -f apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.yaml --record && \ kubectl apply -f apollo-env-test-beta/service-apollo-config-server-test-beta.yaml --record && \ kubectl apply -f apollo-env-test-beta/service-apollo-admin-server-test-beta.yaml --record # prod-env kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record # portal kubectl apply -f service-apollo-portal-server.yaml --record
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # # create namespace kubectl create namespace sre # dev-env kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \ kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record # fat-env kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \ kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record # uat-env kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \ kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record # prod-env kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \ kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record # portal kubectl apply -f service-apollo-portal-server.yaml --record
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.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. # --- # 为外部 mysql 服务设置 service kind: Service apiVersion: v1 metadata: namespace: sre name: service-mysql-for-portal-server labels: app: service-mysql-for-portal-server spec: ports: - protocol: TCP port: 3306 targetPort: 3306 type: ClusterIP sessionAffinity: None --- kind: Endpoints apiVersion: v1 metadata: namespace: sre name: service-mysql-for-portal-server subsets: - addresses: # 更改为你的 mysql addresses, 例如 1.1.1.1 - ip: your-mysql-addresses ports: - protocol: TCP port: 3306 --- # configmap for apollo-portal-server kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-portal-server data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8 # mysql username spring.datasource.username = FillInCorrectUser # mysql password spring.datasource.password = FillInCorrectPassword apollo-env.properties: | dev.meta=http://service-apollo-config-server-dev.sre:8080 fat.meta=http://service-apollo-config-server-test-alpha.sre:8080 uat.meta=http://service-apollo-config-server-test-beta.sre:8080 pro.meta=http://service-apollo-config-server-prod.sre:8080 --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-portal-server labels: app: service-apollo-portal-server spec: ports: - protocol: TCP port: 8070 targetPort: 8070 nodePort: 30001 selector: app: pod-apollo-portal-server type: NodePort # portal session 保持 sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-portal-server labels: app: deployment-apollo-portal-server spec: # 3 个实例 replicas: 3 selector: matchLabels: app: pod-apollo-portal-server strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-portal-server spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-portal-server topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-portal-server configMap: name: configmap-apollo-portal-server items: - key: application-github.properties path: application-github.properties - key: apollo-env.properties path: apollo-env.properties initContainers: # 确保 admin-service 正常提供服务 - image: alpine-bash:3.8 name: check-service-apollo-admin-server-dev command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-dev.sre:8090"] - image: alpine-bash:3.8 name: check-service-apollo-admin-server-alpha command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-test-alpha.sre:8090"] - image: alpine-bash:3.8 name: check-service-apollo-admin-server-beta command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-test-beta.sre:8090"] - image: alpine-bash:3.8 name: check-service-apollo-admin-server-prod command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-prod.sre:8090"] containers: - image: apollo-portal-server:v1.0.0 # 更改为你的 docker registry 下的 image securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-portal-server ports: - protocol: TCP containerPort: 8070 volumeMounts: - name: volume-configmap-apollo-portal-server mountPath: /apollo-portal-server/config/application-github.properties subPath: application-github.properties - name: volume-configmap-apollo-portal-server mountPath: /apollo-portal-server/config/apollo-env.properties subPath: apollo-env.properties env: - name: APOLLO_PORTAL_SERVICE_NAME value: "service-apollo-portal-server.sre" readinessProbe: tcpSocket: port: 8070 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8070 # 120s 内, server 未启动则重启 container 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. # --- # 为外部 mysql 服务设置 service kind: Service apiVersion: v1 metadata: namespace: sre name: service-mysql-for-portal-server labels: app: service-mysql-for-portal-server spec: ports: - protocol: TCP port: 3306 targetPort: 3306 type: ClusterIP sessionAffinity: None --- kind: Endpoints apiVersion: v1 metadata: namespace: sre name: service-mysql-for-portal-server subsets: - addresses: # 更改为你的 mysql addresses, 例如 1.1.1.1 - ip: your-mysql-addresses ports: - protocol: TCP port: 3306 --- # configmap for apollo-portal-server kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-portal-server data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8 # mysql username spring.datasource.username = FillInCorrectUser # mysql password spring.datasource.password = FillInCorrectPassword # enabled environments apollo.portal.envs = dev,fat,uat,pro apollo-env.properties: | dev.meta=http://service-apollo-config-server-dev.sre:8080 fat.meta=http://service-apollo-config-server-fat.sre:8080 uat.meta=http://service-apollo-config-server-uat.sre:8080 pro.meta=http://service-apollo-config-server-prod.sre:8080 --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-portal-server labels: app: service-apollo-portal-server spec: ports: - protocol: TCP port: 8070 targetPort: 8070 nodePort: 30001 selector: app: pod-apollo-portal-server type: NodePort # portal session 保持 sessionAffinity: ClientIP --- kind: Deployment apiVersion: apps/v1 metadata: namespace: sre name: deployment-apollo-portal-server labels: app: deployment-apollo-portal-server spec: # 2 个实例 replicas: 2 selector: matchLabels: app: pod-apollo-portal-server strategy: rollingUpdate: maxSurge: 1 maxUnavailable: 1 type: RollingUpdate template: metadata: labels: app: pod-apollo-portal-server spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-portal-server topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-portal-server configMap: name: configmap-apollo-portal-server items: - key: application-github.properties path: application-github.properties - key: apollo-env.properties path: apollo-env.properties containers: - image: apolloconfig/apollo-portal:1.9.0-SNAPSHOT securityContext: privileged: true imagePullPolicy: IfNotPresent name: container-apollo-portal-server ports: - protocol: TCP containerPort: 8070 volumeMounts: - name: volume-configmap-apollo-portal-server mountPath: /apollo-portal/config/application-github.properties subPath: application-github.properties - name: volume-configmap-apollo-portal-server mountPath: /apollo-portal/config/apollo-env.properties subPath: apollo-env.properties env: - name: APOLLO_PORTAL_SERVICE_NAME value: "service-apollo-portal-server.sre" readinessProbe: tcpSocket: port: 8070 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8070 # 120s 内, server 未启动则重启 container initialDelaySeconds: 120 periodSeconds: 15 dnsPolicy: ClusterFirst restartPolicy: Always
1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/faq/common-issues-in-deployment-and-development-phase.md
### 1. windows怎么执行build.sh? 安装[Git Bash](https://git-for-windows.github.io/),然后运行 “./build.sh” 注意前面 “./” ### 2. 本地运行时Portal一直报Env is down. 默认config service启动在8080端口,admin service启动在8090端口。请确认这两个端口是否被其它应用程序占用。 如果还伴有异常信息:org.springframework.web.client.HttpClientErrorException: 405 Method Not Allowed,一般是由于本地启动了`ShadowSocks`,因为`ShadowSocks`默认会占用8090端口。 1.1.0版本增加了**系统信息**页面,可以通过`管理员工具` -> `系统信息`查看当前各个环境的Meta Server以及admin service信息,有助于排查问题。 ### 3. admin server 或者 config server 注册了内网IP,导致portal或者client访问不了admin server或config server 请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。 ### 4. Portal如何增加环境? #### 4.1 1.6.0及以上的版本 1.6.0版本增加了自定义环境的功能,可以在不修改代码的情况增加环境 1. protaldb增加环境,参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置) 2. 为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息) > 注2:如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化 #### 4.2 1.5.1及之前的版本 ##### 4.2.1 添加Apollo预先定义好的环境 如果需要添加的环境是Apollo预先定义的环境(DEV, FAT, UAT, PRO),需要两步操作: 1. protaldb增加环境,参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置) 2. 为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息) > 注2:如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化 ##### 4.2.2 添加自定义的环境 如果需要添加的环境不是Apollo预先定义的环境,请参照如下步骤操作: 1. 假设需要添加的环境名称叫beta 2. 修改[com.ctrip.framework.apollo.core.enums.Env](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)类,在其中加入`BETA`枚举: ```java public enum Env{ LOCAL, DEV, BETA, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN; ... } ``` 3. 修改[com.ctrip.framework.apollo.core.enums.EnvUtils](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java)类,在其中加入`BETA`枚举的转换逻辑: ```java public final class EnvUtils { public static Env transformEnv(String envName) { if (StringUtils.isBlank(envName)) { return Env.UNKNOWN; } switch (envName.trim().toUpperCase()) { ... case "BETA": return Env.BETA; ... default: return Env.UNKNOWN; } } } ``` 4. 修改[apollo-env.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/resources/apollo-env.properties),增加`beta.meta`占位符: ```properties local.meta=http://localhost:8080 dev.meta=${dev_meta} fat.meta=${fat_meta} beta.meta=${beta_meta} uat.meta=${uat_meta} lpt.meta=${lpt_meta} pro.meta=${pro_meta} ``` 5. 修改[com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)类,增加读取`BETA`环境的meta server地址逻辑: ```java public class LegacyMetaServerProvider { ... domains.put(Env.BETA, getMetaServerAddress(prop, "beta_meta", "beta.meta")); ... } ``` 6. protaldb增加`BETA`环境,参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置) 7. 为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息) > 注2:如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化 ### 5. 如何删除应用、集群、Namespace? 0.11.0版本开始Apollo管理员增加了删除应用、集群和AppNamespace的页面,建议使用该页面进行删除。 页面入口: ![delete-app-cluster-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/delete-app-cluster-namespace-entry.png) 页面详情: ![delete-app-cluster-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/delete-app-cluster-namespace-detail.png) ### 6. 客户端多块网卡造成获取IP不准,如何解决? 获取客户端网卡逻辑在1.4.0版本有所调整,所以需要根据客户端版本区分 #### 6.1 apollo-client为1.3.0及之前的版本 如果有多网卡,且都是普通网卡的话,需要在/etc/hosts里面加一条映射关系来提升权重。 格式:`ip ${hostname}` 这里的${hostname}就是你在机器上执行hostname的结果。 比如正确IP为:192.168.1.50,hostname执行结果为:jim-ubuntu-pc 那么最终在hosts文件映射的记录为: ``` 192.168.1.50 jim-ubuntu-pc ``` #### 6.2 apollo-client为1.4.0及之后的版本 如果有多网卡,且都是普通网卡的话,可以通过调整它们在系统中的顺序来改变优先级,顺序在前的优先级更高。 ### 7. 通过Apollo动态调整Spring Boot的Logging level 可以参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)项目中的[spring-cloud-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-cloud-logger)和[spring-boot-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-logger)代码示例。 ### 8. 将Config Service和Admin Service注册到单独的Eureka Server上 Apollo默认自带了Eureka作为内部的注册中心实现,一般情况下不需要考虑为Apollo单独部署注册中心。 不过有些公司自己已经有了一套Eureka,如果希望把Apollo的Config Service和Admin Service也注册过去实现统一管理的话,可以按照如下步骤操作: #### 1. 配置Config Service不启动内置Eureka Server ##### 1.1 1.5.0及以上版本 为apollo-configservice配置`apollo.eureka.server.enabled=false`即可,通过bootstrap.yml或-D参数等方式皆可。 ##### 1.2 1.5.0之前的版本 修改[com.ctrip.framework.apollo.configservice.ConfigServiceApplication](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java),把`@EnableEurekaServer`改为`@EnableEurekaClient` ```java @EnableEurekaClient @EnableAspectJAutoProxy @EnableAutoConfiguration // (exclude = EurekaClientConfigBean.class) @Configuration @EnableTransactionManagement @PropertySource(value = {"classpath:configservice.properties"}) @ComponentScan(basePackageClasses = {ApolloCommonConfig.class, ApolloBizConfig.class, ConfigServiceApplication.class, ApolloMetaServiceConfig.class}) public class ConfigServiceApplication { ... } ``` #### 2. 修改ApolloConfigDB.ServerConfig表中的`eureka.service.url`,指向自己的Eureka地址 比如自己的Eureka服务地址是1.1.1.1:8761和2.2.2.2:8761,那么就将ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://1.1.1.1:8761/eureka/,http://2.2.2.2:8761/eureka/ ``` 需要注意的是更改Eureka地址只需要改ApolloConfigDB.ServerConfig表中的`eureka.service.url`即可,不需要修改meta server地址。 > 默认情况下,meta service和config service是部署在同一个JVM进程,所以meta service的地址就是config service的地址,修改Eureka地址时不需要修改meta server地址。 ### 9. Spring Boot中使用`ConditionalOnProperty`读取不到配置 `@ConditionalOnProperty`功能从0.10.0版本开始支持,具体可以参考 [Spring Boot集成方式](zh/usage/java-sdk-user-guide?id=_3213-spring-boot集成方式(推荐)) ### 10. 多机房如何实现A机房的客户端就近读取A机房的config service,B机房的客户端就近读取B机房的config service? 请参考[Issue 1294](https://github.com/ctripcorp/apollo/issues/1294),该案例中由于中美机房相距甚远,所以需要config db两地部署,如果是同城多机房的话,两个机房的config service可以连同一个config db。 ### 11. apollo是否有支持HEAD请求的页面?阿里云slb配置健康检查只支持HEAD请求 apollo的每个服务都有`/health`页面的,该页面是apollo用来做健康检测的,支持各种请求方法,如GET, POST, HEAD等。 ### 12. apollo如何配置查看权限? 从1.1.0版本开始,apollo-portal增加了查看权限的支持,可以支持配置某个环境只允许项目成员查看私有Namespace的配置。 这里的项目成员是指: 1. 项目的管理员 2. 具备该私有Namespace在该环境下的修改或发布权限 配置方式很简单,用超级管理员账号登录后,进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。 ![configView.memberOnly.envs](https://user-images.githubusercontent.com/837658/46456519-c155e100-c7e1-11e8-969b-8f332379fa29.png) ### 13. apollo如何放在独立的tomcat中跑? 有些公司的运维策略可能会要求必须使用独立的tomcat跑应用,不允许apollo默认的startup.sh方式运行,下面以apollo-configservice为例简述一下如何使apollo服务端运行在独立的tomcat中: 1. 获取apollo代码(生产部署建议用release的版本) 2. 修改apollo-configservice的pom.xml,增加`<packaging>war</packaging>` 3. 按照分布式部署文档配置build.sh,然后打包 4. 把apollo-configservice的war包放到tomcat下 * cp apollo-configservice/target/apollo-configservice-xxx.war ${tomcat-dir}/webapps/ROOT.war 运行tomcat的startup.sh 5. 运行tomcat的startup.sh 另外,apollo还有一些调优参数建议在tomcat的server.xml中配置一下,可以参考[application.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-common/src/main/resources/application.properties#L12) ### 14. 注册中心Eureka如何替换为zookeeper? 许多公司微服务项目已经在使用zookeeper,如果出于方便服务管理的目的,希望Eureka替换为zookeeper的情况,可以参考[@hanyidreamer](https://github.com/hanyidreamer)贡献的改造步骤:[注册中心Eureka替换为zookeeper](https://blog.csdn.net/u014732209/article/details/89555535) ### 15. 本地多人同时开发,如何实现配置不一样且互不影响? 参考[#1560](https://github.com/ctripcorp/apollo/issues/1560) ### 16. Portal挂载到nginx/slb后如何设置相对路径? 一般情况下建议直接使用根目录来挂载portal,不过如果有些情况希望和其它应用共用nginx/slb,需要加上相对路径(如/apollo),那么可以按照下面的方式配置。 #### 16.1 Portal为1.7.0及以上版本 首先为apollo-portal增加-D参数`server.servlet.context-path=/apollo`或系统环境变量`SERVER_SERVLET_CONTEXT_PATH=/apollo`。 然后在nginx/slb上配置转发即可,以nginx为例: ``` location /apollo/ { proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://127.0.0.1:8070/apollo/; } ``` #### 16.2 Portal为1.6.0及以上版本 首先为portal加上`prefix.path=/apollo`配置参数,配置方式很简单,用超级管理员账号登录后,进入`管理员工具 - 系统参数`页面新增或修改`prefix.path`配置项即可。 然后在nginx/slb上配置转发即可,以nginx为例: ``` location /apollo/ { proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://127.0.0.1:8070/; } ```
### 1. windows怎么执行build.sh? 安装[Git Bash](https://git-for-windows.github.io/),然后运行 “./build.sh” 注意前面 “./” ### 2. 本地运行时Portal一直报Env is down. 默认config service启动在8080端口,admin service启动在8090端口。请确认这两个端口是否被其它应用程序占用。 如果还伴有异常信息:org.springframework.web.client.HttpClientErrorException: 405 Method Not Allowed,一般是由于本地启动了`ShadowSocks`,因为`ShadowSocks`默认会占用8090端口。 1.1.0版本增加了**系统信息**页面,可以通过`管理员工具` -> `系统信息`查看当前各个环境的Meta Server以及admin service信息,有助于排查问题。 ### 3. admin server 或者 config server 注册了内网IP,导致portal或者client访问不了admin server或config server 请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。 ### 4. Portal如何增加环境? #### 4.1 1.6.0及以上的版本 1.6.0版本增加了自定义环境的功能,可以在不修改代码的情况增加环境 1. protaldb增加环境,参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置) 2. 为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息) > 注2:如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化 #### 4.2 1.5.1及之前的版本 ##### 4.2.1 添加Apollo预先定义好的环境 如果需要添加的环境是Apollo预先定义的环境(DEV, FAT, UAT, PRO),需要两步操作: 1. protaldb增加环境,参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置) 2. 为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息) > 注2:如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化 ##### 4.2.2 添加自定义的环境 如果需要添加的环境不是Apollo预先定义的环境,请参照如下步骤操作: 1. 假设需要添加的环境名称叫beta 2. 修改[com.ctrip.framework.apollo.core.enums.Env](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/Env.java)类,在其中加入`BETA`枚举: ```java public enum Env{ LOCAL, DEV, BETA, FWS, FAT, UAT, LPT, PRO, TOOLS, UNKNOWN; ... } ``` 3. 修改[com.ctrip.framework.apollo.core.enums.EnvUtils](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/EnvUtils.java)类,在其中加入`BETA`枚举的转换逻辑: ```java public final class EnvUtils { public static Env transformEnv(String envName) { if (StringUtils.isBlank(envName)) { return Env.UNKNOWN; } switch (envName.trim().toUpperCase()) { ... case "BETA": return Env.BETA; ... default: return Env.UNKNOWN; } } } ``` 4. 修改[apollo-env.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/resources/apollo-env.properties),增加`beta.meta`占位符: ```properties local.meta=http://localhost:8080 dev.meta=${dev_meta} fat.meta=${fat_meta} beta.meta=${beta_meta} uat.meta=${uat_meta} lpt.meta=${lpt_meta} pro.meta=${pro_meta} ``` 5. 修改[com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider](https://github.com/ctripcorp/apollo/blob/master/apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java)类,增加读取`BETA`环境的meta server地址逻辑: ```java public class LegacyMetaServerProvider { ... domains.put(Env.BETA, getMetaServerAddress(prop, "beta_meta", "beta.meta")); ... } ``` 6. protaldb增加`BETA`环境,参考[3.1 调整ApolloPortalDB配置](zh/deployment/distributed-deployment-guide?id=_31-调整apolloportaldb配置) 7. 为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](zh/deployment/distributed-deployment-guide?id=_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide?id=_122-apollo-meta-server)。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](zh/deployment/distributed-deployment-guide?id=_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](zh/deployment/distributed-deployment-guide?id=_22112-配置数据库连接信息) > 注2:如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](zh/deployment/distributed-deployment-guide?id=_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化 ### 5. 如何删除应用、集群、Namespace? 0.11.0版本开始Apollo管理员增加了删除应用、集群和AppNamespace的页面,建议使用该页面进行删除。 页面入口: ![delete-app-cluster-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/delete-app-cluster-namespace-entry.png) 页面详情: ![delete-app-cluster-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/delete-app-cluster-namespace-detail.png) ### 6. 客户端多块网卡造成获取IP不准,如何解决? 获取客户端网卡逻辑在1.4.0版本有所调整,所以需要根据客户端版本区分 #### 6.1 apollo-client为1.3.0及之前的版本 如果有多网卡,且都是普通网卡的话,需要在/etc/hosts里面加一条映射关系来提升权重。 格式:`ip ${hostname}` 这里的${hostname}就是你在机器上执行hostname的结果。 比如正确IP为:192.168.1.50,hostname执行结果为:jim-ubuntu-pc 那么最终在hosts文件映射的记录为: ``` 192.168.1.50 jim-ubuntu-pc ``` #### 6.2 apollo-client为1.4.0及之后的版本 如果有多网卡,且都是普通网卡的话,可以通过调整它们在系统中的顺序来改变优先级,顺序在前的优先级更高。 ### 7. 通过Apollo动态调整Spring Boot的Logging level 可以参考[apollo-use-cases](https://github.com/ctripcorp/apollo-use-cases)项目中的[spring-cloud-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-cloud-logger)和[spring-boot-logger](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-logger)代码示例。 ### 8. 将Config Service和Admin Service注册到单独的Eureka Server上 Apollo默认自带了Eureka作为内部的注册中心实现,一般情况下不需要考虑为Apollo单独部署注册中心。 不过有些公司自己已经有了一套Eureka,如果希望把Apollo的Config Service和Admin Service也注册过去实现统一管理的话,可以按照如下步骤操作: #### 1. 配置Config Service不启动内置Eureka Server ##### 1.1 1.5.0及以上版本 为apollo-configservice配置`apollo.eureka.server.enabled=false`即可,通过bootstrap.yml或-D参数等方式皆可。 ##### 1.2 1.5.0之前的版本 修改[com.ctrip.framework.apollo.configservice.ConfigServiceApplication](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java),把`@EnableEurekaServer`改为`@EnableEurekaClient` ```java @EnableEurekaClient @EnableAspectJAutoProxy @EnableAutoConfiguration // (exclude = EurekaClientConfigBean.class) @Configuration @EnableTransactionManagement @PropertySource(value = {"classpath:configservice.properties"}) @ComponentScan(basePackageClasses = {ApolloCommonConfig.class, ApolloBizConfig.class, ConfigServiceApplication.class, ApolloMetaServiceConfig.class}) public class ConfigServiceApplication { ... } ``` #### 2. 修改ApolloConfigDB.ServerConfig表中的`eureka.service.url`,指向自己的Eureka地址 比如自己的Eureka服务地址是1.1.1.1:8761和2.2.2.2:8761,那么就将ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://1.1.1.1:8761/eureka/,http://2.2.2.2:8761/eureka/ ``` 需要注意的是更改Eureka地址只需要改ApolloConfigDB.ServerConfig表中的`eureka.service.url`即可,不需要修改meta server地址。 > 默认情况下,meta service和config service是部署在同一个JVM进程,所以meta service的地址就是config service的地址,修改Eureka地址时不需要修改meta server地址。 ### 9. Spring Boot中使用`ConditionalOnProperty`读取不到配置 `@ConditionalOnProperty`功能从0.10.0版本开始支持,具体可以参考 [Spring Boot集成方式](zh/usage/java-sdk-user-guide?id=_3213-spring-boot集成方式(推荐)) ### 10. 多机房如何实现A机房的客户端就近读取A机房的config service,B机房的客户端就近读取B机房的config service? 请参考[Issue 1294](https://github.com/ctripcorp/apollo/issues/1294),该案例中由于中美机房相距甚远,所以需要config db两地部署,如果是同城多机房的话,两个机房的config service可以连同一个config db。 ### 11. apollo是否有支持HEAD请求的页面?阿里云slb配置健康检查只支持HEAD请求 apollo的每个服务都有`/health`页面的,该页面是apollo用来做健康检测的,支持各种请求方法,如GET, POST, HEAD等。 ### 12. apollo如何配置查看权限? 从1.1.0版本开始,apollo-portal增加了查看权限的支持,可以支持配置某个环境只允许项目成员查看私有Namespace的配置。 这里的项目成员是指: 1. 项目的管理员 2. 具备该私有Namespace在该环境下的修改或发布权限 配置方式很简单,用超级管理员账号登录后,进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。 ![configView.memberOnly.envs](https://user-images.githubusercontent.com/837658/46456519-c155e100-c7e1-11e8-969b-8f332379fa29.png) ### 13. apollo如何放在独立的tomcat中跑? 有些公司的运维策略可能会要求必须使用独立的tomcat跑应用,不允许apollo默认的startup.sh方式运行,下面以apollo-configservice为例简述一下如何使apollo服务端运行在独立的tomcat中: 1. 获取apollo代码(生产部署建议用release的版本) 2. 修改apollo-configservice的pom.xml,增加`<packaging>war</packaging>` 3. 按照分布式部署文档配置build.sh,然后打包 4. 把apollo-configservice的war包放到tomcat下 * cp apollo-configservice/target/apollo-configservice-xxx.war ${tomcat-dir}/webapps/ROOT.war 运行tomcat的startup.sh 5. 运行tomcat的startup.sh 另外,apollo还有一些调优参数建议在tomcat的server.xml中配置一下,可以参考[application.properties](https://github.com/ctripcorp/apollo/blob/master/apollo-common/src/main/resources/application.properties#L12) ### 14. 注册中心Eureka如何替换为zookeeper? 许多公司微服务项目已经在使用zookeeper,如果出于方便服务管理的目的,希望Eureka替换为zookeeper的情况,可以参考[@hanyidreamer](https://github.com/hanyidreamer)贡献的改造步骤:[注册中心Eureka替换为zookeeper](https://blog.csdn.net/u014732209/article/details/89555535) ### 15. 本地多人同时开发,如何实现配置不一样且互不影响? 参考[#1560](https://github.com/ctripcorp/apollo/issues/1560) ### 16. Portal挂载到nginx/slb后如何设置相对路径? 一般情况下建议直接使用根目录来挂载portal,不过如果有些情况希望和其它应用共用nginx/slb,需要加上相对路径(如/apollo),那么可以按照下面的方式配置。 #### 16.1 Portal为1.7.0及以上版本 首先为apollo-portal增加-D参数`server.servlet.context-path=/apollo`或系统环境变量`SERVER_SERVLET_CONTEXT_PATH=/apollo`。 然后在nginx/slb上配置转发即可,以nginx为例: ``` location /apollo/ { proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://127.0.0.1:8070/apollo/; } ``` #### 16.2 Portal为1.6.0及以上版本 首先为portal加上`prefix.path=/apollo`配置参数,配置方式很简单,用超级管理员账号登录后,进入`管理员工具 - 系统参数`页面新增或修改`prefix.path`配置项即可。 然后在nginx/slb上配置转发即可,以nginx为例: ``` location /apollo/ { proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://127.0.0.1:8070/; } ```
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/spring/yaml/case3.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: 1000
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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: 1000
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/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,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.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: namespace: sre name: service-mysql-for-apollo-test-beta-env labels: app: service-mysql-for-apollo-test-beta-env spec: ports: - protocol: TCP port: 3306 targetPort: 3306 type: ClusterIP sessionAffinity: None --- kind: Endpoints apiVersion: v1 metadata: namespace: sre name: service-mysql-for-apollo-test-beta-env subsets: - addresses: - ip: your-mysql-addresses ports: - protocol: TCP port: 3306
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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: namespace: sre name: service-mysql-for-apollo-test-beta-env labels: app: service-mysql-for-apollo-test-beta-env spec: ports: - protocol: TCP port: 3306 targetPort: 3306 type: ClusterIP sessionAffinity: None --- kind: Endpoints apiVersion: v1 metadata: namespace: sre name: service-mysql-for-apollo-test-beta-env subsets: - addresses: - ip: your-mysql-addresses ports: - protocol: TCP port: 3306
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/README.md
# Apollo Helm Chart [Apollo](https://github.com/ctripcorp/apollo) is a reliable configuration management system. ## 1. Introduction The apollo-service and apollo-portal charts create deployments for apollo-configservice, apollo-adminservice and apollo-portal, which utilize the kubernetes native service discovery. ## 2. Prerequisites - Kubernetes 1.10+ - Helm 3 ## 3. Add Apollo Helm Chart Repository ```bash $ helm repo add apollo https://www.apolloconfig.com/charts $ helm search repo apollo ``` ## 4. Deployments of apollo-configservice and apollo-adminservice ### 4.1 Install apollo-configservice and apollo-adminservice should be installed per environment, so it is suggested to indicate environment in the release name, e.g. `apollo-service-dev` ```bash $ helm install apollo-service-dev \ --set configdb.host=1.2.3.4 \ --set configdb.userName=apollo \ --set configdb.password=apollo \ --set configdb.service.enabled=true \ --set configService.replicaCount=1 \ --set adminService.replicaCount=1 \ -n your-namespace \ apollo/apollo-service ``` Or customize it with values.yaml ```bash $ helm install apollo-service-dev -f values.yaml -n your-namespace apollo/apollo-service ``` ### 4.2 Uninstall To uninstall/delete the `apollo-service-dev` deployment: ```bash $ helm uninstall -n your-namespace apollo-service-dev ``` ### 4.3 Configuration The following table lists the configurable parameters of the apollo-service chart and their default values. | Parameter | Description | Default | |----------------------|---------------------------------------------|---------------------| | `configdb.host` | The host for apollo config db | `nil` | | `configdb.port` | The port for apollo config db | `3306` | | `configdb.dbName` | The database name for apollo config db | `ApolloConfigDB` | | `configdb.userName` | The user name for apollo config db | `nil` | | `configdb.password` | The password for apollo config db | `nil` | | `configdb.connectionStringProperties` | The connection string properties for apollo config db | `characterEncoding=utf8` | | `configdb.service.enabled` | Whether to create a Kubernetes Service for `configdb.host` or not. Set it to `true` if `configdb.host` is an endpoint outside of the kubernetes cluster | `false` | | `configdb.service.fullNameOverride` | Override the service name for apollo config db | `nil` | | `configdb.service.port` | The port for the service of apollo config db | `3306` | | `configdb.service.type` | The service type of apollo config db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. xxx.mysql.rds.aliyuncs.com | `ClusterIP` | | `configService.fullNameOverride` | Override the deployment name for apollo-configservice | `nil` | | `configService.replicaCount` | Replica count of apollo-configservice | `2` | | `configService.containerPort` | Container port of apollo-configservice | `8080` | | `configService.image.repository` | Image repository of apollo-configservice | `apolloconfig/apollo-configservice` | | `configService.image.tag` | Image tag of apollo-configservice, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` | | `configService.image.pullPolicy` | Image pull policy of apollo-configservice | `IfNotPresent` | | `configService.imagePullSecrets` | Image pull secrets of apollo-configservice | `[]` | | `configService.service.fullNameOverride` | Override the service name for apollo-configservice | `nil` | | `configService.service.port` | The port for the service of apollo-configservice | `8080` | | `configService.service.targetPort` | The target port for the service of apollo-configservice | `8080` | | `configService.service.type` | The service type of apollo-configservice | `ClusterIP` | | `configService.ingress.enabled` | Whether to enable the ingress for config-service or not | `false` | | `configService.ingress.annotations` | The annotations of the ingress for config-service | `{}` | | `configService.ingress.hosts.host` | The host of the ingress for config-service | `nil` | | `configService.ingress.hosts.paths` | The paths of the ingress for config-service | `[]` | | `configService.ingress.tls` | The tls definition of the ingress for config-service | `[]` | | `configService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `configService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `configService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `configService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `configService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `configService.config.configServiceUrlOverride` | Override `apollo.config-service.url`: config service url to be accessed by apollo-client | `nil` | | `configService.config.adminServiceUrlOverride` | Override `apollo.admin-service.url`: admin service url to be accessed by apollo-portal | `nil` | | `configService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access config service via `http://{config_service_address}/apollo` | `nil` | | `configService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `configService.strategy` | The deployment strategy of apollo-configservice | `{}` | | `configService.resources` | The resources definition of apollo-configservice | `{}` | | `configService.nodeSelector` | The node selector definition of apollo-configservice | `{}` | | `configService.tolerations` | The tolerations definition of apollo-configservice | `[]` | | `configService.affinity` | The affinity definition of apollo-configservice | `{}` | | `adminService.fullNameOverride` | Override the deployment name for apollo-adminservice | `nil` | | `adminService.replicaCount` | Replica count of apollo-adminservice | `2` | | `adminService.containerPort` | Container port of apollo-adminservice | `8090` | | `adminService.image.repository` | Image repository of apollo-adminservice | `apolloconfig/apollo-adminservice` | | `adminService.image.tag` | Image tag of apollo-adminservice, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` | | `adminService.image.pullPolicy` | Image pull policy of apollo-adminservice | `IfNotPresent` | | `adminService.imagePullSecrets` | Image pull secrets of apollo-adminservice | `[]` | | `adminService.service.fullNameOverride` | Override the service name for apollo-adminservice | `nil` | | `adminService.service.port` | The port for the service of apollo-adminservice | `8090` | | `adminService.service.targetPort` | The target port for the service of apollo-adminservice | `8090` | | `adminService.service.type` | The service type of apollo-adminservice | `ClusterIP` | | `adminService.ingress.enabled` | Whether to enable the ingress for admin-service or not | `false` | | `adminService.ingress.annotations` | The annotations of the ingress for admin-service | `{}` | | `adminService.ingress.hosts.host` | The host of the ingress for admin-service | `nil` | | `adminService.ingress.hosts.paths` | The paths of the ingress for admin-service | `[]` | | `adminService.ingress.tls` | The tls definition of the ingress for admin-service | `[]` | | `adminService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `adminService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `adminService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `adminService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `adminService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `adminService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access admin service via `http://{admin_service_address}/apollo` | `nil` | | `adminService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `adminService.strategy` | The deployment strategy of apollo-adminservice | `{}` | | `adminService.resources` | The resources definition of apollo-adminservice | `{}` | | `adminService.nodeSelector` | The node selector definition of apollo-adminservice | `{}` | | `adminService.tolerations` | The tolerations definition of apollo-adminservice | `[]` | | `adminService.affinity` | The affinity definition of apollo-adminservice | `{}` | ### 4.4 Sample 1. ConfigDB host is an IP outside of kubernetes cluster ```yaml configdb: host: 1.2.3.4 dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` 2. ConfigDB host is a dns name outside of kubernetes cluster ```yaml configdb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` 3. ConfigDB host is a kubernetes service ```yaml configdb: host: apollodb-mysql.mysql dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` 4. Expose config service as Ingress with custom path `/config` ```yaml # use /config as root, should specify configService.config.contextPath as /config configService: config: contextPath: /config ingress: enabled: true hosts: - paths: - /config ``` 5. Expose admin service as Ingress with custom path `/admin` ```yaml # use /admin as root, should specify adminService.config.contextPath as /admin adminService: config: contextPath: /admin ingress: enabled: true hosts: - paths: - /admin ``` ## 5. Deployments of apollo-portal ### 5.1 Install To install the apollo-portal chart with the release name `apollo-portal`: ```bash $ helm install apollo-portal \ --set portaldb.host=1.2.3.4 \ --set portaldb.userName=apollo \ --set portaldb.password=apollo \ --set portaldb.service.enabled=true \ --set config.envs="dev\,pro" \ --set config.metaServers.dev=http://apollo-service-dev-apollo-configservice:8080 \ --set config.metaServers.pro=http://apollo-service-pro-apollo-configservice:8080 \ --set replicaCount=1 \ -n your-namespace \ apollo/apollo-portal ``` Or customize it with values.yaml ```bash $ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal ``` ### 5.2 Uninstallation To uninstall/delete the `apollo-portal` deployment: ```bash $ helm uninstall -n your-namespace apollo-portal ``` ### 5.3 Configuration The following table lists the configurable parameters of the apollo-portal chart and their default values. | Parameter | Description | Default | |----------------------|---------------------------------------------|-----------------------| | `fullNameOverride` | Override the deployment name for apollo-portal | `nil` | | `replicaCount` | Replica count of apollo-portal | `2` | | `containerPort` | Container port of apollo-portal | `8070` | | `image.repository` | Image repository of apollo-portal | `apolloconfig/apollo-portal` | | `image.tag` | Image tag of apollo-portal, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` | | `image.pullPolicy` | Image pull policy of apollo-portal | `IfNotPresent` | | `imagePullSecrets` | Image pull secrets of apollo-portal | `[]` | | `service.fullNameOverride` | Override the service name for apollo-portal | `nil` | | `service.port` | The port for the service of apollo-portal | `8070` | | `service.targetPort` | The target port for the service of apollo-portal | `8070` | | `service.type` | The service type of apollo-portal | `ClusterIP` | | `service.sessionAffinity` | The session affinity for the service of apollo-portal | `ClientIP` | | `ingress.enabled` | Whether to enable the ingress or not | `false` | | `ingress.annotations` | The annotations of the ingress | `{}` | | `ingress.hosts.host` | The host of the ingress | `nil` | | `ingress.hosts.paths` | The paths of the ingress | `[]` | | `ingress.tls` | The tls definition of the ingress | `[]` | | `liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `strategy` | The deployment strategy of apollo-portal | `{}` | | `resources` | The resources definition of apollo-portal | `{}` | | `nodeSelector` | The node selector definition of apollo-portal | `{}` | | `tolerations` | The tolerations definition of apollo-portal | `[]` | | `affinity` | The affinity definition of apollo-portal | `{}` | | `config.profiles` | specify the spring profiles to activate | `github,auth` | | `config.envs` | specify the env names, e.g. dev,pro | `nil` | | `config.contextPath` | specify the context path, e.g. `/apollo`, then users could access portal via `http://{portal_address}/apollo` | `nil` | | `config.metaServers` | specify the meta servers, e.g.<br />`dev: http://apollo-configservice-dev:8080`<br />`pro: http://apollo-configservice-pro:8080` | `{}` | | `config.files` | specify the extra config files for apollo-portal, e.g. application-ldap.yml | `{}` | | `portaldb.host` | The host for apollo portal db | `nil` | | `portaldb.port` | The port for apollo portal db | `3306` | | `portaldb.dbName` | The database name for apollo portal db | `ApolloPortalDB` | | `portaldb.userName` | The user name for apollo portal db | `nil` | | `portaldb.password` | The password for apollo portal db | `nil` | | `portaldb.connectionStringProperties` | The connection string properties for apollo portal db | `characterEncoding=utf8` | | `portaldb.service.enabled` | Whether to create a Kubernetes Service for `portaldb.host` or not. Set it to `true` if `portaldb.host` is an endpoint outside of the kubernetes cluster | `false` | | `portaldb.service.fullNameOverride` | Override the service name for apollo portal db | `nil` | | `portaldb.service.port` | The port for the service of apollo portal db | `3306` | | `portaldb.service.type` | The service type of apollo portal db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. xxx.mysql.rds.aliyuncs.com | `ClusterIP` | ### 5.4 Sample 1. PortalDB host is an IP outside of kubernetes cluster ```yaml portaldb: host: 1.2.3.4 dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` 2. PortalDB host is a dns name outside of kubernetes cluster ```yaml portaldb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` 3. PortalDB host is a kubernetes service ```yaml portaldb: host: apollodb-mysql.mysql dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` 4. Specify environments ```yaml config: envs: dev,pro metaServers: dev: http://apollo-service-dev-apollo-configservice:8080 pro: http://apollo-service-pro-apollo-configservice:8080 ``` 5. Expose service as Load Balancer ```yaml service: type: LoadBalancer ``` 6. Expose service as Ingress ```yaml ingress: enabled: true hosts: - paths: - / ``` 7. Expose service as Ingress with custom path `/apollo` ```yaml # use /apollo as root, should specify config.contextPath as /apollo ingress: enabled: true hosts: - paths: - /apollo config: ... contextPath: /apollo ... ``` 8. Expose service as Ingress with session affinity ```yaml ingress: enabled: true annotations: kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/affinity: "cookie" nginx.ingress.kubernetes.io/affinity-mode: "persistent" nginx.ingress.kubernetes.io/session-cookie-conditional-samesite-none: "true" nginx.ingress.kubernetes.io/session-cookie-expires: "172800" nginx.ingress.kubernetes.io/session-cookie-max-age: "172800" hosts: - host: xxx.somedomain.com # host is required to make session affinity work paths: - / ``` 9. Enable LDAP support ```yaml config: ... profiles: github,ldap ... files: application-ldap.yml: | spring: ldap: base: "dc=example,dc=org" username: "cn=admin,dc=example,dc=org" password: "password" searchFilter: "(uid={0})" urls: - "ldap://xxx.somedomain.com:389" ldap: mapping: objectClass: "inetOrgPerson" loginId: "uid" userDisplayName: "cn" email: "mail" ```
# Apollo Helm Chart [Apollo](https://github.com/ctripcorp/apollo) is a reliable configuration management system. ## 1. Introduction The apollo-service and apollo-portal charts create deployments for apollo-configservice, apollo-adminservice and apollo-portal, which utilize the kubernetes native service discovery. ## 2. Prerequisites - Kubernetes 1.10+ - Helm 3 ## 3. Add Apollo Helm Chart Repository ```bash $ helm repo add apollo https://www.apolloconfig.com/charts $ helm search repo apollo ``` ## 4. Deployments of apollo-configservice and apollo-adminservice ### 4.1 Install apollo-configservice and apollo-adminservice should be installed per environment, so it is suggested to indicate environment in the release name, e.g. `apollo-service-dev` ```bash $ helm install apollo-service-dev \ --set configdb.host=1.2.3.4 \ --set configdb.userName=apollo \ --set configdb.password=apollo \ --set configdb.service.enabled=true \ --set configService.replicaCount=1 \ --set adminService.replicaCount=1 \ -n your-namespace \ apollo/apollo-service ``` Or customize it with values.yaml ```bash $ helm install apollo-service-dev -f values.yaml -n your-namespace apollo/apollo-service ``` ### 4.2 Uninstall To uninstall/delete the `apollo-service-dev` deployment: ```bash $ helm uninstall -n your-namespace apollo-service-dev ``` ### 4.3 Configuration The following table lists the configurable parameters of the apollo-service chart and their default values. | Parameter | Description | Default | |----------------------|---------------------------------------------|---------------------| | `configdb.host` | The host for apollo config db | `nil` | | `configdb.port` | The port for apollo config db | `3306` | | `configdb.dbName` | The database name for apollo config db | `ApolloConfigDB` | | `configdb.userName` | The user name for apollo config db | `nil` | | `configdb.password` | The password for apollo config db | `nil` | | `configdb.connectionStringProperties` | The connection string properties for apollo config db | `characterEncoding=utf8` | | `configdb.service.enabled` | Whether to create a Kubernetes Service for `configdb.host` or not. Set it to `true` if `configdb.host` is an endpoint outside of the kubernetes cluster | `false` | | `configdb.service.fullNameOverride` | Override the service name for apollo config db | `nil` | | `configdb.service.port` | The port for the service of apollo config db | `3306` | | `configdb.service.type` | The service type of apollo config db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. xxx.mysql.rds.aliyuncs.com | `ClusterIP` | | `configService.fullNameOverride` | Override the deployment name for apollo-configservice | `nil` | | `configService.replicaCount` | Replica count of apollo-configservice | `2` | | `configService.containerPort` | Container port of apollo-configservice | `8080` | | `configService.image.repository` | Image repository of apollo-configservice | `apolloconfig/apollo-configservice` | | `configService.image.tag` | Image tag of apollo-configservice, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` | | `configService.image.pullPolicy` | Image pull policy of apollo-configservice | `IfNotPresent` | | `configService.imagePullSecrets` | Image pull secrets of apollo-configservice | `[]` | | `configService.service.fullNameOverride` | Override the service name for apollo-configservice | `nil` | | `configService.service.port` | The port for the service of apollo-configservice | `8080` | | `configService.service.targetPort` | The target port for the service of apollo-configservice | `8080` | | `configService.service.type` | The service type of apollo-configservice | `ClusterIP` | | `configService.ingress.enabled` | Whether to enable the ingress for config-service or not | `false` | | `configService.ingress.annotations` | The annotations of the ingress for config-service | `{}` | | `configService.ingress.hosts.host` | The host of the ingress for config-service | `nil` | | `configService.ingress.hosts.paths` | The paths of the ingress for config-service | `[]` | | `configService.ingress.tls` | The tls definition of the ingress for config-service | `[]` | | `configService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `configService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `configService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `configService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `configService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `configService.config.configServiceUrlOverride` | Override `apollo.config-service.url`: config service url to be accessed by apollo-client | `nil` | | `configService.config.adminServiceUrlOverride` | Override `apollo.admin-service.url`: admin service url to be accessed by apollo-portal | `nil` | | `configService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access config service via `http://{config_service_address}/apollo` | `nil` | | `configService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `configService.strategy` | The deployment strategy of apollo-configservice | `{}` | | `configService.resources` | The resources definition of apollo-configservice | `{}` | | `configService.nodeSelector` | The node selector definition of apollo-configservice | `{}` | | `configService.tolerations` | The tolerations definition of apollo-configservice | `[]` | | `configService.affinity` | The affinity definition of apollo-configservice | `{}` | | `adminService.fullNameOverride` | Override the deployment name for apollo-adminservice | `nil` | | `adminService.replicaCount` | Replica count of apollo-adminservice | `2` | | `adminService.containerPort` | Container port of apollo-adminservice | `8090` | | `adminService.image.repository` | Image repository of apollo-adminservice | `apolloconfig/apollo-adminservice` | | `adminService.image.tag` | Image tag of apollo-adminservice, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` | | `adminService.image.pullPolicy` | Image pull policy of apollo-adminservice | `IfNotPresent` | | `adminService.imagePullSecrets` | Image pull secrets of apollo-adminservice | `[]` | | `adminService.service.fullNameOverride` | Override the service name for apollo-adminservice | `nil` | | `adminService.service.port` | The port for the service of apollo-adminservice | `8090` | | `adminService.service.targetPort` | The target port for the service of apollo-adminservice | `8090` | | `adminService.service.type` | The service type of apollo-adminservice | `ClusterIP` | | `adminService.ingress.enabled` | Whether to enable the ingress for admin-service or not | `false` | | `adminService.ingress.annotations` | The annotations of the ingress for admin-service | `{}` | | `adminService.ingress.hosts.host` | The host of the ingress for admin-service | `nil` | | `adminService.ingress.hosts.paths` | The paths of the ingress for admin-service | `[]` | | `adminService.ingress.tls` | The tls definition of the ingress for admin-service | `[]` | | `adminService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `adminService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `adminService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `adminService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `adminService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `adminService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access admin service via `http://{admin_service_address}/apollo` | `nil` | | `adminService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `adminService.strategy` | The deployment strategy of apollo-adminservice | `{}` | | `adminService.resources` | The resources definition of apollo-adminservice | `{}` | | `adminService.nodeSelector` | The node selector definition of apollo-adminservice | `{}` | | `adminService.tolerations` | The tolerations definition of apollo-adminservice | `[]` | | `adminService.affinity` | The affinity definition of apollo-adminservice | `{}` | ### 4.4 Sample 1. ConfigDB host is an IP outside of kubernetes cluster ```yaml configdb: host: 1.2.3.4 dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` 2. ConfigDB host is a dns name outside of kubernetes cluster ```yaml configdb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` 3. ConfigDB host is a kubernetes service ```yaml configdb: host: apollodb-mysql.mysql dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` 4. Expose config service as Ingress with custom path `/config` ```yaml # use /config as root, should specify configService.config.contextPath as /config configService: config: contextPath: /config ingress: enabled: true hosts: - paths: - /config ``` 5. Expose admin service as Ingress with custom path `/admin` ```yaml # use /admin as root, should specify adminService.config.contextPath as /admin adminService: config: contextPath: /admin ingress: enabled: true hosts: - paths: - /admin ``` ## 5. Deployments of apollo-portal ### 5.1 Install To install the apollo-portal chart with the release name `apollo-portal`: ```bash $ helm install apollo-portal \ --set portaldb.host=1.2.3.4 \ --set portaldb.userName=apollo \ --set portaldb.password=apollo \ --set portaldb.service.enabled=true \ --set config.envs="dev\,pro" \ --set config.metaServers.dev=http://apollo-service-dev-apollo-configservice:8080 \ --set config.metaServers.pro=http://apollo-service-pro-apollo-configservice:8080 \ --set replicaCount=1 \ -n your-namespace \ apollo/apollo-portal ``` Or customize it with values.yaml ```bash $ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal ``` ### 5.2 Uninstallation To uninstall/delete the `apollo-portal` deployment: ```bash $ helm uninstall -n your-namespace apollo-portal ``` ### 5.3 Configuration The following table lists the configurable parameters of the apollo-portal chart and their default values. | Parameter | Description | Default | |----------------------|---------------------------------------------|-----------------------| | `fullNameOverride` | Override the deployment name for apollo-portal | `nil` | | `replicaCount` | Replica count of apollo-portal | `2` | | `containerPort` | Container port of apollo-portal | `8070` | | `image.repository` | Image repository of apollo-portal | `apolloconfig/apollo-portal` | | `image.tag` | Image tag of apollo-portal, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` | | `image.pullPolicy` | Image pull policy of apollo-portal | `IfNotPresent` | | `imagePullSecrets` | Image pull secrets of apollo-portal | `[]` | | `service.fullNameOverride` | Override the service name for apollo-portal | `nil` | | `service.port` | The port for the service of apollo-portal | `8070` | | `service.targetPort` | The target port for the service of apollo-portal | `8070` | | `service.type` | The service type of apollo-portal | `ClusterIP` | | `service.sessionAffinity` | The session affinity for the service of apollo-portal | `ClientIP` | | `ingress.enabled` | Whether to enable the ingress or not | `false` | | `ingress.annotations` | The annotations of the ingress | `{}` | | `ingress.hosts.host` | The host of the ingress | `nil` | | `ingress.hosts.paths` | The paths of the ingress | `[]` | | `ingress.tls` | The tls definition of the ingress | `[]` | | `liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `strategy` | The deployment strategy of apollo-portal | `{}` | | `resources` | The resources definition of apollo-portal | `{}` | | `nodeSelector` | The node selector definition of apollo-portal | `{}` | | `tolerations` | The tolerations definition of apollo-portal | `[]` | | `affinity` | The affinity definition of apollo-portal | `{}` | | `config.profiles` | specify the spring profiles to activate | `github,auth` | | `config.envs` | specify the env names, e.g. dev,pro | `nil` | | `config.contextPath` | specify the context path, e.g. `/apollo`, then users could access portal via `http://{portal_address}/apollo` | `nil` | | `config.metaServers` | specify the meta servers, e.g.<br />`dev: http://apollo-configservice-dev:8080`<br />`pro: http://apollo-configservice-pro:8080` | `{}` | | `config.files` | specify the extra config files for apollo-portal, e.g. application-ldap.yml | `{}` | | `portaldb.host` | The host for apollo portal db | `nil` | | `portaldb.port` | The port for apollo portal db | `3306` | | `portaldb.dbName` | The database name for apollo portal db | `ApolloPortalDB` | | `portaldb.userName` | The user name for apollo portal db | `nil` | | `portaldb.password` | The password for apollo portal db | `nil` | | `portaldb.connectionStringProperties` | The connection string properties for apollo portal db | `characterEncoding=utf8` | | `portaldb.service.enabled` | Whether to create a Kubernetes Service for `portaldb.host` or not. Set it to `true` if `portaldb.host` is an endpoint outside of the kubernetes cluster | `false` | | `portaldb.service.fullNameOverride` | Override the service name for apollo portal db | `nil` | | `portaldb.service.port` | The port for the service of apollo portal db | `3306` | | `portaldb.service.type` | The service type of apollo portal db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. xxx.mysql.rds.aliyuncs.com | `ClusterIP` | ### 5.4 Sample 1. PortalDB host is an IP outside of kubernetes cluster ```yaml portaldb: host: 1.2.3.4 dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` 2. PortalDB host is a dns name outside of kubernetes cluster ```yaml portaldb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` 3. PortalDB host is a kubernetes service ```yaml portaldb: host: apollodb-mysql.mysql dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` 4. Specify environments ```yaml config: envs: dev,pro metaServers: dev: http://apollo-service-dev-apollo-configservice:8080 pro: http://apollo-service-pro-apollo-configservice:8080 ``` 5. Expose service as Load Balancer ```yaml service: type: LoadBalancer ``` 6. Expose service as Ingress ```yaml ingress: enabled: true hosts: - paths: - / ``` 7. Expose service as Ingress with custom path `/apollo` ```yaml # use /apollo as root, should specify config.contextPath as /apollo ingress: enabled: true hosts: - paths: - /apollo config: ... contextPath: /apollo ... ``` 8. Expose service as Ingress with session affinity ```yaml ingress: enabled: true annotations: kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/affinity: "cookie" nginx.ingress.kubernetes.io/affinity-mode: "persistent" nginx.ingress.kubernetes.io/session-cookie-conditional-samesite-none: "true" nginx.ingress.kubernetes.io/session-cookie-expires: "172800" nginx.ingress.kubernetes.io/session-cookie-max-age: "172800" hosts: - host: xxx.somedomain.com # host is required to make session affinity work paths: - / ``` 9. Enable LDAP support ```yaml config: ... profiles: github,ldap ... files: application-ldap.yml: | spring: ldap: base: "dc=example,dc=org" username: "cn=admin,dc=example,dc=org" password: "password" searchFilter: "(uid={0})" urls: - "ldap://xxx.somedomain.com:389" ldap: mapping: objectClass: "inetOrgPerson" loginId: "uid" userDisplayName: "cn" email: "mail" ```
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/community/thank-you.md
# Thank you <hr /> <img src="en/images/community/jetbrains.svg" alt="jetbrains" style="height: 80px; margin-right: 20px"> <img src="en/images/community/intellij-idea.svg" alt="intellij-idea" style="width: 75px" > The Apollo team uses [IntelliJ IDEA](https://www.jetbrains.com/idea) when working on the open source projects. Many thanks to [JetBrains](https://www.jetbrains.com/) for sponsoring our Open Source projects with a license. <hr /> <img src="en/images/community/docsify.svg" alt="docsify" style="height: 80px"> The Apollo team uses [docsify](https://docsify.js.org/) to produce its documentation website.
# Thank you <hr /> <img src="en/images/community/jetbrains.svg" alt="jetbrains" style="height: 80px; margin-right: 20px"> <img src="en/images/community/intellij-idea.svg" alt="intellij-idea" style="width: 75px" > The Apollo team uses [IntelliJ IDEA](https://www.jetbrains.com/idea) when working on the open source projects. Many thanks to [JetBrains](https://www.jetbrains.com/) for sponsoring our Open Source projects with a license. <hr /> <img src="en/images/community/docsify.svg" alt="docsify" style="height: 80px"> The Apollo team uses [docsify](https://docsify.js.org/) to produce its documentation website.
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./.github/ISSUE_TEMPLATE/feature_request_en.md
--- name: Feature request about: Suggest an idea for this project title: '' labels: '' assignees: '' --- **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] **Describe the solution you'd like** A clear and concise description of what you want to happen. **Describe alternatives you've considered** A clear and concise description of any alternative solutions or features you've considered. **Additional context** Add any other context or screenshots about the feature request here.
--- name: Feature request about: Suggest an idea for this project title: '' labels: '' assignees: '' --- **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] **Describe the solution you'd like** A clear and concise description of what you want to happen. **Describe alternatives you've considered** A clear and concise description of any alternative solutions or features you've considered. **Additional context** Add any other context or screenshots about the feature request here.
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/development/portal-how-to-enable-webhook-notification.md
从 1.8.0 版本开始,apollo 增加了 webhook 支持,从而可以在配置发布时触发 webhook 并告知配置发布的信息。 ## 启用方式 > 配置项统一存储在ApolloPortalDB.ServerConfig表中,也可以通过`管理员工具 - 系统参数`页面进行配置,修改完一分钟实时生效。 1. webhook.supported.envs 开启 webhook 的环境列表,多个环境以英文逗号分隔,如 ``` DEV,FAT,UAT,PRO ``` 2. config.release.webhook.service.url webhook 通知的 url 地址,需要接收 HTTP POST 请求。如有多个地址,以英文逗号分隔,如 ``` http://www.xxx.com/webhook1,http://www.xxx.com/webhook2 ``` ## Webhook 接入方式 1. URL 参数 参数名 | 参数说明 --- | --- env | 该次配置发布所在的环境 2. Request body sample ```json { "appId": "", // appId "clusterName": "", // 集群 "namespaceName": "", // namespace "operator": "", // 发布人 "releaseId": 2, // releaseId "releaseTitle": "", // releaseTitle "releaseComment": "", // releaseComment "releaseTime": "", // 发布时间 eg:2020-01-01T00:00:00.000+0800 "configuration": [ { // 发布后的全部配置,如果为灰度发布,则为灰度发布后的全部配置 "firstEntity": "", // 配置的key "secondEntity": "" // 配置的value } ], "isReleaseAbandoned": false, "previousReleaseId": 1, // 上一次正式发布的releaseId "operation": // 0-正常发布 1-配置回滚 2-灰度发布 4-全量发布 "operationContext": { // 操作设置的属性配置 "isEmergencyPublish": true/false, // 是否紧急发布 "rules": [ { // 灰度规则 "clientAppId": "", // appId "clientIpList": [ "10.0.0.2", "10.0.0.3" ] // IP列表 } ], "branchReleaseKeys": [ "", "" ] // 灰度发布的key } } ```
从 1.8.0 版本开始,apollo 增加了 webhook 支持,从而可以在配置发布时触发 webhook 并告知配置发布的信息。 ## 启用方式 > 配置项统一存储在ApolloPortalDB.ServerConfig表中,也可以通过`管理员工具 - 系统参数`页面进行配置,修改完一分钟实时生效。 1. webhook.supported.envs 开启 webhook 的环境列表,多个环境以英文逗号分隔,如 ``` DEV,FAT,UAT,PRO ``` 2. config.release.webhook.service.url webhook 通知的 url 地址,需要接收 HTTP POST 请求。如有多个地址,以英文逗号分隔,如 ``` http://www.xxx.com/webhook1,http://www.xxx.com/webhook2 ``` ## Webhook 接入方式 1. URL 参数 参数名 | 参数说明 --- | --- env | 该次配置发布所在的环境 2. Request body sample ```json { "appId": "", // appId "clusterName": "", // 集群 "namespaceName": "", // namespace "operator": "", // 发布人 "releaseId": 2, // releaseId "releaseTitle": "", // releaseTitle "releaseComment": "", // releaseComment "releaseTime": "", // 发布时间 eg:2020-01-01T00:00:00.000+0800 "configuration": [ { // 发布后的全部配置,如果为灰度发布,则为灰度发布后的全部配置 "firstEntity": "", // 配置的key "secondEntity": "" // 配置的value } ], "isReleaseAbandoned": false, "previousReleaseId": 1, // 上一次正式发布的releaseId "operation": // 0-正常发布 1-配置回滚 2-灰度发布 4-全量发布 "operationContext": { // 操作设置的属性配置 "isEmergencyPublish": true/false, // 是否紧急发布 "rules": [ { // 灰度规则 "clientAppId": "", // appId "clientIpList": [ "10.0.0.2", "10.0.0.3" ] // IP列表 } ], "branchReleaseKeys": [ "", "" ] // 灰度发布的key } } ```
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/development/portal-how-to-enable-session-store.md
从 1.9.0 版本开始,apollo-portal 增加了 session 共享支持,从而可以在集群部署 apollo-portal 时实现 session 共享。 ## 使用方式 ### 1. 不启用 session 共享(默认) 默认配置即为不启用 所以清除 session 共享相关的配置即可,需要清理的配置如下 外置配置文件(properties/yml)里面的 `spring.session.store-type` 配置项 环境变量里面的 `SPRING_SESSION_STORE_TYPE` System Property 里面的 `spring.session.store-type` ### 2. 基于 Redis 的 session 共享 有以下几种方式设置,按照优先级从高到低分别为: 注:redis 也支持集群、哨兵模式,配置方式为标准的 `Spring Data Redis` 模式(以 `spring.redis` 开头的配置项),具体方式请自行研究 `Spring Data Redis` 相关文档或咨询 `Spring Data` Group #### 2.1 System Property ```bash -Dspring.session.store-type=redis -Dspring.redis.host=xxx -Dspring.redis.port=xxx -Dspring.redis.username=xxx -Dspring.redis.password=xxx ``` #### 2.2 环境变量 ```bash export SPRING_SESSION_STORE_TYPE="redis" export SPRING_REDIS_HOST="xxx" export SPRING_REDIS_PORT="xxx" export SPRING_REDIS_USERNAME="xxx" export SPRING_REDIS_PASSWORD="xxx" ``` #### 2.3 外部配置文件 例如 `config/application-github.properties` ```properties spring.session.store-type=redis spring.redis.host=xxx spring.redis.port=xxx spring.redis.username=xxx spring.redis.password=xxx ``` ### 3. 基于 JDBC 的 session 共享 有以下几种方式设置,按照优先级从高到低分别为: #### 3.1 System Property ```bash -Dspring.session.store-type=jdbc -Dspring.datasource.url=xxx -Dspring.datasource.username=xxx -Dspring.datasource.password=xxx ``` #### 3.2 环境变量 ```bash export SPRING_SESSION_STORE_TYPE="jdbc" export SPRING_DATASOURCE_URL="xxx" export SPRING_DATASOURCE_USERNAME="xxx" export SPRING_DATASOURCE_PASSWORD="xxx" ``` #### 3.3 外部配置文件 例如 `config/application-github.properties` ```properties spring.session.store-type=jdbc spring.datasource.url=xxx spring.datasource.username=xxx spring.datasource.password=xxx ``` #### 关于初始化 session 的表 ##### 1. apollo-portal 应用自动建表 给 apollo-portal 准备好具有 DDL 权限的数据库帐号。 然后首次启动时配置 `spring.session.jdbc.initialize-schema=always`(System Property,环境变量,外部配置文件均可) 即可, 一共会自动创建两张表 `spring_session` 和 `spring_session_attributes`。 创建完成后配置 `spring.session.jdbc.initialize-schema=never`,否则每次启动都会尝试去建表,会刷一大堆错误日志(无实际影响)。 ##### 2. 临时部署建表应用进行自动建表 准备好一个给 apollo-portal 使用的普通权限的数据库帐号,以及一个给建表临时应用使用的具有 DDL 权限的数据库帐号。 部署一个 apollo-portal 作为临时建表应用,配置如下 ```properties spring.session.store-type=jdbc spring.session.jdbc.initialize-schema=always spring.datasource.url=xxx spring.datasource.username={{DDL权限帐号}} spring.datasource.password={{DDL权限帐号的密码}} ``` 应用启动完成后检查数据库里 `spring_session` 和 `spring_session_attributes` 这两张表是否创建完成,创建完成即可停止并删除该临时应用,使用普通数据库帐号配置部署 apollo-portal 集群即可。 ##### 3. 手动建表 可以选择手动在数据库执行建表语句,sql 脚本由 [spring-session](https://github.com/spring-projects/spring-session) 提供 具体的建表 sql 如下,请根据所使用的数据库选择对应的 sql 脚本 [db2.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-db2.sql) [derby.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-derby.sql) [h2.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-h2.sql) [hsqldb.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql) [mysql.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql) [oracle.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql) [postgresql.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql) [sqlite.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql) [sqlserver.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql) [sybase.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql)
从 1.9.0 版本开始,apollo-portal 增加了 session 共享支持,从而可以在集群部署 apollo-portal 时实现 session 共享。 ## 使用方式 ### 1. 不启用 session 共享(默认) 默认配置即为不启用 所以清除 session 共享相关的配置即可,需要清理的配置如下 外置配置文件(properties/yml)里面的 `spring.session.store-type` 配置项 环境变量里面的 `SPRING_SESSION_STORE_TYPE` System Property 里面的 `spring.session.store-type` ### 2. 基于 Redis 的 session 共享 有以下几种方式设置,按照优先级从高到低分别为: 注:redis 也支持集群、哨兵模式,配置方式为标准的 `Spring Data Redis` 模式(以 `spring.redis` 开头的配置项),具体方式请自行研究 `Spring Data Redis` 相关文档或咨询 `Spring Data` Group #### 2.1 System Property ```bash -Dspring.session.store-type=redis -Dspring.redis.host=xxx -Dspring.redis.port=xxx -Dspring.redis.username=xxx -Dspring.redis.password=xxx ``` #### 2.2 环境变量 ```bash export SPRING_SESSION_STORE_TYPE="redis" export SPRING_REDIS_HOST="xxx" export SPRING_REDIS_PORT="xxx" export SPRING_REDIS_USERNAME="xxx" export SPRING_REDIS_PASSWORD="xxx" ``` #### 2.3 外部配置文件 例如 `config/application-github.properties` ```properties spring.session.store-type=redis spring.redis.host=xxx spring.redis.port=xxx spring.redis.username=xxx spring.redis.password=xxx ``` ### 3. 基于 JDBC 的 session 共享 有以下几种方式设置,按照优先级从高到低分别为: #### 3.1 System Property ```bash -Dspring.session.store-type=jdbc -Dspring.datasource.url=xxx -Dspring.datasource.username=xxx -Dspring.datasource.password=xxx ``` #### 3.2 环境变量 ```bash export SPRING_SESSION_STORE_TYPE="jdbc" export SPRING_DATASOURCE_URL="xxx" export SPRING_DATASOURCE_USERNAME="xxx" export SPRING_DATASOURCE_PASSWORD="xxx" ``` #### 3.3 外部配置文件 例如 `config/application-github.properties` ```properties spring.session.store-type=jdbc spring.datasource.url=xxx spring.datasource.username=xxx spring.datasource.password=xxx ``` #### 关于初始化 session 的表 ##### 1. apollo-portal 应用自动建表 给 apollo-portal 准备好具有 DDL 权限的数据库帐号。 然后首次启动时配置 `spring.session.jdbc.initialize-schema=always`(System Property,环境变量,外部配置文件均可) 即可, 一共会自动创建两张表 `spring_session` 和 `spring_session_attributes`。 创建完成后配置 `spring.session.jdbc.initialize-schema=never`,否则每次启动都会尝试去建表,会刷一大堆错误日志(无实际影响)。 ##### 2. 临时部署建表应用进行自动建表 准备好一个给 apollo-portal 使用的普通权限的数据库帐号,以及一个给建表临时应用使用的具有 DDL 权限的数据库帐号。 部署一个 apollo-portal 作为临时建表应用,配置如下 ```properties spring.session.store-type=jdbc spring.session.jdbc.initialize-schema=always spring.datasource.url=xxx spring.datasource.username={{DDL权限帐号}} spring.datasource.password={{DDL权限帐号的密码}} ``` 应用启动完成后检查数据库里 `spring_session` 和 `spring_session_attributes` 这两张表是否创建完成,创建完成即可停止并删除该临时应用,使用普通数据库帐号配置部署 apollo-portal 集群即可。 ##### 3. 手动建表 可以选择手动在数据库执行建表语句,sql 脚本由 [spring-session](https://github.com/spring-projects/spring-session) 提供 具体的建表 sql 如下,请根据所使用的数据库选择对应的 sql 脚本 [db2.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-db2.sql) [derby.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-derby.sql) [h2.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-h2.sql) [hsqldb.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-hsqldb.sql) [mysql.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-mysql.sql) [oracle.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-oracle.sql) [postgresql.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-postgresql.sql) [sqlite.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlite.sql) [sqlserver.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sqlserver.sql) [sybase.sql](https://github.com/spring-projects/spring-session/blob/faee8f1bdb8822a5653a81eba838dddf224d92d6/spring-session-jdbc/src/main/resources/org/springframework/session/jdbc/schema-sybase.sql)
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-portal/templates/deployment-portal.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-portal kind: ConfigMap apiVersion: v1 metadata: {{- $portalFullName := include "apollo.portal.fullName" . }} name: {{ $portalFullName }} data: application-github.properties: | spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }} spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }} spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }} {{- if .Values.config.envs }} apollo.portal.envs = {{ .Values.config.envs }} {{- end }} {{- if .Values.config.contextPath }} server.servlet.context-path = {{ .Values.config.contextPath }} {{- end }} apollo-env.properties: | {{- range $env, $address := .Values.config.metaServers }} {{ $env }}.meta = {{ $address }} {{- end }} {{- range $fileName, $content := .Values.config.files }} {{ $fileName | indent 2 }}: | {{ $content | indent 4 }} {{- end }} --- kind: Deployment apiVersion: apps/v1 metadata: name: {{ $portalFullName }} labels: {{- include "apollo.portal.labels" . | nindent 4 }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: app: {{ $portalFullName }} {{- with .Values.strategy }} strategy: {{- toYaml . | nindent 4 }} {{- end }} template: metadata: labels: app: {{ $portalFullName }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} volumes: - name: configmap-{{ $portalFullName }} configMap: name: {{ $portalFullName }} items: - key: application-github.properties path: application-github.properties - key: apollo-env.properties path: apollo-env.properties {{- range $fileName, $content := .Values.config.files }} - key: {{ $fileName }} path: {{ $fileName }} {{- end }} defaultMode: 420 containers: - name: {{ .Values.name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http containerPort: {{ .Values.containerPort }} protocol: TCP env: - name: SPRING_PROFILES_ACTIVE value: {{ .Values.config.profiles | quote }} {{- range $key, $value := .Values.env }} - name: {{ $key }} value: {{ $value }} {{- end }} volumeMounts: - name: configmap-{{ $portalFullName }} mountPath: /apollo-portal/config/application-github.properties subPath: application-github.properties - name: configmap-{{ $portalFullName }} mountPath: /apollo-portal/config/apollo-env.properties subPath: apollo-env.properties {{- range $fileName, $content := .Values.config.files }} - name: configmap-{{ $portalFullName }} mountPath: /apollo-portal/config/{{ $fileName }} subPath: {{ $fileName }} {{- end }} livenessProbe: tcpSocket: port: {{ .Values.containerPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} readinessProbe: httpGet: path: {{ .Values.config.contextPath }}/health port: {{ .Values.containerPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.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-portal kind: ConfigMap apiVersion: v1 metadata: {{- $portalFullName := include "apollo.portal.fullName" . }} name: {{ $portalFullName }} data: application-github.properties: | spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }} spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }} spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }} {{- if .Values.config.envs }} apollo.portal.envs = {{ .Values.config.envs }} {{- end }} {{- if .Values.config.contextPath }} server.servlet.context-path = {{ .Values.config.contextPath }} {{- end }} apollo-env.properties: | {{- range $env, $address := .Values.config.metaServers }} {{ $env }}.meta = {{ $address }} {{- end }} {{- range $fileName, $content := .Values.config.files }} {{ $fileName | indent 2 }}: | {{ $content | indent 4 }} {{- end }} --- kind: Deployment apiVersion: apps/v1 metadata: name: {{ $portalFullName }} labels: {{- include "apollo.portal.labels" . | nindent 4 }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: app: {{ $portalFullName }} {{- with .Values.strategy }} strategy: {{- toYaml . | nindent 4 }} {{- end }} template: metadata: labels: app: {{ $portalFullName }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} volumes: - name: configmap-{{ $portalFullName }} configMap: name: {{ $portalFullName }} items: - key: application-github.properties path: application-github.properties - key: apollo-env.properties path: apollo-env.properties {{- range $fileName, $content := .Values.config.files }} - key: {{ $fileName }} path: {{ $fileName }} {{- end }} defaultMode: 420 containers: - name: {{ .Values.name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http containerPort: {{ .Values.containerPort }} protocol: TCP env: - name: SPRING_PROFILES_ACTIVE value: {{ .Values.config.profiles | quote }} {{- range $key, $value := .Values.env }} - name: {{ $key }} value: {{ $value }} {{- end }} volumeMounts: - name: configmap-{{ $portalFullName }} mountPath: /apollo-portal/config/application-github.properties subPath: application-github.properties - name: configmap-{{ $portalFullName }} mountPath: /apollo-portal/config/apollo-env.properties subPath: apollo-env.properties {{- range $fileName, $content := .Values.config.files }} - name: configmap-{{ $portalFullName }} mountPath: /apollo-portal/config/{{ $fileName }} subPath: {{ $fileName }} {{- end }} livenessProbe: tcpSocket: port: {{ .Values.containerPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} readinessProbe: httpGet: path: {{ .Values.config.contextPath }}/health port: {{ .Values.containerPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }}
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./CODE_OF_CONDUCT.md
# Contributor Covenant Code of Conduct ## Our Pledge In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. ## Our Standards Examples of behavior that contributes to creating a positive environment include: * Using welcoming and inclusive language * Being respectful of differing viewpoints and experiences * Gracefully accepting constructive criticism * Focusing on what is best for the community * Showing empathy towards other community members Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment * Publishing others' private information, such as a physical or electronic address, without explicit permission * Other conduct which could reasonably be considered inappropriate in a professional setting ## Our Responsibilities Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. ## Scope This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at apollo-config@googlegroups.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] [homepage]: http://contributor-covenant.org [version]: http://contributor-covenant.org/version/1/4/
# Contributor Covenant Code of Conduct ## Our Pledge In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. ## Our Standards Examples of behavior that contributes to creating a positive environment include: * Using welcoming and inclusive language * Being respectful of differing viewpoints and experiences * Gracefully accepting constructive criticism * Focusing on what is best for the community * Showing empathy towards other community members Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment * Publishing others' private information, such as a physical or electronic address, without explicit permission * Other conduct which could reasonably be considered inappropriate in a professional setting ## Our Responsibilities Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. ## Scope This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at apollo-config@googlegroups.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] [homepage]: http://contributor-covenant.org [version]: http://contributor-covenant.org/version/1/4/
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/design/apollo-design.md
TODO
TODO
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/development/apollo-development-guide.md
本文档介绍了如何在本地使用IDE编译、运行Apollo,从而可以帮助大家了解Apollo的内在运行机制,同时也为自定义开发做好准备。 # &nbsp; # 一、准备工作 ## 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`。 ![ConfigAdminApplication-Overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-Overview.png) ### 2.1.1 新建运行配置 ![NewConfiguration-Application](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/NewConfiguration-Application.png) ### 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配置 ![ConfigAdminApplication-VM-Options](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-VM-Options.png) -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皆可。 ![ConfigAdminApplication-Run](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-Run.png) 启动完后,打开[http://localhost:8080](http://localhost:8080)可以看到`apollo-configservice`和`apollo-adminservice`都已经启动完成并注册到Eureka。 ![ConfigAdminApplication-Eureka](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-Eureka.png) > 注:除了在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`。 ![PortalApplication-Overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-Overview.png) ### 2.2.1 新建运行配置 ![NewConfiguration-Application](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/NewConfiguration-Application.png) ### 2.2.2 Main class配置 `com.ctrip.framework.apollo.portal.PortalApplication` ### 2.2.3 VM options配置 ![PortalApplication-VM-Options](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-VM-Options.png) -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皆可。 ![PortalApplication-Run](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-Run.png) 启动完后,打开[http://localhost:8070](http://localhost:8070)就可以看到Apollo配置中心界面了。 ![PortalApplication-Home](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-Home.png) >注:如果启用了`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`。 ![apollo-demo-app-properties](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-app-properties.png) 如我们自己的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 新建运行配置 ![NewConfiguration-Application](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/NewConfiguration-Application.png) ### 2.3.3 Main class配置 `com.ctrip.framework.apollo.demo.api.SimpleApolloConfigDemo` ### 2.3.4 VM options配置 ![apollo-demo-vm-options](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-vm-options.png) -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 概览 ![apollo-demo-overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-overview.png) ### 2.3.6 运行 对新建的运行配置点击Run或Debug皆可。 ![apollo-demo-run](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-run.png) 启动完后,忽略前面的调试信息,可以看到如下提示: 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`。 ![apollo-demo-app-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-net-app-config.png) 如我们自己的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,那么我们就做如下配置: ![apollo-net-server-url-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-net-server-url-config.png) ### 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) # 三、开发 ## 模块依赖图 ![模块依赖图](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/module-dependency.png) ## 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) ## 3.3 Portal 集群部署时共享 session 请参考[Portal 共享 session](zh/development/portal-how-to-enable-session-store)
本文档介绍了如何在本地使用IDE编译、运行Apollo,从而可以帮助大家了解Apollo的内在运行机制,同时也为自定义开发做好准备。 # &nbsp; # 一、准备工作 ## 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`。 ![ConfigAdminApplication-Overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-Overview.png) ### 2.1.1 新建运行配置 ![NewConfiguration-Application](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/NewConfiguration-Application.png) ### 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配置 ![ConfigAdminApplication-VM-Options](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-VM-Options.png) -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皆可。 ![ConfigAdminApplication-Run](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-Run.png) 启动完后,打开[http://localhost:8080](http://localhost:8080)可以看到`apollo-configservice`和`apollo-adminservice`都已经启动完成并注册到Eureka。 ![ConfigAdminApplication-Eureka](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/ConfigAdminApplication-Eureka.png) > 注:除了在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`。 ![PortalApplication-Overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-Overview.png) ### 2.2.1 新建运行配置 ![NewConfiguration-Application](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/NewConfiguration-Application.png) ### 2.2.2 Main class配置 `com.ctrip.framework.apollo.portal.PortalApplication` ### 2.2.3 VM options配置 ![PortalApplication-VM-Options](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-VM-Options.png) -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皆可。 ![PortalApplication-Run](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-Run.png) 启动完后,打开[http://localhost:8070](http://localhost:8070)就可以看到Apollo配置中心界面了。 ![PortalApplication-Home](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/PortalApplication-Home.png) >注:如果启用了`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`。 ![apollo-demo-app-properties](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-app-properties.png) 如我们自己的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 新建运行配置 ![NewConfiguration-Application](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/NewConfiguration-Application.png) ### 2.3.3 Main class配置 `com.ctrip.framework.apollo.demo.api.SimpleApolloConfigDemo` ### 2.3.4 VM options配置 ![apollo-demo-vm-options](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-vm-options.png) -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 概览 ![apollo-demo-overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-overview.png) ### 2.3.6 运行 对新建的运行配置点击Run或Debug皆可。 ![apollo-demo-run](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/apollo-demo-run.png) 启动完后,忽略前面的调试信息,可以看到如下提示: 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`。 ![apollo-demo-app-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-net-app-config.png) 如我们自己的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,那么我们就做如下配置: ![apollo-net-server-url-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-net-server-url-config.png) ### 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) # 三、开发 ## 模块依赖图 ![模块依赖图](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/module-dependency.png) ## 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) ## 3.3 Portal 集群部署时共享 session 请参考[Portal 共享 session](zh/development/portal-how-to-enable-session-store)
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-portal/Chart.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. # apiVersion: v2 name: apollo-portal description: A Helm chart for Apollo Portal type: application version: 0.3.0 appVersion: 1.9.0-SNAPSHOT home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - name: nobodyiam email: nobodyiam@gmail.com url: https://github.com/nobodyiam
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # apiVersion: v2 name: apollo-portal description: A Helm chart for Apollo Portal type: application version: 0.3.0 appVersion: 1.9.0-SNAPSHOT home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - name: nobodyiam email: nobodyiam@gmail.com url: https://github.com/nobodyiam
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/main/scripts/startup.sh
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-configservice ## Adjust log dir if necessary LOG_DIR=/opt/logs/100003171 ## Adjust server port if necessary SERVER_PORT=${SERVER_PORT:=8080} ## Create log directory if not existed because JDK 8+ won't do that mkdir -p $LOG_DIR ## Adjust memory settings if necessary #export JAVA_OPTS="-Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8" ## Only uncomment the following when you are using server jvm #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks" ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" # DS_URL, DS_USERNAME, DS_PASSWORD are deprecated, please use SPRING_DATASOURCE_URL, SPRING_DATASOURCE_USERNAME, SPRING_DATASOURCE_PASSWORD instead # DataSource URL USERNAME PASSWORD if [ "$DS_URL"x != x ] then export SPRING_DATASOURCE_URL=$DS_URL export SPRING_DATASOURCE_USERNAME=$DS_USERNAME export SPRING_DATASOURCE_PASSWORD=$DS_PASSWORD fi export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file.name=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" export APP_NAME=$SERVICE_NAME PATH_TO_JAR=$SERVICE_NAME".jar" SERVER_URL="http://localhost:$SERVER_PORT" function checkPidAlive { for i in `ls -t $APP_NAME/$APP_NAME.pid 2>/dev/null` do read pid < $i result=$(ps -p "$pid") if [ "$?" -eq 0 ]; then return 0 else printf "\npid - $pid just quit unexpectedly, please check logs under $LOG_DIR and /tmp for more information!\n" exit 1; fi done printf "\nNo pid file found, startup may failed. Please check logs under $LOG_DIR and /tmp for more information!\n" exit 1; } if [ "$(uname)" == "Darwin" ]; then windows="0" elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then windows="0" elif [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then windows="1" else windows="0" fi # for Windows if [ "$windows" == "1" ] && [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then tmp_java_home=`cygpath -sw "$JAVA_HOME"` export JAVA_HOME=`cygpath -u $tmp_java_home` echo "Windows new JAVA_HOME is: $JAVA_HOME" fi # Find Java if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then javaexe="$JAVA_HOME/bin/java" elif type -p java > /dev/null 2>&1; then javaexe=$(type -p java) elif [[ -x "/usr/bin/java" ]]; then javaexe="/usr/bin/java" else echo "Unable to find Java" exit 1 fi if [[ "$javaexe" ]]; then version=$("$javaexe" -version 2>&1 | awk -F '"' '/version/ {print $2}') version=$(echo "$version" | awk -F. '{printf("%03d%03d",$1,$2);}') # now version is of format 009003 (9.3.x) if [ $version -ge 011000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 010000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 009000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" else JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC" JAVA_OPTS="$JAVA_OPTS -Xloggc:$LOG_DIR/gc.log -XX:+PrintGCDetails" JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:+CMSClassUnloadingEnabled -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=5M" fi fi cd `dirname $0`/.. for i in `ls $SERVICE_NAME-*.jar 2>/dev/null` do if [[ ! $i == *"-sources.jar" ]] then PATH_TO_JAR=$i break fi done if [[ ! -f PATH_TO_JAR && -d current ]]; then cd current for i in `ls $SERVICE_NAME-*.jar 2>/dev/null` do if [[ ! $i == *"-sources.jar" ]] then PATH_TO_JAR=$i break fi done fi # For Docker environment, start in foreground mode if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR else if [[ -f $SERVICE_NAME".jar" ]]; then rm -rf $SERVICE_NAME".jar" fi printf "$(date) ==== Starting ==== \n" ln $PATH_TO_JAR $SERVICE_NAME".jar" chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start rc=$?; if [[ $rc != 0 ]]; then echo "$(date) Failed to start $SERVICE_NAME.jar, return code: $rc" exit $rc; fi declare -i counter=0 declare -i max_counter=48 # 48*5=240s declare -i total_time=0 printf "Waiting for server startup" until [[ (( counter -ge max_counter )) || "$(curl -X GET --silent --connect-timeout 1 --max-time 2 --head $SERVER_URL | grep "HTTP")" != "" ]]; do printf "." counter+=1 sleep 5 checkPidAlive done total_time=counter*5 if [[ (( counter -ge max_counter )) ]]; then printf "\n$(date) Server failed to start in $total_time seconds!\n" exit 1; fi printf "\n$(date) Server started in $total_time seconds!\n" exit 0; fi
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-configservice ## Adjust log dir if necessary LOG_DIR=/opt/logs/100003171 ## Adjust server port if necessary SERVER_PORT=${SERVER_PORT:=8080} ## Create log directory if not existed because JDK 8+ won't do that mkdir -p $LOG_DIR ## Adjust memory settings if necessary #export JAVA_OPTS="-Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=8" ## Only uncomment the following when you are using server jvm #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks" ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" # DS_URL, DS_USERNAME, DS_PASSWORD are deprecated, please use SPRING_DATASOURCE_URL, SPRING_DATASOURCE_USERNAME, SPRING_DATASOURCE_PASSWORD instead # DataSource URL USERNAME PASSWORD if [ "$DS_URL"x != x ] then export SPRING_DATASOURCE_URL=$DS_URL export SPRING_DATASOURCE_USERNAME=$DS_USERNAME export SPRING_DATASOURCE_PASSWORD=$DS_PASSWORD fi export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file.name=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" export APP_NAME=$SERVICE_NAME PATH_TO_JAR=$SERVICE_NAME".jar" SERVER_URL="http://localhost:$SERVER_PORT" function checkPidAlive { for i in `ls -t $APP_NAME/$APP_NAME.pid 2>/dev/null` do read pid < $i result=$(ps -p "$pid") if [ "$?" -eq 0 ]; then return 0 else printf "\npid - $pid just quit unexpectedly, please check logs under $LOG_DIR and /tmp for more information!\n" exit 1; fi done printf "\nNo pid file found, startup may failed. Please check logs under $LOG_DIR and /tmp for more information!\n" exit 1; } if [ "$(uname)" == "Darwin" ]; then windows="0" elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then windows="0" elif [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then windows="1" else windows="0" fi # for Windows if [ "$windows" == "1" ] && [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then tmp_java_home=`cygpath -sw "$JAVA_HOME"` export JAVA_HOME=`cygpath -u $tmp_java_home` echo "Windows new JAVA_HOME is: $JAVA_HOME" fi # Find Java if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then javaexe="$JAVA_HOME/bin/java" elif type -p java > /dev/null 2>&1; then javaexe=$(type -p java) elif [[ -x "/usr/bin/java" ]]; then javaexe="/usr/bin/java" else echo "Unable to find Java" exit 1 fi if [[ "$javaexe" ]]; then version=$("$javaexe" -version 2>&1 | awk -F '"' '/version/ {print $2}') version=$(echo "$version" | awk -F. '{printf("%03d%03d",$1,$2);}') # now version is of format 009003 (9.3.x) if [ $version -ge 011000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 010000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 009000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" else JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC" JAVA_OPTS="$JAVA_OPTS -Xloggc:$LOG_DIR/gc.log -XX:+PrintGCDetails" JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:+CMSClassUnloadingEnabled -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=5M" fi fi cd `dirname $0`/.. for i in `ls $SERVICE_NAME-*.jar 2>/dev/null` do if [[ ! $i == *"-sources.jar" ]] then PATH_TO_JAR=$i break fi done if [[ ! -f PATH_TO_JAR && -d current ]]; then cd current for i in `ls $SERVICE_NAME-*.jar 2>/dev/null` do if [[ ! $i == *"-sources.jar" ]] then PATH_TO_JAR=$i break fi done fi # For Docker environment, start in foreground mode if [[ -n "$APOLLO_RUN_MODE" ]] && [[ "$APOLLO_RUN_MODE" == "Docker" ]]; then exec $javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $PATH_TO_JAR else if [[ -f $SERVICE_NAME".jar" ]]; then rm -rf $SERVICE_NAME".jar" fi printf "$(date) ==== Starting ==== \n" ln $PATH_TO_JAR $SERVICE_NAME".jar" chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start rc=$?; if [[ $rc != 0 ]]; then echo "$(date) Failed to start $SERVICE_NAME.jar, return code: $rc" exit $rc; fi declare -i counter=0 declare -i max_counter=48 # 48*5=240s declare -i total_time=0 printf "Waiting for server startup" until [[ (( counter -ge max_counter )) || "$(curl -X GET --silent --connect-timeout 1 --max-time 2 --head $SERVER_URL | grep "HTTP")" != "" ]]; do printf "." counter+=1 sleep 5 checkPidAlive done total_time=counter*5 if [[ (( counter -ge max_counter )) ]]; then printf "\n$(date) Server failed to start in $total_time seconds!\n" exit 1; fi printf "\n$(date) Server started in $total_time seconds!\n" exit 0; fi
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.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: namespace: sre name: service-mysql-for-apollo-test-alpha-env labels: app: service-mysql-for-apollo-test-alpha-env spec: ports: - protocol: TCP port: 3306 targetPort: 3306 type: ClusterIP sessionAffinity: None --- kind: Endpoints apiVersion: v1 metadata: namespace: sre name: service-mysql-for-apollo-test-alpha-env subsets: - addresses: - ip: your-mysql-addresses ports: - protocol: TCP port: 3306
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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: namespace: sre name: service-mysql-for-apollo-test-alpha-env labels: app: service-mysql-for-apollo-test-alpha-env spec: ports: - protocol: TCP port: 3306 targetPort: 3306 type: ClusterIP sessionAffinity: None --- kind: Endpoints apiVersion: v1 metadata: namespace: sre name: service-mysql-for-apollo-test-alpha-env subsets: - addresses: - ip: your-mysql-addresses ports: - protocol: TCP port: 3306
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/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 共享 session](zh/development/portal-how-to-enable-session-store.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) - [致谢](zh/community/thank-you.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 共享 session](zh/development/portal-how-to-enable-session-store.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) - [致谢](zh/community/thank-you.md)
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-service/templates/ingress-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. # {{- if .Values.adminService.ingress.enabled -}} {{- $fullName := include "apollo.adminService.fullName" . -}} {{- $svcPort := .Values.adminService.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: {{- include "apollo.service.labels" . | nindent 4 }} {{- with .Values.adminService.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: {{- if .Values.adminService.ingress.tls }} tls: {{- range .Values.adminService.ingress.tls }} - hosts: {{- range .hosts }} - {{ . | quote }} {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} rules: {{- range .Values.adminService.ingress.hosts }} - host: {{ .host | quote }} http: paths: {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }} {{- 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. # {{- if .Values.adminService.ingress.enabled -}} {{- $fullName := include "apollo.adminService.fullName" . -}} {{- $svcPort := .Values.adminService.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: {{- include "apollo.service.labels" . | nindent 4 }} {{- with .Values.adminService.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: {{- if .Values.adminService.ingress.tls }} tls: {{- range .Values.adminService.ingress.tls }} - hosts: {{- range .hosts }} - {{ . | quote }} {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} rules: {{- range .Values.adminService.ingress.hosts }} - host: {{ .host | quote }} http: paths: {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }} {{- end }}
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/design/apollo-introduction.md
TODO
TODO
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/spring/yaml/case4.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: 1000 batch: 2000
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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: 1000 batch: 2000
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-service/templates/deployment-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. # --- # configmap for apollo-adminservice kind: ConfigMap apiVersion: v1 metadata: {{- $adminServiceFullName := include "apollo.adminService.fullName" . }} name: {{ $adminServiceFullName }} 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 }} {{- if .Values.adminService.config.contextPath }} server.servlet.context-path = {{ .Values.adminService.config.contextPath }} {{- end }} --- kind: Deployment apiVersion: apps/v1 metadata: name: {{ $adminServiceFullName }} labels: {{- include "apollo.service.labels" . | nindent 4 }} spec: replicas: {{ .Values.adminService.replicaCount }} selector: matchLabels: app: {{ $adminServiceFullName }} {{- with .Values.adminService.strategy }} strategy: {{- toYaml . | nindent 4 }} {{- end }} template: metadata: labels: app: {{ $adminServiceFullName }} spec: {{- with .Values.adminService.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} volumes: - name: volume-configmap-{{ $adminServiceFullName }} configMap: name: {{ $adminServiceFullName }} items: - key: application-github.properties path: application-github.properties defaultMode: 420 containers: - name: {{ .Values.adminService.name }} image: "{{ .Values.adminService.image.repository }}:{{ .Values.adminService.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.adminService.image.pullPolicy }} ports: - name: http containerPort: {{ .Values.adminService.containerPort }} protocol: TCP env: - name: SPRING_PROFILES_ACTIVE value: {{ .Values.adminService.config.profiles | quote }} {{- range $key, $value := .Values.adminService.env }} - name: {{ $key }} value: {{ $value }} {{- end }} volumeMounts: - name: volume-configmap-{{ $adminServiceFullName }} mountPath: /apollo-adminservice/config/application-github.properties subPath: application-github.properties livenessProbe: tcpSocket: port: {{ .Values.adminService.containerPort }} initialDelaySeconds: {{ .Values.adminService.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.adminService.liveness.periodSeconds }} readinessProbe: httpGet: path: {{ .Values.adminService.config.contextPath }}/health port: {{ .Values.adminService.containerPort }} initialDelaySeconds: {{ .Values.adminService.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.adminService.readiness.periodSeconds }} resources: {{- toYaml .Values.adminService.resources | nindent 12 }} {{- with .Values.adminService.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.adminService.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.adminService.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-adminservice kind: ConfigMap apiVersion: v1 metadata: {{- $adminServiceFullName := include "apollo.adminService.fullName" . }} name: {{ $adminServiceFullName }} 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 }} {{- if .Values.adminService.config.contextPath }} server.servlet.context-path = {{ .Values.adminService.config.contextPath }} {{- end }} --- kind: Deployment apiVersion: apps/v1 metadata: name: {{ $adminServiceFullName }} labels: {{- include "apollo.service.labels" . | nindent 4 }} spec: replicas: {{ .Values.adminService.replicaCount }} selector: matchLabels: app: {{ $adminServiceFullName }} {{- with .Values.adminService.strategy }} strategy: {{- toYaml . | nindent 4 }} {{- end }} template: metadata: labels: app: {{ $adminServiceFullName }} spec: {{- with .Values.adminService.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} volumes: - name: volume-configmap-{{ $adminServiceFullName }} configMap: name: {{ $adminServiceFullName }} items: - key: application-github.properties path: application-github.properties defaultMode: 420 containers: - name: {{ .Values.adminService.name }} image: "{{ .Values.adminService.image.repository }}:{{ .Values.adminService.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.adminService.image.pullPolicy }} ports: - name: http containerPort: {{ .Values.adminService.containerPort }} protocol: TCP env: - name: SPRING_PROFILES_ACTIVE value: {{ .Values.adminService.config.profiles | quote }} {{- range $key, $value := .Values.adminService.env }} - name: {{ $key }} value: {{ $value }} {{- end }} volumeMounts: - name: volume-configmap-{{ $adminServiceFullName }} mountPath: /apollo-adminservice/config/application-github.properties subPath: application-github.properties livenessProbe: tcpSocket: port: {{ .Values.adminService.containerPort }} initialDelaySeconds: {{ .Values.adminService.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.adminService.liveness.periodSeconds }} readinessProbe: httpGet: path: {{ .Values.adminService.config.contextPath }}/health port: {{ .Values.adminService.containerPort }} initialDelaySeconds: {{ .Values.adminService.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.adminService.readiness.periodSeconds }} resources: {{- toYaml .Values.adminService.resources | nindent 12 }} {{- with .Values.adminService.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.adminService.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.adminService.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }}
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/yaml/case3.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. # root: key1: "someValue" key2: 100
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # root: key1: "someValue" key2: 100
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/usage/third-party-sdks-user-guide.md
## 1. Go ### Apollo Go 客户端 1 项目地址:[apolloconfig/agollo](https://github.com/apolloconfig/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 项目地址:[apolloconfig/agollo](https://github.com/apolloconfig/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,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/apollo-portal-server/scripts/startup-kubernetes.sh
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-portal ## Adjust log dir if necessary LOG_DIR=/opt/logs/apollo-portal-server ## Adjust server port if necessary SERVER_PORT=8070 # SERVER_URL="http://localhost:$SERVER_PORT" SERVER_URL="http://${APOLLO_PORTAL_SERVICE_NAME}:${SERVER_PORT}" ## Adjust memory settings if necessary #export JAVA_OPTS="-Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=8" ## Only uncomment the following when you are using server jvm #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks" ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file.name=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" # Find Java if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then javaexe="$JAVA_HOME/bin/java" elif type -p java > /dev/null 2>&1; then javaexe=$(type -p java) elif [[ -x "/usr/bin/java" ]]; then javaexe="/usr/bin/java" else echo "Unable to find Java" exit 1 fi if [[ "$javaexe" ]]; then version=$("$javaexe" -version 2>&1 | awk -F '"' '/version/ {print $2}') version=$(echo "$version" | awk -F. '{printf("%03d%03d",$1,$2);}') # now version is of format 009003 (9.3.x) if [ $version -ge 011000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 010000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 009000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" else JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC" JAVA_OPTS="$JAVA_OPTS -Xloggc:$LOG_DIR/gc.log -XX:+PrintGCDetails" JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:+CMSClassUnloadingEnabled -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=5M" fi fi printf "$(date) ==== Starting ==== \n" cd `dirname $0`/.. chmod 755 $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start rc=$?; if [[ $rc != 0 ]]; then echo "$(date) Failed to start $SERVICE_NAME.jar, return code: $rc" exit $rc; fi tail -f /dev/null
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-portal ## Adjust log dir if necessary LOG_DIR=/opt/logs/apollo-portal-server ## Adjust server port if necessary SERVER_PORT=8070 # SERVER_URL="http://localhost:$SERVER_PORT" SERVER_URL="http://${APOLLO_PORTAL_SERVICE_NAME}:${SERVER_PORT}" ## Adjust memory settings if necessary #export JAVA_OPTS="-Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=8" ## Only uncomment the following when you are using server jvm #export JAVA_OPTS="$JAVA_OPTS -server -XX:-ReduceInitialCardMarks" ########### The following is the same for configservice, adminservice, portal ########### export JAVA_OPTS="$JAVA_OPTS -XX:ParallelGCThreads=4 -XX:MaxTenuringThreshold=9 -XX:+DisableExplicitGC -XX:+ScavengeBeforeFullGC -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+ExplicitGCInvokesConcurrent -XX:+HeapDumpOnOutOfMemoryError -XX:-OmitStackTraceInFastThrow -Duser.timezone=Asia/Shanghai -Dclient.encoding.override=UTF-8 -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom" export JAVA_OPTS="$JAVA_OPTS -Dserver.port=$SERVER_PORT -Dlogging.file.name=$LOG_DIR/$SERVICE_NAME.log -XX:HeapDumpPath=$LOG_DIR/HeapDumpOnOutOfMemoryError/" # Find Java if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then javaexe="$JAVA_HOME/bin/java" elif type -p java > /dev/null 2>&1; then javaexe=$(type -p java) elif [[ -x "/usr/bin/java" ]]; then javaexe="/usr/bin/java" else echo "Unable to find Java" exit 1 fi if [[ "$javaexe" ]]; then version=$("$javaexe" -version 2>&1 | awk -F '"' '/version/ {print $2}') version=$(echo "$version" | awk -F. '{printf("%03d%03d",$1,$2);}') # now version is of format 009003 (9.3.x) if [ $version -ge 011000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 010000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" elif [ $version -ge 009000 ]; then JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$LOG_DIR/gc.log:time,level,tags -Xlog:safepoint -Xlog:gc+heap=trace" else JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC" JAVA_OPTS="$JAVA_OPTS -Xloggc:$LOG_DIR/gc.log -XX:+PrintGCDetails" JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:CMSFullGCsBeforeCompaction=9 -XX:+CMSClassUnloadingEnabled -XX:+PrintGCDateStamps -XX:+PrintGCApplicationConcurrentTime -XX:+PrintHeapAtGC -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=5M" fi fi printf "$(date) ==== Starting ==== \n" cd `dirname $0`/.. chmod 755 $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" start rc=$?; if [[ $rc != 0 ]]; then echo "$(date) Failed to start $SERVICE_NAME.jar, return code: $rc" exit $rc; fi tail -f /dev/null
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/charts/index.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. # apiVersion: v1 entries: apollo-portal: - apiVersion: v2 appVersion: 1.8.2 created: "2021-06-02T23:05:43.379448+08:00" description: A Helm chart for Apollo Portal digest: 5586b2597ebe098a26c94273855461891041241628d85dc13e05ce661ff5e7a2 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.2.2.tgz version: 0.2.2 - apiVersion: v2 appVersion: 1.8.1 created: "2021-06-02T23:05:43.378586+08:00" description: A Helm chart for Apollo Portal digest: 8bac1b48361e2717d7d4ee669a85a14ee22ada96f249300d90ee563def63baea home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.2.1.tgz version: 0.2.1 - apiVersion: v2 appVersion: 1.8.0 created: "2021-06-02T23:05:43.377736+08:00" description: A Helm chart for Apollo Portal digest: 8a55c5f3ddd76b9768067fe6eecfb34b588084557c11882e263abb2af7dfc173 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.2.0.tgz version: 0.2.0 - apiVersion: v2 appVersion: 1.7.2 created: "2021-06-02T23:05:43.376846+08:00" description: A Helm chart for Apollo Portal digest: 1db8b2435e0471ef55c63c47b970e4ae059800f88ed4ac4f1ca6cd27fe502722 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.1.2.tgz version: 0.1.2 - apiVersion: v2 appVersion: 1.7.1 created: "2021-06-02T23:05:43.375959+08:00" description: A Helm chart for Apollo Portal digest: 7c1b4efa13d4cc54a714b3ec836f609a8f97286c465789f6d807d1227cfc5b74 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.1.1.tgz version: 0.1.1 - apiVersion: v2 appVersion: 1.7.0 created: "2021-06-02T23:05:43.37481+08:00" description: A Helm chart for Apollo Portal digest: b838e4478f0c031093691defeffb5805d51189989db0eb9caaa2dc67905c8391 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.1.0.tgz version: 0.1.0 apollo-service: - apiVersion: v2 appVersion: 1.8.2 created: "2021-06-02T23:05:43.388235+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 7291d516b94390843439bae7a2635561e713a549339a314fa2ef79ef098b6ab4 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.2.2.tgz version: 0.2.2 - apiVersion: v2 appVersion: 1.8.1 created: "2021-06-02T23:05:43.387399+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: f88f0c6942353b3d49b4caa43a7580b885ccc94a646428694adc2ed3d43e49fe home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.2.1.tgz version: 0.2.1 - apiVersion: v2 appVersion: 1.8.0 created: "2021-06-02T23:05:43.385355+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 73e66c651499f93b6f3891e979dcbe2a20ad37809087e42bc98643c604c457c6 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.2.0.tgz version: 0.2.0 - apiVersion: v2 appVersion: 1.7.2 created: "2021-06-02T23:05:43.38449+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: be9379611b45db416a32b7e1367527faec7c29a969493ca4a0a72b5b87a280f4 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.1.2.tgz version: 0.1.2 - apiVersion: v2 appVersion: 1.7.1 created: "2021-06-02T23:05:43.381142+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 787a26590d68735341b7839c14274492097fed4a0843fc9a1e5c692194199707 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.1.1.tgz version: 0.1.1 - apiVersion: v2 appVersion: 1.7.0 created: "2021-06-02T23:05:43.380337+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 65c08f39b54ad1ac1d849cc841ce978bd6e95b0b6cbd2423d9f17f66bc7e8d3e home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.1.0.tgz version: 0.1.0 generated: "2021-06-02T23:05:43.373363+08:00"
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # apiVersion: v1 entries: apollo-portal: - apiVersion: v2 appVersion: 1.8.2 created: "2021-06-02T23:05:43.379448+08:00" description: A Helm chart for Apollo Portal digest: 5586b2597ebe098a26c94273855461891041241628d85dc13e05ce661ff5e7a2 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.2.2.tgz version: 0.2.2 - apiVersion: v2 appVersion: 1.8.1 created: "2021-06-02T23:05:43.378586+08:00" description: A Helm chart for Apollo Portal digest: 8bac1b48361e2717d7d4ee669a85a14ee22ada96f249300d90ee563def63baea home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.2.1.tgz version: 0.2.1 - apiVersion: v2 appVersion: 1.8.0 created: "2021-06-02T23:05:43.377736+08:00" description: A Helm chart for Apollo Portal digest: 8a55c5f3ddd76b9768067fe6eecfb34b588084557c11882e263abb2af7dfc173 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.2.0.tgz version: 0.2.0 - apiVersion: v2 appVersion: 1.7.2 created: "2021-06-02T23:05:43.376846+08:00" description: A Helm chart for Apollo Portal digest: 1db8b2435e0471ef55c63c47b970e4ae059800f88ed4ac4f1ca6cd27fe502722 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.1.2.tgz version: 0.1.2 - apiVersion: v2 appVersion: 1.7.1 created: "2021-06-02T23:05:43.375959+08:00" description: A Helm chart for Apollo Portal digest: 7c1b4efa13d4cc54a714b3ec836f609a8f97286c465789f6d807d1227cfc5b74 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.1.1.tgz version: 0.1.1 - apiVersion: v2 appVersion: 1.7.0 created: "2021-06-02T23:05:43.37481+08:00" description: A Helm chart for Apollo Portal digest: b838e4478f0c031093691defeffb5805d51189989db0eb9caaa2dc67905c8391 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-portal type: application urls: - apollo-portal-0.1.0.tgz version: 0.1.0 apollo-service: - apiVersion: v2 appVersion: 1.8.2 created: "2021-06-02T23:05:43.388235+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 7291d516b94390843439bae7a2635561e713a549339a314fa2ef79ef098b6ab4 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.2.2.tgz version: 0.2.2 - apiVersion: v2 appVersion: 1.8.1 created: "2021-06-02T23:05:43.387399+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: f88f0c6942353b3d49b4caa43a7580b885ccc94a646428694adc2ed3d43e49fe home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.2.1.tgz version: 0.2.1 - apiVersion: v2 appVersion: 1.8.0 created: "2021-06-02T23:05:43.385355+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 73e66c651499f93b6f3891e979dcbe2a20ad37809087e42bc98643c604c457c6 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.2.0.tgz version: 0.2.0 - apiVersion: v2 appVersion: 1.7.2 created: "2021-06-02T23:05:43.38449+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: be9379611b45db416a32b7e1367527faec7c29a969493ca4a0a72b5b87a280f4 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.1.2.tgz version: 0.1.2 - apiVersion: v2 appVersion: 1.7.1 created: "2021-06-02T23:05:43.381142+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 787a26590d68735341b7839c14274492097fed4a0843fc9a1e5c692194199707 home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.1.1.tgz version: 0.1.1 - apiVersion: v2 appVersion: 1.7.0 created: "2021-06-02T23:05:43.380337+08:00" description: A Helm chart for Apollo Config Service and Apollo Admin Service digest: 65c08f39b54ad1ac1d849cc841ce978bd6e95b0b6cbd2423d9f17f66bc7e8d3e home: https://github.com/ctripcorp/apollo icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png maintainers: - email: nobodyiam@gmail.com name: nobodyiam url: https://github.com/nobodyiam name: apollo-service type: application urls: - apollo-service-0.1.0.tgz version: 0.1.0 generated: "2021-06-02T23:05:43.373363+08:00"
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./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 [![Build Status](https://github.com/ctripcorp/apollo/workflows/build/badge.svg)](https://github.com/ctripcorp/apollo/actions) [![GitHub Release](https://img.shields.io/github/release/ctripcorp/apollo.svg)](https://github.com/ctripcorp/apollo/releases) [![Maven Central Repo](https://img.shields.io/maven-central/v/com.ctrip.framework.apollo/apollo.svg)](https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client) [![codecov.io](https://codecov.io/github/ctripcorp/apollo/coverage.svg?branch=master)](https://codecov.io/github/ctripcorp/apollo?branch=master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](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 ![Screenshot](https://raw.githubusercontent.com/ctripcorp/apollo/master/docs/en/images/apollo-home-screenshot.jpg) # Features * **Unified management of the configurations of different environments and different clusters** * Apollo provides a unified interface to centrally manage the configurations of different environments, different clusters, and different namespaces * The same codebase could have different configurations when deployed in different clusters * With the namespace concept, it is easy to support multiple applications to share the same configurations, while also allowing them to customize the configurations * Multiple languages is provided in user interface(currently Chinese and English) * **Configuration changes takes effect in real time (hot release)** * After the user modified the configuration and released it in Apollo, the sdk will receive the latest configurations in real time (1 second) and notify the application * **Release version management** * Every configuration releases are versioned, which is friendly to support configuration rollback * **Grayscale release** * Support grayscale configuration release, for example, after clicking release, it will only take effect for some application instances. After a period of observation, we could push the configurations to all application instances if there is no problem * **Authorization management, release approval and operation audit** * Great authorization mechanism is designed for applications and configurations management, and the management of configurations is divided into two operations: editing and publishing, therefore greatly reducing human errors * All operations have audit logs for easy tracking of problems * **Client side configuration information monitoring** * It's very easy to see which instances are using the configurations and what versions they are using * **Rich SDKs available** * Provides native sdks of Java and .Net to facilitate application integration * Support Spring Placeholder, Annotation and Spring Boot ConfigurationProperties for easy application use (requires Spring 3.1.1+) * Http APIs are provided, so non-Java and .Net applications can integrate conveniently * Rich third party sdks are also available, e.g. Golang, Python, NodeJS, PHP, C, etc * **Open platform API** * Apollo itself provides a unified configuration management interface, which supports features such as multi-environment, multi-data center configuration management, permissions, and process governance * However, for the sake of versatility, Apollo will not put too many restrictions on the modification of the configuration, as long as it conforms to the basic format, it can be saved. * In our research, we found that for some users, their configurations may have more complicated formats, such as xml, json, and the format needs to be verified * There are also some users such as DAL, which not only have a specific format, but also need to verify the entered value before saving, such as checking whether the database, username and password match * For this type of application, Apollo allows the application to modify and release configurations through open APIs, which has great authorization and permission control mechanism built in * **Simple deployment** * As an infrastructure service, the configuration center has very high availability requirements, which forces Apollo to rely on external dependencies as little as possible * Currently, the only external dependency is MySQL, so the deployment is very simple. Apollo can run as long as Java and MySQL are installed * Apollo also provides a packaging script, which can generate all required installation packages with just one click, and supports customization of runtime parameters # Usage 1. [Apollo User Guide](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide) 2. [Java SDK User Guide](https://www.apolloconfig.com/#/zh/usage/java-sdk-user-guide) 3. [.Net SDK user Guide](https://www.apolloconfig.com/#/zh/usage/dotnet-sdk-user-guide) 4. [Third Party SDK User Guide](https://www.apolloconfig.com/#/zh/usage/third-party-sdks-user-guide) 5. [Other Language Client User Guide](https://www.apolloconfig.com/#/zh/usage/other-language-client-user-guide) 6. [Apollo Open APIs](https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform) 7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases) 8. [Apollo User Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-practices) 9. [Apollo Security Best Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) # Design * [Apollo Design](https://www.apolloconfig.com/#/zh/design/apollo-design) * [Apollo Core Concept - Namespace](https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace) * [Apollo Architecture Analysis](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ) * [Apollo Source Code Explanation](http://www.iocoder.cn/categories/Apollo/) # Development * [Apollo Development Guide](https://www.apolloconfig.com/#/zh/development/apollo-development-guide) * Code Styles * [Eclipse Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) * [Intellij Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) # Deployment * [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start) * [Distributed Deployment Guide](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide) # Release Notes * [Releases](https://github.com/ctripcorp/apollo/releases) # FAQ * [FAQ](https://www.apolloconfig.com/#/zh/faq/faq) * [Common Issues in Deployment & Development Phase](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) # Presentation * [Design and Implementation Details of Apollo](http://www.itdks.com/dakalive/detail/3420) * [Slides](https://myslide.cn/slides/10168) * [Configuration Center Makes Microservices Smart](https://2018.qconshanghai.com/presentation/799) * [Slides](https://myslide.cn/slides/10035) # Publication * [Design and Implementation Details of Apollo](https://www.infoq.cn/article/open-source-configuration-center-apollo) * [Configuration Center Makes Microservices Smart](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ) # Community * [Apollo Team](https://www.apolloconfig.com/#/en/community/team) * [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) * [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) # License The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE). # Known Users > Sorted by registration order,users are welcome to register in [https://github.com/ctripcorp/apollo/issues/451](https://github.com/ctripcorp/apollo/issues/451) (reference purpose only for the community) <table> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctrip.png" alt="携程"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bluestone.png" alt="青石证券"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sagreen.png" alt="沙绿"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/umetrip.jpg" alt="航旅纵横"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuanzhuan.png" alt="58转转"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/phone580.png" alt="蜂助手"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hainan-airlines.png" alt="海南航空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cvte.png" alt="CVTE"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mainbo.jpg" alt="明博教育"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/madailicai.png" alt="麻袋理财"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mxnavi.jpg" alt="美行科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fshows.jpg" alt="首展科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/feezu.png" alt="易微行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rencaijia.png" alt="人才加"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/keking.png" alt="凯京集团"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leoao.png" alt="乐刻运动"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dji.png" alt="大疆"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kkmh.png" alt="快看漫画"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wolaidai.png" alt="我来贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xsrj.png" alt="虚实软件"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yanxuan.png" alt="网易严选"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sjzg.png" alt="视觉中国"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zc360.png" alt="资产360"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ecarx.png" alt="亿咖通"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5173.png" alt="5173"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hujiang.png" alt="沪江"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163yun.png" alt="网易云基础服务"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cash-bus.png" alt="现金巴士"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/smartisan.png" alt="锤子科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toodc.png" alt="头等仓"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/juneyaoair.png" alt="吉祥航空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/263mobile.png" alt="263移动通信"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toutoujinrong.png" alt="投投金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mytijian.png" alt="每天健康"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyabank.png" alt="麦芽金服"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fengunion.png" alt="蜂向科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/geex-logo.png" alt="即科金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beike.png" alt="贝壳网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/youzan.png" alt="有赞"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunjihuitong.png" alt="云集汇通"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rhinotech.png" alt="犀牛瀚海科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nxin.png" alt="农信互联"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mgzf.png" alt="蘑菇租房"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huli-logo.png" alt="狐狸金服"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mandao.png" alt="漫道集团"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enmonster.png" alt="怪兽充电"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nanguazufang.png" alt="南瓜租房"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shitoujinrong.png" alt="石投金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tubatu.png" alt="土巴兔"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/payh_logo.png" alt="平安银行"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinxindai.png" alt="新新贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chrtc.png" alt="中国华戎科技集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuya_logo.png" alt="涂鸦智能"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/szlcsc.jpg" alt="立创商城"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hairongyi.png" alt="乐赚金服"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kxqc.png" alt="开心汽车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppcredit.png" alt="乐赚金服"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/primeton.png" alt="普元信息"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoskeeper.png" alt="医帮管家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fula.png" alt="付啦信用卡管家"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uzai.png" alt="悠哉网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/91wutong.png" alt="梧桐诚选"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppdai.png" alt="拍拍贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinyongfei.png" alt="信用飞"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dxy.png" alt="丁香园"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ghtech.png" alt="国槐科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qbb.png" alt="亲宝宝"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huawei_logo.png" alt="华为视频直播"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weiboyi.png" alt="微播易"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ofpay.png" alt="欧飞"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mishuo.png" alt="迷说"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yixia.png" alt="一下科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daocloud.png" alt="DaoCloud"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnvex.png" alt="汽摩交易所"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100tal.png" alt="好未来教育集团"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ainirobot.png" alt="猎户星空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuojian.png" alt="卓健科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoyor.png" alt="银江股份"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuhu.png" alt="途虎养车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/homedo.png" alt="河姆渡"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xwbank.png" alt="新网银行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctspcl.png" alt="中旅安信云贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meiyou.png" alt="美柚"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkh-logo.png" alt="震坤行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wgss.png" alt="万谷盛世"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/plateno.png" alt="铂涛旅行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lifesense.png" alt="乐心"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/reachmedia.png" alt="亿投传媒"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guxiansheng.png" alt="股先生"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caixuetang.png" alt="财学堂"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/4399.png" alt="4399"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autohome.png" alt="汽车之家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mbcaijing.png" alt="面包财经"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoopchina.png" alt="虎扑"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sohu-auto.png" alt="搜狐汽车"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/liangfuzhengxin.png" alt="量富征信"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maihaoche.png" alt="卖好车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiot.jpg" alt="中移物联网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/biauto.png" alt="易车网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyaole.png" alt="一药网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoying.png" alt="小影"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caibeike.png" alt="彩贝壳"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeelight.png" alt="YEELIGHT"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/itsgmu.png" alt="积目"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acmedcare.png" alt="极致医疗"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhui365.png" alt="金汇金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/900etrip.png" alt="久柏易游"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/24xiaomai.png" alt="小麦铺"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vvic.png" alt="搜款网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mizlicai.png" alt="米庄理财"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bjt.png" alt="贝吉塔网络科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weimob.png" alt="微盟"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kada.png" alt="网易卡搭"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kapbook.png" alt="股书"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jumore.png" alt="聚贸"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bimface.png" alt="广联达bimface"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/globalgrow.png" alt="环球易购"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jollychic.png" alt="浙江执御"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2dfire.jpg" alt="二维火"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shopin.png" alt="上品"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inspur.png" alt="浪潮集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ngarihealth.png" alt="纳里健康"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oraro.png" alt="橙红科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dragonpass.png" alt="龙腾出行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lizhi.fm.png" alt="荔枝"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/htd.png" alt="汇通达"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunrong.png" alt="云融金科"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tszg360.png" alt="天生掌柜"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rongplus.png" alt="容联光辉"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/intellif.png" alt="云天励飞"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jiayundata.png" alt="嘉云数据"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zts.png" alt="中泰证券网络金融部"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163dun.png" alt="网易易盾"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiangwushuo.png" alt="享物说"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sto.png" alt="申通"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhe.png" alt="金和网络"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2345.png" alt="二三四五"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chtwm.jpg" alt="恒天财富"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uweixin.png" alt="沐雪微信"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wzeye.png" alt="温州医科大学附属眼视光医院"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/10010pay.png" alt="联通支付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanshu.png" alt="杉数科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fenlibao.png" alt="分利宝"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hetao101.png" alt="核桃编程"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaohongshu.png" alt="小红书"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/blissmall.png" alt="幸福西饼"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ky-express.png" alt="跨越速运"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oyohotels.png" alt="OYO"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100-me.png" alt="叮咚买菜"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhidaohulian.jpg" alt="智道网联"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xueqiu.jpg" alt="雪球"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autocloudpro.png" alt="车通云"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dadaabc.png" alt="哒哒英语"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xedaojia.jpg" alt="小E微店"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daling.png" alt="达令家"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/renliwo.png" alt="人力窝"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mocire.jpg" alt="嘉美在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uepay.png" alt="极易付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wdom.png" alt="智慧开源"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cheshiku.png" alt="车仕库"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/taimeitech.png" alt="太美医疗科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yilianbaihui.png" alt="亿联百汇"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhoupu123.png" alt="舟谱数据"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/frxs.png" alt="芙蓉兴盛"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beastshop.png" alt="野兽派"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kaishustory.png" alt="凯叔讲故事"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/haodf.png" alt="好大夫在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/insyunmi.png" alt="云幂信息技术"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/duiba.png" alt="兑吧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/9ji.png" alt="九机网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sui.png" alt="随手科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aixiangdao.png" alt="万谷盛世"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunzhangfang.png" alt="云账房"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yuantutech.png" alt="浙江远图互联"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qk365.png" alt="青客公寓"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/eastmoney.png" alt="东方财富"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jikexiu.png" alt="极客修"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meix.png" alt="美市科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zto.png" alt="中通快递"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/e6yun.png" alt="易流科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoyuanzhao.png" alt="实习僧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dalingjia.png" alt="达令家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/secoo.png" alt="寺库"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lianlianpay.png" alt="连连支付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhongan.png" alt="众安保险"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/360jinrong.png" alt="360金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caschina.png" alt="中航服商旅"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ke.png" alt="贝壳"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeahmobi.png" alt="Yeahmobi易点天下"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/idengyun.png" alt="北京登云美业网络科技有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinher.png" alt="金和网络"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/komect.png" alt="中移(杭州)信息技术有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beisen.png" alt="北森"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/log56.png" alt="合肥维天运通"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meboth.png" alt="北京蜜步科技有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/postop.png" alt="术康"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rfchina.png" alt="富力集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tfxing.png" alt="天府行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/8travelpay.png" alt="八商山"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/centaline.png" alt="中原地产"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkyda.png" alt="智科云达"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/house730.png" alt="中原730"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/pagoda.png" alt="百果园"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bolome.png" alt="波罗蜜"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xignite.png" alt="Xignite"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aduer.png" alt="杭州有云科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jojoreading.png" alt="成都书声科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sweetome.png" alt="斯维登集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vipthink.png" alt="广东快乐种子科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tongxuecool.png" alt="上海盈翼文化传播有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sccfc.png" alt="上海尚诚消费金融股份有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ziroom.png" alt="自如网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jd.png" alt="京东"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rabbitpre.png" alt="兔展智能"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhubei.png" alt="竹贝"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/imile.png" alt="iMile(中东)"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/helloglobal.png" alt="哈罗出行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhaopin.png" alt="智联招聘"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acadsoc.png" alt="阿卡索"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mojory.png" alt="妙知旅"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chengduoduo.png" alt="程多多"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baojunev.png" alt="上汽通用五菱"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leyan.png" alt="乐言科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dushu.png" alt="樊登读书"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiz.png" alt="找一找教程网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bppc.png" alt="中油碧辟石油有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanglv51.png" alt="四川商旅无忧科技服务有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/waijiao365.png" alt="懿鸢网络科技(上海)有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaoding.jpg" alt="稿定科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ricacorp.png" alt="搵樓 - 利嘉閣"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/t3go.png" alt="南京领行科技股份有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mokahr.jpg" alt="北京希瑞亚斯科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/printrainbow.png" alt="印彩虹印刷公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/milliontech.png" alt="Million Tech"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guoguokeji.jpg" alt="果果科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/airkunming.png" alt="昆明航空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5i5j.png" alt="我爱我家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gjzq.png" alt="国金证券"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoymusic.jpg" alt="不亦乐乎"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnhnb.png" alt="惠农网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daoklab.jpg" alt="成都道壳"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ausnutria.jpg" alt="澳优乳业"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/deiyoudian.png" alt="河南有态度信息科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezhiyang.png" alt="智阳第一人力"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shie.png" alt="上海保险交易所"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wsecar.png" alt="万顺叫车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shouqinba.jpg" alt="收钱吧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baozun.png" alt="宝尊电商"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xbnwl.png" alt="喜百年供应链"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gwwisdom.png" alt="南京观为智慧软件科技有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ztrip.png" alt="在途商旅"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hualala.png" alt="哗啦啦"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xin.png" alt="优信二手车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maycur.png" alt="每刻科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bullyun.png" alt="杭州蛮牛"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bestpay.png" alt="翼支付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mockuai.png" alt="魔筷科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ct108.png" alt="畅唐网络"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jusdaglobal.jpg" alt="准时达"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/izaodao.png" alt="早道网校"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ovopark.jpg" alt="万店掌"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/funstory.jpg" alt="推文科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lemonbox.png" alt="Lemonbox"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/polyt.png" alt="保利票务"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chipwing.png" alt="芯翼科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbank.png" alt="浙商银行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbyqy.png" alt="易企银科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yundun.jpg" alt="上海云盾"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaiaworks.jpg" alt="苏州盖雅信息技术有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mengxiang.png" alt="爱库存"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jidouauto.png" alt="极豆车联网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ipalfish.png" alt="伴鱼少儿英语"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/iqboard.png" alt="锐达科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/koolearn.png" alt="新东方在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kingcome.png" alt="金康高科"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/soulapp.png" alt="soul"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezrpro.png" alt="驿氪"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hc360.png" alt="慧聪"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/21cp.png" alt="中塑在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/goinglink.jpg" alt="甄云科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aitrace.jpg" alt="追溯科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/moqipobing.png" alt="玩吧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cassan.png" alt="广州卡桑信息技术有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shuidichou.png" alt="水滴"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kuwo.png" alt="酷我音乐"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mi.png" alt="小米"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mvmyun.png" alt="今典"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/visabao.jpg" alt="签宝科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inrice.png" alt="广州趣米网络科技有限公司"></td> <td><a target="_blank" href="https://github.com/ctripcorp/apollo/issues/451">More...</a></td> </tr> </table> # Awards <img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/awards/oschina-2018-award.jpg" width="240px" alt="The most popular Chinese open source software in 2018"> # Stargazers over time [![Stargazers over time](https://starcharts.herokuapp.com/ctripcorp/apollo.svg)](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 [![Build Status](https://github.com/ctripcorp/apollo/workflows/build/badge.svg)](https://github.com/ctripcorp/apollo/actions) [![GitHub Release](https://img.shields.io/github/release/ctripcorp/apollo.svg)](https://github.com/ctripcorp/apollo/releases) [![Maven Central Repo](https://img.shields.io/maven-central/v/com.ctrip.framework.apollo/apollo.svg)](https://mvnrepository.com/artifact/com.ctrip.framework.apollo/apollo-client) [![codecov.io](https://codecov.io/github/ctripcorp/apollo/coverage.svg?branch=master)](https://codecov.io/github/ctripcorp/apollo?branch=master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](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 ![Screenshot](https://raw.githubusercontent.com/ctripcorp/apollo/master/docs/en/images/apollo-home-screenshot.jpg) # Features * **Unified management of the configurations of different environments and different clusters** * Apollo provides a unified interface to centrally manage the configurations of different environments, different clusters, and different namespaces * The same codebase could have different configurations when deployed in different clusters * With the namespace concept, it is easy to support multiple applications to share the same configurations, while also allowing them to customize the configurations * Multiple languages is provided in user interface(currently Chinese and English) * **Configuration changes takes effect in real time (hot release)** * After the user modified the configuration and released it in Apollo, the sdk will receive the latest configurations in real time (1 second) and notify the application * **Release version management** * Every configuration releases are versioned, which is friendly to support configuration rollback * **Grayscale release** * Support grayscale configuration release, for example, after clicking release, it will only take effect for some application instances. After a period of observation, we could push the configurations to all application instances if there is no problem * **Authorization management, release approval and operation audit** * Great authorization mechanism is designed for applications and configurations management, and the management of configurations is divided into two operations: editing and publishing, therefore greatly reducing human errors * All operations have audit logs for easy tracking of problems * **Client side configuration information monitoring** * It's very easy to see which instances are using the configurations and what versions they are using * **Rich SDKs available** * Provides native sdks of Java and .Net to facilitate application integration * Support Spring Placeholder, Annotation and Spring Boot ConfigurationProperties for easy application use (requires Spring 3.1.1+) * Http APIs are provided, so non-Java and .Net applications can integrate conveniently * Rich third party sdks are also available, e.g. Golang, Python, NodeJS, PHP, C, etc * **Open platform API** * Apollo itself provides a unified configuration management interface, which supports features such as multi-environment, multi-data center configuration management, permissions, and process governance * However, for the sake of versatility, Apollo will not put too many restrictions on the modification of the configuration, as long as it conforms to the basic format, it can be saved. * In our research, we found that for some users, their configurations may have more complicated formats, such as xml, json, and the format needs to be verified * There are also some users such as DAL, which not only have a specific format, but also need to verify the entered value before saving, such as checking whether the database, username and password match * For this type of application, Apollo allows the application to modify and release configurations through open APIs, which has great authorization and permission control mechanism built in * **Simple deployment** * As an infrastructure service, the configuration center has very high availability requirements, which forces Apollo to rely on external dependencies as little as possible * Currently, the only external dependency is MySQL, so the deployment is very simple. Apollo can run as long as Java and MySQL are installed * Apollo also provides a packaging script, which can generate all required installation packages with just one click, and supports customization of runtime parameters # Usage 1. [Apollo User Guide](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide) 2. [Java SDK User Guide](https://www.apolloconfig.com/#/zh/usage/java-sdk-user-guide) 3. [.Net SDK user Guide](https://www.apolloconfig.com/#/zh/usage/dotnet-sdk-user-guide) 4. [Third Party SDK User Guide](https://www.apolloconfig.com/#/zh/usage/third-party-sdks-user-guide) 5. [Other Language Client User Guide](https://www.apolloconfig.com/#/zh/usage/other-language-client-user-guide) 6. [Apollo Open APIs](https://www.apolloconfig.com/#/zh/usage/apollo-open-api-platform) 7. [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases) 8. [Apollo User Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-practices) 9. [Apollo Security Best Practices](https://www.apolloconfig.com/#/zh/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) # Design * [Apollo Design](https://www.apolloconfig.com/#/zh/design/apollo-design) * [Apollo Core Concept - Namespace](https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace) * [Apollo Architecture Analysis](https://mp.weixin.qq.com/s/-hUaQPzfsl9Lm3IqQW3VDQ) * [Apollo Source Code Explanation](http://www.iocoder.cn/categories/Apollo/) # Development * [Apollo Development Guide](https://www.apolloconfig.com/#/zh/development/apollo-development-guide) * Code Styles * [Eclipse Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) * [Intellij Code Style](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) # Deployment * [Quick Start](https://www.apolloconfig.com/#/zh/deployment/quick-start) * [Distributed Deployment Guide](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide) # Release Notes * [Releases](https://github.com/ctripcorp/apollo/releases) # FAQ * [FAQ](https://www.apolloconfig.com/#/zh/faq/faq) * [Common Issues in Deployment & Development Phase](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) # Presentation * [Design and Implementation Details of Apollo](http://www.itdks.com/dakalive/detail/3420) * [Slides](https://myslide.cn/slides/10168) * [Configuration Center Makes Microservices Smart](https://2018.qconshanghai.com/presentation/799) * [Slides](https://myslide.cn/slides/10035) # Publication * [Design and Implementation Details of Apollo](https://www.infoq.cn/article/open-source-configuration-center-apollo) * [Configuration Center Makes Microservices Smart](https://mp.weixin.qq.com/s/iDmYJre_ULEIxuliu1EbIQ) # Community * [Apollo Team](https://www.apolloconfig.com/#/en/community/team) * [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) * [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) # License The project is licensed under the [Apache 2 license](https://github.com/ctripcorp/apollo/blob/master/LICENSE). # Known Users > Sorted by registration order,users are welcome to register in [https://github.com/ctripcorp/apollo/issues/451](https://github.com/ctripcorp/apollo/issues/451) (reference purpose only for the community) <table> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctrip.png" alt="携程"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bluestone.png" alt="青石证券"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sagreen.png" alt="沙绿"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/umetrip.jpg" alt="航旅纵横"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuanzhuan.png" alt="58转转"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/phone580.png" alt="蜂助手"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hainan-airlines.png" alt="海南航空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cvte.png" alt="CVTE"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mainbo.jpg" alt="明博教育"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/madailicai.png" alt="麻袋理财"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mxnavi.jpg" alt="美行科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fshows.jpg" alt="首展科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/feezu.png" alt="易微行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rencaijia.png" alt="人才加"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/keking.png" alt="凯京集团"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leoao.png" alt="乐刻运动"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dji.png" alt="大疆"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kkmh.png" alt="快看漫画"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wolaidai.png" alt="我来贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xsrj.png" alt="虚实软件"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yanxuan.png" alt="网易严选"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sjzg.png" alt="视觉中国"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zc360.png" alt="资产360"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ecarx.png" alt="亿咖通"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5173.png" alt="5173"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hujiang.png" alt="沪江"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163yun.png" alt="网易云基础服务"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cash-bus.png" alt="现金巴士"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/smartisan.png" alt="锤子科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toodc.png" alt="头等仓"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/juneyaoair.png" alt="吉祥航空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/263mobile.png" alt="263移动通信"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/toutoujinrong.png" alt="投投金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mytijian.png" alt="每天健康"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyabank.png" alt="麦芽金服"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fengunion.png" alt="蜂向科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/geex-logo.png" alt="即科金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beike.png" alt="贝壳网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/youzan.png" alt="有赞"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunjihuitong.png" alt="云集汇通"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rhinotech.png" alt="犀牛瀚海科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nxin.png" alt="农信互联"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mgzf.png" alt="蘑菇租房"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huli-logo.png" alt="狐狸金服"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mandao.png" alt="漫道集团"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enmonster.png" alt="怪兽充电"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/nanguazufang.png" alt="南瓜租房"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shitoujinrong.png" alt="石投金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tubatu.png" alt="土巴兔"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/payh_logo.png" alt="平安银行"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinxindai.png" alt="新新贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chrtc.png" alt="中国华戎科技集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuya_logo.png" alt="涂鸦智能"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/szlcsc.jpg" alt="立创商城"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hairongyi.png" alt="乐赚金服"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kxqc.png" alt="开心汽车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppcredit.png" alt="乐赚金服"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/primeton.png" alt="普元信息"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoskeeper.png" alt="医帮管家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fula.png" alt="付啦信用卡管家"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uzai.png" alt="悠哉网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/91wutong.png" alt="梧桐诚选"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ppdai.png" alt="拍拍贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xinyongfei.png" alt="信用飞"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dxy.png" alt="丁香园"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ghtech.png" alt="国槐科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qbb.png" alt="亲宝宝"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/huawei_logo.png" alt="华为视频直播"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weiboyi.png" alt="微播易"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ofpay.png" alt="欧飞"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mishuo.png" alt="迷说"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yixia.png" alt="一下科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daocloud.png" alt="DaoCloud"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnvex.png" alt="汽摩交易所"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100tal.png" alt="好未来教育集团"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ainirobot.png" alt="猎户星空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhuojian.png" alt="卓健科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoyor.png" alt="银江股份"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tuhu.png" alt="途虎养车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/homedo.png" alt="河姆渡"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xwbank.png" alt="新网银行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ctspcl.png" alt="中旅安信云贷"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meiyou.png" alt="美柚"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkh-logo.png" alt="震坤行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wgss.png" alt="万谷盛世"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/plateno.png" alt="铂涛旅行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lifesense.png" alt="乐心"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/reachmedia.png" alt="亿投传媒"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guxiansheng.png" alt="股先生"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caixuetang.png" alt="财学堂"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/4399.png" alt="4399"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autohome.png" alt="汽车之家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mbcaijing.png" alt="面包财经"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hoopchina.png" alt="虎扑"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sohu-auto.png" alt="搜狐汽车"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/liangfuzhengxin.png" alt="量富征信"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maihaoche.png" alt="卖好车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiot.jpg" alt="中移物联网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/biauto.png" alt="易车网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maiyaole.png" alt="一药网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoying.png" alt="小影"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caibeike.png" alt="彩贝壳"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeelight.png" alt="YEELIGHT"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/itsgmu.png" alt="积目"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acmedcare.png" alt="极致医疗"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhui365.png" alt="金汇金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/900etrip.png" alt="久柏易游"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/24xiaomai.png" alt="小麦铺"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vvic.png" alt="搜款网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mizlicai.png" alt="米庄理财"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bjt.png" alt="贝吉塔网络科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/weimob.png" alt="微盟"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kada.png" alt="网易卡搭"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kapbook.png" alt="股书"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jumore.png" alt="聚贸"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bimface.png" alt="广联达bimface"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/globalgrow.png" alt="环球易购"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jollychic.png" alt="浙江执御"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2dfire.jpg" alt="二维火"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shopin.png" alt="上品"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inspur.png" alt="浪潮集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ngarihealth.png" alt="纳里健康"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oraro.png" alt="橙红科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dragonpass.png" alt="龙腾出行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lizhi.fm.png" alt="荔枝"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/htd.png" alt="汇通达"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunrong.png" alt="云融金科"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tszg360.png" alt="天生掌柜"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rongplus.png" alt="容联光辉"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/intellif.png" alt="云天励飞"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jiayundata.png" alt="嘉云数据"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zts.png" alt="中泰证券网络金融部"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/163dun.png" alt="网易易盾"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiangwushuo.png" alt="享物说"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sto.png" alt="申通"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinhe.png" alt="金和网络"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/2345.png" alt="二三四五"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chtwm.jpg" alt="恒天财富"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uweixin.png" alt="沐雪微信"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wzeye.png" alt="温州医科大学附属眼视光医院"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/10010pay.png" alt="联通支付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanshu.png" alt="杉数科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/fenlibao.png" alt="分利宝"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hetao101.png" alt="核桃编程"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaohongshu.png" alt="小红书"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/blissmall.png" alt="幸福西饼"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ky-express.png" alt="跨越速运"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/oyohotels.png" alt="OYO"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/100-me.png" alt="叮咚买菜"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhidaohulian.jpg" alt="智道网联"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xueqiu.jpg" alt="雪球"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/autocloudpro.png" alt="车通云"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dadaabc.png" alt="哒哒英语"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xedaojia.jpg" alt="小E微店"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daling.png" alt="达令家"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/renliwo.png" alt="人力窝"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mocire.jpg" alt="嘉美在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/uepay.png" alt="极易付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wdom.png" alt="智慧开源"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cheshiku.png" alt="车仕库"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/taimeitech.png" alt="太美医疗科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yilianbaihui.png" alt="亿联百汇"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhoupu123.png" alt="舟谱数据"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/frxs.png" alt="芙蓉兴盛"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beastshop.png" alt="野兽派"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kaishustory.png" alt="凯叔讲故事"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/haodf.png" alt="好大夫在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/insyunmi.png" alt="云幂信息技术"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/duiba.png" alt="兑吧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/9ji.png" alt="九机网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sui.png" alt="随手科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aixiangdao.png" alt="万谷盛世"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yunzhangfang.png" alt="云账房"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yuantutech.png" alt="浙江远图互联"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/qk365.png" alt="青客公寓"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/eastmoney.png" alt="东方财富"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jikexiu.png" alt="极客修"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meix.png" alt="美市科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zto.png" alt="中通快递"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/e6yun.png" alt="易流科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xiaoyuanzhao.png" alt="实习僧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dalingjia.png" alt="达令家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/secoo.png" alt="寺库"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lianlianpay.png" alt="连连支付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhongan.png" alt="众安保险"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/360jinrong.png" alt="360金融"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/caschina.png" alt="中航服商旅"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ke.png" alt="贝壳"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yeahmobi.png" alt="Yeahmobi易点天下"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/idengyun.png" alt="北京登云美业网络科技有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jinher.png" alt="金和网络"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/komect.png" alt="中移(杭州)信息技术有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/beisen.png" alt="北森"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/log56.png" alt="合肥维天运通"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/meboth.png" alt="北京蜜步科技有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/postop.png" alt="术康"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rfchina.png" alt="富力集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tfxing.png" alt="天府行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/8travelpay.png" alt="八商山"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/centaline.png" alt="中原地产"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zkyda.png" alt="智科云达"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/house730.png" alt="中原730"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/pagoda.png" alt="百果园"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bolome.png" alt="波罗蜜"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xignite.png" alt="Xignite"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aduer.png" alt="杭州有云科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jojoreading.png" alt="成都书声科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sweetome.png" alt="斯维登集团"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/vipthink.png" alt="广东快乐种子科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/tongxuecool.png" alt="上海盈翼文化传播有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/sccfc.png" alt="上海尚诚消费金融股份有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ziroom.png" alt="自如网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jd.png" alt="京东"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/rabbitpre.png" alt="兔展智能"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhubei.png" alt="竹贝"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/imile.png" alt="iMile(中东)"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/helloglobal.png" alt="哈罗出行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zhaopin.png" alt="智联招聘"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/acadsoc.png" alt="阿卡索"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mojory.png" alt="妙知旅"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chengduoduo.png" alt="程多多"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baojunev.png" alt="上汽通用五菱"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/leyan.png" alt="乐言科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/dushu.png" alt="樊登读书"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/zyiz.png" alt="找一找教程网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bppc.png" alt="中油碧辟石油有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shanglv51.png" alt="四川商旅无忧科技服务有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/waijiao365.png" alt="懿鸢网络科技(上海)有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaoding.jpg" alt="稿定科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ricacorp.png" alt="搵樓 - 利嘉閣"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/t3go.png" alt="南京领行科技股份有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mokahr.jpg" alt="北京希瑞亚斯科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/printrainbow.png" alt="印彩虹印刷公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/milliontech.png" alt="Million Tech"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/guoguokeji.jpg" alt="果果科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/airkunming.png" alt="昆明航空"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/5i5j.png" alt="我爱我家"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gjzq.png" alt="国金证券"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/enjoymusic.jpg" alt="不亦乐乎"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cnhnb.png" alt="惠农网"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/daoklab.jpg" alt="成都道壳"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ausnutria.jpg" alt="澳优乳业"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/deiyoudian.png" alt="河南有态度信息科技有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezhiyang.png" alt="智阳第一人力"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shie.png" alt="上海保险交易所"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/wsecar.png" alt="万顺叫车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shouqinba.jpg" alt="收钱吧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/baozun.png" alt="宝尊电商"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xbnwl.png" alt="喜百年供应链"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gwwisdom.png" alt="南京观为智慧软件科技有限公司"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ztrip.png" alt="在途商旅"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hualala.png" alt="哗啦啦"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/xin.png" alt="优信二手车"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/maycur.png" alt="每刻科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bullyun.png" alt="杭州蛮牛"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/bestpay.png" alt="翼支付"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mockuai.png" alt="魔筷科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ct108.png" alt="畅唐网络"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jusdaglobal.jpg" alt="准时达"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/izaodao.png" alt="早道网校"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ovopark.jpg" alt="万店掌"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/funstory.jpg" alt="推文科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/lemonbox.png" alt="Lemonbox"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/polyt.png" alt="保利票务"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/chipwing.png" alt="芯翼科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbank.png" alt="浙商银行"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/czbyqy.png" alt="易企银科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/yundun.jpg" alt="上海云盾"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/gaiaworks.jpg" alt="苏州盖雅信息技术有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mengxiang.png" alt="爱库存"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/jidouauto.png" alt="极豆车联网"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ipalfish.png" alt="伴鱼少儿英语"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/iqboard.png" alt="锐达科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/koolearn.png" alt="新东方在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kingcome.png" alt="金康高科"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/soulapp.png" alt="soul"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/ezrpro.png" alt="驿氪"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/hc360.png" alt="慧聪"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/21cp.png" alt="中塑在线"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/goinglink.jpg" alt="甄云科技"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/aitrace.jpg" alt="追溯科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/moqipobing.png" alt="玩吧"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/cassan.png" alt="广州卡桑信息技术有限公司"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/shuidichou.png" alt="水滴"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/kuwo.png" alt="酷我音乐"></td> </tr> <tr> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mi.png" alt="小米"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/mvmyun.png" alt="今典"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/visabao.jpg" alt="签宝科技"></td> <td><img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/known-users/inrice.png" alt="广州趣米网络科技有限公司"></td> <td><a target="_blank" href="https://github.com/ctripcorp/apollo/issues/451">More...</a></td> </tr> </table> # Awards <img src="https://raw.githubusercontent.com/ctripcorp/apollo-community/master/images/awards/oschina-2018-award.jpg" width="240px" alt="The most popular Chinese open source software in 2018"> # Stargazers over time [![Stargazers over time](https://starcharts.herokuapp.com/ctripcorp/apollo.svg)](https://starcharts.herokuapp.com/ctripcorp/apollo)
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/spring/yaml/case3-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,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-apollo-config-server-test-alpha.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-alpha kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-test-alpha data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-meta-server-test-alpha labels: app: service-apollo-meta-server-test-alpha spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-test-alpha type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-test-alpha labels: app: service-apollo-config-server-test-alpha spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30003 selector: app: pod-apollo-config-server-test-alpha type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-test-alpha labels: app: statefulset-apollo-config-server-test-alpha spec: serviceName: service-apollo-meta-server-test-alpha replicas: 3 selector: matchLabels: app: pod-apollo-config-server-test-alpha updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-test-alpha spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-test-alpha topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-test-alpha configMap: name: configmap-apollo-config-server-test-alpha 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-alpha ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-test-alpha mountPath: /apollo-config-server/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-test-alpha.sre" readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8080 initialDelaySeconds: 120 periodSeconds: 10 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-alpha kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-server-test-alpha data: application-github.properties: | spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8 spring.datasource.username = FillInCorrectUser spring.datasource.password = FillInCorrectPassword eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/ --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-meta-server-test-alpha labels: app: service-apollo-meta-server-test-alpha spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-test-alpha type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-test-alpha labels: app: service-apollo-config-server-test-alpha spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30003 selector: app: pod-apollo-config-server-test-alpha type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-test-alpha labels: app: statefulset-apollo-config-server-test-alpha spec: serviceName: service-apollo-meta-server-test-alpha replicas: 3 selector: matchLabels: app: pod-apollo-config-server-test-alpha updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-test-alpha spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-test-alpha topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-test-alpha configMap: name: configmap-apollo-config-server-test-alpha 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-alpha ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-test-alpha mountPath: /apollo-config-server/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-test-alpha.sre" readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 10 periodSeconds: 5 livenessProbe: tcpSocket: port: 8080 initialDelaySeconds: 120 periodSeconds: 10 dnsPolicy: ClusterFirst restartPolicy: Always
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-portal/templates/service-portal.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.portal.serviceName" . }} labels: {{- include "apollo.portal.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: - name: http protocol: TCP port: {{ .Values.service.port }} targetPort: {{ .Values.service.targetPort }} selector: app: {{ include "apollo.portal.fullName" . }} sessionAffinity: {{ .Values.service.sessionAffinity }}
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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.portal.serviceName" . }} labels: {{- include "apollo.portal.labels" . | nindent 4 }} spec: type: {{ .Values.service.type }} ports: - name: http protocol: TCP port: {{ .Values.service.port }} targetPort: {{ .Values.service.targetPort }} selector: app: {{ include "apollo.portal.fullName" . }} sessionAffinity: {{ .Values.service.sessionAffinity }}
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/yaml/case8.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. # ,
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # ,
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/test/resources/yaml/case2.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. # root: key1: "someValue" key2: 100 key1: "anotherValue"
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # root: key1: "someValue" key2: 100 key1: "anotherValue"
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/scripts/shutdown.sh
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-portal export APP_NAME=$SERVICE_NAME if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then export JAVA_HOME=/usr/java/latest/ fi cd `dirname $0`/.. if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then cd current fi if [[ -f $SERVICE_NAME".jar" ]]; then chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" stop fi
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-portal export APP_NAME=$SERVICE_NAME if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then export JAVA_HOME=/usr/java/latest/ fi cd `dirname $0`/.. if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then cd current fi if [[ -f $SERVICE_NAME".jar" ]]; then chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" stop fi
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/deployment/distributed-deployment-guide.md
本文档介绍了如何按照分布式部署的方式编译、打包、部署Apollo配置中心,从而可以在开发、测试、生产等环境分别部署运行。 > 如果只是需要在本地快速部署试用Apollo的话,可以参考[Quick Start](zh/deployment/quick-start) # &nbsp; # 一、准备工作 ## 1.1 运行时环境 ### 1.1.1 OS 服务端基于Spring Boot,启动脚本理论上支持所有Linux发行版,建议[CentOS 7](https://www.centos.org/)。 ### 1.1.2 Java * Apollo服务端:1.8+ * Apollo客户端:1.7+ 由于需要同时运行服务端和客户端,所以建议安装Java 1.8+。 >对于Apollo客户端,运行时环境只需要1.7+即可。 >注:对于Apollo客户端,如果有需要的话,可以做少量代码修改来降级到Java 1.6,详细信息可以参考[Issue 483](https://github.com/ctripcorp/apollo/issues/483) 在配置好后,可以通过如下命令检查: ```sh java -version ``` 样例输出: ```sh java version "1.8.0_74" Java(TM) SE Runtime Environment (build 1.8.0_74-b02) Java HotSpot(TM) 64-Bit Server VM (build 25.74-b02, mixed mode) ``` ## 1.2 MySQL * 版本要求:5.6.5+ Apollo的表结构对`timestamp`使用了多个default声明,所以需要5.6.5以上版本。 连接上MySQL后,可以通过如下命令检查: ```sql SHOW VARIABLES WHERE Variable_name = 'version'; ``` | Variable_name | Value | |---------------|--------| | version | 5.7.11 | > 注1:MySQL版本可以降级到5.5,详见[mysql 依赖降级讨论](https://github.com/ctripcorp/apollo/issues/481)。 > 注2:如果希望使用Oracle的话,可以参考[vanpersl](https://github.com/vanpersl)在Apollo 0.8.0基础上开发的[Oracle适配代码](https://github.com/ctripcorp/apollo/compare/v0.8.0...vanpersl:db-oracle),Oracle版本为10.2.0.1.0。 > 注3:如果希望使用Postgres的话,可以参考[oaksharks](https://github.com/oaksharks)在Apollo 0.9.1基础上开发的[Pg适配代码](https://github.com/oaksharks/apollo/compare/ac10768ee2e11c488523ca0e845984f6f71499ac...oaksharks:pg),Postgres的版本为9.3.20,也可以参考[xiao0yy](https://github.com/xiao0yy)在Apollo 0.10.2基础上开发的[Pg适配代码](https://github.com/ctripcorp/apollo/issues/1293),Postgres的版本为9.5。 ## 1.3 环境 分布式部署需要事先确定部署的环境以及部署方式。 Apollo目前支持以下环境: * DEV * 开发环境 * FAT * 测试环境,相当于alpha环境(功能测试) * UAT * 集成环境,相当于beta环境(回归测试) * PRO * 生产环境 > 如果希望添加自定义的环境名称,具体步骤可以参考[Portal如何增加环境](zh/faq/common-issues-in-deployment-and-development-phase?id=_4-portal如何增加环境?) 以ctrip为例,我们的部署策略如下: ![Deployment](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-deployment.png) * Portal部署在生产环境的机房,通过它来直接管理FAT、UAT、PRO等环境的配置 * Meta Server、Config Service和Admin Service在每个环境都单独部署,使用独立的数据库 * Meta Server、Config Service和Admin Service在生产环境部署在两个机房,实现双活 * Meta Server和Config Service部署在同一个JVM进程内,Admin Service部署在同一台服务器的另一个JVM进程内 另外也可以参考下[@lyliyongblue](https://github.com/lyliyongblue) 贡献的样例部署图(建议右键新窗口打开看大图): ![Deployment](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/lyliyongblue-apollo-deployment.png) ## 1.4 网络策略 分布式部署的时候,`apollo-configservice`和`apollo-adminservice`需要把自己的IP和端口注册到Meta Server(apollo-configservice本身)。 Apollo客户端和Portal会从Meta Server获取服务的地址(IP+端口),然后通过服务地址直接访问。 需要注意的是,`apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的,所以出于安全考虑,**请不要将`apollo-configservice`和`apollo-adminservice`直接暴露在公网**。 所以如果实际部署的机器有多块网卡(如docker),或者存在某些网卡的IP是Apollo客户端和Portal无法访问的(如网络安全限制),那么我们就需要在`apollo-configservice`和`apollo-adminservice`中做相关配置来解决连通性问题。 ### 1.4.1 忽略某些网卡 可以分别修改`apollo-configservice`和`apollo-adminservice`的startup.sh,通过JVM System Property传入-D参数,也可以通过OS Environment Variable传入,下面的例子会把`docker0`和`veth`开头的网卡在注册到Eureka时忽略掉。 JVM System Property示例: ```properties -Dspring.cloud.inetutils.ignoredInterfaces[0]=docker0 -Dspring.cloud.inetutils.ignoredInterfaces[1]=veth.* ``` OS Environment Variable示例: ```properties SPRING_CLOUD_INETUTILS_IGNORED_INTERFACES[0]=docker0 SPRING_CLOUD_INETUTILS_IGNORED_INTERFACES[1]=veth.* ``` ### 1.4.2 指定要注册的IP 可以分别修改`apollo-configservice`和`apollo-adminservice`的startup.sh,通过JVM System Property传入-D参数,也可以通过OS Environment Variable传入,下面的例子会指定注册的IP为`1.2.3.4`。 JVM System Property示例: ```properties -Deureka.instance.ip-address=1.2.3.4 ``` OS Environment Variable示例: ```properties EUREKA_INSTANCE_IP_ADDRESS=1.2.3.4 ``` ### 1.4.3 指定要注册的URL 可以分别修改`apollo-configservice`和`apollo-adminservice`的startup.sh,通过JVM System Property传入-D参数,也可以通过OS Environment Variable传入,下面的例子会指定注册的URL为`http://1.2.3.4:8080`。 JVM System Property示例: ```properties -Deureka.instance.homePageUrl=http://1.2.3.4:8080 -Deureka.instance.preferIpAddress=false ``` OS Environment Variable示例: ```properties EUREKA_INSTANCE_HOME_PAGE_URL=http://1.2.3.4:8080 EUREKA_INSTANCE_PREFER_IP_ADDRESS=false ``` ### 1.4.4 直接指定apollo-configservice地址 如果Apollo部署在公有云上,本地开发环境无法连接,但又需要做开发测试的话,客户端可以升级到0.11.0版本及以上,然后配置[跳过Apollo Meta Server服务发现](zh/usage/java-sdk-user-guide#_1222-跳过apollo-meta-server服务发现) # 二、部署步骤 部署步骤总体还是比较简单的,Apollo的唯一依赖是数据库,所以需要首先把数据库准备好,然后根据实际情况,选择不同的部署方式: > [@lingjiaju](https://github.com/lingjiaju)录制了一系列Apollo快速上手视频,如果看文档觉得略繁琐的话,不妨可以先看一下他的[视频教程](https://pan.baidu.com/s/1blv87EOZS77NWT8Amkijkw#list/path=%2F)。 > 如果部署过程中遇到了问题,可以参考[部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase),一般都能找到答案。 ## 2.1 创建数据库 Apollo服务端共需要两个数据库:`ApolloPortalDB`和`ApolloConfigDB`,我们把数据库、表的创建和样例数据都分别准备了sql文件,只需要导入数据库即可。 需要注意的是ApolloPortalDB只需要在生产环境部署一个即可,而ApolloConfigDB需要在每个环境部署一套,如fat、uat和pro分别部署3套ApolloConfigDB。 > 注意:如果你本地已经创建过Apollo数据库,请注意备份数据。我们准备的sql文件会清空Apollo相关的表。 ### 2.1.1 创建ApolloPortalDB 可以根据实际情况选择通过手动导入SQL或是通过[Flyway](https://flywaydb.org/)自动导入SQL创建。 #### 2.1.1.1 手动导入SQL创建 通过各种MySQL客户端导入[apolloportaldb.sql](https://github.com/ctripcorp/apollo/blob/master/scripts/sql/apolloportaldb.sql)即可。 以MySQL原生客户端为例: ```sql source /your_local_path/scripts/sql/apolloportaldb.sql ``` #### 2.1.1.2 通过Flyway导入SQL创建 > 需要1.3.0及以上版本 1. 根据实际情况修改[flyway-portaldb.properties](https://github.com/ctripcorp/apollo/blob/master/scripts/flyway/flyway-portaldb.properties)中的`flyway.user`、`flyway.password`和`flyway.url`配置 2. 在apollo项目根目录下执行`mvn -N -Pportaldb flyway:migrate` #### 2.1.1.3 验证 导入成功后,可以通过执行以下sql语句来验证: ```sql select `Id`, `Key`, `Value`, `Comment` from `ApolloPortalDB`.`ServerConfig` limit 1; ``` | Id | Key | Value | Comment | |----|--------------------|-------|------------------| | 1 | apollo.portal.envs | dev | 可支持的环境列表 | > 注:ApolloPortalDB只需要在生产环境部署一个即可 ### 2.1.2 创建ApolloConfigDB 可以根据实际情况选择通过手动导入SQL或是通过[Flyway](https://flywaydb.org/)自动导入SQL创建。 #### 2.1.2.1 手动导入SQL 通过各种MySQL客户端导入[apolloconfigdb.sql](https://github.com/ctripcorp/apollo/blob/master/scripts/sql/apolloconfigdb.sql)即可。 以MySQL原生客户端为例: ```sql source /your_local_path/scripts/sql/apolloconfigdb.sql ``` #### 2.1.2.2 通过Flyway导入SQL > 需要1.3.0及以上版本 1. 根据实际情况修改[flyway-configdb.properties](https://github.com/ctripcorp/apollo/blob/master/scripts/flyway/flyway-configdb.properties)中的`flyway.user`、`flyway.password`和`flyway.url`配置 2. 在apollo项目根目录下执行`mvn -N -Pconfigdb flyway:migrate` #### 2.1.2.3 验证 导入成功后,可以通过执行以下sql语句来验证: ```sql select `Id`, `Key`, `Value`, `Comment` from `ApolloConfigDB`.`ServerConfig` limit 1; ``` | Id | Key | Value | Comment | |----|--------------------|-------------------------------|---------------| | 1 | eureka.service.url | http://127.0.0.1:8080/eureka/ | Eureka服务Url | > 注:ApolloConfigDB需要在每个环境部署一套,如fat、uat和pro分别部署3套ApolloConfigDB #### 2.1.2.4 从别的环境导入ApolloConfigDB的项目数据 如果是全新部署的Apollo配置中心,请忽略此步。 如果不是全新部署的Apollo配置中心,比如已经使用了一段时间,这时在Apollo配置中心已经创建了不少项目以及namespace等,那么在新环境中的ApolloConfigDB中需要从其它正常运行的环境中导入必要的项目数据。 主要涉及ApolloConfigDB的下面4张表,下面同时附上需要导入的数据查询语句: 1. App * 导入全部的App * 如:insert into `新环境的ApolloConfigDB`.`App` select * from `其它环境的ApolloConfigDB`.`App` where `IsDeleted` = 0; 2. AppNamespace * 导入全部的AppNamespace * 如:insert into `新环境的ApolloConfigDB`.`AppNamespace` select * from `其它环境的ApolloConfigDB`.`AppNamespace` where `IsDeleted` = 0; 3. Cluster * 导入默认的default集群 * 如:insert into `新环境的ApolloConfigDB`.`Cluster` select * from `其它环境的ApolloConfigDB`.`Cluster` where `Name` = 'default' and `IsDeleted` = 0; 4. Namespace * 导入默认的default集群中的namespace * 如:insert into `新环境的ApolloConfigDB`.`Namespace` select * from `其它环境的ApolloConfigDB`.`Namespace` where `ClusterName` = 'default' and `IsDeleted` = 0; 同时也别忘了通知用户在新的环境给自己的项目设置正确的配置信息,尤其是一些影响面比较大的公共namespace配置。 > 如果是为正在运行的环境迁移数据,建议迁移完重启一下config service,因为config service中有appnamespace的缓存数据 ### 2.1.3 调整服务端配置 Apollo自身的一些配置是放在数据库里面的,所以需要针对实际情况做一些调整,具体参数说明请参考[三、服务端配置说明](#三、服务端配置说明)。 大部分配置可以先使用默认值,不过 [apollo.portal.envs](#_311-apolloportalenvs-可支持的环境列表) 和 [eureka.service.url](#_321-eurekaserviceurl-eureka服务url) 请务必配置正确后再进行下面的部署步骤。 ## 2.2 虚拟机/物理机部署 ### 2.2.1 获取安装包 可以通过两种方式获取安装包: 1. 直接下载安装包 * 从[GitHub Release](https://github.com/ctripcorp/apollo/releases)页面下载预先打好的安装包 * 如果对Apollo的代码没有定制需求,建议使用这种方式,可以省去本地打包的过程 2. 通过源码构建 * 从[GitHub Release](https://github.com/ctripcorp/apollo/releases)页面下载Source code包或直接clone[源码](https://github.com/ctripcorp/apollo)后在本地构建 * 如果需要对Apollo的做定制开发,需要使用这种方式 #### 2.2.1.1 直接下载安装包 ##### 2.2.1.1.1 获取apollo-configservice、apollo-adminservice、apollo-portal安装包 从[GitHub Release](https://github.com/ctripcorp/apollo/releases)页面下载最新版本的`apollo-configservice-x.x.x-github.zip`、`apollo-adminservice-x.x.x-github.zip`和`apollo-portal-x.x.x-github.zip`即可。 ##### 2.2.1.1.2 配置数据库连接信息 Apollo服务端需要知道如何连接到你前面创建的数据库,数据库连接串信息位于上一步下载的压缩包中的`config/application-github.properties`中。 ###### 2.2.1.1.2.1 配置apollo-configservice的数据库连接信息 1. 解压`apollo-configservice-x.x.x-github.zip` 2. 用程序员专用编辑器(如vim,notepad++,sublime等)打开`config`目录下的`application-github.properties`文件 3. 填写正确的ApolloConfigDB数据库连接串信息,注意用户名和密码后面不要有空格! 4. 修改完的效果如下: ```properties # DataSource spring.datasource.url = jdbc:mysql://localhost:3306/ApolloConfigDB?useSSL=false&characterEncoding=utf8 spring.datasource.username = someuser spring.datasource.password = somepwd ``` > 注:由于ApolloConfigDB在每个环境都有部署,所以对不同的环境config-service需要配置对应环境的数据库参数 ###### 2.2.1.1.2.2 配置apollo-adminservice的数据库连接信息 1. 解压`apollo-adminservice-x.x.x-github.zip` 2. 用程序员专用编辑器(如vim,notepad++,sublime等)打开`config`目录下的`application-github.properties`文件 3. 填写正确的ApolloConfigDB数据库连接串信息,注意用户名和密码后面不要有空格! 4. 修改完的效果如下: ```properties # DataSource spring.datasource.url = jdbc:mysql://localhost:3306/ApolloConfigDB?useSSL=false&characterEncoding=utf8 spring.datasource.username = someuser spring.datasource.password = somepwd ``` > 注:由于ApolloConfigDB在每个环境都有部署,所以对不同的环境admin-service需要配置对应环境的数据库参数 ###### 2.2.1.1.2.3 配置apollo-portal的数据库连接信息 1. 解压`apollo-portal-x.x.x-github.zip` 2. 用程序员专用编辑器(如vim,notepad++,sublime等)打开`config`目录下的`application-github.properties`文件 3. 填写正确的ApolloPortalDB数据库连接串信息,注意用户名和密码后面不要有空格! 4. 修改完的效果如下: ```properties # DataSource spring.datasource.url = jdbc:mysql://localhost:3306/ApolloPortalDB?useSSL=false&characterEncoding=utf8 spring.datasource.username = someuser spring.datasource.password = somepwd ``` ###### 2.2.1.1.2.4 配置apollo-portal的meta service信息 Apollo Portal需要在不同的环境访问不同的meta service(apollo-configservice)地址,所以我们需要在配置中提供这些信息。默认情况下,meta service和config service是部署在同一个JVM进程,所以meta service的地址就是config service的地址。 > 对于1.6.0及以上版本,可以通过ApolloPortalDB.ServerConfig中的配置项来配置Meta Service地址,详见[apollo.portal.meta.servers - 各环境Meta Service列表](#_312-apolloportalmetaservers-各环境meta-service列表) 使用程序员专用编辑器(如vim,notepad++,sublime等)打开`apollo-portal-x.x.x-github.zip`中`config`目录下的`apollo-env.properties`文件。 假设DEV的apollo-configservice未绑定域名,地址是1.1.1.1:8080,FAT的apollo-configservice绑定了域名apollo.fat.xxx.com,UAT的apollo-configservice绑定了域名apollo.uat.xxx.com,PRO的apollo-configservice绑定了域名apollo.xxx.com,那么可以如下修改各环境meta service服务地址,格式为`${env}.meta=http://${config-service-url:port}`,如果某个环境不需要,也可以直接删除对应的配置项(如lpt.meta): ```sh dev.meta=http://1.1.1.1:8080 fat.meta=http://apollo.fat.xxx.com uat.meta=http://apollo.uat.xxx.com pro.meta=http://apollo.xxx.com ``` 除了通过`apollo-env.properties`方式配置meta service以外,apollo也支持在运行时指定meta service(优先级比`apollo-env.properties`高): 1. 通过Java System Property `${env}_meta` * 可以通过Java的System Property `${env}_meta`来指定 * 如`java -Ddev_meta=http://config-service-url -jar xxx.jar` * 也可以通过程序指定,如`System.setProperty("dev_meta", "http://config-service-url");` 2. 通过操作系统的System Environment`${ENV}_META` * 如`DEV_META=http://config-service-url` * 注意key为全大写,且中间是`_`分隔 >注1: 为了实现meta service的高可用,推荐通过SLB(Software Load Balancer)做动态负载均衡 >注2: meta service地址也可以填入IP,0.11.0版本之前只支持填入一个IP。从0.11.0版本开始支持填入以逗号分隔的多个地址([PR #1214](https://github.com/ctripcorp/apollo/pull/1214)),如`http://1.1.1.1:8080,http://2.2.2.2:8080`,不过生产环境还是建议使用域名(走slb),因为机器扩容、缩容等都可能导致IP列表的变化。 #### 2.2.1.2 通过源码构建 ##### 2.2.1.2.1 配置数据库连接信息 Apollo服务端需要知道如何连接到你前面创建的数据库,所以需要编辑[scripts/build.sh](https://github.com/ctripcorp/apollo/blob/master/scripts/build.sh),修改ApolloPortalDB和ApolloConfigDB相关的数据库连接串信息。 > 注意:填入的用户需要具备对ApolloPortalDB和ApolloConfigDB数据的读写权限。 ```sh #apollo config db info apollo_config_db_url=jdbc:mysql://localhost:3306/ApolloConfigDB?useSSL=false&characterEncoding=utf8 apollo_config_db_username=用户名 apollo_config_db_password=密码(如果没有密码,留空即可) # apollo portal db info apollo_portal_db_url=jdbc:mysql://localhost:3306/ApolloPortalDB?useSSL=false&characterEncoding=utf8 apollo_portal_db_username=用户名 apollo_portal_db_password=密码(如果没有密码,留空即可) ``` > 注1:由于ApolloConfigDB在每个环境都有部署,所以对不同的环境config-service和admin-service需要使用不同的数据库参数打不同的包,portal只需要打一次包即可 > 注2:如果不想config-service和admin-service每个环境打一个包的话,也可以通过运行时传入数据库连接串信息实现,具体可以参考 [Issue 869](https://github.com/ctripcorp/apollo/issues/869) > 注3:每个环境都需要独立部署一套config-service、admin-service和ApolloConfigDB ##### 2.2.1.2.2 配置各环境meta service地址 Apollo Portal需要在不同的环境访问不同的meta service(apollo-configservice)地址,所以需要在打包时提供这些信息。 假设DEV的apollo-configservice未绑定域名,地址是1.1.1.1:8080,FAT的apollo-configservice绑定了域名apollo.fat.xxx.com,UAT的apollo-configservice绑定了域名apollo.uat.xxx.com,PRO的apollo-configservice绑定了域名apollo.xxx.com,那么编辑[scripts/build.sh](https://github.com/ctripcorp/apollo/blob/master/scripts/build.sh),如下修改各环境meta service服务地址,格式为`${env}_meta=http://${config-service-url:port}`,如果某个环境不需要,也可以直接删除对应的配置项: ```sh dev_meta=http://1.1.1.1:8080 fat_meta=http://apollo.fat.xxx.com uat_meta=http://apollo.uat.xxx.com pro_meta=http://apollo.xxx.com META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_meta -Dpro_meta=$pro_meta" ``` 除了在打包时配置meta service以外,apollo也支持在运行时指定meta service: 1. 通过Java System Property `${env}_meta` * 可以通过Java的System Property `${env}_meta`来指定 * 如`java -Ddev_meta=http://config-service-url -jar xxx.jar` * 也可以通过程序指定,如`System.setProperty("dev_meta", "http://config-service-url");` 2. 通过操作系统的System Environment`${ENV}_META` * 如`DEV_META=http://config-service-url` * 注意key为全大写,且中间是`_`分隔 >注1: 为了实现meta service的高可用,推荐通过SLB(Software Load Balancer)做动态负载均衡 >注2: meta service地址也可以填入IP,0.11.0版本之前只支持填入一个IP。从0.11.0版本开始支持填入以逗号分隔的多个地址([PR #1214](https://github.com/ctripcorp/apollo/pull/1214)),如`http://1.1.1.1:8080,http://2.2.2.2:8080`,不过生产环境还是建议使用域名(走slb),因为机器扩容、缩容等都可能导致IP列表的变化。 ##### 2.2.1.2.3 执行编译、打包 做完上述配置后,就可以执行编译和打包了。 > 注:初次编译会从Maven中央仓库下载不少依赖,如果网络情况不佳时很容易出错,建议使用国内的Maven仓库源,比如[阿里云Maven镜像](http://www.cnblogs.com/geektown/p/5705405.html) ```sh ./build.sh ``` 该脚本会依次打包apollo-configservice, apollo-adminservice, apollo-portal。 > 注:由于ApolloConfigDB在每个环境都有部署,所以对不同环境的config-service和admin-service需要使用不同的数据库连接信息打不同的包,portal只需要打一次包即可 ##### 2.2.1.2.4 获取apollo-configservice安装包 位于`apollo-configservice/target/`目录下的`apollo-configservice-x.x.x-github.zip` 需要注意的是由于ApolloConfigDB在每个环境都有部署,所以对不同环境的config-service需要使用不同的数据库参数打不同的包后分别部署 ##### 2.2.1.2.5 获取apollo-adminservice安装包 位于`apollo-adminservice/target/`目录下的`apollo-adminservice-x.x.x-github.zip` 需要注意的是由于ApolloConfigDB在每个环境都有部署,所以对不同环境的admin-service需要使用不同的数据库参数打不同的包后分别部署 ##### 2.2.1.2.6 获取apollo-portal安装包 位于`apollo-portal/target/`目录下的`apollo-portal-x.x.x-github.zip` ##### 2.2.1.2.7 启用外部nacos服务注册中心替换内置eureka 1. 修改build.sh/build.bat,将config-service和admin-service的maven编译命令更改为 ```shell mvn clean package -Pgithub,nacos-discovery -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,nacos-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password ``` 2. 分别修改apollo-configservice和apollo-adminservice安装包中config目录下的application-github.properties,配置nacos服务器地址 ```properties nacos.discovery.server-addr=127.0.0.1:8848 # 更多 nacos 配置 nacos.discovery.access-key= nacos.discovery.username= nacos.discovery.password= nacos.discovery.secret-key= nacos.discovery.namespace= nacos.discovery.context-path= ``` ##### 2.2.1.2.8 启用外部Consul服务注册中心替换内置eureka 1. 修改build.sh/build.bat,将config-service和admin-service的maven编译命令更改为 ```shell mvn clean package -Pgithub -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,consul-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password ``` 2. 分别修改apollo-configservice和apollo-adminservice安装包中config目录下的application-github.properties,配置consul服务器地址 ```properties spring.cloud.consul.host=127.0.0.1 spring.cloud.consul.port=8500 ``` ### 2.2.2 部署Apollo服务端 #### 2.2.2.1 部署apollo-configservice 将对应环境的`apollo-configservice-x.x.x-github.zip`上传到服务器上,解压后执行scripts/startup.sh即可。如需停止服务,执行scripts/shutdown.sh. 记得在scripts/startup.sh中按照实际的环境设置一个JVM内存,以下是我们的默认设置,供参考: ```bash export JAVA_OPTS="-server -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=18" ``` > 注1:如果需要修改JVM参数,可以修改scripts/startup.sh的`JAVA_OPTS`部分。 > 注2:如要调整服务的日志输出路径,可以修改scripts/startup.sh和apollo-configservice.conf中的`LOG_DIR`。 > 注3:如要调整服务的监听端口,可以修改scripts/startup.sh中的`SERVER_PORT`。另外apollo-configservice同时承担meta server职责,如果要修改端口,注意要同时ApolloConfigDB.ServerConfig表中的`eureka.service.url`配置项以及apollo-portal和apollo-client中的使用到的meta server信息,详见:[2.2.1.1.2.4 配置apollo-portal的meta service信息](#_221124-配置apollo-portal的meta-service信息)和[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)。 > 注4:如果ApolloConfigDB.ServerConfig的eureka.service.url只配了当前正在启动的机器的话,在启动apollo-configservice的过程中会在日志中输出eureka注册失败的信息,如`com.sun.jersey.api.client.ClientHandlerException: java.net.ConnectException: Connection refused`。需要注意的是,这个是预期的情况,因为apollo-configservice需要向Meta Server(它自己)注册服务,但是因为在启动过程中,自己还没起来,所以会报这个错。后面会进行重试的动作,所以等自己服务起来后就会注册正常了。 > 注5:如果你看到了这里,相信你一定是一个细心阅读文档的人,而且离成功就差一点点了,继续加油,应该很快就能完成Apollo的分布式部署了!不过你是否有感觉Apollo的分布式部署步骤有点繁琐?是否有啥建议想要和作者说?如果答案是肯定的话,请移步 [#1424](https://github.com/ctripcorp/apollo/issues/1424),期待你的建议! #### 2.2.2.2 部署apollo-adminservice 将对应环境的`apollo-adminservice-x.x.x-github.zip`上传到服务器上,解压后执行scripts/startup.sh即可。如需停止服务,执行scripts/shutdown.sh. 记得在scripts/startup.sh中按照实际的环境设置一个JVM内存,以下是我们的默认设置,供参考: ```bash export JAVA_OPTS="-server -Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:SurvivorRatio=22" ``` > 注1:如果需要修改JVM参数,可以修改scripts/startup.sh的`JAVA_OPTS`部分。 > 注2:如要调整服务的日志输出路径,可以修改scripts/startup.sh和apollo-adminservice.conf中的`LOG_DIR`。 > 注3:如要调整服务的监听端口,可以修改scripts/startup.sh中的`SERVER_PORT`。 #### 2.2.2.3 部署apollo-portal 将`apollo-portal-x.x.x-github.zip`上传到服务器上,解压后执行scripts/startup.sh即可。如需停止服务,执行scripts/shutdown.sh. 记得在startup.sh中按照实际的环境设置一个JVM内存,以下是我们的默认设置,供参考: ```bash export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22" ``` > 注1:如果需要修改JVM参数,可以修改scripts/startup.sh的`JAVA_OPTS`部分。 > 注2:如要调整服务的日志输出路径,可以修改scripts/startup.sh和apollo-portal.conf中的`LOG_DIR`。 > 注3:如要调整服务的监听端口,可以修改scripts/startup.sh中的`SERVER_PORT`。 ## 2.3 Docker部署 ### 2.3.1 1.7.0及以上版本 Apollo 1.7.0版本开始会默认上传Docker镜像到[Docker Hub](https://hub.docker.com/u/apolloconfig),可以按照如下步骤获取 #### 2.3.1.1 Apollo Config Service ##### 2.3.1.1.1 获取镜像 ```bash docker pull apolloconfig/apollo-configservice:${version} ``` ##### 2.3.1.1.2 运行镜像 示例: ```bash docker run -p 8080:8080 \ -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8" \ -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword \ -d -v /tmp/logs:/opt/logs --name apollo-configservice apolloconfig/apollo-configservice:${version} ``` 参数说明: * SPRING_DATASOURCE_URL: 对应环境ApolloConfigDB的地址 * SPRING_DATASOURCE_USERNAME: 对应环境ApolloConfigDB的用户名 * SPRING_DATASOURCE_PASSWORD: 对应环境ApolloConfigDB的密码 #### 2.3.1.2 Apollo Admin Service ##### 2.3.1.2.1 获取镜像 ```bash docker pull apolloconfig/apollo-adminservice:${version} ``` ##### 2.3.1.2.2 运行镜像 示例: ```bash docker run -p 8090:8090 \ -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8" \ -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword \ -d -v /tmp/logs:/opt/logs --name apollo-adminservice apolloconfig/apollo-adminservice:${version} ``` 参数说明: * SPRING_DATASOURCE_URL: 对应环境ApolloConfigDB的地址 * SPRING_DATASOURCE_USERNAME: 对应环境ApolloConfigDB的用户名 * SPRING_DATASOURCE_PASSWORD: 对应环境ApolloConfigDB的密码 #### 2.3.1.3 Apollo Portal ##### 2.3.1.3.1 获取镜像 ```bash docker pull apolloconfig/apollo-portal:${version} ``` ##### 2.3.1.3.2 运行镜像 示例: ```bash docker run -p 8070:8070 \ -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloPortalDB?characterEncoding=utf8" \ -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword \ -e APOLLO_PORTAL_ENVS=dev,pro \ -e DEV_META=http://fill-in-dev-meta-server:8080 -e PRO_META=http://fill-in-pro-meta-server:8080 \ -d -v /tmp/logs:/opt/logs --name apollo-portal apolloconfig/apollo-portal:${version} ``` 参数说明: * SPRING_DATASOURCE_URL: 对应环境ApolloPortalDB的地址 * SPRING_DATASOURCE_USERNAME: 对应环境ApolloPortalDB的用户名 * SPRING_DATASOURCE_PASSWORD: 对应环境ApolloPortalDB的密码 * APOLLO_PORTAL_ENVS(可选): 对应ApolloPortalDB中的[apollo.portal.envs](#_311-apolloportalenvs-可支持的环境列表)配置项,如果没有在数据库中配置的话,可以通过此环境参数配置 * DEV_META/PRO_META(可选): 配置对应环境的Meta Service地址,以${ENV}_META命名,需要注意的是如果配置了ApolloPortalDB中的[apollo.portal.meta.servers](#_312-apolloportalmetaservers-各环境meta-service列表)配置,则以apollo.portal.meta.servers中的配置为准 #### 2.3.1.4 通过源码构建 Docker 镜像 如果修改了 apollo 服务端的代码,希望通过源码构建 Docker 镜像,可以参考下面的步骤: 1. 通过源码构建安装包:`./scripts/build.sh` 2. 构建 Docker 镜像:`mvn docker:build -pl apollo-configservice,apollo-adminservice,apollo-portal` ### 2.3.2 1.7.0之前的版本 Apollo项目已经自带了Docker file,可以参照[2.2.1 获取安装包](#_221-获取安装包)配置好安装包后通过下面的文件来打Docker镜像: 1. [apollo-configservice](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/docker/Dockerfile) 2. [apollo-adminservice](https://github.com/ctripcorp/apollo/blob/master/apollo-adminservice/src/main/docker/Dockerfile) 3. [apollo-portal](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/docker/Dockerfile) 也可以参考Apollo用户[@kulovecc](https://github.com/kulovecc)的[docker-apollo](https://github.com/kulovecc/docker-apollo)项目和[@idoop](https://github.com/idoop)的[docker-apollo](https://github.com/idoop/docker-apollo)项目。 ## 2.4 Kubernetes部署 ### 2.4.1 基于Kubernetes原生服务发现 Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的部署模式,由于不再使用内置的Eureka,所以在整体部署上有很大简化,同时也提供了Helm Charts,便于部署。 > 更多设计说明可以参考[#3054](https://github.com/ctripcorp/apollo/issues/3054)。 #### 2.4.1.1 环境要求 - Kubernetes 1.10+ - Helm 3 #### 2.4.1.2 添加Apollo Helm Chart仓库 ```bash $ helm repo add apollo https://www.apolloconfig.com/charts $ helm search repo apollo ``` #### 2.4.1.3 部署apollo-configservice和apollo-adminservice ##### 2.4.1.3.1 安装apollo-configservice和apollo-adminservice 需要在每个环境中安装apollo-configservice和apollo-adminservice,所以建议在release名称中加入环境信息,例如:`apollo-service-dev` ```bash $ helm install apollo-service-dev \ --set configdb.host=1.2.3.4 \ --set configdb.userName=apollo \ --set configdb.password=apollo \ --set configdb.service.enabled=true \ --set configService.replicaCount=1 \ --set adminService.replicaCount=1 \ -n your-namespace \ apollo/apollo-service ``` 一般部署建议通过 values.yaml 来配置: ```bash $ helm install apollo-service-dev -f values.yaml -n your-namespace apollo/apollo-service ``` 安装完成后会提示对应环境的Meta Server地址,需要记录下来,apollo-portal安装时需要用到: ```bash Get meta service url for current release by running these commands: echo http://apollo-service-dev-apollo-configservice:8080 ``` > 更多配置项说明可以参考[2.4.1.3.3 配置项说明](#_24133-配置项说明) ##### 2.4.1.3.2 卸载apollo-configservice和apollo-adminservice 例如要卸载`apollo-service-dev`的部署: ```bash $ helm uninstall -n your-namespace apollo-service-dev ``` ##### 2.4.1.3.3 配置项说明 下表列出了apollo-service chart的可配置参数及其默认值: | Parameter | Description | Default | |----------------------|---------------------------------------------|---------------------| | `configdb.host` | The host for apollo config db | `nil` | | `configdb.port` | The port for apollo config db | `3306` | | `configdb.dbName` | The database name for apollo config db | `ApolloConfigDB` | | `configdb.userName` | The user name for apollo config db | `nil` | | `configdb.password` | The password for apollo config db | `nil` | | `configdb.connectionStringProperties` | The connection string properties for apollo config db | `characterEncoding=utf8` | | `configdb.service.enabled` | Whether to create a Kubernetes Service for `configdb.host` or not. Set it to `true` if `configdb.host` is an endpoint outside of the kubernetes cluster | `false` | | `configdb.service.fullNameOverride` | Override the service name for apollo config db | `nil` | | `configdb.service.port` | The port for the service of apollo config db | `3306` | | `configdb.service.type` | The service type of apollo config db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. `xxx.mysql.rds.aliyuncs.com` | `ClusterIP` | | `configService.fullNameOverride` | Override the deployment name for apollo-configservice | `nil` | | `configService.replicaCount` | Replica count of apollo-configservice | `2` | | `configService.containerPort` | Container port of apollo-configservice | `8080` | | `configService.image.repository` | Image repository of apollo-configservice | `apolloconfig/apollo-configservice` | | `configService.image.tag` | Image tag of apollo-configservice, e.g. `1.8.0`, leave it to `nil` to use the default version. _(chart version >= 0.2.0)_ | `nil` | | `configService.image.pullPolicy` | Image pull policy of apollo-configservice | `IfNotPresent` | | `configService.imagePullSecrets` | Image pull secrets of apollo-configservice | `[]` | | `configService.service.fullNameOverride` | Override the service name for apollo-configservice | `nil` | | `configService.service.port` | The port for the service of apollo-configservice | `8080` | | `configService.service.targetPort` | The target port for the service of apollo-configservice | `8080` | | `configService.service.type` | The service type of apollo-configservice | `ClusterIP` | | `configService.ingress.enabled` | Whether to enable the ingress for config-service or not. _(chart version >= 0.2.0)_ | `false` | | `configService.ingress.annotations` | The annotations of the ingress for config-service. _(chart version >= 0.2.0)_ | `{}` | | `configService.ingress.hosts.host` | The host of the ingress for config-service. _(chart version >= 0.2.0)_ | `nil` | | `configService.ingress.hosts.paths` | The paths of the ingress for config-service. _(chart version >= 0.2.0)_ | `[]` | | `configService.ingress.tls` | The tls definition of the ingress for config-service. _(chart version >= 0.2.0)_ | `[]` | | `configService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `configService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `configService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `configService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `configService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `configService.config.configServiceUrlOverride` | Override `apollo.config-service.url`: config service url to be accessed by apollo-client, e.g. `http://apollo-config-service-dev:8080` | `nil` | | `configService.config.adminServiceUrlOverride` | Override `apollo.admin-service.url`: admin service url to be accessed by apollo-portal, e.g. `http://apollo-admin-service-dev:8090` | `nil` | | `configService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access config service via `http://{config_service_address}/apollo`. _(chart version >= 0.2.0)_ | `nil` | | `configService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `configService.strategy` | The deployment strategy of apollo-configservice | `{}` | | `configService.resources` | The resources definition of apollo-configservice | `{}` | | `configService.nodeSelector` | The node selector definition of apollo-configservice | `{}` | | `configService.tolerations` | The tolerations definition of apollo-configservice | `[]` | | `configService.affinity` | The affinity definition of apollo-configservice | `{}` | | `adminService.fullNameOverride` | Override the deployment name for apollo-adminservice | `nil` | | `adminService.replicaCount` | Replica count of apollo-adminservice | `2` | | `adminService.containerPort` | Container port of apollo-adminservice | `8090` | | `adminService.image.repository` | Image repository of apollo-adminservice | `apolloconfig/apollo-adminservice` | | `adminService.image.tag` | Image tag of apollo-adminservice, e.g. `1.8.0`, leave it to `nil` to use the default version. _(chart version >= 0.2.0)_ | `nil` | | `adminService.image.pullPolicy` | Image pull policy of apollo-adminservice | `IfNotPresent` | | `adminService.imagePullSecrets` | Image pull secrets of apollo-adminservice | `[]` | | `adminService.service.fullNameOverride` | Override the service name for apollo-adminservice | `nil` | | `adminService.service.port` | The port for the service of apollo-adminservice | `8090` | | `adminService.service.targetPort` | The target port for the service of apollo-adminservice | `8090` | | `adminService.service.type` | The service type of apollo-adminservice | `ClusterIP` | | `adminService.ingress.enabled` | Whether to enable the ingress for admin-service or not. _(chart version >= 0.2.0)_ | `false` | | `adminService.ingress.annotations` | The annotations of the ingress for admin-service. _(chart version >= 0.2.0)_ | `{}` | | `adminService.ingress.hosts.host` | The host of the ingress for admin-service. _(chart version >= 0.2.0)_ | `nil` | | `adminService.ingress.hosts.paths` | The paths of the ingress for admin-service. _(chart version >= 0.2.0)_ | `[]` | | `adminService.ingress.tls` | The tls definition of the ingress for admin-service. _(chart version >= 0.2.0)_ | `[]` | | `adminService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `adminService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `adminService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `adminService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `adminService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `adminService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access admin service via `http://{admin_service_address}/apollo`. _(chart version >= 0.2.0)_ | `nil` | | `adminService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `adminService.strategy` | The deployment strategy of apollo-adminservice | `{}` | | `adminService.resources` | The resources definition of apollo-adminservice | `{}` | | `adminService.nodeSelector` | The node selector definition of apollo-adminservice | `{}` | | `adminService.tolerations` | The tolerations definition of apollo-adminservice | `[]` | | `adminService.affinity` | The affinity definition of apollo-adminservice | `{}` | ##### 2.4.1.3.4 配置样例 ###### 2.4.1.3.4.1 ConfigDB的host是k8s集群外的IP ```yaml configdb: host: 1.2.3.4 dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` ###### 2.4.1.3.4.2 ConfigDB的host是k8s集群外的域名 ```yaml configdb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` ###### 2.4.1.3.4.3 ConfigDB的host是k8s集群内的一个服务 ```yaml configdb: host: apollodb-mysql.mysql dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` ###### 2.4.1.3.4.4 指定Meta Server返回的apollo-configservice地址 如果apollo-client无法直接访问apollo-configservice的Service(比如不在同一个k8s集群),那么可以参照下面的示例指定Meta Server返回给apollo-client的地址(比如可以通过nodeport访问) ```yaml configService: config: configServiceUrlOverride: http://1.2.3.4:12345 ``` ###### 2.4.1.3.4.5 指定Meta Server返回的apollo-adminservice地址 如果apollo-portal无法直接访问apollo-adminservice的Service(比如不在同一个k8s集群),那么可以参照下面的示例指定Meta Server返回给apollo-portal的地址(比如可以通过nodeport访问) ```yaml configService: config: adminServiceUrlOverride: http://1.2.3.4:23456 ``` ###### 2.4.1.3.4.6 以Ingress配置自定义路径`/config`形式暴露apollo-configservice服务 ```yaml # use /config as root, should specify configService.config.contextPath as /config configService: config: contextPath: /config ingress: enabled: true hosts: - paths: - /config ``` ###### 2.4.1.3.4.7 以Ingress配置自定义路径`/admin`形式暴露apollo-adminservice服务 ```yaml # use /admin as root, should specify adminService.config.contextPath as /admin adminService: config: contextPath: /admin ingress: enabled: true hosts: - paths: - /admin ``` #### 2.4.1.4 部署apollo-portal ##### 2.4.1.4.1 安装apollo-portal 假设有dev, pro两个环境,且meta server地址分别为`http://apollo-service-dev-apollo-configservice:8080`和`http://apollo-service-pro-apollo-configservice:8080`: ```bash $ helm install apollo-portal \ --set portaldb.host=1.2.3.4 \ --set portaldb.userName=apollo \ --set portaldb.password=apollo \ --set portaldb.service.enabled=true \ --set config.envs="dev\,pro" \ --set config.metaServers.dev=http://apollo-service-dev-apollo-configservice:8080 \ --set config.metaServers.pro=http://apollo-service-pro-apollo-configservice:8080 \ --set replicaCount=1 \ -n your-namespace \ apollo/apollo-portal ``` 一般部署建议通过 values.yaml 来配置: ```bash $ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal ``` > 更多配置项说明可以参考[2.4.1.4.3 配置项说明](#_24143-配置项说明) ##### 2.4.1.4.2 卸载apollo-portal 例如要卸载`apollo-portal`的部署: ```bash $ helm uninstall -n your-namespace apollo-portal ``` ##### 2.4.1.4.3 配置项说明 下表列出了apollo-portal chart的可配置参数及其默认值: | Parameter | Description | Default | |----------------------|---------------------------------------------|-----------------------| | `fullNameOverride` | Override the deployment name for apollo-portal | `nil` | | `replicaCount` | Replica count of apollo-portal | `2` | | `containerPort` | Container port of apollo-portal | `8070` | | `image.repository` | Image repository of apollo-portal | `apolloconfig/apollo-portal` | | `image.tag` | Image tag of apollo-portal, e.g. `1.8.0`, leave it to `nil` to use the default version. _(chart version >= 0.2.0)_ | `nil` | | `image.pullPolicy` | Image pull policy of apollo-portal | `IfNotPresent` | | `imagePullSecrets` | Image pull secrets of apollo-portal | `[]` | | `service.fullNameOverride` | Override the service name for apollo-portal | `nil` | | `service.port` | The port for the service of apollo-portal | `8070` | | `service.targetPort` | The target port for the service of apollo-portal | `8070` | | `service.type` | The service type of apollo-portal | `ClusterIP` | | `service.sessionAffinity` | The session affinity for the service of apollo-portal | `ClientIP` | | `ingress.enabled` | Whether to enable the ingress or not | `false` | | `ingress.annotations` | The annotations of the ingress | `{}` | | `ingress.hosts.host` | The host of the ingress | `nil` | | `ingress.hosts.paths` | The paths of the ingress | `[]` | | `ingress.tls` | The tls definition of the ingress | `[]` | | `liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `strategy` | The deployment strategy of apollo-portal | `{}` | | `resources` | The resources definition of apollo-portal | `{}` | | `nodeSelector` | The node selector definition of apollo-portal | `{}` | | `tolerations` | The tolerations definition of apollo-portal | `[]` | | `affinity` | The affinity definition of apollo-portal | `{}` | | `config.profiles` | specify the spring profiles to activate | `github,auth` | | `config.envs` | specify the env names, e.g. `dev,pro` | `nil` | | `config.contextPath` | specify the context path, e.g. `/apollo`, then users could access portal via `http://{portal_address}/apollo` | `nil` | | `config.metaServers` | specify the meta servers, e.g.<br />`dev: http://apollo-configservice-dev:8080`<br />`pro: http://apollo-configservice-pro:8080` | `{}` | | `config.files` | specify the extra config files for apollo-portal, e.g. `application-ldap.yml` | `{}` | | `portaldb.host` | The host for apollo portal db | `nil` | | `portaldb.port` | The port for apollo portal db | `3306` | | `portaldb.dbName` | The database name for apollo portal db | `ApolloPortalDB` | | `portaldb.userName` | The user name for apollo portal db | `nil` | | `portaldb.password` | The password for apollo portal db | `nil` | | `portaldb.connectionStringProperties` | The connection string properties for apollo portal db | `characterEncoding=utf8` | | `portaldb.service.enabled` | Whether to create a Kubernetes Service for `portaldb.host` or not. Set it to `true` if `portaldb.host` is an endpoint outside of the kubernetes cluster | `false` | | `portaldb.service.fullNameOverride` | Override the service name for apollo portal db | `nil` | | `portaldb.service.port` | The port for the service of apollo portal db | `3306` | | `portaldb.service.type` | The service type of apollo portal db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. `xxx.mysql.rds.aliyuncs.com` | `ClusterIP` | ##### 2.4.1.4.4 配置样例 ###### 2.4.1.4.4.1 PortalDB的host是k8s集群外的IP ```yaml portaldb: host: 1.2.3.4 dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` ###### 2.4.1.4.4.2 PortalDB的host是k8s集群外的域名 ```yaml portaldb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` ###### 2.4.1.4.4.3 PortalDB的host是k8s集群内的一个服务 ```yaml portaldb: host: apollodb-mysql.mysql dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` ###### 2.4.1.4.4.4 配置环境信息 ```yaml config: envs: dev,pro metaServers: dev: http://apollo-service-dev-apollo-configservice:8080 pro: http://apollo-service-pro-apollo-configservice:8080 ``` ###### 2.4.1.4.4.5 以Load Balancer形式暴露服务 ```yaml service: type: LoadBalancer ``` ###### 2.4.1.4.4.6 以Ingress形式暴露服务 ```yaml ingress: enabled: true hosts: - paths: - / ``` ###### 2.4.1.4.4.7 以Ingress配置自定义路径`/apollo`形式暴露服务 ```yaml # use /apollo as root, should specify config.contextPath as /apollo ingress: enabled: true hosts: - paths: - /apollo config: ... contextPath: /apollo ... ``` ###### 2.4.1.4.4.8 以Ingress配置session affinity形式暴露服务 ```yaml ingress: enabled: true annotations: kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/affinity: "cookie" nginx.ingress.kubernetes.io/affinity-mode: "persistent" nginx.ingress.kubernetes.io/session-cookie-conditional-samesite-none: "true" nginx.ingress.kubernetes.io/session-cookie-expires: "172800" nginx.ingress.kubernetes.io/session-cookie-max-age: "172800" hosts: - host: xxx.somedomain.com # host is required to make session affinity work paths: - / ``` ###### 2.4.1.4.4.9 启用 LDAP 支持 ```yaml config: ... profiles: github,ldap ... files: application-ldap.yml: | spring: ldap: base: "dc=example,dc=org" username: "cn=admin,dc=example,dc=org" password: "password" searchFilter: "(uid={0})" urls: - "ldap://xxx.somedomain.com:389" ldap: mapping: objectClass: "inetOrgPerson" loginId: "uid" userDisplayName: "cn" email: "mail" ``` #### 2.4.1.5 通过源码构建 Docker 镜像 如果修改了 apollo 服务端的代码,希望通过源码构建 Docker 镜像,可以参考[2.3.1.4 通过源码构建 Docker 镜像](#_2314-通过源码构建-docker-镜像)的步骤。 ### 2.4.2 基于内置的Eureka服务发现 感谢[AiotCEO](https://github.com/AiotCEO)提供了k8s的部署支持,使用说明可以参考[apollo-on-kubernetes](https://github.com/ctripcorp/apollo/blob/master/scripts/apollo-on-kubernetes/README.md)。 感谢[qct](https://github.com/qct)提供的Helm Chart部署支持,使用说明可以参考[qct/apollo-helm](https://github.com/qct/apollo-helm)。 # 三、服务端配置说明 > 以下配置除了支持在数据库中配置以外,也支持通过-D参数、application.properties等配置,且-D参数、application.properties等优先级高于数据库中的配置 ## 3.1 调整ApolloPortalDB配置 配置项统一存储在ApolloPortalDB.ServerConfig表中,也可以通过`管理员工具 - 系统参数`页面进行配置,无特殊说明则修改完一分钟实时生效。 ### 3.1.1 apollo.portal.envs - 可支持的环境列表 默认值是dev,如果portal需要管理多个环境的话,以逗号分隔即可(大小写不敏感),如: ``` DEV,FAT,UAT,PRO ``` 修改完需要重启生效。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](#_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](#_22112-配置数据库连接信息),另外如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](#_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化。 >注2:只在数据库添加环境是不起作用的,还需要为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](#_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)。 >注3:如果希望添加自定义的环境名称,具体步骤可以参考[Portal如何增加环境](zh/faq/common-issues-in-deployment-and-development-phase?id=_4-portal如何增加环境?)。 >注4:1.1.0版本增加了系统信息页面(`管理员工具` -> `系统信息`),可以通过该页面检查配置是否正确 ### 3.1.2 apollo.portal.meta.servers - 各环境Meta Service列表 > 适用于1.6.0及以上版本 Apollo Portal需要在不同的环境访问不同的meta service(apollo-configservice)地址,所以我们需要在配置中提供这些信息。默认情况下,meta service和config service是部署在同一个JVM进程,所以meta service的地址就是config service的地址。 样例如下: ```json { "DEV":"http://1.1.1.1:8080", "FAT":"http://apollo.fat.xxx.com", "UAT":"http://apollo.uat.xxx.com", "PRO":"http://apollo.xxx.com" } ``` 修改完需要重启生效。 > 该配置优先级高于其它方式设置的Meta Service地址,更多信息可以参考[2.2.1.1.2.4 配置apollo-portal的meta service信息](#_221124-配置apollo-portal的meta-service信息)。 ### 3.1.3 organizations - 部门列表 Portal中新建的App都需要选择部门,所以需要在这里配置可选的部门信息,样例如下: ```json [{"orgId":"TEST1","orgName":"样例部门1"},{"orgId":"TEST2","orgName":"样例部门2"}] ``` ### 3.1.4 superAdmin - Portal超级管理员 超级管理员拥有所有权限,需要谨慎设置。 如果没有接入自己公司的SSO系统的话,可以先暂时使用默认值apollo(默认用户)。等接入后,修改为实际使用的账号,多个账号以英文逗号分隔(,)。 ### 3.1.5 consumer.token.salt - consumer token salt 如果会使用开放平台API的话,可以设置一个token salt。如果不使用,可以忽略。 ### 3.1.6 wiki.address portal上“帮助”链接的地址,默认是Apollo github的wiki首页,可自行设置。 ### 3.1.7 admin.createPrivateNamespace.switch 是否允许项目管理员创建private namespace。设置为`true`允许创建,设置为`false`则项目管理员在页面上看不到创建private namespace的选项。[了解更多Namespace](zh/design/apollo-core-concept-namespace) ### 3.1.8 emergencyPublish.supported.envs 配置允许紧急发布的环境列表,多个env以英文逗号分隔。 当config service开启一次发布只能有一个人修改开关(`namespace.lock.switch`)后,一次配置发布只能是一个人修改,另一个发布。为了避免遇到紧急情况时(如非工作时间、节假日)无法发布配置,可以配置此项以允许某些环境可以操作紧急发布,即同一个人可以修改并发布配置。 ### 3.1.9 configView.memberOnly.envs 只对项目成员显示配置信息的环境列表,多个env以英文逗号分隔。 对设定了只对项目成员显示配置信息的环境,只有该项目的管理员或拥有该namespace的编辑或发布权限的用户才能看到该私有namespace的配置信息和发布历史。公共namespace始终对所有用户可见。 > 从1.1.0版本开始支持,详见[PR 1531](https://github.com/ctripcorp/apollo/pull/1531) ### 3.1.10 role.create-application.enabled - 是否开启创建项目权限控制 > 适用于1.5.0及以上版本 默认为false,所有用户都可以创建项目 如果设置为true,那么只有超级管理员和拥有创建项目权限的帐号可以创建项目,超级管理员可以通过`管理员工具 - 系统权限管理`给用户分配创建项目权限 ### 3.1.11 role.manage-app-master.enabled - 是否开启项目管理员分配权限控制 > 适用于1.5.0及以上版本 默认为false,所有项目的管理员可以为项目添加/删除管理员 如果设置为true,那么只有超级管理员和拥有项目管理员分配权限的帐号可以为特定项目添加/删除管理员,超级管理员可以通过`管理员工具 - 系统权限管理`给用户分配特定项目的管理员分配权限 ### 3.1.12 admin-service.access.tokens - 设置apollo-portal访问各环境apollo-adminservice所需的access token > 适用于1.7.1及以上版本 如果对应环境的apollo-adminservice开启了[访问控制](#_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制),那么需要在此配置apollo-portal访问该环境apollo-adminservice所需的access token,否则会访问失败 格式为json,如下所示: ```json { "dev" : "098f6bcd4621d373cade4e832627b4f6", "pro" : "ad0234829205b9033196ba818f7a872b" } ``` ## 3.2 调整ApolloConfigDB配置 配置项统一存储在ApolloConfigDB.ServerConfig表中,需要注意每个环境的ApolloConfigDB.ServerConfig都需要单独配置,修改完一分钟实时生效。 ### 3.2.1 eureka.service.url - Eureka服务Url > 不适用于基于Kubernetes原生服务发现场景 不管是apollo-configservice还是apollo-adminservice都需要向eureka服务注册,所以需要配置eureka服务地址。 按照目前的实现,apollo-configservice本身就是一个eureka服务,所以只需要填入apollo-configservice的地址即可,如有多个,用逗号分隔(注意不要忘了/eureka/后缀)。 需要注意的是每个环境只填入自己环境的eureka服务地址,比如FAT的apollo-configservice是1.1.1.1:8080和2.2.2.2:8080,UAT的apollo-configservice是3.3.3.3:8080和4.4.4.4:8080,PRO的apollo-configservice是5.5.5.5:8080和6.6.6.6:8080,那么: 1. 在FAT环境的ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://1.1.1.1:8080/eureka/,http://2.2.2.2:8080/eureka/ ``` 2. 在UAT环境的ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://3.3.3.3:8080/eureka/,http://4.4.4.4:8080/eureka/ ``` 3. 在PRO环境的ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://5.5.5.5:8080/eureka/,http://6.6.6.6:8080/eureka/ ``` >注1:这里需要填写本环境中全部的eureka服务地址,因为eureka需要互相复制注册信息 >注2:如果希望将Config Service和Admin Service注册到公司统一的Eureka上,可以参考[部署&开发遇到的常见问题 - 将Config Service和Admin Service注册到单独的Eureka Server上](zh/faq/common-issues-in-deployment-and-development-phase#_8-将config-service和admin-service注册到单独的eureka-server上)章节 >注3:在多机房部署时,往往希望config service和admin service只向同机房的eureka注册,要实现这个效果,需要利用`ServerConfig`表中的cluster字段,config service和admin service会读取所在机器的`/opt/settings/server.properties`(Mac/Linux)或`C:\opt\settings\server.properties`(Windows)中的idc属性,如果该idc有对应的eureka.service.url配置,那么就只会向该机房的eureka注册。比如config service和admin service会部署到`SHAOY`和`SHAJQ`两个IDC,那么为了实现这两个机房中的服务只向该机房注册,那么可以在`ServerConfig`表中新增两条记录,分别填入`SHAOY`和`SHAJQ`两个机房的eureka地址即可,`default` cluster的记录可以保留,如果有config service和admin service不是部署在`SHAOY`和`SHAJQ`这两个机房的,就会使用这条默认配置。 | Key |Cluster | Value | Comment | |--------------------|-----------|-------------------------------|---------------------| | eureka.service.url | default | http://1.1.1.1:8080/eureka/ | 默认的Eureka服务Url | | eureka.service.url | SHAOY | http://2.2.2.2:8080/eureka/ | SHAOY的Eureka服务Url | | eureka.service.url | SHAJQ | http://3.3.3.3:8080/eureka/ | SHAJQ的Eureka服务Url | ### 3.2.2 namespace.lock.switch - 一次发布只能有一个人修改开关,用于发布审核 这是一个功能开关,如果配置为true的话,那么一次配置发布只能是一个人修改,另一个发布。 > 生产环境建议开启此选项 ### 3.2.3 config-service.cache.enabled - 是否开启配置缓存 这是一个功能开关,如果配置为true的话,config service会缓存加载过的配置信息,从而加快后续配置获取性能。 默认为false,开启前请先评估总配置大小并调整config service内存配置。 > 开启缓存后必须确保应用中配置的app.id大小写正确,否则将获取不到正确的配置 ### 3.2.4 item.key.length.limit - 配置项 key 最大长度限制 默认配置是128。 ### 3.2.5 item.value.length.limit - 配置项 value 最大长度限制 默认配置是20000。 #### 3.2.5.1 namespace.value.length.limit.override - namespace 的配置项 value 最大长度限制 此配置用来覆盖 `item.value.length.limit` 的配置,做到细粒度控制 namespace 的 value 最大长度限制,配置的值是一个 json 格式,json 的 key 为 namespace 在数据库中的 id 值,格式如下: ``` namespace.value.length.limit.override = {1:200,3:20} ``` 以上配置指定了 ApolloConfigDB.Namespace 表中 id=1 的 namespace 的 value 最大长度限制为 200,id=3 的 namespace 的 value 最大长度限制为 20 ### 3.2.6 admin-service.access.control.enabled - 配置apollo-adminservice是否开启访问控制 > 适用于1.7.1及以上版本 默认为false,如果配置为true,那么apollo-portal就需要[正确配置](#_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)访问该环境的access token,否则访问会被拒绝 ### 3.2.7 admin-service.access.tokens - 配置允许访问apollo-adminservice的access token列表 > 适用于1.7.1及以上版本 如果该配置项为空,那么访问控制不会生效。如果允许多个token,token 之间以英文逗号分隔 样例: ```properties admin-service.access.tokens=098f6bcd4621d373cade4e832627b4f6 admin-service.access.tokens=098f6bcd4621d373cade4e832627b4f6,ad0234829205b9033196ba818f7a872b ```
本文档介绍了如何按照分布式部署的方式编译、打包、部署Apollo配置中心,从而可以在开发、测试、生产等环境分别部署运行。 > 如果只是需要在本地快速部署试用Apollo的话,可以参考[Quick Start](zh/deployment/quick-start) # &nbsp; # 一、准备工作 ## 1.1 运行时环境 ### 1.1.1 OS 服务端基于Spring Boot,启动脚本理论上支持所有Linux发行版,建议[CentOS 7](https://www.centos.org/)。 ### 1.1.2 Java * Apollo服务端:1.8+ * Apollo客户端:1.7+ 由于需要同时运行服务端和客户端,所以建议安装Java 1.8+。 >对于Apollo客户端,运行时环境只需要1.7+即可。 >注:对于Apollo客户端,如果有需要的话,可以做少量代码修改来降级到Java 1.6,详细信息可以参考[Issue 483](https://github.com/ctripcorp/apollo/issues/483) 在配置好后,可以通过如下命令检查: ```sh java -version ``` 样例输出: ```sh java version "1.8.0_74" Java(TM) SE Runtime Environment (build 1.8.0_74-b02) Java HotSpot(TM) 64-Bit Server VM (build 25.74-b02, mixed mode) ``` ## 1.2 MySQL * 版本要求:5.6.5+ Apollo的表结构对`timestamp`使用了多个default声明,所以需要5.6.5以上版本。 连接上MySQL后,可以通过如下命令检查: ```sql SHOW VARIABLES WHERE Variable_name = 'version'; ``` | Variable_name | Value | |---------------|--------| | version | 5.7.11 | > 注1:MySQL版本可以降级到5.5,详见[mysql 依赖降级讨论](https://github.com/ctripcorp/apollo/issues/481)。 > 注2:如果希望使用Oracle的话,可以参考[vanpersl](https://github.com/vanpersl)在Apollo 0.8.0基础上开发的[Oracle适配代码](https://github.com/ctripcorp/apollo/compare/v0.8.0...vanpersl:db-oracle),Oracle版本为10.2.0.1.0。 > 注3:如果希望使用Postgres的话,可以参考[oaksharks](https://github.com/oaksharks)在Apollo 0.9.1基础上开发的[Pg适配代码](https://github.com/oaksharks/apollo/compare/ac10768ee2e11c488523ca0e845984f6f71499ac...oaksharks:pg),Postgres的版本为9.3.20,也可以参考[xiao0yy](https://github.com/xiao0yy)在Apollo 0.10.2基础上开发的[Pg适配代码](https://github.com/ctripcorp/apollo/issues/1293),Postgres的版本为9.5。 ## 1.3 环境 分布式部署需要事先确定部署的环境以及部署方式。 Apollo目前支持以下环境: * DEV * 开发环境 * FAT * 测试环境,相当于alpha环境(功能测试) * UAT * 集成环境,相当于beta环境(回归测试) * PRO * 生产环境 > 如果希望添加自定义的环境名称,具体步骤可以参考[Portal如何增加环境](zh/faq/common-issues-in-deployment-and-development-phase?id=_4-portal如何增加环境?) 以ctrip为例,我们的部署策略如下: ![Deployment](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-deployment.png) * Portal部署在生产环境的机房,通过它来直接管理FAT、UAT、PRO等环境的配置 * Meta Server、Config Service和Admin Service在每个环境都单独部署,使用独立的数据库 * Meta Server、Config Service和Admin Service在生产环境部署在两个机房,实现双活 * Meta Server和Config Service部署在同一个JVM进程内,Admin Service部署在同一台服务器的另一个JVM进程内 另外也可以参考下[@lyliyongblue](https://github.com/lyliyongblue) 贡献的样例部署图(建议右键新窗口打开看大图): ![Deployment](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/lyliyongblue-apollo-deployment.png) ## 1.4 网络策略 分布式部署的时候,`apollo-configservice`和`apollo-adminservice`需要把自己的IP和端口注册到Meta Server(apollo-configservice本身)。 Apollo客户端和Portal会从Meta Server获取服务的地址(IP+端口),然后通过服务地址直接访问。 需要注意的是,`apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的,所以出于安全考虑,**请不要将`apollo-configservice`和`apollo-adminservice`直接暴露在公网**。 所以如果实际部署的机器有多块网卡(如docker),或者存在某些网卡的IP是Apollo客户端和Portal无法访问的(如网络安全限制),那么我们就需要在`apollo-configservice`和`apollo-adminservice`中做相关配置来解决连通性问题。 ### 1.4.1 忽略某些网卡 可以分别修改`apollo-configservice`和`apollo-adminservice`的startup.sh,通过JVM System Property传入-D参数,也可以通过OS Environment Variable传入,下面的例子会把`docker0`和`veth`开头的网卡在注册到Eureka时忽略掉。 JVM System Property示例: ```properties -Dspring.cloud.inetutils.ignoredInterfaces[0]=docker0 -Dspring.cloud.inetutils.ignoredInterfaces[1]=veth.* ``` OS Environment Variable示例: ```properties SPRING_CLOUD_INETUTILS_IGNORED_INTERFACES[0]=docker0 SPRING_CLOUD_INETUTILS_IGNORED_INTERFACES[1]=veth.* ``` ### 1.4.2 指定要注册的IP 可以分别修改`apollo-configservice`和`apollo-adminservice`的startup.sh,通过JVM System Property传入-D参数,也可以通过OS Environment Variable传入,下面的例子会指定注册的IP为`1.2.3.4`。 JVM System Property示例: ```properties -Deureka.instance.ip-address=1.2.3.4 ``` OS Environment Variable示例: ```properties EUREKA_INSTANCE_IP_ADDRESS=1.2.3.4 ``` ### 1.4.3 指定要注册的URL 可以分别修改`apollo-configservice`和`apollo-adminservice`的startup.sh,通过JVM System Property传入-D参数,也可以通过OS Environment Variable传入,下面的例子会指定注册的URL为`http://1.2.3.4:8080`。 JVM System Property示例: ```properties -Deureka.instance.homePageUrl=http://1.2.3.4:8080 -Deureka.instance.preferIpAddress=false ``` OS Environment Variable示例: ```properties EUREKA_INSTANCE_HOME_PAGE_URL=http://1.2.3.4:8080 EUREKA_INSTANCE_PREFER_IP_ADDRESS=false ``` ### 1.4.4 直接指定apollo-configservice地址 如果Apollo部署在公有云上,本地开发环境无法连接,但又需要做开发测试的话,客户端可以升级到0.11.0版本及以上,然后配置[跳过Apollo Meta Server服务发现](zh/usage/java-sdk-user-guide#_1222-跳过apollo-meta-server服务发现) # 二、部署步骤 部署步骤总体还是比较简单的,Apollo的唯一依赖是数据库,所以需要首先把数据库准备好,然后根据实际情况,选择不同的部署方式: > [@lingjiaju](https://github.com/lingjiaju)录制了一系列Apollo快速上手视频,如果看文档觉得略繁琐的话,不妨可以先看一下他的[视频教程](https://pan.baidu.com/s/1blv87EOZS77NWT8Amkijkw#list/path=%2F)。 > 如果部署过程中遇到了问题,可以参考[部署&开发遇到的常见问题](zh/faq/common-issues-in-deployment-and-development-phase),一般都能找到答案。 ## 2.1 创建数据库 Apollo服务端共需要两个数据库:`ApolloPortalDB`和`ApolloConfigDB`,我们把数据库、表的创建和样例数据都分别准备了sql文件,只需要导入数据库即可。 需要注意的是ApolloPortalDB只需要在生产环境部署一个即可,而ApolloConfigDB需要在每个环境部署一套,如fat、uat和pro分别部署3套ApolloConfigDB。 > 注意:如果你本地已经创建过Apollo数据库,请注意备份数据。我们准备的sql文件会清空Apollo相关的表。 ### 2.1.1 创建ApolloPortalDB 可以根据实际情况选择通过手动导入SQL或是通过[Flyway](https://flywaydb.org/)自动导入SQL创建。 #### 2.1.1.1 手动导入SQL创建 通过各种MySQL客户端导入[apolloportaldb.sql](https://github.com/ctripcorp/apollo/blob/master/scripts/sql/apolloportaldb.sql)即可。 以MySQL原生客户端为例: ```sql source /your_local_path/scripts/sql/apolloportaldb.sql ``` #### 2.1.1.2 通过Flyway导入SQL创建 > 需要1.3.0及以上版本 1. 根据实际情况修改[flyway-portaldb.properties](https://github.com/ctripcorp/apollo/blob/master/scripts/flyway/flyway-portaldb.properties)中的`flyway.user`、`flyway.password`和`flyway.url`配置 2. 在apollo项目根目录下执行`mvn -N -Pportaldb flyway:migrate` #### 2.1.1.3 验证 导入成功后,可以通过执行以下sql语句来验证: ```sql select `Id`, `Key`, `Value`, `Comment` from `ApolloPortalDB`.`ServerConfig` limit 1; ``` | Id | Key | Value | Comment | |----|--------------------|-------|------------------| | 1 | apollo.portal.envs | dev | 可支持的环境列表 | > 注:ApolloPortalDB只需要在生产环境部署一个即可 ### 2.1.2 创建ApolloConfigDB 可以根据实际情况选择通过手动导入SQL或是通过[Flyway](https://flywaydb.org/)自动导入SQL创建。 #### 2.1.2.1 手动导入SQL 通过各种MySQL客户端导入[apolloconfigdb.sql](https://github.com/ctripcorp/apollo/blob/master/scripts/sql/apolloconfigdb.sql)即可。 以MySQL原生客户端为例: ```sql source /your_local_path/scripts/sql/apolloconfigdb.sql ``` #### 2.1.2.2 通过Flyway导入SQL > 需要1.3.0及以上版本 1. 根据实际情况修改[flyway-configdb.properties](https://github.com/ctripcorp/apollo/blob/master/scripts/flyway/flyway-configdb.properties)中的`flyway.user`、`flyway.password`和`flyway.url`配置 2. 在apollo项目根目录下执行`mvn -N -Pconfigdb flyway:migrate` #### 2.1.2.3 验证 导入成功后,可以通过执行以下sql语句来验证: ```sql select `Id`, `Key`, `Value`, `Comment` from `ApolloConfigDB`.`ServerConfig` limit 1; ``` | Id | Key | Value | Comment | |----|--------------------|-------------------------------|---------------| | 1 | eureka.service.url | http://127.0.0.1:8080/eureka/ | Eureka服务Url | > 注:ApolloConfigDB需要在每个环境部署一套,如fat、uat和pro分别部署3套ApolloConfigDB #### 2.1.2.4 从别的环境导入ApolloConfigDB的项目数据 如果是全新部署的Apollo配置中心,请忽略此步。 如果不是全新部署的Apollo配置中心,比如已经使用了一段时间,这时在Apollo配置中心已经创建了不少项目以及namespace等,那么在新环境中的ApolloConfigDB中需要从其它正常运行的环境中导入必要的项目数据。 主要涉及ApolloConfigDB的下面4张表,下面同时附上需要导入的数据查询语句: 1. App * 导入全部的App * 如:insert into `新环境的ApolloConfigDB`.`App` select * from `其它环境的ApolloConfigDB`.`App` where `IsDeleted` = 0; 2. AppNamespace * 导入全部的AppNamespace * 如:insert into `新环境的ApolloConfigDB`.`AppNamespace` select * from `其它环境的ApolloConfigDB`.`AppNamespace` where `IsDeleted` = 0; 3. Cluster * 导入默认的default集群 * 如:insert into `新环境的ApolloConfigDB`.`Cluster` select * from `其它环境的ApolloConfigDB`.`Cluster` where `Name` = 'default' and `IsDeleted` = 0; 4. Namespace * 导入默认的default集群中的namespace * 如:insert into `新环境的ApolloConfigDB`.`Namespace` select * from `其它环境的ApolloConfigDB`.`Namespace` where `ClusterName` = 'default' and `IsDeleted` = 0; 同时也别忘了通知用户在新的环境给自己的项目设置正确的配置信息,尤其是一些影响面比较大的公共namespace配置。 > 如果是为正在运行的环境迁移数据,建议迁移完重启一下config service,因为config service中有appnamespace的缓存数据 ### 2.1.3 调整服务端配置 Apollo自身的一些配置是放在数据库里面的,所以需要针对实际情况做一些调整,具体参数说明请参考[三、服务端配置说明](#三、服务端配置说明)。 大部分配置可以先使用默认值,不过 [apollo.portal.envs](#_311-apolloportalenvs-可支持的环境列表) 和 [eureka.service.url](#_321-eurekaserviceurl-eureka服务url) 请务必配置正确后再进行下面的部署步骤。 ## 2.2 虚拟机/物理机部署 ### 2.2.1 获取安装包 可以通过两种方式获取安装包: 1. 直接下载安装包 * 从[GitHub Release](https://github.com/ctripcorp/apollo/releases)页面下载预先打好的安装包 * 如果对Apollo的代码没有定制需求,建议使用这种方式,可以省去本地打包的过程 2. 通过源码构建 * 从[GitHub Release](https://github.com/ctripcorp/apollo/releases)页面下载Source code包或直接clone[源码](https://github.com/ctripcorp/apollo)后在本地构建 * 如果需要对Apollo的做定制开发,需要使用这种方式 #### 2.2.1.1 直接下载安装包 ##### 2.2.1.1.1 获取apollo-configservice、apollo-adminservice、apollo-portal安装包 从[GitHub Release](https://github.com/ctripcorp/apollo/releases)页面下载最新版本的`apollo-configservice-x.x.x-github.zip`、`apollo-adminservice-x.x.x-github.zip`和`apollo-portal-x.x.x-github.zip`即可。 ##### 2.2.1.1.2 配置数据库连接信息 Apollo服务端需要知道如何连接到你前面创建的数据库,数据库连接串信息位于上一步下载的压缩包中的`config/application-github.properties`中。 ###### 2.2.1.1.2.1 配置apollo-configservice的数据库连接信息 1. 解压`apollo-configservice-x.x.x-github.zip` 2. 用程序员专用编辑器(如vim,notepad++,sublime等)打开`config`目录下的`application-github.properties`文件 3. 填写正确的ApolloConfigDB数据库连接串信息,注意用户名和密码后面不要有空格! 4. 修改完的效果如下: ```properties # DataSource spring.datasource.url = jdbc:mysql://localhost:3306/ApolloConfigDB?useSSL=false&characterEncoding=utf8 spring.datasource.username = someuser spring.datasource.password = somepwd ``` > 注:由于ApolloConfigDB在每个环境都有部署,所以对不同的环境config-service需要配置对应环境的数据库参数 ###### 2.2.1.1.2.2 配置apollo-adminservice的数据库连接信息 1. 解压`apollo-adminservice-x.x.x-github.zip` 2. 用程序员专用编辑器(如vim,notepad++,sublime等)打开`config`目录下的`application-github.properties`文件 3. 填写正确的ApolloConfigDB数据库连接串信息,注意用户名和密码后面不要有空格! 4. 修改完的效果如下: ```properties # DataSource spring.datasource.url = jdbc:mysql://localhost:3306/ApolloConfigDB?useSSL=false&characterEncoding=utf8 spring.datasource.username = someuser spring.datasource.password = somepwd ``` > 注:由于ApolloConfigDB在每个环境都有部署,所以对不同的环境admin-service需要配置对应环境的数据库参数 ###### 2.2.1.1.2.3 配置apollo-portal的数据库连接信息 1. 解压`apollo-portal-x.x.x-github.zip` 2. 用程序员专用编辑器(如vim,notepad++,sublime等)打开`config`目录下的`application-github.properties`文件 3. 填写正确的ApolloPortalDB数据库连接串信息,注意用户名和密码后面不要有空格! 4. 修改完的效果如下: ```properties # DataSource spring.datasource.url = jdbc:mysql://localhost:3306/ApolloPortalDB?useSSL=false&characterEncoding=utf8 spring.datasource.username = someuser spring.datasource.password = somepwd ``` ###### 2.2.1.1.2.4 配置apollo-portal的meta service信息 Apollo Portal需要在不同的环境访问不同的meta service(apollo-configservice)地址,所以我们需要在配置中提供这些信息。默认情况下,meta service和config service是部署在同一个JVM进程,所以meta service的地址就是config service的地址。 > 对于1.6.0及以上版本,可以通过ApolloPortalDB.ServerConfig中的配置项来配置Meta Service地址,详见[apollo.portal.meta.servers - 各环境Meta Service列表](#_312-apolloportalmetaservers-各环境meta-service列表) 使用程序员专用编辑器(如vim,notepad++,sublime等)打开`apollo-portal-x.x.x-github.zip`中`config`目录下的`apollo-env.properties`文件。 假设DEV的apollo-configservice未绑定域名,地址是1.1.1.1:8080,FAT的apollo-configservice绑定了域名apollo.fat.xxx.com,UAT的apollo-configservice绑定了域名apollo.uat.xxx.com,PRO的apollo-configservice绑定了域名apollo.xxx.com,那么可以如下修改各环境meta service服务地址,格式为`${env}.meta=http://${config-service-url:port}`,如果某个环境不需要,也可以直接删除对应的配置项(如lpt.meta): ```sh dev.meta=http://1.1.1.1:8080 fat.meta=http://apollo.fat.xxx.com uat.meta=http://apollo.uat.xxx.com pro.meta=http://apollo.xxx.com ``` 除了通过`apollo-env.properties`方式配置meta service以外,apollo也支持在运行时指定meta service(优先级比`apollo-env.properties`高): 1. 通过Java System Property `${env}_meta` * 可以通过Java的System Property `${env}_meta`来指定 * 如`java -Ddev_meta=http://config-service-url -jar xxx.jar` * 也可以通过程序指定,如`System.setProperty("dev_meta", "http://config-service-url");` 2. 通过操作系统的System Environment`${ENV}_META` * 如`DEV_META=http://config-service-url` * 注意key为全大写,且中间是`_`分隔 >注1: 为了实现meta service的高可用,推荐通过SLB(Software Load Balancer)做动态负载均衡 >注2: meta service地址也可以填入IP,0.11.0版本之前只支持填入一个IP。从0.11.0版本开始支持填入以逗号分隔的多个地址([PR #1214](https://github.com/ctripcorp/apollo/pull/1214)),如`http://1.1.1.1:8080,http://2.2.2.2:8080`,不过生产环境还是建议使用域名(走slb),因为机器扩容、缩容等都可能导致IP列表的变化。 #### 2.2.1.2 通过源码构建 ##### 2.2.1.2.1 配置数据库连接信息 Apollo服务端需要知道如何连接到你前面创建的数据库,所以需要编辑[scripts/build.sh](https://github.com/ctripcorp/apollo/blob/master/scripts/build.sh),修改ApolloPortalDB和ApolloConfigDB相关的数据库连接串信息。 > 注意:填入的用户需要具备对ApolloPortalDB和ApolloConfigDB数据的读写权限。 ```sh #apollo config db info apollo_config_db_url=jdbc:mysql://localhost:3306/ApolloConfigDB?useSSL=false&characterEncoding=utf8 apollo_config_db_username=用户名 apollo_config_db_password=密码(如果没有密码,留空即可) # apollo portal db info apollo_portal_db_url=jdbc:mysql://localhost:3306/ApolloPortalDB?useSSL=false&characterEncoding=utf8 apollo_portal_db_username=用户名 apollo_portal_db_password=密码(如果没有密码,留空即可) ``` > 注1:由于ApolloConfigDB在每个环境都有部署,所以对不同的环境config-service和admin-service需要使用不同的数据库参数打不同的包,portal只需要打一次包即可 > 注2:如果不想config-service和admin-service每个环境打一个包的话,也可以通过运行时传入数据库连接串信息实现,具体可以参考 [Issue 869](https://github.com/ctripcorp/apollo/issues/869) > 注3:每个环境都需要独立部署一套config-service、admin-service和ApolloConfigDB ##### 2.2.1.2.2 配置各环境meta service地址 Apollo Portal需要在不同的环境访问不同的meta service(apollo-configservice)地址,所以需要在打包时提供这些信息。 假设DEV的apollo-configservice未绑定域名,地址是1.1.1.1:8080,FAT的apollo-configservice绑定了域名apollo.fat.xxx.com,UAT的apollo-configservice绑定了域名apollo.uat.xxx.com,PRO的apollo-configservice绑定了域名apollo.xxx.com,那么编辑[scripts/build.sh](https://github.com/ctripcorp/apollo/blob/master/scripts/build.sh),如下修改各环境meta service服务地址,格式为`${env}_meta=http://${config-service-url:port}`,如果某个环境不需要,也可以直接删除对应的配置项: ```sh dev_meta=http://1.1.1.1:8080 fat_meta=http://apollo.fat.xxx.com uat_meta=http://apollo.uat.xxx.com pro_meta=http://apollo.xxx.com META_SERVERS_OPTS="-Ddev_meta=$dev_meta -Dfat_meta=$fat_meta -Duat_meta=$uat_meta -Dpro_meta=$pro_meta" ``` 除了在打包时配置meta service以外,apollo也支持在运行时指定meta service: 1. 通过Java System Property `${env}_meta` * 可以通过Java的System Property `${env}_meta`来指定 * 如`java -Ddev_meta=http://config-service-url -jar xxx.jar` * 也可以通过程序指定,如`System.setProperty("dev_meta", "http://config-service-url");` 2. 通过操作系统的System Environment`${ENV}_META` * 如`DEV_META=http://config-service-url` * 注意key为全大写,且中间是`_`分隔 >注1: 为了实现meta service的高可用,推荐通过SLB(Software Load Balancer)做动态负载均衡 >注2: meta service地址也可以填入IP,0.11.0版本之前只支持填入一个IP。从0.11.0版本开始支持填入以逗号分隔的多个地址([PR #1214](https://github.com/ctripcorp/apollo/pull/1214)),如`http://1.1.1.1:8080,http://2.2.2.2:8080`,不过生产环境还是建议使用域名(走slb),因为机器扩容、缩容等都可能导致IP列表的变化。 ##### 2.2.1.2.3 执行编译、打包 做完上述配置后,就可以执行编译和打包了。 > 注:初次编译会从Maven中央仓库下载不少依赖,如果网络情况不佳时很容易出错,建议使用国内的Maven仓库源,比如[阿里云Maven镜像](http://www.cnblogs.com/geektown/p/5705405.html) ```sh ./build.sh ``` 该脚本会依次打包apollo-configservice, apollo-adminservice, apollo-portal。 > 注:由于ApolloConfigDB在每个环境都有部署,所以对不同环境的config-service和admin-service需要使用不同的数据库连接信息打不同的包,portal只需要打一次包即可 ##### 2.2.1.2.4 获取apollo-configservice安装包 位于`apollo-configservice/target/`目录下的`apollo-configservice-x.x.x-github.zip` 需要注意的是由于ApolloConfigDB在每个环境都有部署,所以对不同环境的config-service需要使用不同的数据库参数打不同的包后分别部署 ##### 2.2.1.2.5 获取apollo-adminservice安装包 位于`apollo-adminservice/target/`目录下的`apollo-adminservice-x.x.x-github.zip` 需要注意的是由于ApolloConfigDB在每个环境都有部署,所以对不同环境的admin-service需要使用不同的数据库参数打不同的包后分别部署 ##### 2.2.1.2.6 获取apollo-portal安装包 位于`apollo-portal/target/`目录下的`apollo-portal-x.x.x-github.zip` ##### 2.2.1.2.7 启用外部nacos服务注册中心替换内置eureka 1. 修改build.sh/build.bat,将config-service和admin-service的maven编译命令更改为 ```shell mvn clean package -Pgithub,nacos-discovery -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,nacos-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password ``` 2. 分别修改apollo-configservice和apollo-adminservice安装包中config目录下的application-github.properties,配置nacos服务器地址 ```properties nacos.discovery.server-addr=127.0.0.1:8848 # 更多 nacos 配置 nacos.discovery.access-key= nacos.discovery.username= nacos.discovery.password= nacos.discovery.secret-key= nacos.discovery.namespace= nacos.discovery.context-path= ``` ##### 2.2.1.2.8 启用外部Consul服务注册中心替换内置eureka 1. 修改build.sh/build.bat,将config-service和admin-service的maven编译命令更改为 ```shell mvn clean package -Pgithub -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github,consul-discovery -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password ``` 2. 分别修改apollo-configservice和apollo-adminservice安装包中config目录下的application-github.properties,配置consul服务器地址 ```properties spring.cloud.consul.host=127.0.0.1 spring.cloud.consul.port=8500 ``` ### 2.2.2 部署Apollo服务端 #### 2.2.2.1 部署apollo-configservice 将对应环境的`apollo-configservice-x.x.x-github.zip`上传到服务器上,解压后执行scripts/startup.sh即可。如需停止服务,执行scripts/shutdown.sh. 记得在scripts/startup.sh中按照实际的环境设置一个JVM内存,以下是我们的默认设置,供参考: ```bash export JAVA_OPTS="-server -Xms6144m -Xmx6144m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=4096m -XX:MaxNewSize=4096m -XX:SurvivorRatio=18" ``` > 注1:如果需要修改JVM参数,可以修改scripts/startup.sh的`JAVA_OPTS`部分。 > 注2:如要调整服务的日志输出路径,可以修改scripts/startup.sh和apollo-configservice.conf中的`LOG_DIR`。 > 注3:如要调整服务的监听端口,可以修改scripts/startup.sh中的`SERVER_PORT`。另外apollo-configservice同时承担meta server职责,如果要修改端口,注意要同时ApolloConfigDB.ServerConfig表中的`eureka.service.url`配置项以及apollo-portal和apollo-client中的使用到的meta server信息,详见:[2.2.1.1.2.4 配置apollo-portal的meta service信息](#_221124-配置apollo-portal的meta-service信息)和[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)。 > 注4:如果ApolloConfigDB.ServerConfig的eureka.service.url只配了当前正在启动的机器的话,在启动apollo-configservice的过程中会在日志中输出eureka注册失败的信息,如`com.sun.jersey.api.client.ClientHandlerException: java.net.ConnectException: Connection refused`。需要注意的是,这个是预期的情况,因为apollo-configservice需要向Meta Server(它自己)注册服务,但是因为在启动过程中,自己还没起来,所以会报这个错。后面会进行重试的动作,所以等自己服务起来后就会注册正常了。 > 注5:如果你看到了这里,相信你一定是一个细心阅读文档的人,而且离成功就差一点点了,继续加油,应该很快就能完成Apollo的分布式部署了!不过你是否有感觉Apollo的分布式部署步骤有点繁琐?是否有啥建议想要和作者说?如果答案是肯定的话,请移步 [#1424](https://github.com/ctripcorp/apollo/issues/1424),期待你的建议! #### 2.2.2.2 部署apollo-adminservice 将对应环境的`apollo-adminservice-x.x.x-github.zip`上传到服务器上,解压后执行scripts/startup.sh即可。如需停止服务,执行scripts/shutdown.sh. 记得在scripts/startup.sh中按照实际的环境设置一个JVM内存,以下是我们的默认设置,供参考: ```bash export JAVA_OPTS="-server -Xms2560m -Xmx2560m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1024m -XX:MaxNewSize=1024m -XX:SurvivorRatio=22" ``` > 注1:如果需要修改JVM参数,可以修改scripts/startup.sh的`JAVA_OPTS`部分。 > 注2:如要调整服务的日志输出路径,可以修改scripts/startup.sh和apollo-adminservice.conf中的`LOG_DIR`。 > 注3:如要调整服务的监听端口,可以修改scripts/startup.sh中的`SERVER_PORT`。 #### 2.2.2.3 部署apollo-portal 将`apollo-portal-x.x.x-github.zip`上传到服务器上,解压后执行scripts/startup.sh即可。如需停止服务,执行scripts/shutdown.sh. 记得在startup.sh中按照实际的环境设置一个JVM内存,以下是我们的默认设置,供参考: ```bash export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:NewSize=1536m -XX:MaxNewSize=1536m -XX:SurvivorRatio=22" ``` > 注1:如果需要修改JVM参数,可以修改scripts/startup.sh的`JAVA_OPTS`部分。 > 注2:如要调整服务的日志输出路径,可以修改scripts/startup.sh和apollo-portal.conf中的`LOG_DIR`。 > 注3:如要调整服务的监听端口,可以修改scripts/startup.sh中的`SERVER_PORT`。 ## 2.3 Docker部署 ### 2.3.1 1.7.0及以上版本 Apollo 1.7.0版本开始会默认上传Docker镜像到[Docker Hub](https://hub.docker.com/u/apolloconfig),可以按照如下步骤获取 #### 2.3.1.1 Apollo Config Service ##### 2.3.1.1.1 获取镜像 ```bash docker pull apolloconfig/apollo-configservice:${version} ``` ##### 2.3.1.1.2 运行镜像 示例: ```bash docker run -p 8080:8080 \ -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8" \ -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword \ -d -v /tmp/logs:/opt/logs --name apollo-configservice apolloconfig/apollo-configservice:${version} ``` 参数说明: * SPRING_DATASOURCE_URL: 对应环境ApolloConfigDB的地址 * SPRING_DATASOURCE_USERNAME: 对应环境ApolloConfigDB的用户名 * SPRING_DATASOURCE_PASSWORD: 对应环境ApolloConfigDB的密码 #### 2.3.1.2 Apollo Admin Service ##### 2.3.1.2.1 获取镜像 ```bash docker pull apolloconfig/apollo-adminservice:${version} ``` ##### 2.3.1.2.2 运行镜像 示例: ```bash docker run -p 8090:8090 \ -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8" \ -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword \ -d -v /tmp/logs:/opt/logs --name apollo-adminservice apolloconfig/apollo-adminservice:${version} ``` 参数说明: * SPRING_DATASOURCE_URL: 对应环境ApolloConfigDB的地址 * SPRING_DATASOURCE_USERNAME: 对应环境ApolloConfigDB的用户名 * SPRING_DATASOURCE_PASSWORD: 对应环境ApolloConfigDB的密码 #### 2.3.1.3 Apollo Portal ##### 2.3.1.3.1 获取镜像 ```bash docker pull apolloconfig/apollo-portal:${version} ``` ##### 2.3.1.3.2 运行镜像 示例: ```bash docker run -p 8070:8070 \ -e SPRING_DATASOURCE_URL="jdbc:mysql://fill-in-the-correct-server:3306/ApolloPortalDB?characterEncoding=utf8" \ -e SPRING_DATASOURCE_USERNAME=FillInCorrectUser -e SPRING_DATASOURCE_PASSWORD=FillInCorrectPassword \ -e APOLLO_PORTAL_ENVS=dev,pro \ -e DEV_META=http://fill-in-dev-meta-server:8080 -e PRO_META=http://fill-in-pro-meta-server:8080 \ -d -v /tmp/logs:/opt/logs --name apollo-portal apolloconfig/apollo-portal:${version} ``` 参数说明: * SPRING_DATASOURCE_URL: 对应环境ApolloPortalDB的地址 * SPRING_DATASOURCE_USERNAME: 对应环境ApolloPortalDB的用户名 * SPRING_DATASOURCE_PASSWORD: 对应环境ApolloPortalDB的密码 * APOLLO_PORTAL_ENVS(可选): 对应ApolloPortalDB中的[apollo.portal.envs](#_311-apolloportalenvs-可支持的环境列表)配置项,如果没有在数据库中配置的话,可以通过此环境参数配置 * DEV_META/PRO_META(可选): 配置对应环境的Meta Service地址,以${ENV}_META命名,需要注意的是如果配置了ApolloPortalDB中的[apollo.portal.meta.servers](#_312-apolloportalmetaservers-各环境meta-service列表)配置,则以apollo.portal.meta.servers中的配置为准 #### 2.3.1.4 通过源码构建 Docker 镜像 如果修改了 apollo 服务端的代码,希望通过源码构建 Docker 镜像,可以参考下面的步骤: 1. 通过源码构建安装包:`./scripts/build.sh` 2. 构建 Docker 镜像:`mvn docker:build -pl apollo-configservice,apollo-adminservice,apollo-portal` ### 2.3.2 1.7.0之前的版本 Apollo项目已经自带了Docker file,可以参照[2.2.1 获取安装包](#_221-获取安装包)配置好安装包后通过下面的文件来打Docker镜像: 1. [apollo-configservice](https://github.com/ctripcorp/apollo/blob/master/apollo-configservice/src/main/docker/Dockerfile) 2. [apollo-adminservice](https://github.com/ctripcorp/apollo/blob/master/apollo-adminservice/src/main/docker/Dockerfile) 3. [apollo-portal](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/docker/Dockerfile) 也可以参考Apollo用户[@kulovecc](https://github.com/kulovecc)的[docker-apollo](https://github.com/kulovecc/docker-apollo)项目和[@idoop](https://github.com/idoop)的[docker-apollo](https://github.com/idoop/docker-apollo)项目。 ## 2.4 Kubernetes部署 ### 2.4.1 基于Kubernetes原生服务发现 Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的部署模式,由于不再使用内置的Eureka,所以在整体部署上有很大简化,同时也提供了Helm Charts,便于部署。 > 更多设计说明可以参考[#3054](https://github.com/ctripcorp/apollo/issues/3054)。 #### 2.4.1.1 环境要求 - Kubernetes 1.10+ - Helm 3 #### 2.4.1.2 添加Apollo Helm Chart仓库 ```bash $ helm repo add apollo https://www.apolloconfig.com/charts $ helm search repo apollo ``` #### 2.4.1.3 部署apollo-configservice和apollo-adminservice ##### 2.4.1.3.1 安装apollo-configservice和apollo-adminservice 需要在每个环境中安装apollo-configservice和apollo-adminservice,所以建议在release名称中加入环境信息,例如:`apollo-service-dev` ```bash $ helm install apollo-service-dev \ --set configdb.host=1.2.3.4 \ --set configdb.userName=apollo \ --set configdb.password=apollo \ --set configdb.service.enabled=true \ --set configService.replicaCount=1 \ --set adminService.replicaCount=1 \ -n your-namespace \ apollo/apollo-service ``` 一般部署建议通过 values.yaml 来配置: ```bash $ helm install apollo-service-dev -f values.yaml -n your-namespace apollo/apollo-service ``` 安装完成后会提示对应环境的Meta Server地址,需要记录下来,apollo-portal安装时需要用到: ```bash Get meta service url for current release by running these commands: echo http://apollo-service-dev-apollo-configservice:8080 ``` > 更多配置项说明可以参考[2.4.1.3.3 配置项说明](#_24133-配置项说明) ##### 2.4.1.3.2 卸载apollo-configservice和apollo-adminservice 例如要卸载`apollo-service-dev`的部署: ```bash $ helm uninstall -n your-namespace apollo-service-dev ``` ##### 2.4.1.3.3 配置项说明 下表列出了apollo-service chart的可配置参数及其默认值: | Parameter | Description | Default | |----------------------|---------------------------------------------|---------------------| | `configdb.host` | The host for apollo config db | `nil` | | `configdb.port` | The port for apollo config db | `3306` | | `configdb.dbName` | The database name for apollo config db | `ApolloConfigDB` | | `configdb.userName` | The user name for apollo config db | `nil` | | `configdb.password` | The password for apollo config db | `nil` | | `configdb.connectionStringProperties` | The connection string properties for apollo config db | `characterEncoding=utf8` | | `configdb.service.enabled` | Whether to create a Kubernetes Service for `configdb.host` or not. Set it to `true` if `configdb.host` is an endpoint outside of the kubernetes cluster | `false` | | `configdb.service.fullNameOverride` | Override the service name for apollo config db | `nil` | | `configdb.service.port` | The port for the service of apollo config db | `3306` | | `configdb.service.type` | The service type of apollo config db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. `xxx.mysql.rds.aliyuncs.com` | `ClusterIP` | | `configService.fullNameOverride` | Override the deployment name for apollo-configservice | `nil` | | `configService.replicaCount` | Replica count of apollo-configservice | `2` | | `configService.containerPort` | Container port of apollo-configservice | `8080` | | `configService.image.repository` | Image repository of apollo-configservice | `apolloconfig/apollo-configservice` | | `configService.image.tag` | Image tag of apollo-configservice, e.g. `1.8.0`, leave it to `nil` to use the default version. _(chart version >= 0.2.0)_ | `nil` | | `configService.image.pullPolicy` | Image pull policy of apollo-configservice | `IfNotPresent` | | `configService.imagePullSecrets` | Image pull secrets of apollo-configservice | `[]` | | `configService.service.fullNameOverride` | Override the service name for apollo-configservice | `nil` | | `configService.service.port` | The port for the service of apollo-configservice | `8080` | | `configService.service.targetPort` | The target port for the service of apollo-configservice | `8080` | | `configService.service.type` | The service type of apollo-configservice | `ClusterIP` | | `configService.ingress.enabled` | Whether to enable the ingress for config-service or not. _(chart version >= 0.2.0)_ | `false` | | `configService.ingress.annotations` | The annotations of the ingress for config-service. _(chart version >= 0.2.0)_ | `{}` | | `configService.ingress.hosts.host` | The host of the ingress for config-service. _(chart version >= 0.2.0)_ | `nil` | | `configService.ingress.hosts.paths` | The paths of the ingress for config-service. _(chart version >= 0.2.0)_ | `[]` | | `configService.ingress.tls` | The tls definition of the ingress for config-service. _(chart version >= 0.2.0)_ | `[]` | | `configService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `configService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `configService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `configService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `configService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `configService.config.configServiceUrlOverride` | Override `apollo.config-service.url`: config service url to be accessed by apollo-client, e.g. `http://apollo-config-service-dev:8080` | `nil` | | `configService.config.adminServiceUrlOverride` | Override `apollo.admin-service.url`: admin service url to be accessed by apollo-portal, e.g. `http://apollo-admin-service-dev:8090` | `nil` | | `configService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access config service via `http://{config_service_address}/apollo`. _(chart version >= 0.2.0)_ | `nil` | | `configService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `configService.strategy` | The deployment strategy of apollo-configservice | `{}` | | `configService.resources` | The resources definition of apollo-configservice | `{}` | | `configService.nodeSelector` | The node selector definition of apollo-configservice | `{}` | | `configService.tolerations` | The tolerations definition of apollo-configservice | `[]` | | `configService.affinity` | The affinity definition of apollo-configservice | `{}` | | `adminService.fullNameOverride` | Override the deployment name for apollo-adminservice | `nil` | | `adminService.replicaCount` | Replica count of apollo-adminservice | `2` | | `adminService.containerPort` | Container port of apollo-adminservice | `8090` | | `adminService.image.repository` | Image repository of apollo-adminservice | `apolloconfig/apollo-adminservice` | | `adminService.image.tag` | Image tag of apollo-adminservice, e.g. `1.8.0`, leave it to `nil` to use the default version. _(chart version >= 0.2.0)_ | `nil` | | `adminService.image.pullPolicy` | Image pull policy of apollo-adminservice | `IfNotPresent` | | `adminService.imagePullSecrets` | Image pull secrets of apollo-adminservice | `[]` | | `adminService.service.fullNameOverride` | Override the service name for apollo-adminservice | `nil` | | `adminService.service.port` | The port for the service of apollo-adminservice | `8090` | | `adminService.service.targetPort` | The target port for the service of apollo-adminservice | `8090` | | `adminService.service.type` | The service type of apollo-adminservice | `ClusterIP` | | `adminService.ingress.enabled` | Whether to enable the ingress for admin-service or not. _(chart version >= 0.2.0)_ | `false` | | `adminService.ingress.annotations` | The annotations of the ingress for admin-service. _(chart version >= 0.2.0)_ | `{}` | | `adminService.ingress.hosts.host` | The host of the ingress for admin-service. _(chart version >= 0.2.0)_ | `nil` | | `adminService.ingress.hosts.paths` | The paths of the ingress for admin-service. _(chart version >= 0.2.0)_ | `[]` | | `adminService.ingress.tls` | The tls definition of the ingress for admin-service. _(chart version >= 0.2.0)_ | `[]` | | `adminService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `adminService.liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `adminService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `adminService.readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `adminService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` | | `adminService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access admin service via `http://{admin_service_address}/apollo`. _(chart version >= 0.2.0)_ | `nil` | | `adminService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `adminService.strategy` | The deployment strategy of apollo-adminservice | `{}` | | `adminService.resources` | The resources definition of apollo-adminservice | `{}` | | `adminService.nodeSelector` | The node selector definition of apollo-adminservice | `{}` | | `adminService.tolerations` | The tolerations definition of apollo-adminservice | `[]` | | `adminService.affinity` | The affinity definition of apollo-adminservice | `{}` | ##### 2.4.1.3.4 配置样例 ###### 2.4.1.3.4.1 ConfigDB的host是k8s集群外的IP ```yaml configdb: host: 1.2.3.4 dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` ###### 2.4.1.3.4.2 ConfigDB的host是k8s集群外的域名 ```yaml configdb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` ###### 2.4.1.3.4.3 ConfigDB的host是k8s集群内的一个服务 ```yaml configdb: host: apollodb-mysql.mysql dbName: ApolloConfigDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` ###### 2.4.1.3.4.4 指定Meta Server返回的apollo-configservice地址 如果apollo-client无法直接访问apollo-configservice的Service(比如不在同一个k8s集群),那么可以参照下面的示例指定Meta Server返回给apollo-client的地址(比如可以通过nodeport访问) ```yaml configService: config: configServiceUrlOverride: http://1.2.3.4:12345 ``` ###### 2.4.1.3.4.5 指定Meta Server返回的apollo-adminservice地址 如果apollo-portal无法直接访问apollo-adminservice的Service(比如不在同一个k8s集群),那么可以参照下面的示例指定Meta Server返回给apollo-portal的地址(比如可以通过nodeport访问) ```yaml configService: config: adminServiceUrlOverride: http://1.2.3.4:23456 ``` ###### 2.4.1.3.4.6 以Ingress配置自定义路径`/config`形式暴露apollo-configservice服务 ```yaml # use /config as root, should specify configService.config.contextPath as /config configService: config: contextPath: /config ingress: enabled: true hosts: - paths: - /config ``` ###### 2.4.1.3.4.7 以Ingress配置自定义路径`/admin`形式暴露apollo-adminservice服务 ```yaml # use /admin as root, should specify adminService.config.contextPath as /admin adminService: config: contextPath: /admin ingress: enabled: true hosts: - paths: - /admin ``` #### 2.4.1.4 部署apollo-portal ##### 2.4.1.4.1 安装apollo-portal 假设有dev, pro两个环境,且meta server地址分别为`http://apollo-service-dev-apollo-configservice:8080`和`http://apollo-service-pro-apollo-configservice:8080`: ```bash $ helm install apollo-portal \ --set portaldb.host=1.2.3.4 \ --set portaldb.userName=apollo \ --set portaldb.password=apollo \ --set portaldb.service.enabled=true \ --set config.envs="dev\,pro" \ --set config.metaServers.dev=http://apollo-service-dev-apollo-configservice:8080 \ --set config.metaServers.pro=http://apollo-service-pro-apollo-configservice:8080 \ --set replicaCount=1 \ -n your-namespace \ apollo/apollo-portal ``` 一般部署建议通过 values.yaml 来配置: ```bash $ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal ``` > 更多配置项说明可以参考[2.4.1.4.3 配置项说明](#_24143-配置项说明) ##### 2.4.1.4.2 卸载apollo-portal 例如要卸载`apollo-portal`的部署: ```bash $ helm uninstall -n your-namespace apollo-portal ``` ##### 2.4.1.4.3 配置项说明 下表列出了apollo-portal chart的可配置参数及其默认值: | Parameter | Description | Default | |----------------------|---------------------------------------------|-----------------------| | `fullNameOverride` | Override the deployment name for apollo-portal | `nil` | | `replicaCount` | Replica count of apollo-portal | `2` | | `containerPort` | Container port of apollo-portal | `8070` | | `image.repository` | Image repository of apollo-portal | `apolloconfig/apollo-portal` | | `image.tag` | Image tag of apollo-portal, e.g. `1.8.0`, leave it to `nil` to use the default version. _(chart version >= 0.2.0)_ | `nil` | | `image.pullPolicy` | Image pull policy of apollo-portal | `IfNotPresent` | | `imagePullSecrets` | Image pull secrets of apollo-portal | `[]` | | `service.fullNameOverride` | Override the service name for apollo-portal | `nil` | | `service.port` | The port for the service of apollo-portal | `8070` | | `service.targetPort` | The target port for the service of apollo-portal | `8070` | | `service.type` | The service type of apollo-portal | `ClusterIP` | | `service.sessionAffinity` | The session affinity for the service of apollo-portal | `ClientIP` | | `ingress.enabled` | Whether to enable the ingress or not | `false` | | `ingress.annotations` | The annotations of the ingress | `{}` | | `ingress.hosts.host` | The host of the ingress | `nil` | | `ingress.hosts.paths` | The paths of the ingress | `[]` | | `ingress.tls` | The tls definition of the ingress | `[]` | | `liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` | | `liveness.periodSeconds` | The period seconds of liveness probe | `10` | | `readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` | | `readiness.periodSeconds` | The period seconds of readiness probe | `5` | | `env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` | | `strategy` | The deployment strategy of apollo-portal | `{}` | | `resources` | The resources definition of apollo-portal | `{}` | | `nodeSelector` | The node selector definition of apollo-portal | `{}` | | `tolerations` | The tolerations definition of apollo-portal | `[]` | | `affinity` | The affinity definition of apollo-portal | `{}` | | `config.profiles` | specify the spring profiles to activate | `github,auth` | | `config.envs` | specify the env names, e.g. `dev,pro` | `nil` | | `config.contextPath` | specify the context path, e.g. `/apollo`, then users could access portal via `http://{portal_address}/apollo` | `nil` | | `config.metaServers` | specify the meta servers, e.g.<br />`dev: http://apollo-configservice-dev:8080`<br />`pro: http://apollo-configservice-pro:8080` | `{}` | | `config.files` | specify the extra config files for apollo-portal, e.g. `application-ldap.yml` | `{}` | | `portaldb.host` | The host for apollo portal db | `nil` | | `portaldb.port` | The port for apollo portal db | `3306` | | `portaldb.dbName` | The database name for apollo portal db | `ApolloPortalDB` | | `portaldb.userName` | The user name for apollo portal db | `nil` | | `portaldb.password` | The password for apollo portal db | `nil` | | `portaldb.connectionStringProperties` | The connection string properties for apollo portal db | `characterEncoding=utf8` | | `portaldb.service.enabled` | Whether to create a Kubernetes Service for `portaldb.host` or not. Set it to `true` if `portaldb.host` is an endpoint outside of the kubernetes cluster | `false` | | `portaldb.service.fullNameOverride` | Override the service name for apollo portal db | `nil` | | `portaldb.service.port` | The port for the service of apollo portal db | `3306` | | `portaldb.service.type` | The service type of apollo portal db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. `xxx.mysql.rds.aliyuncs.com` | `ClusterIP` | ##### 2.4.1.4.4 配置样例 ###### 2.4.1.4.4.1 PortalDB的host是k8s集群外的IP ```yaml portaldb: host: 1.2.3.4 dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true ``` ###### 2.4.1.4.4.2 PortalDB的host是k8s集群外的域名 ```yaml portaldb: host: xxx.mysql.rds.aliyuncs.com dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false service: enabled: true type: ExternalName ``` ###### 2.4.1.4.4.3 PortalDB的host是k8s集群内的一个服务 ```yaml portaldb: host: apollodb-mysql.mysql dbName: ApolloPortalDBName userName: someUserName password: somePassword connectionStringProperties: characterEncoding=utf8&useSSL=false ``` ###### 2.4.1.4.4.4 配置环境信息 ```yaml config: envs: dev,pro metaServers: dev: http://apollo-service-dev-apollo-configservice:8080 pro: http://apollo-service-pro-apollo-configservice:8080 ``` ###### 2.4.1.4.4.5 以Load Balancer形式暴露服务 ```yaml service: type: LoadBalancer ``` ###### 2.4.1.4.4.6 以Ingress形式暴露服务 ```yaml ingress: enabled: true hosts: - paths: - / ``` ###### 2.4.1.4.4.7 以Ingress配置自定义路径`/apollo`形式暴露服务 ```yaml # use /apollo as root, should specify config.contextPath as /apollo ingress: enabled: true hosts: - paths: - /apollo config: ... contextPath: /apollo ... ``` ###### 2.4.1.4.4.8 以Ingress配置session affinity形式暴露服务 ```yaml ingress: enabled: true annotations: kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/affinity: "cookie" nginx.ingress.kubernetes.io/affinity-mode: "persistent" nginx.ingress.kubernetes.io/session-cookie-conditional-samesite-none: "true" nginx.ingress.kubernetes.io/session-cookie-expires: "172800" nginx.ingress.kubernetes.io/session-cookie-max-age: "172800" hosts: - host: xxx.somedomain.com # host is required to make session affinity work paths: - / ``` ###### 2.4.1.4.4.9 启用 LDAP 支持 ```yaml config: ... profiles: github,ldap ... files: application-ldap.yml: | spring: ldap: base: "dc=example,dc=org" username: "cn=admin,dc=example,dc=org" password: "password" searchFilter: "(uid={0})" urls: - "ldap://xxx.somedomain.com:389" ldap: mapping: objectClass: "inetOrgPerson" loginId: "uid" userDisplayName: "cn" email: "mail" ``` #### 2.4.1.5 通过源码构建 Docker 镜像 如果修改了 apollo 服务端的代码,希望通过源码构建 Docker 镜像,可以参考[2.3.1.4 通过源码构建 Docker 镜像](#_2314-通过源码构建-docker-镜像)的步骤。 ### 2.4.2 基于内置的Eureka服务发现 感谢[AiotCEO](https://github.com/AiotCEO)提供了k8s的部署支持,使用说明可以参考[apollo-on-kubernetes](https://github.com/ctripcorp/apollo/blob/master/scripts/apollo-on-kubernetes/README.md)。 感谢[qct](https://github.com/qct)提供的Helm Chart部署支持,使用说明可以参考[qct/apollo-helm](https://github.com/qct/apollo-helm)。 # 三、服务端配置说明 > 以下配置除了支持在数据库中配置以外,也支持通过-D参数、application.properties等配置,且-D参数、application.properties等优先级高于数据库中的配置 ## 3.1 调整ApolloPortalDB配置 配置项统一存储在ApolloPortalDB.ServerConfig表中,也可以通过`管理员工具 - 系统参数`页面进行配置,无特殊说明则修改完一分钟实时生效。 ### 3.1.1 apollo.portal.envs - 可支持的环境列表 默认值是dev,如果portal需要管理多个环境的话,以逗号分隔即可(大小写不敏感),如: ``` DEV,FAT,UAT,PRO ``` 修改完需要重启生效。 >注1:一套Portal可以管理多个环境,但是每个环境都需要独立部署一套Config Service、Admin Service和ApolloConfigDB,具体请参考:[2.1.2 创建ApolloConfigDB](#_212-创建apolloconfigdb),[3.2 调整ApolloConfigDB配置](zh/deployment/distributed-deployment-guide?id=_32-调整apolloconfigdb配置),[2.2.1.1.2 配置数据库连接信息](#_22112-配置数据库连接信息),另外如果是为已经运行了一段时间的Apollo配置中心增加环境,别忘了参考[2.1.2.4 从别的环境导入ApolloConfigDB的项目数据](#_2124-从别的环境导入apolloconfigdb的项目数据)对新的环境做初始化。 >注2:只在数据库添加环境是不起作用的,还需要为apollo-portal添加新增环境对应的meta server地址,具体参考:[2.2.1.1.2.4 配置apollo-portal的meta service信息](#_221124-配置apollo-portal的meta-service信息)。apollo-client在新的环境下使用时也需要做好相应的配置,具体参考:[1.2.2 Apollo Meta Server](zh/usage/java-sdk-user-guide#_122-apollo-meta-server)。 >注3:如果希望添加自定义的环境名称,具体步骤可以参考[Portal如何增加环境](zh/faq/common-issues-in-deployment-and-development-phase?id=_4-portal如何增加环境?)。 >注4:1.1.0版本增加了系统信息页面(`管理员工具` -> `系统信息`),可以通过该页面检查配置是否正确 ### 3.1.2 apollo.portal.meta.servers - 各环境Meta Service列表 > 适用于1.6.0及以上版本 Apollo Portal需要在不同的环境访问不同的meta service(apollo-configservice)地址,所以我们需要在配置中提供这些信息。默认情况下,meta service和config service是部署在同一个JVM进程,所以meta service的地址就是config service的地址。 样例如下: ```json { "DEV":"http://1.1.1.1:8080", "FAT":"http://apollo.fat.xxx.com", "UAT":"http://apollo.uat.xxx.com", "PRO":"http://apollo.xxx.com" } ``` 修改完需要重启生效。 > 该配置优先级高于其它方式设置的Meta Service地址,更多信息可以参考[2.2.1.1.2.4 配置apollo-portal的meta service信息](#_221124-配置apollo-portal的meta-service信息)。 ### 3.1.3 organizations - 部门列表 Portal中新建的App都需要选择部门,所以需要在这里配置可选的部门信息,样例如下: ```json [{"orgId":"TEST1","orgName":"样例部门1"},{"orgId":"TEST2","orgName":"样例部门2"}] ``` ### 3.1.4 superAdmin - Portal超级管理员 超级管理员拥有所有权限,需要谨慎设置。 如果没有接入自己公司的SSO系统的话,可以先暂时使用默认值apollo(默认用户)。等接入后,修改为实际使用的账号,多个账号以英文逗号分隔(,)。 ### 3.1.5 consumer.token.salt - consumer token salt 如果会使用开放平台API的话,可以设置一个token salt。如果不使用,可以忽略。 ### 3.1.6 wiki.address portal上“帮助”链接的地址,默认是Apollo github的wiki首页,可自行设置。 ### 3.1.7 admin.createPrivateNamespace.switch 是否允许项目管理员创建private namespace。设置为`true`允许创建,设置为`false`则项目管理员在页面上看不到创建private namespace的选项。[了解更多Namespace](zh/design/apollo-core-concept-namespace) ### 3.1.8 emergencyPublish.supported.envs 配置允许紧急发布的环境列表,多个env以英文逗号分隔。 当config service开启一次发布只能有一个人修改开关(`namespace.lock.switch`)后,一次配置发布只能是一个人修改,另一个发布。为了避免遇到紧急情况时(如非工作时间、节假日)无法发布配置,可以配置此项以允许某些环境可以操作紧急发布,即同一个人可以修改并发布配置。 ### 3.1.9 configView.memberOnly.envs 只对项目成员显示配置信息的环境列表,多个env以英文逗号分隔。 对设定了只对项目成员显示配置信息的环境,只有该项目的管理员或拥有该namespace的编辑或发布权限的用户才能看到该私有namespace的配置信息和发布历史。公共namespace始终对所有用户可见。 > 从1.1.0版本开始支持,详见[PR 1531](https://github.com/ctripcorp/apollo/pull/1531) ### 3.1.10 role.create-application.enabled - 是否开启创建项目权限控制 > 适用于1.5.0及以上版本 默认为false,所有用户都可以创建项目 如果设置为true,那么只有超级管理员和拥有创建项目权限的帐号可以创建项目,超级管理员可以通过`管理员工具 - 系统权限管理`给用户分配创建项目权限 ### 3.1.11 role.manage-app-master.enabled - 是否开启项目管理员分配权限控制 > 适用于1.5.0及以上版本 默认为false,所有项目的管理员可以为项目添加/删除管理员 如果设置为true,那么只有超级管理员和拥有项目管理员分配权限的帐号可以为特定项目添加/删除管理员,超级管理员可以通过`管理员工具 - 系统权限管理`给用户分配特定项目的管理员分配权限 ### 3.1.12 admin-service.access.tokens - 设置apollo-portal访问各环境apollo-adminservice所需的access token > 适用于1.7.1及以上版本 如果对应环境的apollo-adminservice开启了[访问控制](#_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制),那么需要在此配置apollo-portal访问该环境apollo-adminservice所需的access token,否则会访问失败 格式为json,如下所示: ```json { "dev" : "098f6bcd4621d373cade4e832627b4f6", "pro" : "ad0234829205b9033196ba818f7a872b" } ``` ## 3.2 调整ApolloConfigDB配置 配置项统一存储在ApolloConfigDB.ServerConfig表中,需要注意每个环境的ApolloConfigDB.ServerConfig都需要单独配置,修改完一分钟实时生效。 ### 3.2.1 eureka.service.url - Eureka服务Url > 不适用于基于Kubernetes原生服务发现场景 不管是apollo-configservice还是apollo-adminservice都需要向eureka服务注册,所以需要配置eureka服务地址。 按照目前的实现,apollo-configservice本身就是一个eureka服务,所以只需要填入apollo-configservice的地址即可,如有多个,用逗号分隔(注意不要忘了/eureka/后缀)。 需要注意的是每个环境只填入自己环境的eureka服务地址,比如FAT的apollo-configservice是1.1.1.1:8080和2.2.2.2:8080,UAT的apollo-configservice是3.3.3.3:8080和4.4.4.4:8080,PRO的apollo-configservice是5.5.5.5:8080和6.6.6.6:8080,那么: 1. 在FAT环境的ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://1.1.1.1:8080/eureka/,http://2.2.2.2:8080/eureka/ ``` 2. 在UAT环境的ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://3.3.3.3:8080/eureka/,http://4.4.4.4:8080/eureka/ ``` 3. 在PRO环境的ApolloConfigDB.ServerConfig表中设置eureka.service.url为: ``` http://5.5.5.5:8080/eureka/,http://6.6.6.6:8080/eureka/ ``` >注1:这里需要填写本环境中全部的eureka服务地址,因为eureka需要互相复制注册信息 >注2:如果希望将Config Service和Admin Service注册到公司统一的Eureka上,可以参考[部署&开发遇到的常见问题 - 将Config Service和Admin Service注册到单独的Eureka Server上](zh/faq/common-issues-in-deployment-and-development-phase#_8-将config-service和admin-service注册到单独的eureka-server上)章节 >注3:在多机房部署时,往往希望config service和admin service只向同机房的eureka注册,要实现这个效果,需要利用`ServerConfig`表中的cluster字段,config service和admin service会读取所在机器的`/opt/settings/server.properties`(Mac/Linux)或`C:\opt\settings\server.properties`(Windows)中的idc属性,如果该idc有对应的eureka.service.url配置,那么就只会向该机房的eureka注册。比如config service和admin service会部署到`SHAOY`和`SHAJQ`两个IDC,那么为了实现这两个机房中的服务只向该机房注册,那么可以在`ServerConfig`表中新增两条记录,分别填入`SHAOY`和`SHAJQ`两个机房的eureka地址即可,`default` cluster的记录可以保留,如果有config service和admin service不是部署在`SHAOY`和`SHAJQ`这两个机房的,就会使用这条默认配置。 | Key |Cluster | Value | Comment | |--------------------|-----------|-------------------------------|---------------------| | eureka.service.url | default | http://1.1.1.1:8080/eureka/ | 默认的Eureka服务Url | | eureka.service.url | SHAOY | http://2.2.2.2:8080/eureka/ | SHAOY的Eureka服务Url | | eureka.service.url | SHAJQ | http://3.3.3.3:8080/eureka/ | SHAJQ的Eureka服务Url | ### 3.2.2 namespace.lock.switch - 一次发布只能有一个人修改开关,用于发布审核 这是一个功能开关,如果配置为true的话,那么一次配置发布只能是一个人修改,另一个发布。 > 生产环境建议开启此选项 ### 3.2.3 config-service.cache.enabled - 是否开启配置缓存 这是一个功能开关,如果配置为true的话,config service会缓存加载过的配置信息,从而加快后续配置获取性能。 默认为false,开启前请先评估总配置大小并调整config service内存配置。 > 开启缓存后必须确保应用中配置的app.id大小写正确,否则将获取不到正确的配置 ### 3.2.4 item.key.length.limit - 配置项 key 最大长度限制 默认配置是128。 ### 3.2.5 item.value.length.limit - 配置项 value 最大长度限制 默认配置是20000。 #### 3.2.5.1 namespace.value.length.limit.override - namespace 的配置项 value 最大长度限制 此配置用来覆盖 `item.value.length.limit` 的配置,做到细粒度控制 namespace 的 value 最大长度限制,配置的值是一个 json 格式,json 的 key 为 namespace 在数据库中的 id 值,格式如下: ``` namespace.value.length.limit.override = {1:200,3:20} ``` 以上配置指定了 ApolloConfigDB.Namespace 表中 id=1 的 namespace 的 value 最大长度限制为 200,id=3 的 namespace 的 value 最大长度限制为 20 ### 3.2.6 admin-service.access.control.enabled - 配置apollo-adminservice是否开启访问控制 > 适用于1.7.1及以上版本 默认为false,如果配置为true,那么apollo-portal就需要[正确配置](#_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)访问该环境的access token,否则访问会被拒绝 ### 3.2.7 admin-service.access.tokens - 配置允许访问apollo-adminservice的access token列表 > 适用于1.7.1及以上版本 如果该配置项为空,那么访问控制不会生效。如果允许多个token,token 之间以英文逗号分隔 样例: ```properties admin-service.access.tokens=098f6bcd4621d373cade4e832627b4f6 admin-service.access.tokens=098f6bcd4621d373cade4e832627b4f6,ad0234829205b9033196ba818f7a872b ```
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-portal/templates/ingress-portal.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. # {{- if .Values.ingress.enabled -}} {{- $fullName := include "apollo.portal.fullName" . -}} {{- $svcPort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: {{- include "apollo.portal.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} - hosts: {{- range .hosts }} - {{ . | quote }} {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} rules: {{- range .Values.ingress.hosts }} - host: {{ .host | quote }} http: paths: {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }} {{- 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. # {{- if .Values.ingress.enabled -}} {{- $fullName := include "apollo.portal.fullName" . -}} {{- $svcPort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: {{- include "apollo.portal.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} - hosts: {{- range .hosts }} - {{ . | quote }} {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} rules: {{- range .Values.ingress.hosts }} - host: {{ .host | quote }} http: paths: {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }} {{- end }}
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/yaml/case4.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. # --- # document start # Comments in YAML look like this. ################ # SCALAR TYPES # ################ # Our root object (which continues for the entire document) will be a map, # which is equivalent to a dictionary, hash or object in other languages. key: value another_key: Another value goes here. a_number_value: 100 scientific_notation: 1e+12 # The number 1 will be interpreted as a number, not a boolean. if you want # it to be interpreted as a boolean, use true boolean: true null_value: null key with spaces: value # Notice that strings don't need to be quoted. However, they can be. however: 'A string, enclosed in quotes.' 'Keys can be quoted too.': "Useful if you want to put a ':' in your key." single quotes: 'have ''one'' escape pattern' double quotes: "have many: \", \0, \t, \u263A, \x0d\x0a == \r\n, and more." # Multiple-line strings can be written either as a 'literal block' (using |), # or a 'folded block' (using '>'). literal_block: | This entire block of text will be the value of the 'literal_block' key, with line breaks being preserved. The literal continues until de-dented, and the leading indentation is stripped. Any lines that are 'more-indented' keep the rest of their indentation - these lines will be indented by 4 spaces. folded_style: > This entire block of text will be the value of 'folded_style', but this time, all newlines will be replaced with a single space. Blank lines, like above, are converted to a newline character. 'More-indented' lines keep their newlines, too - this text will appear over two lines. #################### # COLLECTION TYPES # #################### # Nesting uses indentation. 2 space indent is preferred (but not required). a_nested_map: key: value another_key: Another Value another_nested_map: hello: hello # Maps don't have to have string keys. 0.25: a float key # Keys can also be complex, like multi-line objects # We use ? followed by a space to indicate the start of a complex key. ? | This is a key that has multiple lines : and this is its value # YAML also allows mapping between sequences with the complex key syntax # Some language parsers might complain # An example ? - Manchester United - Real Madrid : [2001-01-01, 2002-02-02] # Sequences (equivalent to lists or arrays) look like this # (note that the '-' counts as indentation): a_sequence: - Item 1 - Item 2 - 0.5 # sequences can contain disparate types. - Item 4 - key: value another_key: another_value - - This is a sequence - inside another sequence - - - Nested sequence indicators - can be collapsed # Since YAML is a superset of JSON, you can also write JSON-style maps and # sequences: json_map: {"key": "value"} json_seq: [3, 2, 1, "takeoff"] and quotes are optional: {key: [3, 2, 1, takeoff]} ####################### # EXTRA YAML FEATURES # ####################### # YAML also has a handy feature called 'anchors', which let you easily duplicate # content across your document. Both of these keys will have the same value: anchored_content: &anchor_name This string will appear as the value of two keys. other_anchor: *anchor_name # Anchors can be used to duplicate/inherit properties base: &base name: Everyone has same name # The regexp << is called Merge Key Language-Independent Type. It is used to # indicate that all the keys of one or more specified maps should be inserted # into the current map. foo: &foo <<: *base age: 10 bar: &bar <<: *base age: 20 # foo and bar would also have name: Everyone has same name # YAML also has tags, which you can use to explicitly declare types. explicit_string: !!str 0.5 #################### # EXTRA YAML TYPES # #################### # Strings and numbers aren't the only scalars that YAML can understand. # ISO-formatted date and datetime literals are also parsed. datetime: 2001-12-15T02:59:43.1Z datetime_with_spaces: 2001-12-14 21:59:43.10 -5 date: 2002-12-14 # YAML also has a set type, which looks like this: set: ? item1 ? item2 ? item3 or: {item1, item2, item3} # Sets are just maps with null values; the above is equivalent to: set2: item1: null item2: null item3: null ... # document 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. # --- # document start # Comments in YAML look like this. ################ # SCALAR TYPES # ################ # Our root object (which continues for the entire document) will be a map, # which is equivalent to a dictionary, hash or object in other languages. key: value another_key: Another value goes here. a_number_value: 100 scientific_notation: 1e+12 # The number 1 will be interpreted as a number, not a boolean. if you want # it to be interpreted as a boolean, use true boolean: true null_value: null key with spaces: value # Notice that strings don't need to be quoted. However, they can be. however: 'A string, enclosed in quotes.' 'Keys can be quoted too.': "Useful if you want to put a ':' in your key." single quotes: 'have ''one'' escape pattern' double quotes: "have many: \", \0, \t, \u263A, \x0d\x0a == \r\n, and more." # Multiple-line strings can be written either as a 'literal block' (using |), # or a 'folded block' (using '>'). literal_block: | This entire block of text will be the value of the 'literal_block' key, with line breaks being preserved. The literal continues until de-dented, and the leading indentation is stripped. Any lines that are 'more-indented' keep the rest of their indentation - these lines will be indented by 4 spaces. folded_style: > This entire block of text will be the value of 'folded_style', but this time, all newlines will be replaced with a single space. Blank lines, like above, are converted to a newline character. 'More-indented' lines keep their newlines, too - this text will appear over two lines. #################### # COLLECTION TYPES # #################### # Nesting uses indentation. 2 space indent is preferred (but not required). a_nested_map: key: value another_key: Another Value another_nested_map: hello: hello # Maps don't have to have string keys. 0.25: a float key # Keys can also be complex, like multi-line objects # We use ? followed by a space to indicate the start of a complex key. ? | This is a key that has multiple lines : and this is its value # YAML also allows mapping between sequences with the complex key syntax # Some language parsers might complain # An example ? - Manchester United - Real Madrid : [2001-01-01, 2002-02-02] # Sequences (equivalent to lists or arrays) look like this # (note that the '-' counts as indentation): a_sequence: - Item 1 - Item 2 - 0.5 # sequences can contain disparate types. - Item 4 - key: value another_key: another_value - - This is a sequence - inside another sequence - - - Nested sequence indicators - can be collapsed # Since YAML is a superset of JSON, you can also write JSON-style maps and # sequences: json_map: {"key": "value"} json_seq: [3, 2, 1, "takeoff"] and quotes are optional: {key: [3, 2, 1, takeoff]} ####################### # EXTRA YAML FEATURES # ####################### # YAML also has a handy feature called 'anchors', which let you easily duplicate # content across your document. Both of these keys will have the same value: anchored_content: &anchor_name This string will appear as the value of two keys. other_anchor: *anchor_name # Anchors can be used to duplicate/inherit properties base: &base name: Everyone has same name # The regexp << is called Merge Key Language-Independent Type. It is used to # indicate that all the keys of one or more specified maps should be inserted # into the current map. foo: &foo <<: *base age: 10 bar: &bar <<: *base age: 20 # foo and bar would also have name: Everyone has same name # YAML also has tags, which you can use to explicitly declare types. explicit_string: !!str 0.5 #################### # EXTRA YAML TYPES # #################### # Strings and numbers aren't the only scalars that YAML can understand. # ISO-formatted date and datetime literals are also parsed. datetime: 2001-12-15T02:59:43.1Z datetime_with_spaces: 2001-12-14 21:59:43.10 -5 date: 2002-12-14 # YAML also has a set type, which looks like this: set: ? item1 ? item2 ? item3 or: {item1, item2, item3} # Sets are just maps with null values; the above is equivalent to: set2: item1: null item2: null item3: null ... # document end
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-buildtools/src/main/scripts/deploy_jenkins.sh
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # set -e set -u cd `dirname $0` if [ $# -lt 1 ];then echo "usage: `basename $0` 100003171|100003172|100003173" exit 1 fi valid_app=false for supported_app in 100003171 100003172 100003173 ;do if [ $1 == $supported_app ];then valid_app=true break; fi done if [ $valid_app == false ];then echo "$1 is not a supported app id" exit 1 else echo "Upgrading $1" fi APP_BASE_DIR=/opt/ctrip/app APP_NAME=$1 APP_DIR=$APP_BASE_DIR/$APP_NAME APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%S"` APP_STARTUP_SCRIPT=$APP_DIR/scripts/startup.sh APP_SHUTDOWN_SCRIPT=$APP_DIR/scripts/shutdown.sh chmod +x $APP_SHUTDOWN_SCRIPT if [ -e $APP_STARTUP_SCRIPT ];then $APP_SHUTDOWN_SCRIPT echo "Sleeping 5s to wait shutting down" sleep 5s fi mkdir -p $APP_RELEASE_DIR unzip *.zip -d $APP_RELEASE_DIR if [ -d $APP_DIR ];then rm -rf $APP_DIR fi ln -s $APP_RELEASE_DIR $APP_DIR chmod +x $APP_STARTUP_SCRIPT BUILD_ID=dontKillMe $APP_STARTUP_SCRIPT
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # set -e set -u cd `dirname $0` if [ $# -lt 1 ];then echo "usage: `basename $0` 100003171|100003172|100003173" exit 1 fi valid_app=false for supported_app in 100003171 100003172 100003173 ;do if [ $1 == $supported_app ];then valid_app=true break; fi done if [ $valid_app == false ];then echo "$1 is not a supported app id" exit 1 else echo "Upgrading $1" fi APP_BASE_DIR=/opt/ctrip/app APP_NAME=$1 APP_DIR=$APP_BASE_DIR/$APP_NAME APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%S"` APP_STARTUP_SCRIPT=$APP_DIR/scripts/startup.sh APP_SHUTDOWN_SCRIPT=$APP_DIR/scripts/shutdown.sh chmod +x $APP_SHUTDOWN_SCRIPT if [ -e $APP_STARTUP_SCRIPT ];then $APP_SHUTDOWN_SCRIPT echo "Sleeping 5s to wait shutting down" sleep 5s fi mkdir -p $APP_RELEASE_DIR unzip *.zip -d $APP_RELEASE_DIR if [ -d $APP_DIR ];then rm -rf $APP_DIR fi ln -s $APP_RELEASE_DIR $APP_DIR chmod +x $APP_STARTUP_SCRIPT BUILD_ID=dontKillMe $APP_STARTUP_SCRIPT
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-service/templates/ingress-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. # {{- if .Values.configService.ingress.enabled -}} {{- $fullName := include "apollo.configService.fullName" . -}} {{- $svcPort := .Values.configService.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: {{- include "apollo.service.labels" . | nindent 4 }} {{- with .Values.configService.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: {{- if .Values.configService.ingress.tls }} tls: {{- range .Values.configService.ingress.tls }} - hosts: {{- range .hosts }} - {{ . | quote }} {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} rules: {{- range .Values.configService.ingress.hosts }} - host: {{ .host | quote }} http: paths: {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }} {{- 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. # {{- if .Values.configService.ingress.enabled -}} {{- $fullName := include "apollo.configService.fullName" . -}} {{- $svcPort := .Values.configService.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ $fullName }} labels: {{- include "apollo.service.labels" . | nindent 4 }} {{- with .Values.configService.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} spec: {{- if .Values.configService.ingress.tls }} tls: {{- range .Values.configService.ingress.tls }} - hosts: {{- range .hosts }} - {{ . | quote }} {{- end }} secretName: {{ .secretName }} {{- end }} {{- end }} rules: {{- range .Values.configService.ingress.hosts }} - host: {{ .host | quote }} http: paths: {{- range .paths }} - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }} {{- end }}
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/development/portal-how-to-enable-email-service.md
TODO
TODO
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/design/apollo-core-concept-namespace.md
TODO
TODO
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./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,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/helm/apollo-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,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/usage/apollo-user-practices.md
TODO
TODO
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/design/apollo-core-concept-namespace.md
### 1. 什么是Namespace? Namespace是配置项的集合,类似于一个配置文件的概念。 ### 2. 什么是“application”的Namespace? Apollo在创建项目的时候,都会默认创建一个“application”的Namespace。顾名思义,“application”是给应用自身使用的,熟悉Spring Boot的同学都知道,Spring Boot项目都有一个默认配置文件application.yml。在这里application.yml就等同于“application”的Namespace。对于90%的应用来说,“application”的Namespace已经满足日常配置使用场景了。 #### 客户端获取“application” Namespace的代码如下: ``` java Config config = ConfigService.getAppConfig(); ``` #### 客户端获取非“application” Namespace的代码如下: ``` java Config config = ConfigService.getConfig(namespaceName); ``` ### 3. Namespace的格式有哪些? 配置文件有多种格式,例如:properties、xml、yml、yaml、json等。同样Namespace也具有这些格式。在Portal UI中可以看到“application”的Namespace上有一个“properties”标签,表明“application”是properties格式的。 >注1:非properties格式的namespace,在客户端使用时需要调用`ConfigService.getConfigFile(String namespace, ConfigFileFormat configFileFormat)`来获取,如果使用[Http接口直接调用](zh/usage/other-language-client-user-guide#_12-通过带缓存的http接口从apollo读取配置)时,对应的namespace参数需要传入namespace的名字加上后缀名,如datasources.json。 >注2:apollo-client 1.3.0版本开始对yaml/yml做了更好的支持,使用起来和properties格式一致:`Config config = ConfigService.getConfig("application.yml");`,Spring的注入方式也和properties一致。 ### 4. Namespace的获取权限分类 Namespace的获取权限分为两种: * private (私有的) * public (公共的) 这里的获取权限是相对于Apollo客户端来说的。 #### 4.1 private权限 private权限的Namespace,只能被所属的应用获取到。一个应用尝试获取其它应用private的Namespace,Apollo会报“404”异常。 #### 4.2 public权限 public权限的Namespace,能被任何应用获取。 ### 5. Namespace的类型 Namespace类型有三种: * 私有类型 * 公共类型 * 关联类型(继承类型) #### 5.1 私有类型 私有类型的Namespace具有private权限。例如上文提到的“application” Namespace就是私有类型。 #### 5.2 公共类型 ##### 5.2.1 含义 公共类型的Namespace具有public权限。公共类型的Namespace相当于游离于应用之外的配置,且通过Namespace的名称去标识公共Namespace,所以公共的Namespace的名称必须全局唯一。 ##### 5.2.2 使用场景 * 部门级别共享的配置 * 小组级别共享的配置 * 几个项目之间共享的配置 * 中间件客户端的配置 #### 5.3 关联类型 ##### 5.3.1 含义 关联类型又可称为继承类型,关联类型具有private权限。关联类型的Namespace继承于公共类型的Namespace,用于覆盖公共Namespace的某些配置。例如公共的Namespace有两个配置项 ``` k1 = v1 k2 = v2 ``` 然后应用A有一个关联类型的Namespace关联了此公共Namespace,且覆盖了配置项k1,新值为v3。那么在应用A实际运行时,获取到的公共Namespace的配置为: ``` k1 = v3 k2 = v2 ``` ##### 5.3.2 使用场景 举一个实际使用的场景。假设RPC框架的配置(如:timeout)有以下要求: * 提供一份全公司默认的配置且可动态调整 * RPC客户端项目可以自定义某些配置项且可动态调整 1. 如果把以上两点要求去掉“动态调整”,那么做法很简单。在rpc-client.jar包里有一份配置文件,每次修改配置文件然后重新发一个版本的jar包即可。同理,客户端项目修改配置也是如此。 2. 如果只支持客户端项目可动态调整配置。客户端项目可以在Apollo “application” Namespace上配置一些配置项。在初始化service的时候,从Apollo上读取配置即可。这样做的坏处就是,每个项目都要自定义一些key,不统一。 3. 那么如何完美支持以上需求呢?答案就是结合使用Apollo的公共类型的Namespace和关联类型的Namespace。RPC团队在Apollo上维护一个叫“rpc-client”的公共Namespace,在“rpc-client” Namespace上配置默认的参数值。rpc-client.jar里的代码读取“rpc-client”Namespace的配置即可。如果需要调整默认的配置,只需要修改公共类型“rpc-client” Namespace的配置。如果客户端项目想要自定义或动态修改某些配置项,只需要在Apollo 自己项目下关联“rpc-client”,就能创建关联类型“rpc-client”的Namespace。然后在关联类型“rpc-client”的Namespace下修改配置项即可。这里有一点需要指出的,那就是rpc-client.jar是在应用容器里运行的,所以rpc-client获取到的“rpc-client” Namespace的配置是应用的关联类型的Namespace加上公共类型的Namespace。 #### 5.4 例子 如下图所示,有三个应用:应用A、应用B、应用C。 * 应用A有两个私有类型的Namespace:application和NS-Private,以及一个关联类型的Namespace:NS-Public。 * 应用B有一个私有类型的Namespace:application,以及一个公共类型的Namespace:NS-Public。 * 应用C只有一个私有类型的Namespace:application ![Namespace例子](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-model-example.png) ##### 5.4.1 应用A获取Apollo配置 ```java //application Config appConfig = ConfigService.getAppConfig(); appConfig.getProperty("k1", null); // k1 = v11 appConfig.getProperty("k2", null); // k2 = v21 //NS-Private Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.getProperty("k1", null); // k1 = v3 privateConfig.getProperty("k3", null); // k3 = v4 //NS-Public,覆盖公共类型配置的情况,k4被覆盖 Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.getProperty("k4", null); // k4 = v6 cover publicConfig.getProperty("k6", null); // k6 = v6 publicConfig.getProperty("k7", null); // k7 = v7 ``` ##### 5.4.2 应用B获取Apollo配置 ```java //application Config appConfig = ConfigService.getAppConfig(); appConfig.getProperty("k1", null); // k1 = v12 appConfig.getProperty("k2", null); // k2 = null appConfig.getProperty("k3", null); // k3 = v32 //NS-Private,由于没有NS-Private Namespace 所以获取到default value Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.getProperty("k1", "default value"); //NS-Public Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.getProperty("k4", null); // k4 = v5 publicConfig.getProperty("k6", null); // k6 = v6 publicConfig.getProperty("k7", null); // k7 = v7 ``` ##### 5.4.3 应用C获取Apollo配置 ```java //application Config appConfig = ConfigService.getAppConfig(); appConfig.getProperty("k1", null); // k1 = v12 appConfig.getProperty("k2", null); // k2 = null appConfig.getProperty("k3", null); // k3 = v33 //NS-Private,由于没有NS-Private Namespace 所以获取到default value Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.getProperty("k1", "default value"); //NS-Public,公共类型的Namespace,任何项目都可以获取到 Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.getProperty("k4", null); // k4 = v5 publicConfig.getProperty("k6", null); // k6 = v6 publicConfig.getProperty("k7", null); // k7 = v7 ``` ##### 5.4.4 ChangeListener 以上代码例子中可以看到,在客户端Namespace映射成一个Config对象。Namespace配置变更的监听器是注册在Config对象上。 所以在应用A中监听application的Namespace代码如下: ```java Config appConfig = ConfigService.getAppConfig(); appConfig.addChangeListener(new ConfigChangeListener() { public void onChange(ConfigChangeEvent changeEvent) { //do something } }) ``` 在应用A中监听NS-Private的Namespace代码如下: ```java Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.addChangeListener(new ConfigChangeListener() { public void onChange(ConfigChangeEvent changeEvent) { //do something } }) ``` 在应用A、应用B、应用C中监听NS-Public的Namespace代码如下: ```java Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.addChangeListener(new ConfigChangeListener() { public void onChange(ConfigChangeEvent changeEvent) { //do something } }) ```
### 1. 什么是Namespace? Namespace是配置项的集合,类似于一个配置文件的概念。 ### 2. 什么是“application”的Namespace? Apollo在创建项目的时候,都会默认创建一个“application”的Namespace。顾名思义,“application”是给应用自身使用的,熟悉Spring Boot的同学都知道,Spring Boot项目都有一个默认配置文件application.yml。在这里application.yml就等同于“application”的Namespace。对于90%的应用来说,“application”的Namespace已经满足日常配置使用场景了。 #### 客户端获取“application” Namespace的代码如下: ``` java Config config = ConfigService.getAppConfig(); ``` #### 客户端获取非“application” Namespace的代码如下: ``` java Config config = ConfigService.getConfig(namespaceName); ``` ### 3. Namespace的格式有哪些? 配置文件有多种格式,例如:properties、xml、yml、yaml、json等。同样Namespace也具有这些格式。在Portal UI中可以看到“application”的Namespace上有一个“properties”标签,表明“application”是properties格式的。 >注1:非properties格式的namespace,在客户端使用时需要调用`ConfigService.getConfigFile(String namespace, ConfigFileFormat configFileFormat)`来获取,如果使用[Http接口直接调用](zh/usage/other-language-client-user-guide#_12-通过带缓存的http接口从apollo读取配置)时,对应的namespace参数需要传入namespace的名字加上后缀名,如datasources.json。 >注2:apollo-client 1.3.0版本开始对yaml/yml做了更好的支持,使用起来和properties格式一致:`Config config = ConfigService.getConfig("application.yml");`,Spring的注入方式也和properties一致。 ### 4. Namespace的获取权限分类 Namespace的获取权限分为两种: * private (私有的) * public (公共的) 这里的获取权限是相对于Apollo客户端来说的。 #### 4.1 private权限 private权限的Namespace,只能被所属的应用获取到。一个应用尝试获取其它应用private的Namespace,Apollo会报“404”异常。 #### 4.2 public权限 public权限的Namespace,能被任何应用获取。 ### 5. Namespace的类型 Namespace类型有三种: * 私有类型 * 公共类型 * 关联类型(继承类型) #### 5.1 私有类型 私有类型的Namespace具有private权限。例如上文提到的“application” Namespace就是私有类型。 #### 5.2 公共类型 ##### 5.2.1 含义 公共类型的Namespace具有public权限。公共类型的Namespace相当于游离于应用之外的配置,且通过Namespace的名称去标识公共Namespace,所以公共的Namespace的名称必须全局唯一。 ##### 5.2.2 使用场景 * 部门级别共享的配置 * 小组级别共享的配置 * 几个项目之间共享的配置 * 中间件客户端的配置 #### 5.3 关联类型 ##### 5.3.1 含义 关联类型又可称为继承类型,关联类型具有private权限。关联类型的Namespace继承于公共类型的Namespace,用于覆盖公共Namespace的某些配置。例如公共的Namespace有两个配置项 ``` k1 = v1 k2 = v2 ``` 然后应用A有一个关联类型的Namespace关联了此公共Namespace,且覆盖了配置项k1,新值为v3。那么在应用A实际运行时,获取到的公共Namespace的配置为: ``` k1 = v3 k2 = v2 ``` ##### 5.3.2 使用场景 举一个实际使用的场景。假设RPC框架的配置(如:timeout)有以下要求: * 提供一份全公司默认的配置且可动态调整 * RPC客户端项目可以自定义某些配置项且可动态调整 1. 如果把以上两点要求去掉“动态调整”,那么做法很简单。在rpc-client.jar包里有一份配置文件,每次修改配置文件然后重新发一个版本的jar包即可。同理,客户端项目修改配置也是如此。 2. 如果只支持客户端项目可动态调整配置。客户端项目可以在Apollo “application” Namespace上配置一些配置项。在初始化service的时候,从Apollo上读取配置即可。这样做的坏处就是,每个项目都要自定义一些key,不统一。 3. 那么如何完美支持以上需求呢?答案就是结合使用Apollo的公共类型的Namespace和关联类型的Namespace。RPC团队在Apollo上维护一个叫“rpc-client”的公共Namespace,在“rpc-client” Namespace上配置默认的参数值。rpc-client.jar里的代码读取“rpc-client”Namespace的配置即可。如果需要调整默认的配置,只需要修改公共类型“rpc-client” Namespace的配置。如果客户端项目想要自定义或动态修改某些配置项,只需要在Apollo 自己项目下关联“rpc-client”,就能创建关联类型“rpc-client”的Namespace。然后在关联类型“rpc-client”的Namespace下修改配置项即可。这里有一点需要指出的,那就是rpc-client.jar是在应用容器里运行的,所以rpc-client获取到的“rpc-client” Namespace的配置是应用的关联类型的Namespace加上公共类型的Namespace。 #### 5.4 例子 如下图所示,有三个应用:应用A、应用B、应用C。 * 应用A有两个私有类型的Namespace:application和NS-Private,以及一个关联类型的Namespace:NS-Public。 * 应用B有一个私有类型的Namespace:application,以及一个公共类型的Namespace:NS-Public。 * 应用C只有一个私有类型的Namespace:application ![Namespace例子](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-model-example.png) ##### 5.4.1 应用A获取Apollo配置 ```java //application Config appConfig = ConfigService.getAppConfig(); appConfig.getProperty("k1", null); // k1 = v11 appConfig.getProperty("k2", null); // k2 = v21 //NS-Private Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.getProperty("k1", null); // k1 = v3 privateConfig.getProperty("k3", null); // k3 = v4 //NS-Public,覆盖公共类型配置的情况,k4被覆盖 Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.getProperty("k4", null); // k4 = v6 cover publicConfig.getProperty("k6", null); // k6 = v6 publicConfig.getProperty("k7", null); // k7 = v7 ``` ##### 5.4.2 应用B获取Apollo配置 ```java //application Config appConfig = ConfigService.getAppConfig(); appConfig.getProperty("k1", null); // k1 = v12 appConfig.getProperty("k2", null); // k2 = null appConfig.getProperty("k3", null); // k3 = v32 //NS-Private,由于没有NS-Private Namespace 所以获取到default value Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.getProperty("k1", "default value"); //NS-Public Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.getProperty("k4", null); // k4 = v5 publicConfig.getProperty("k6", null); // k6 = v6 publicConfig.getProperty("k7", null); // k7 = v7 ``` ##### 5.4.3 应用C获取Apollo配置 ```java //application Config appConfig = ConfigService.getAppConfig(); appConfig.getProperty("k1", null); // k1 = v12 appConfig.getProperty("k2", null); // k2 = null appConfig.getProperty("k3", null); // k3 = v33 //NS-Private,由于没有NS-Private Namespace 所以获取到default value Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.getProperty("k1", "default value"); //NS-Public,公共类型的Namespace,任何项目都可以获取到 Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.getProperty("k4", null); // k4 = v5 publicConfig.getProperty("k6", null); // k6 = v6 publicConfig.getProperty("k7", null); // k7 = v7 ``` ##### 5.4.4 ChangeListener 以上代码例子中可以看到,在客户端Namespace映射成一个Config对象。Namespace配置变更的监听器是注册在Config对象上。 所以在应用A中监听application的Namespace代码如下: ```java Config appConfig = ConfigService.getAppConfig(); appConfig.addChangeListener(new ConfigChangeListener() { public void onChange(ConfigChangeEvent changeEvent) { //do something } }) ``` 在应用A中监听NS-Private的Namespace代码如下: ```java Config privateConfig = ConfigService.getConfig("NS-Private"); privateConfig.addChangeListener(new ConfigChangeListener() { public void onChange(ConfigChangeEvent changeEvent) { //do something } }) ``` 在应用A、应用B、应用C中监听NS-Public的Namespace代码如下: ```java Config publicConfig = ConfigService.getConfig("NS-Public"); publicConfig.addChangeListener(new ConfigChangeListener() { public void onChange(ConfigChangeEvent changeEvent) { //do something } }) ```
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/spring/yaml/case5-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: newBatch
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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: newBatch
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/spring/yaml/case1.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: 1000 batch: 2000
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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: 1000 batch: 2000
-1
apolloconfig/apollo
3,840
use official docker images for manual kubernetes deployment
## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
nobodyiam
2021-07-24T13:15:10Z
2021-07-25T22:58:51Z
b2d666f68ebbe0b1d592b0494dde8ce2a598560a
fa4386faee2548aa16aab828127a38a28327fe30
use official docker images for manual kubernetes deployment. ## What's the purpose of this PR Use official docker images for manual kubernetes deployment ## Brief changelog 1. use official docker images 2. remove unnecessary docker build scripts 3. remove custom database scripts and let users use standard ones 4. use built-in default environment names instead of test-alpha and test-beta 5. adjust default replica to 2 6. remove init container check as there is no strict requirement of container startup sequence Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Write necessary unit tests to verify the code. - [x] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-adminservice/src/main/scripts/shutdown.sh
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-adminservice export APP_NAME=$SERVICE_NAME if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then export JAVA_HOME=/usr/java/latest/ fi cd `dirname $0`/.. if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then cd current fi if [[ -f $SERVICE_NAME".jar" ]]; then chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" stop fi
#!/bin/bash # # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # SERVICE_NAME=apollo-adminservice export APP_NAME=$SERVICE_NAME if [[ -z "$JAVA_HOME" && -d /usr/java/latest/ ]]; then export JAVA_HOME=/usr/java/latest/ fi cd `dirname $0`/.. if [[ ! -f $SERVICE_NAME".jar" && -d current ]]; then cd current fi if [[ -f $SERVICE_NAME".jar" ]]; then chmod a+x $SERVICE_NAME".jar" ./$SERVICE_NAME".jar" stop fi
-1