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,864
Lazy load ConfigUtil
prevent ConfigUtil init when ApolloApplicationContextInitializer initialized, That is too early. This issue caused by commit 6d50ca881a6afb2766725bdb3c09c14d450cc12f ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-07-31T12:12:17Z
2021-08-04T00:43:24Z
02c43dd547db3d44253d0b08659b8b0e8e3a8374
bfdfd985fbdd7fd156ddb0be34507224a3db70f5
Lazy load ConfigUtil. prevent ConfigUtil init when ApolloApplicationContextInitializer initialized, That is too early. This issue caused by commit 6d50ca881a6afb2766725bdb3c09c14d450cc12f ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/InstanceService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.dto.InstanceDTO; import com.ctrip.framework.apollo.common.dto.PageDTO; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; import org.springframework.stereotype.Service; import java.util.List; import java.util.Set; @Service public class InstanceService { private final AdminServiceAPI.InstanceAPI instanceAPI; public InstanceService(final AdminServiceAPI.InstanceAPI instanceAPI) { this.instanceAPI = instanceAPI; } public PageDTO<InstanceDTO> getByRelease(Env env, long releaseId, int page, int size){ return instanceAPI.getByRelease(env, releaseId, page, size); } public PageDTO<InstanceDTO> getByNamespace(Env env, String appId, String clusterName, String namespaceName, String instanceAppId, int page, int size){ return instanceAPI.getByNamespace(appId, env, clusterName, namespaceName, instanceAppId, page, size); } public int getInstanceCountByNamepsace(String appId, Env env, String clusterName, String namespaceName){ return instanceAPI.getInstanceCountByNamespace(appId, env, clusterName, namespaceName); } public List<InstanceDTO> getByReleasesNotIn(Env env, String appId, String clusterName, String namespaceName, Set<Long> releaseIds){ return instanceAPI.getByReleasesNotIn(appId, env, clusterName, namespaceName, releaseIds); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.common.dto.InstanceDTO; import com.ctrip.framework.apollo.common.dto.PageDTO; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.portal.api.AdminServiceAPI; import org.springframework.stereotype.Service; import java.util.List; import java.util.Set; @Service public class InstanceService { private final AdminServiceAPI.InstanceAPI instanceAPI; public InstanceService(final AdminServiceAPI.InstanceAPI instanceAPI) { this.instanceAPI = instanceAPI; } public PageDTO<InstanceDTO> getByRelease(Env env, long releaseId, int page, int size){ return instanceAPI.getByRelease(env, releaseId, page, size); } public PageDTO<InstanceDTO> getByNamespace(Env env, String appId, String clusterName, String namespaceName, String instanceAppId, int page, int size){ return instanceAPI.getByNamespace(appId, env, clusterName, namespaceName, instanceAppId, page, size); } public int getInstanceCountByNamepsace(String appId, Env env, String clusterName, String namespaceName){ return instanceAPI.getInstanceCountByNamespace(appId, env, clusterName, namespaceName); } public List<InstanceDTO> getByReleasesNotIn(Env env, String appId, String clusterName, String namespaceName, Set<Long> releaseIds){ return instanceAPI.getByReleasesNotIn(appId, env, clusterName, namespaceName, releaseIds); } }
-1
apolloconfig/apollo
3,864
Lazy load ConfigUtil
prevent ConfigUtil init when ApolloApplicationContextInitializer initialized, That is too early. This issue caused by commit 6d50ca881a6afb2766725bdb3c09c14d450cc12f ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-07-31T12:12:17Z
2021-08-04T00:43:24Z
02c43dd547db3d44253d0b08659b8b0e8e3a8374
bfdfd985fbdd7fd156ddb0be34507224a3db70f5
Lazy load ConfigUtil. prevent ConfigUtil init when ApolloApplicationContextInitializer initialized, That is too early. This issue caused by commit 6d50ca881a6afb2766725bdb3c09c14d450cc12f ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySource.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.config; import com.ctrip.framework.apollo.ConfigChangeListener; import java.util.Set; import org.springframework.core.env.EnumerablePropertySource; import com.ctrip.framework.apollo.Config; /** * Property source wrapper for Config * * @author Jason Song(song_s@ctrip.com) */ public class ConfigPropertySource extends EnumerablePropertySource<Config> { private static final String[] EMPTY_ARRAY = new String[0]; ConfigPropertySource(String name, Config source) { super(name, source); } @Override public boolean containsProperty(String name) { return this.source.getProperty(name, null) != null; } @Override public String[] getPropertyNames() { Set<String> propertyNames = this.source.getPropertyNames(); if (propertyNames.isEmpty()) { return EMPTY_ARRAY; } return propertyNames.toArray(new String[propertyNames.size()]); } @Override public Object getProperty(String name) { return this.source.getProperty(name, null); } public void addChangeListener(ConfigChangeListener listener) { this.source.addChangeListener(listener); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.config; import com.ctrip.framework.apollo.ConfigChangeListener; import java.util.Set; import org.springframework.core.env.EnumerablePropertySource; import com.ctrip.framework.apollo.Config; /** * Property source wrapper for Config * * @author Jason Song(song_s@ctrip.com) */ public class ConfigPropertySource extends EnumerablePropertySource<Config> { private static final String[] EMPTY_ARRAY = new String[0]; ConfigPropertySource(String name, Config source) { super(name, source); } @Override public boolean containsProperty(String name) { return this.source.getProperty(name, null) != null; } @Override public String[] getPropertyNames() { Set<String> propertyNames = this.source.getPropertyNames(); if (propertyNames.isEmpty()) { return EMPTY_ARRAY; } return propertyNames.toArray(new String[propertyNames.size()]); } @Override public Object getProperty(String name) { return this.source.getProperty(name, null); } public void addChangeListener(ConfigChangeListener listener) { this.source.addChangeListener(listener); } }
-1
apolloconfig/apollo
3,864
Lazy load ConfigUtil
prevent ConfigUtil init when ApolloApplicationContextInitializer initialized, That is too early. This issue caused by commit 6d50ca881a6afb2766725bdb3c09c14d450cc12f ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
lonre
2021-07-31T12:12:17Z
2021-08-04T00:43:24Z
02c43dd547db3d44253d0b08659b8b0e8e3a8374
bfdfd985fbdd7fd156ddb0be34507224a3db70f5
Lazy load ConfigUtil. prevent ConfigUtil init when ApolloApplicationContextInitializer initialized, That is too early. This issue caused by commit 6d50ca881a6afb2766725bdb3c09c14d450cc12f ## What's the purpose of this PR XXXXX ## Which issue(s) this PR fixes: Fixes # ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/AppController.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.v1.controller; import com.ctrip.framework.apollo.common.dto.ClusterDTO; import com.ctrip.framework.apollo.common.entity.App; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.openapi.entity.ConsumerRole; import com.ctrip.framework.apollo.openapi.service.ConsumerService; import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO; import com.ctrip.framework.apollo.openapi.dto.OpenEnvClusterDTO; import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; import com.ctrip.framework.apollo.portal.component.PortalSettings; import com.ctrip.framework.apollo.portal.service.AppService; import com.ctrip.framework.apollo.portal.service.ClusterService; import com.google.common.collect.Sets; import java.util.Set; import javax.servlet.http.HttpServletRequest; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @RestController("openapiAppController") @RequestMapping("/openapi/v1") public class AppController { private final PortalSettings portalSettings; private final ClusterService clusterService; private final AppService appService; private final ConsumerAuthUtil consumerAuthUtil; private final ConsumerService consumerService; public AppController(final PortalSettings portalSettings, final ClusterService clusterService, final AppService appService, final ConsumerAuthUtil consumerAuthUtil, final ConsumerService consumerService) { this.portalSettings = portalSettings; this.clusterService = clusterService; this.appService = appService; this.consumerAuthUtil = consumerAuthUtil; this.consumerService = consumerService; } @GetMapping(value = "/apps/{appId}/envclusters") public List<OpenEnvClusterDTO> loadEnvClusterInfo(@PathVariable String appId){ List<OpenEnvClusterDTO> envClusters = new LinkedList<>(); List<Env> envs = portalSettings.getActiveEnvs(); for (Env env : envs) { OpenEnvClusterDTO envCluster = new OpenEnvClusterDTO(); envCluster.setEnv(env.name()); List<ClusterDTO> clusterDTOs = clusterService.findClusters(env, appId); envCluster.setClusters(BeanUtils.toPropertySet("name", clusterDTOs)); envClusters.add(envCluster); } return envClusters; } @GetMapping("/apps") public List<OpenAppDTO> findApps(@RequestParam(value = "appIds", required = false) String appIds) { final List<App> apps = new ArrayList<>(); if (StringUtils.isEmpty(appIds)) { apps.addAll(appService.findAll()); } else { apps.addAll(appService.findByAppIds(Sets.newHashSet(appIds.split(",")))); } return OpenApiBeanUtils.transformFromApps(apps); } /** * @return which apps can be operated by open api */ @GetMapping("/apps/authorized") public List<OpenAppDTO> findAppsAuthorized(HttpServletRequest request) { long consumerId = this.consumerAuthUtil.retrieveConsumerId(request); Set<String> appIds = this.consumerService.findAppIdsAuthorizedByConsumerId(consumerId); List<App> apps = this.appService.findByAppIds(appIds); List<OpenAppDTO> openAppDTOS = OpenApiBeanUtils.transformFromApps(apps); return openAppDTOS; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.openapi.v1.controller; import com.ctrip.framework.apollo.common.dto.ClusterDTO; import com.ctrip.framework.apollo.common.entity.App; import com.ctrip.framework.apollo.common.utils.BeanUtils; import com.ctrip.framework.apollo.openapi.entity.ConsumerRole; import com.ctrip.framework.apollo.openapi.service.ConsumerService; import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil; import com.ctrip.framework.apollo.portal.environment.Env; import com.ctrip.framework.apollo.openapi.dto.OpenAppDTO; import com.ctrip.framework.apollo.openapi.dto.OpenEnvClusterDTO; import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; import com.ctrip.framework.apollo.portal.component.PortalSettings; import com.ctrip.framework.apollo.portal.service.AppService; import com.ctrip.framework.apollo.portal.service.ClusterService; import com.google.common.collect.Sets; import java.util.Set; import javax.servlet.http.HttpServletRequest; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @RestController("openapiAppController") @RequestMapping("/openapi/v1") public class AppController { private final PortalSettings portalSettings; private final ClusterService clusterService; private final AppService appService; private final ConsumerAuthUtil consumerAuthUtil; private final ConsumerService consumerService; public AppController(final PortalSettings portalSettings, final ClusterService clusterService, final AppService appService, final ConsumerAuthUtil consumerAuthUtil, final ConsumerService consumerService) { this.portalSettings = portalSettings; this.clusterService = clusterService; this.appService = appService; this.consumerAuthUtil = consumerAuthUtil; this.consumerService = consumerService; } @GetMapping(value = "/apps/{appId}/envclusters") public List<OpenEnvClusterDTO> loadEnvClusterInfo(@PathVariable String appId){ List<OpenEnvClusterDTO> envClusters = new LinkedList<>(); List<Env> envs = portalSettings.getActiveEnvs(); for (Env env : envs) { OpenEnvClusterDTO envCluster = new OpenEnvClusterDTO(); envCluster.setEnv(env.name()); List<ClusterDTO> clusterDTOs = clusterService.findClusters(env, appId); envCluster.setClusters(BeanUtils.toPropertySet("name", clusterDTOs)); envClusters.add(envCluster); } return envClusters; } @GetMapping("/apps") public List<OpenAppDTO> findApps(@RequestParam(value = "appIds", required = false) String appIds) { final List<App> apps = new ArrayList<>(); if (StringUtils.isEmpty(appIds)) { apps.addAll(appService.findAll()); } else { apps.addAll(appService.findByAppIds(Sets.newHashSet(appIds.split(",")))); } return OpenApiBeanUtils.transformFromApps(apps); } /** * @return which apps can be operated by open api */ @GetMapping("/apps/authorized") public List<OpenAppDTO> findAppsAuthorized(HttpServletRequest request) { long consumerId = this.consumerAuthUtil.retrieveConsumerId(request); Set<String> appIds = this.consumerService.findAppIdsAuthorizedByConsumerId(consumerId); List<App> apps = this.appService.findByAppIds(appIds); List<OpenAppDTO> openAppDTOS = OpenApiBeanUtils.transformFromApps(apps); return openAppDTOS; } }
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [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) * [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840) * [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849) ------------------ 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) * [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849) * [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/namespace-panel-branch-tab.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <section class="branch-panel-body" ng-if="namespace.initialized && (namespace.hasBranch && namespace.displayControl.currentOperateBranch != 'master')"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label" ng-show="namespace.branch.itemModifiedCnt > 0">{{'Component.Namespace.Branch.IsChanged' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.branch.itemModifiedCnt"></span> </span> <span class="label label-primary no-radius namespace-label" ng-show="namespace.branch.lockOwner">{{'Component.Namespace.Branch.ChangeUser' | translate }}: <span ng-bind="namespace.branch.lockOwner"></span> </span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <a type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.ContinueGrayscalePublish' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-click="publish(namespace.branch)"> {{'Component.Namespace.Branch.GrayscalePublish' | translate }} </a> <a type="button" class="btn btn-primary btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.MergeToMasterAndPublish' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-click="mergeAndPublish(namespace.branch)"> {{'Component.Namespace.Branch.AllPublish' | translate }} </a> <a type="button" class="btn btn-warning btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.DiscardGrayscaleVersion' | translate }}" ng-show="(namespace.hasReleasePermission || (!namespace.branch.latestRelease && namespace.hasModifyPermission))" ng-click="preDeleteBranch(namespace.branch)"> {{'Component.Namespace.Branch.DiscardGrayscale' | translate }} </a> </div> </div> </header> <div id="BODY{{namespace.branch.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden"> <span style="color: red">{{'Component.Namespace.Branch.NoPermissionTips' | translate }}</span> </div> <!--second header--> <header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden"> <div class="row"> <div class="col-md-12 pull-left"> <ul class="nav nav-tabs"> <li role="presentation" ng-click="switchView(namespace.branch, 'table')" ng-show="namespace.isPropertiesFormat"> <a ng-class="{node_active:namespace.branch.viewType == 'table'}"> <img src="img/table.png"> {{'Component.Namespace.Branch.Tab.Configuration' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace.branch, 'rule')"> <a ng-class="{node_active:namespace.branch.viewType == 'rule'}"> <img src="img/rule.png"> {{'Component.Namespace.Branch.Tab.GrayscaleRule' | translate }} <span class="badge badge-grey" ng-bind="namespace.branch.grayIps.length + namespace.branch.grayApps.length"></span> </a> </li> <li role="presentation" ng-click="switchView(namespace.branch, 'instance')"> <a ng-class="{node_active:namespace.branch.viewType == 'instance'}"> <img src="img/machine.png"> {{'Component.Namespace.Branch.Tab.GrayscaleInstance' | translate }} <span class="badge badge-grey" ng-bind="namespace.branch.latestReleaseInstances.total"></span> </a> </li> <li role="presentation" ng-click="switchView(namespace.branch, 'history')"> <a ng-class="{node_active:namespace.branch.viewType == 'history'}"> <img src="img/change.png"> {{'Component.Namespace.Branch.Tab.ChangeHistory' | translate }} </a> </li> </ul> </div> </div> </header> <!--namespace body--> <section ng-show="!namespace.isConfigHidden"> <!--items--> <div class="namespace-view-table" ng-show="namespace.branch.viewType == 'table'"> <div class="panel panel-default" ng-if="namespace.hasBranch"> <div class="panel-heading"> {{'Component.Namespace.Branch.Body.Item' | translate }} <button type="button" class="btn btn-primary btn-sm pull-right" style="margin-top: -4px;" ng-show="namespace.hasModifyPermission" ng-click="createItem(namespace.branch)"> <img src="img/plus.png"> {{'Component.Namespace.Branch.Body.AddedItem' | translate }} </button> </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Branch.Body.PublishState' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Branch.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Branch.Body.ItemMasterValue' | translate }} </th> <th> {{'Component.Namespace.Branch.Body.ItemGrayscaleValue' | translate }} </th> <th> {{'Component.Namespace.Branch.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Branch.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Branch.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Branch.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.branch.branchItems |orderBy:col:desc" ng-if="config.item.key"> <td width="7%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ClickToSeeItemValue' | translate }}" ng-if="config.isModified || config.isDeleted" ng-click="showText(config.oldValue)">{{'Component.Namespace.Branch.Body.ItemNoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ItemEffective' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Branch.Body.ItemPublished' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span> <span class="label label-info" ng-if="!config.isDeleted && config.masterItemExists" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ChangedFromMaster' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span> <span class="label label-success" ng-if="!config.isDeleted && !config.masterItemExists" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.AddedByGrayscale' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span> </td> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.masterReleaseValue)"> <span ng-bind="config.masterReleaseValue | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="10%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="9%" class="text-center"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.Op.Modify' | translate }}" ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.Op.Delete' | translate }}" ng-if="!config.isDeleted" ng-click="preDeleteItem(namespace.branch, config.item)" ng-show="namespace.hasModifyPermission"> </td> </tr> </tbody> </table> </div> <div class="panel panel-default" ng-if="namespace.branch.masterItems && namespace.branch.masterItems.length > 0"> <div class="panel-heading"> {{'Component.Namespace.MasterBranch.Body.Title' | translate }} </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th>{{'Component.Namespace.MasterBranch.Body.PublishState' | translate }}</th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.MasterBranch.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.MasterBranch.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.MasterBranch.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.MasterBranch.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.MasterBranch.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.MasterBranch.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.branch.masterItems |orderBy:col:desc" ng-if="config.item.key"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.ClickToSeeItemValue' | translate }}" ng-if="config.isModified || config.isDeleted" ng-click="showText(config.oldValue)">{{'Component.Namespace.MasterBranch.Body.ItemNoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.ItemEffective' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.MasterBranch.Body.ItemPublished' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.AddedItem' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ModifiedItem' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span> </td> <td width="35%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="12%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="5%" class="text-center"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.ModifyItem' | translate }}" ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)" ng-show="namespace.hasModifyPermission"> </td> </tr> </tbody> </table> </div> </div> <!--gray rules--> <div class="rules-manage-view row" ng-show="namespace.branch.viewType == 'rule'"> <div class="alert alert-warning no-radius" ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> <strong>Tips:</strong> {{'Component.Namespace.Branch.GrayScaleRule.NoPermissionTips' | translate }} </div> <table class="table table-bordered table-hover"> <thead> <tr> <th>{{'Component.Namespace.Branch.GrayScaleRule.AppId' | translate }}</th> <th>{{'Component.Namespace.Branch.GrayScaleRule.IpList' | translate }}</th> <th>{{'Component.Namespace.Branch.GrayScaleRule.Operator' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="ruleItem in namespace.branch.rules.ruleItems"> <td width="20%" ng-bind="ruleItem.clientAppId"></td> <td width="70%" ng-show="!ruleItem.ApplyToAllInstances" ng-bind="ruleItem.clientIpList.join(', ')"></td> <td width="70%" ng-show="ruleItem.ApplyToAllInstances"> {{'Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances' | translate }}</td> <td class="text-center" width="10%"> <img src="img/edit.png" class="i-20 hover" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.GrayScaleRule.Modify' | translate }}" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission" ng-click="editRuleItem(namespace.branch, ruleItem)"> <img src="img/cancel.png" class="i-20 hover" style="margin-left: 5px;" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.GrayScaleRule.Delete' | translate }}" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission" ng-click="deleteRuleItem(namespace.branch, ruleItem)"> </td> </tr> </tbody> </table> <button class="btn btn-primary" ng-if="namespace.hasModifyPermission || namespace.hasReleasePermission" ng-show="(namespace.isPublic && !namespace.isLinkedNamespace) || ((!namespace.isPublic || namespace.isLinkedNamespace) && (!namespace.branch.rules || !namespace.branch.rules.ruleItems || !namespace.branch.rules.ruleItems.length))" ng-click="addRuleItem(namespace.branch)">{{'Component.Namespace.Branch.GrayScaleRule.AddNewRule' | translate }} </button> </div> <!--instances --> <div class="panel panel-default" ng-show="namespace.branch.viewType == 'instance'"> <div class="panel-heading text-right"> <button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Instance.RefreshList' | translate }}" ng-click="refreshInstancesInfo(namespace.branch)"> <img ng-src="{{ '/img/refresh.png' | prefixPath }}" /> </button> </div> <div class="panel-body"> <div class="panel-default" ng-if="namespace.branch.latestReleaseInstances.total > 0"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Instance.ItemToSee' | translate }}" ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{namespace.baseInfo.clusterName}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.branch.latestRelease.id}}"> {{namespace.branch.latestRelease.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Branch.Instance.InstanceAppId' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceClusterName' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceDataCenter' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceIp' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceGetItemTime' | translate }}</td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.branch.latestReleaseInstances.content"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.branch.latestReleaseInstances.content.length < namespace.branch.latestReleaseInstances.total"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace.branch)">{{'Component.Namespace.Branch.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.branch.latestReleaseInstances.total == 0"> {{'Component.Namespace.Branch.Instance.NoInstance' | translate }} </div> </div> </div> <!--history view--> <div class="J_historyview history-view" ng-show="namespace.branch.viewType == 'history'"> <div class="media" ng-show="namespace.branch.commits && namespace.branch.commits.length" ng-repeat="commits in namespace.branch.commits"> <div class="media-body"> <div class="row"> <div class="col-md-6 col-sm-6 "> <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3> </div> <div class="col-md-6 col-sm-6 text-right"> <h5 class="media-heading" ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> </div> </div> <!--properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Branch.History.ItemType' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemKey' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Branch.History.NewAdded' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Branch.History.Modified' | translate }} </td> <td width="20%" title="{{item.newItem.key}}"> <span ng-bind="item.newItem.key | limitTo: 250"></span> <span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Branch.History.Deleted' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> <!--not properties format--> <div ng-if="!namespace.isPropertiesFormat"> <div ng-repeat="item in commits.changeSets.createItems"> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="item.value"> </textarea> </div> <div ng-repeat="item in commits.changeSets.updateItems"> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="item.newItem.value"> </textarea> </div> </div> </div> <hr> </div> <div class="text-center"> <button type="button" class="btn btn-default" ng-show="!namespace.branch.hasLoadAllCommit" ng-click="loadCommitHistory(namespace.branch)">{{'Component.Namespace.Branch.History.LoadMore' | translate }} <span class="glyphicon glyphicon-menu-down"></span></button> </div> <div class="empty-container text-center" ng-show="!namespace.branch.commits || !namespace.branch.commits.length"> {{'Component.Namespace.Branch.History.NoHistory' | translate }} </div> </div> </section> </div> </section>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <section class="branch-panel-body" ng-if="namespace.initialized && (namespace.hasBranch && namespace.displayControl.currentOperateBranch != 'master')"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label" ng-show="namespace.branch.itemModifiedCnt > 0">{{'Component.Namespace.Branch.IsChanged' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.branch.itemModifiedCnt"></span> </span> <span class="label label-primary no-radius namespace-label" ng-show="namespace.branch.lockOwner">{{'Component.Namespace.Branch.ChangeUser' | translate }}: <span ng-bind="namespace.branch.lockOwner"></span> </span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <a type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.ContinueGrayscalePublish' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-click="publish(namespace.branch)"> {{'Component.Namespace.Branch.GrayscalePublish' | translate }} </a> <a type="button" class="btn btn-primary btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.MergeToMasterAndPublish' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-click="mergeAndPublish(namespace.branch)"> {{'Component.Namespace.Branch.AllPublish' | translate }} </a> <a type="button" class="btn btn-warning btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.DiscardGrayscaleVersion' | translate }}" ng-show="(namespace.hasReleasePermission || (!namespace.branch.latestRelease && namespace.hasModifyPermission))" ng-click="preDeleteBranch(namespace.branch)"> {{'Component.Namespace.Branch.DiscardGrayscale' | translate }} </a> </div> </div> </header> <div id="BODY{{namespace.branch.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden"> <span style="color: red">{{'Component.Namespace.Branch.NoPermissionTips' | translate }}</span> </div> <!--second header--> <header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden"> <div class="row"> <div class="col-md-12 pull-left"> <ul class="nav nav-tabs"> <li role="presentation" ng-click="switchView(namespace.branch, 'table')" ng-show="namespace.isPropertiesFormat"> <a ng-class="{node_active:namespace.branch.viewType == 'table'}"> <img src="img/table.png"> {{'Component.Namespace.Branch.Tab.Configuration' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace.branch, 'rule')"> <a ng-class="{node_active:namespace.branch.viewType == 'rule'}"> <img src="img/rule.png"> {{'Component.Namespace.Branch.Tab.GrayscaleRule' | translate }} <span class="badge badge-grey" ng-bind="namespace.branch.grayIps.length + namespace.branch.grayApps.length"></span> </a> </li> <li role="presentation" ng-click="switchView(namespace.branch, 'instance')"> <a ng-class="{node_active:namespace.branch.viewType == 'instance'}"> <img src="img/machine.png"> {{'Component.Namespace.Branch.Tab.GrayscaleInstance' | translate }} <span class="badge badge-grey" ng-bind="namespace.branch.latestReleaseInstances.total"></span> </a> </li> <li role="presentation" ng-click="switchView(namespace.branch, 'history')"> <a ng-class="{node_active:namespace.branch.viewType == 'history'}"> <img src="img/change.png"> {{'Component.Namespace.Branch.Tab.ChangeHistory' | translate }} </a> </li> </ul> </div> </div> </header> <!--namespace body--> <section ng-show="!namespace.isConfigHidden"> <!--items--> <div class="namespace-view-table" ng-show="namespace.branch.viewType == 'table'"> <div class="panel panel-default" ng-if="namespace.hasBranch"> <div class="panel-heading"> {{'Component.Namespace.Branch.Body.Item' | translate }} <button type="button" class="btn btn-primary btn-sm pull-right" style="margin-top: -4px;" ng-show="namespace.hasModifyPermission" ng-click="createItem(namespace.branch)"> <img src="img/plus.png"> {{'Component.Namespace.Branch.Body.AddedItem' | translate }} </button> </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Branch.Body.PublishState' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Branch.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Branch.Body.ItemMasterValue' | translate }} </th> <th> {{'Component.Namespace.Branch.Body.ItemGrayscaleValue' | translate }} </th> <th> {{'Component.Namespace.Branch.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Branch.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Branch.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Branch.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.branch.branchItems |orderBy:col:desc" ng-if="config.item.key"> <td width="7%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ClickToSeeItemValue' | translate }}" ng-if="config.isModified || config.isDeleted" ng-click="showText(config.oldValue)">{{'Component.Namespace.Branch.Body.ItemNoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ItemEffective' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Branch.Body.ItemPublished' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span> <span class="label label-info" ng-if="!config.isDeleted && config.masterItemExists" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ChangedFromMaster' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span> <span class="label label-success" ng-if="!config.isDeleted && !config.masterItemExists" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.AddedByGrayscale' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span> </td> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.masterReleaseValue)"> <span ng-bind="config.masterReleaseValue | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="10%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="9%" class="text-center"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.Op.Modify' | translate }}" ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.Op.Delete' | translate }}" ng-if="!config.isDeleted" ng-click="preDeleteItem(namespace.branch, config.item)" ng-show="namespace.hasModifyPermission"> </td> </tr> </tbody> </table> </div> <div class="panel panel-default" ng-if="namespace.branch.masterItems && namespace.branch.masterItems.length > 0"> <div class="panel-heading"> {{'Component.Namespace.MasterBranch.Body.Title' | translate }} </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th>{{'Component.Namespace.MasterBranch.Body.PublishState' | translate }}</th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.MasterBranch.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.MasterBranch.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.MasterBranch.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.MasterBranch.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Branch.Body.ItemSort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.MasterBranch.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.MasterBranch.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.branch.masterItems |orderBy:col:desc" ng-if="config.item.key"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.ClickToSeeItemValue' | translate }}" ng-if="config.isModified || config.isDeleted" ng-click="showText(config.oldValue)">{{'Component.Namespace.MasterBranch.Body.ItemNoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.ItemEffective' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.MasterBranch.Body.ItemPublished' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.AddedItem' | translate }}">{{'Component.Namespace.Branch.Body.Added' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.ModifiedItem' | translate }}">{{'Component.Namespace.Branch.Body.Modify' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Body.DeletedItem' | translate }}">{{'Component.Namespace.Branch.Body.Delete' | translate }}</span> </td> <td width="35%" class="cursor-pointer" title="{{'Component.Namespace.Branch.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="12%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="5%" class="text-center"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.MasterBranch.Body.ModifyItem' | translate }}" ng-if="!config.isDeleted" ng-click="editItem(namespace.branch, config.item)" ng-show="namespace.hasModifyPermission"> </td> </tr> </tbody> </table> </div> </div> <!--gray rules--> <div class="rules-manage-view row" ng-show="namespace.branch.viewType == 'rule'"> <div class="alert alert-warning no-radius" ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> <strong>Tips:</strong> {{'Component.Namespace.Branch.GrayScaleRule.NoPermissionTips' | translate }} </div> <table class="table table-bordered table-hover"> <thead> <tr> <th>{{'Component.Namespace.Branch.GrayScaleRule.AppId' | translate }}</th> <th>{{'Component.Namespace.Branch.GrayScaleRule.IpList' | translate }}</th> <th>{{'Component.Namespace.Branch.GrayScaleRule.Operator' | translate }}</th> </tr> </thead> <tbody> <tr ng-repeat="ruleItem in namespace.branch.rules.ruleItems"> <td width="20%" ng-bind="ruleItem.clientAppId"></td> <td width="70%" ng-show="!ruleItem.ApplyToAllInstances" ng-bind="ruleItem.clientIpList.join(', ')"></td> <td width="70%" ng-show="ruleItem.ApplyToAllInstances"> {{'Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances' | translate }}</td> <td class="text-center" width="10%"> <img src="img/edit.png" class="i-20 hover" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.GrayScaleRule.Modify' | translate }}" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission" ng-click="editRuleItem(namespace.branch, ruleItem)"> <img src="img/cancel.png" class="i-20 hover" style="margin-left: 5px;" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.GrayScaleRule.Delete' | translate }}" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission" ng-click="deleteRuleItem(namespace.branch, ruleItem)"> </td> </tr> </tbody> </table> <button class="btn btn-primary" ng-if="namespace.hasModifyPermission || namespace.hasReleasePermission" ng-show="(namespace.isPublic && !namespace.isLinkedNamespace) || ((!namespace.isPublic || namespace.isLinkedNamespace) && (!namespace.branch.rules || !namespace.branch.rules.ruleItems || !namespace.branch.rules.ruleItems.length))" ng-click="addRuleItem(namespace.branch)">{{'Component.Namespace.Branch.GrayScaleRule.AddNewRule' | translate }} </button> </div> <!--instances --> <div class="panel panel-default" ng-show="namespace.branch.viewType == 'instance'"> <div class="panel-heading text-right"> <button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Instance.RefreshList' | translate }}" ng-click="refreshInstancesInfo(namespace.branch)"> <img ng-src="{{ '/img/refresh.png' | prefixPath }}" /> </button> </div> <div class="panel-body"> <div class="panel-default" ng-if="namespace.branch.latestReleaseInstances.total > 0"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Branch.Instance.ItemToSee' | translate }}" ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{namespace.baseInfo.clusterName}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.branch.latestRelease.id}}"> {{namespace.branch.latestRelease.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Branch.Instance.InstanceAppId' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceClusterName' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceDataCenter' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceIp' | translate }}</td> <td>{{'Component.Namespace.Branch.Instance.InstanceGetItemTime' | translate }}</td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.branch.latestReleaseInstances.content"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.branch.latestReleaseInstances.content.length < namespace.branch.latestReleaseInstances.total"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace.branch)">{{'Component.Namespace.Branch.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.branch.latestReleaseInstances.total == 0"> {{'Component.Namespace.Branch.Instance.NoInstance' | translate }} </div> </div> </div> <!--history view--> <div class="J_historyview history-view" ng-show="namespace.branch.viewType == 'history'"> <div class="media" ng-show="namespace.branch.commits && namespace.branch.commits.length" ng-repeat="commits in namespace.branch.commits"> <div class="media-body"> <div class="row"> <div class="col-md-6 col-sm-6 "> <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3> </div> <div class="col-md-6 col-sm-6 text-right"> <h5 class="media-heading" ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> </div> </div> <!--properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Branch.History.ItemType' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemKey' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Branch.History.NewAdded' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Branch.History.Modified' | translate }} </td> <td width="20%" title="{{item.newItem.key}}"> <span ng-bind="item.newItem.key | limitTo: 250"></span> <span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Branch.History.Deleted' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> <!--not properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="!namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Branch.History.ItemType' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Branch.History.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Branch.History.NewAdded' | translate }} </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Branch.History.Modified' | translate }} </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Branch.History.Deleted' | translate }} </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> </div> <hr> </div> <div class="text-center"> <button type="button" class="btn btn-default" ng-show="!namespace.branch.hasLoadAllCommit" ng-click="loadCommitHistory(namespace.branch)">{{'Component.Namespace.Branch.History.LoadMore' | translate }} <span class="glyphicon glyphicon-menu-down"></span></button> </div> <div class="empty-container text-center" ng-show="!namespace.branch.commits || !namespace.branch.commits.length"> {{'Component.Namespace.Branch.History.NoHistory' | translate }} </div> </div> </section> </div> </section>
1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!--master panel body when not initialized--> <section class="master-panel-body" ng-if="!namespace.initialized"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}" ng-click="refreshNamespace()"> <img src="img/more.png"> {{'Component.Namespace.Master.LoadNamespace' | translate }} </button> </div> </div> </header> </section> <!--master panel body--> <section class="master-panel-body" ng-if="namespace.initialized && (namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> <span class="label label-primary no-radius namespace-label" ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)"> <img src="img/release.png"> {{'Component.Namespace.Master.Items.Publish' | translate }} </button> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}" ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.Rollback' | translate }} </button> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}"> <img src="img/release-history.png"> {{'Component.Namespace.Master.Items.PublishHistory' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}" href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}" ng-show="hasAssignUserPermission"> <img src="img/assign.png"> {{'Component.Namespace.Master.Items.Grant' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}" ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission" ng-click="preCreateBranch(namespace)"> <img src="img/test.png"> {{'Component.Namespace.Master.Items.Grayscale' | translate }} </a> <a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}" ng-click="showNoModifyPermissionDialog()" ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> {{'Component.Namespace.Master.Items.RequestPermission' | translate }} </a> <div class="btn-group" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <img src="img/operate.png"> <span class="caret"></span> </button> <ul class="dropdown-menu" style="right: 0; left: -160px;"> <li ng-click="deleteNamespace(namespace)"> <a style="color: red"> <img src="img/delete.png"> {{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a> </li> </ul> </div> </div> </div> </header> <div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden"> <span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span> </div> <!--second header--> <header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden"> <div class="row"> <div class="col-md-6 col-sm-6 pull-left"> <!--master branch nav tabs--> <ul class="nav nav-tabs"> <li role="presentation" ng-click="switchView(namespace, 'table')" ng-show="namespace.isPropertiesFormat"> <a ng-class="{node_active:namespace.viewType == 'table'}"> <img src="img/table.png"> {{'Component.Namespace.Master.Items.ItemList' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'text')"> <a ng-class="{node_active:namespace.viewType == 'text'}"> <img src="img/text.png"> {{'Component.Namespace.Master.Items.ItemListByText' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'history')"> <a ng-class="{node_active:namespace.viewType == 'history'}"> <img src="img/change.png"> {{'Component.Namespace.Master.Items.ItemHistory' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'instance')"> <a ng-class="{node_active:namespace.viewType == 'instance'}"> <img src="img/machine.png"> {{'Component.Namespace.Master.Items.ItemInstance' | translate }} <span class="badge badge-grey" ng-bind="namespace.instancesCount"></span> </a> </li> </ul> </div> <div class="col-md-6 col-sm-6 text-right"> <img src="img/copy.png" class="ns_btn clipboard cursor-pointer" data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CopyText' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"> <img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable" ng-click="syntaxCheck(namespace)"> &nbsp; <img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="toggleTextEditStatus(namespace)"> <img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Change' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission" ng-click="toggleTextEditStatus(namespace)"> &nbsp; <img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal" data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="modifyByText(namespace)"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)"> <span class="glyphicon glyphicon-filter"></span> {{'Component.Namespace.Master.Items.FilterItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}" ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/sync.png"> {{'Component.Namespace.Master.Items.SyncItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}" ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.RevokeItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}" ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.isPropertiesFormat"> <img src="img/diff.png"> {{'Component.Namespace.Master.Items.DiffItem' | translate }} </button> <button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace && namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission" ng-click="createItem(namespace)"> <img src="img/plus.png"> {{'Component.Namespace.Master.Items.AddItem' | translate }} </button> </div> </div> </header> <!--namespace body--> <section ng-show="!namespace.isConfigHidden"> <!--table view--> <div class="namespace-view-table" ng-show="namespace.viewType == 'table'"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease"> <span style="color: red"> {{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span> </div> <!--not link namespace--> <div ng-if="!namespace.isLinkedNamespace"> <div class="search-input" ng-show="namespace.displayControl.showSearchInput"> <input type="text" class="form-control" placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)"> </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.PublishState' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key" ng-class="{'warning': !config.item.value}"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> </div> <!--link namespace--> <div class="panel panel-default" ng-if="namespace.isLinkedNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }} </div> <div class="col-md-8 col-sm-8"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus, 'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'" ng-blur="namespace.searchStatus='OFF'"> </div> </div> </div> <table class="table table-bordered table-striped table-hover" ng-if="namespace.viewItems && namespace.viewItems.length"> <thead> <tr> <th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.viewItems || !namespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5> </div> </div> <!--link namespace's public namespace--> <div ng-if="namespace.isLinkedNamespace"> <div class="panel panel-default" ng-if="namespace.publicNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}" target="_blank"> <small> ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}}, {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}}) </small> </a> </div> <div class="col-md-4 col-sm-4 text-center"> <div class="btn-group btn-group-sm" role="group" ng-show="namespace.publicNamespace.isModified"> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE' || !namespace.publicNamespaceViewType}" ng-click="namespace.publicNamespaceViewType = 'RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.Published' | translate }} </button> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}" ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }} </button> </div> </div> <div class="col-md-4 col-sm-4"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF' || !namespace.publicNamespace.searchStatus, 'search-focus': namespace.publicNamespace.searchStatus == 'ON'}" ng-model="namespace.publicNamespace.searchKey" ng-change="searchItems(namespace.publicNamespace)" ng-blur="namespace.publicNamespace.searchStatus='OFF'" ng-focus="namespace.publicNamespace.searchStatus='ON'" /> </div> </div> </div> <!--published items--> <div ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'"> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespace.hasPublishedItem"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && !config.isModified && !config.isDeleted"> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> </td> <td width="35%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="15%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="10%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems && namespace.publicNamespace.viewItems.length && !namespace.publicNamespace.hasPublishedItem"> <h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5> </div> </div> <!--not published items--> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && (config.isModified || config.isDeleted)"> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.oldValue)"> <span ng-bind="config.oldValue | limitTo: 250"></span> <span ng-bind="config.oldValue.length > 250 ? '...': ''"></span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="10%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="5%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5> </div> </div> <div class="panel panel-default" ng-if="!namespace.publicNamespace"> <div class="panel-heading"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} </div> <div class="panel-body text-center"> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}" target="_blank">{{namespace.parentAppId}}</a> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }} </div> </div> </div> </div> <!--text view--> <!--只读模式下的文本内容,不替换换行符--> <div ui-ace="aceConfig" readonly="true" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text"> </div> <!--编辑状态下的文本内容,会过滤掉换行符--> <div ui-ace="aceConfig" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing" ng-model="namespace.editText"> </div> <!--history view--> <div class="J_historyview history-view" ng-show="namespace.viewType == 'history'"> <div class="media" ng-show="namespace.commits && namespace.commits.length" ng-repeat="commits in namespace.commits"> <div class="media-body"> <div class="row"> <div class="col-md-6 col-sm-6"> <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3> </div> <div class="col-md-6 col-sm-6 text-right"> <h5 class="media-heading" ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> </div> </div> <!--properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="20%" title="{{item.newItem.key}}"> <span ng-bind="item.newItem.key | limitTo: 250"></span> <span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> <!--not properties format--> <div ng-if="!namespace.isPropertiesFormat"> <div ng-repeat="item in commits.changeSets.createItems"> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="item.value"> </textarea> </div> <div ng-repeat="item in commits.changeSets.updateItems"> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="item.newItem.value"> </textarea> </div> </div> </div> <hr> </div> <div class="text-center"> <button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit" ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }} <span class="glyphicon glyphicon-menu-down"></span></button> </div> <div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length"> {{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }} </div> </div> <!--instance view--> <div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'"> <div class="panel-heading"> <div class="row"> <div class="col-md-5 col-sm-5"> <small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small> </div> <div class="col-md-7 col-sm-7 text-right"> <div class="btn-group btn-group-sm" role="group"> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}" ng-click="switchInstanceViewType(namespace, 'latest_release')"> {{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }} <span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}" ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }} <span class="badge" ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'all'}" ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }} <span class="badge" ng-bind="namespace.instancesCount"></span> </button> </div> <button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}" ng-click="refreshInstancesInfo(namespace)"> <img ng-src="{{ '/img/refresh.png' | prefixPath }}" /> </button> </div> </div> </div> <!--latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'"> <div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}"> {{namespace.latestRelease.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.latestReleaseInstances.content"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--not latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'"> <div class="panel-default" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0" ng-repeat="release in namespace.notLatestReleases"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}"> {{release.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> </div> <div class="text-center" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--all instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'all'"> <div class="panel-default" ng-if="namespace.instancesCount > 0"> <table class="table table-bordered table-striped" ng-if="namespace.allInstances"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.allInstances"> <td width="25%" ng-bind="instance.appId"></td> <td width="25%" ng-bind="instance.clusterName"></td> <td width="25%" ng-bind="instance.dataCenter"></td> <td width="25%" ng-bind="instance.ip"></td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.instancesCount == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> </div> </section> </div> </section>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!--master panel body when not initialized--> <section class="master-panel-body" ng-if="!namespace.initialized"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}" ng-click="refreshNamespace()"> <img src="img/more.png"> {{'Component.Namespace.Master.LoadNamespace' | translate }} </button> </div> </div> </header> </section> <!--master panel body--> <section class="master-panel-body" ng-if="namespace.initialized && (namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)"> <!--main header--> <header class="panel-heading"> <div class="row"> <div class="col-md-6 col-sm-6 header-namespace"> <b class="namespace-name" ng-bind="namespace.viewName" data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b> <span class="label label-warning no-radius namespace-label modify-tip" ng-show="namespace.itemModifiedCnt > 0"> {{'Component.Namespace.Master.Items.Changed' | translate }} <span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span> </span> <span class="label label-primary no-radius namespace-label" ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span> </div> <div class="col-md-6 col-sm-6 text-right header-buttons"> <button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}" ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)" ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)"> <img src="img/release.png"> {{'Component.Namespace.Master.Items.Publish' | translate }} </button> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}" ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.Rollback' | translate }} </button> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}"> <img src="img/release-history.png"> {{'Component.Namespace.Master.Items.PublishHistory' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}" href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}" ng-show="hasAssignUserPermission"> <img src="img/assign.png"> {{'Component.Namespace.Master.Items.Grant' | translate }} </a> <a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}" ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission" ng-click="preCreateBranch(namespace)"> <img src="img/test.png"> {{'Component.Namespace.Master.Items.Grayscale' | translate }} </a> <a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}" ng-click="showNoModifyPermissionDialog()" ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission"> {{'Component.Namespace.Master.Items.RequestPermission' | translate }} </a> <div class="btn-group" ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <img src="img/operate.png"> <span class="caret"></span> </button> <ul class="dropdown-menu" style="right: 0; left: -160px;"> <li ng-click="deleteNamespace(namespace)"> <a style="color: red"> <img src="img/delete.png"> {{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a> </li> </ul> </div> </div> </div> </header> <div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden"> <span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span> </div> <!--second header--> <header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden"> <div class="row"> <div class="col-md-6 col-sm-6 pull-left"> <!--master branch nav tabs--> <ul class="nav nav-tabs"> <li role="presentation" ng-click="switchView(namespace, 'table')" ng-show="namespace.isPropertiesFormat"> <a ng-class="{node_active:namespace.viewType == 'table'}"> <img src="img/table.png"> {{'Component.Namespace.Master.Items.ItemList' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'text')"> <a ng-class="{node_active:namespace.viewType == 'text'}"> <img src="img/text.png"> {{'Component.Namespace.Master.Items.ItemListByText' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'history')"> <a ng-class="{node_active:namespace.viewType == 'history'}"> <img src="img/change.png"> {{'Component.Namespace.Master.Items.ItemHistory' | translate }} </a> </li> <li role="presentation" ng-click="switchView(namespace, 'instance')"> <a ng-class="{node_active:namespace.viewType == 'instance'}"> <img src="img/machine.png"> {{'Component.Namespace.Master.Items.ItemInstance' | translate }} <span class="badge badge-grey" ng-bind="namespace.instancesCount"></span> </a> </li> </ul> </div> <div class="col-md-6 col-sm-6 text-right"> <img src="img/copy.png" class="ns_btn clipboard cursor-pointer" data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CopyText' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"> <img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable" ng-click="syntaxCheck(namespace)"> &nbsp; <img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="toggleTextEditStatus(namespace)"> <img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Change' | translate }}" ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission" ng-click="toggleTextEditStatus(namespace)"> &nbsp; <img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal" data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'" ng-click="modifyByText(namespace)"> <button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)"> <span class="glyphicon glyphicon-filter"></span> {{'Component.Namespace.Master.Items.FilterItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}" ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/sync.png"> {{'Component.Namespace.Master.Items.SyncItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}" ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission && namespace.isPropertiesFormat"> <img src="img/rollback.png"> {{'Component.Namespace.Master.Items.RevokeItem' | translate }} </button> <button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}" ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.isPropertiesFormat"> <img src="img/diff.png"> {{'Component.Namespace.Master.Items.DiffItem' | translate }} </button> <button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace && namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master' && namespace.hasModifyPermission" ng-click="createItem(namespace)"> <img src="img/plus.png"> {{'Component.Namespace.Master.Items.AddItem' | translate }} </button> </div> </div> </header> <!--namespace body--> <section ng-show="!namespace.isConfigHidden"> <!--table view--> <div class="namespace-view-table" ng-show="namespace.viewType == 'table'"> <div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease"> <span style="color: red"> {{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span> </div> <!--not link namespace--> <div ng-if="!namespace.isLinkedNamespace"> <div class="search-input" ng-show="namespace.displayControl.showSearchInput"> <input type="text" class="form-control" placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)"> </div> <table class="table table-bordered table-striped table-hover"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.PublishState' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key" ng-class="{'warning': !config.item.value}"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> </div> <!--link namespace--> <div class="panel panel-default" ng-if="namespace.isLinkedNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Link.Title' | translate }} </div> <div class="col-md-8 col-sm-8"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus, 'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey" ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'" ng-blur="namespace.searchStatus='OFF'"> </div> </div> </div> <table class="table table-bordered table-striped table-hover" ng-if="namespace.viewItems && namespace.viewItems.length"> <thead> <tr> <th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"> <td width="8%" class="text-center"> <span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}" ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span> <span class="label label-default-light no-radius" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}" ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span> </td> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-default cursor-pointer" ng-if="config.hasBranchValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}" ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="30%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="13%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="16%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="8%" class="text-center" ng-if="!config.isDeleted"> <img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> <img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}" ng-click="preDeleteItem(namespace, config.item)" ng-show="namespace.hasModifyPermission"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.viewItems || !namespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5> </div> </div> <!--link namespace's public namespace--> <div ng-if="namespace.isLinkedNamespace"> <div class="panel panel-default" ng-if="namespace.publicNamespace"> <div class="panel-heading"> <div class="row"> <div class="padding-top-5 col-md-4 col-sm-4"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}" target="_blank"> <small> ({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}}, {{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}}) </small> </a> </div> <div class="col-md-4 col-sm-4 text-center"> <div class="btn-group btn-group-sm" role="group" ng-show="namespace.publicNamespace.isModified"> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE' || !namespace.publicNamespaceViewType}" ng-click="namespace.publicNamespaceViewType = 'RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.Published' | translate }} </button> <button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}" ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'"> {{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }} </button> </div> </div> <div class="col-md-4 col-sm-4"> <input type="text" class="form-control pull-right" placeholder="filter by key ..." ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF' || !namespace.publicNamespace.searchStatus, 'search-focus': namespace.publicNamespace.searchStatus == 'ON'}" ng-model="namespace.publicNamespace.searchKey" ng-change="searchItems(namespace.publicNamespace)" ng-blur="namespace.publicNamespace.searchStatus='OFF'" ng-focus="namespace.publicNamespace.searchStatus='ON'" /> </div> </div> </div> <!--published items--> <div ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'"> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespace.hasPublishedItem"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && !config.isModified && !config.isDeleted"> <td width="15%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> </td> <td width="35%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="15%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'"> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="10%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> <td width="6%" class="text-center" ng-if="config.isDeleted"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems && namespace.publicNamespace.viewItems.length && !namespace.publicNamespace.hasPublishedItem"> <h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5> </div> </div> <!--not published items--> <table class="table table-bordered table-striped table-hover" ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'"> <thead> <tr> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.key';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}&nbsp; <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.ItemComment' | translate }} </th> <th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}" ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;"> {{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }} <span class="glyphicon glyphicon-sort"></span> </th> <th> {{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc" ng-if="config.item.key && (config.isModified || config.isDeleted)"> <td width="20%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.key)"> <span ng-bind="config.item.key | limitTo: 250"></span> <span ng-bind="config.item.key.length > 250 ? '...' :''"></span> <span class="label label-success" ng-if="config.isModified && !config.oldValue" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span> <span class="label label-info" ng-if="config.isModified && config.oldValue && !config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span> <span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.oldValue)"> <span ng-bind="config.oldValue | limitTo: 250"></span> <span ng-bind="config.oldValue.length > 250 ? '...': ''"></span> </td> <td width="25%" class="cursor-pointer" title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}" ng-click="showText(config.item.value)"> <span ng-bind="config.item.value | limitTo: 250"></span> <span ng-bind="config.item.value.length > 250 ? '...': ''"></span> </td> <td width="10%" title="{{config.item.comment}}"> <span ng-bind="config.item.comment | limitTo: 250"></span> <span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span> </td> <td width="15%" ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'"> </td> <td width="5%" class="text-center" ng-if="!config.isDeleted"> <img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}" ng-click="editItem(namespace, config.item)" ng-show="namespace.hasModifyPermission && !config.covered"> </td> </tr> </tbody> </table> <div class="text-center no-config-panel" ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length"> <h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5> </div> </div> <div class="panel panel-default" ng-if="!namespace.publicNamespace"> <div class="panel-heading"> {{'Component.Namespace.Master.Items.Body.Public.Title' | translate }} </div> <div class="panel-body text-center"> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }} <a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}" target="_blank">{{namespace.parentAppId}}</a> {{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }} </div> </div> </div> </div> <!--text view--> <!--只读模式下的文本内容,不替换换行符--> <div ui-ace="aceConfig" readonly="true" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text"> </div> <!--编辑状态下的文本内容,会过滤掉换行符--> <div ui-ace="aceConfig" class="form-control no-radius" rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}" ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing" ng-model="namespace.editText"> </div> <!--history view--> <div class="J_historyview history-view" ng-show="namespace.viewType == 'history'"> <div class="media" ng-show="namespace.commits && namespace.commits.length" ng-repeat="commits in namespace.commits"> <div class="media-body"> <div class="row"> <div class="col-md-6 col-sm-6"> <h3 class="media-heading" ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3> </div> <div class="col-md-6 col-sm-6 text-right"> <h5 class="media-heading" ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5> </div> </div> <!--properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="20%" title="{{item.newItem.key}}"> <span ng-bind="item.newItem.key | limitTo: 250"></span> <span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="20%" title="{{item.key}}"> <span ng-bind="item.key | limitTo: 250"></span> <span ng-bind="item.key.length > 250 ? '...' :''"></span> </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> <!--not properties format--> <table class="table table-bordered table-striped text-center table-hover" style="margin-top: 5px;" ng-if="!namespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }} </th> <th> {{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }} </th> </tr> </thead> <tbody> <!--兼容老数据,不显示item类型为空行和注释的item--> <tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }} </td> <td width="28%"> </td> <td width="28%" class="cursor-pointer" title="{{item.value}}" ng-click="showText(item.value)"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.updateItems"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }} </td> <td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}" ng-click="showText(item.oldItem.value)"> <span ng-bind="item.oldItem.value | limitTo: 250"></span> <span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span> </td> <td width="28%" class="cursor-pointer" title="{{item.newItem.value}}" ng-click="showText(item.newItem.value)"> <span ng-bind="item.newItem.value | limitTo: 250"></span> <span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span> </td> <td width="18%" title="{{item.newItem.comment}}"> <span ng-bind="item.newItem.comment | limitTo: 250"></span> <span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span> </td> </tr> <tr ng-repeat="item in commits.changeSets.deleteItems" ng-show="item.key || item.comment"> <td width="6%"> {{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }} </td> <td width="28%" title="{{item.value}}"> <span ng-bind="item.value | limitTo: 250"></span> <span ng-bind="item.value.length > 250 ? '...': ''"></span> </td> <td width="28%"> </td> <td width="18%" title="{{item.comment}}"> <span ng-bind="item.comment | limitTo: 250"></span> <span ng-bind="item.comment.length > 250 ?'...' : ''"></span> </td> </tr> </tbody> </table> </div> <hr> </div> <div class="text-center"> <button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit" ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }} <span class="glyphicon glyphicon-menu-down"></span></button> </div> <div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length"> {{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }} </div> </div> <!--instance view--> <div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'"> <div class="panel-heading"> <div class="row"> <div class="col-md-5 col-sm-5"> <small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small> </div> <div class="col-md-7 col-sm-7 text-right"> <div class="btn-group btn-group-sm" role="group"> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}" ng-click="switchInstanceViewType(namespace, 'latest_release')"> {{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }} <span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}" ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }} <span class="badge" ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span> </button> <button type="button" class="btn btn-default" ng-class="{'btn-primary':namespace.instanceViewType == 'all'}" ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }} <span class="badge" ng-bind="namespace.instancesCount"></span> </button> </div> <button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}" ng-click="refreshInstancesInfo(namespace)"> <img ng-src="{{ '/img/refresh.png' | prefixPath }}" /> </button> </div> </div> </div> <!--latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'"> <div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}"> {{namespace.latestRelease.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.latestReleaseInstances.content"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--not latest release instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'"> <div class="panel-default" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0" ng-repeat="release in namespace.notLatestReleases"> <div class="panel-heading"> <a target="_blank" data-tooltip="tooltip" data-placement="bottom" title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}"> {{release.name}} </a> </div> <table class="table table-bordered table-striped"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }} </td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]"> <td width="20%" ng-bind="instance.appId"></td> <td width="20%" ng-bind="instance.clusterName"></td> <td width="20%" ng-bind="instance.dataCenter"></td> <td width="20%" ng-bind="instance.ip"></td> <td width="20%">{{instance.configs && instance.configs.length ? (instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}} </td> </tr> </tbody> </table> </div> <div class="text-center" ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> <!--all instances--> <div class="panel-body" ng-show="namespace.instanceViewType == 'all'"> <div class="panel-default" ng-if="namespace.instancesCount > 0"> <table class="table table-bordered table-striped" ng-if="namespace.allInstances"> <thead> <tr> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }} </td> <td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td> </tr> </thead> <tbody> <tr ng-repeat="instance in namespace.allInstances"> <td width="25%" ng-bind="instance.appId"></td> <td width="25%" ng-bind="instance.clusterName"></td> <td width="25%" ng-bind="instance.dataCenter"></td> <td width="25%" ng-bind="instance.ip"></td> </tr> </tbody> </table> <div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount"> <button class="btn btn-default" ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button> </div> </div> <div class="text-center" ng-if="namespace.instancesCount == 0"> {{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }} </div> </div> </div> </section> </div> </section>
1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./GOVERNANCE.md
# Overview Apollo is a meritocratic, consensus-based community project. Anyone with an interest in the project can join the community, contribute to the project design and participate in the decision-making process. This document describes how that participation takes place and how to set about earning merit within the project community. # Roles and Responsibilities Apollo community is composed of and operated by the following roles: - Users - Contributors - Committers - Project Management Committee (PMC) ## Users Users are community members who have a need for the project. They are the most important members of the community and without them the project would have no purpose. Anyone can be a user and there are no special requirements. ## Contributors Contributors are community members who contribute in concrete ways to the project. ### How to become a Contributor - merged at least 1 pull request You are also encouraged to participate in the projects in the following ways: - Actively answer technical questions raised by community users in GitHub issues. - Help test the projects - Help review the pull requests (PRs) submitted by others - Help improve technical documents - Submit valuable issues - Report or fix known and unknown bugs - Write articles about source code analysis and usage cases for a project. - Give representations of Apollo topic in conferences. - Take part in our discussions of features, enhancements, etc. ## Committers Committers are contributors who have shown that they are committed to the continued development of the project through ongoing engagement with the community and recognized by PMCs for their outstanding contributions. ### How to become a Committer A Committer must have accomplished one or more of the following items: - Demonstrated a good sense of responsibility in PR reviews. - Demonstrated deep understanding of Apollo components by contributing significantly as: - Finished 2 or more tasks of Medium difficulty - Fixed 1 or more tasks of Hard difficulty - Nominated by one PMC member and gained more +1 than -1. ### Privileges and responsibilities - Control overall code quality of projects - Guide Contributors to contribute to the community continuously - Participate in design discussions ## Project Management Committee The PMC(Project Management Committee) functions as the core management team that oversees the Apollo community. The PMC has additional responsibilities over and above those of Committers. These responsibilities ensure the smooth running of the project. ### How to become a PMC member - Membership of the PMC is by invitation from the existing PMC members. - A nomination will result in discussion and then a vote by the existing PMC members. - PMC membership votes are subject to consensus approval of the current PMC members. ### Privileges and responsibilities - Handle reported security issues (CVE, etc.) - Nominate new committers and PMC members - Vote on new committers and new PMC members - Make major decisions for the future with respect to Apollo, such as project-level governance policies, management of sub-structures, security processes and so on - Make decisions when community consensus cannot be reached # Decision-making and voting Proposals and ideas can be submitted for agreement via a GitHub issue, PR, or GitHub Discussion. Major changes such as feature proposals and organization or process changes should be brought to the PMC. For the change to happen, the change must earn more +1 than -1. # Conflict resolution In general, we prefer that technical issues and other disputes upon which consensus can't be reached are amicably worked out between the persons involved. If a dispute cannot be decided independently, the PMC can be called in to resolve the issue by voting. The same PR can be used, or a separate PR can be opened for voting. # Changes in Governance Any change in this Governance document, or similar nature of changes to other governance related documents, shall go through the voting process as described in [Decision-making and voting](#decision-making-and-voting). # Credits The contents of this document are based on <http://oss-watch.ac.uk/resources/meritocraticgovernancemodel> by Ross Gardler and Gabriel Hanganu, and [TiDB Governance](https://github.com/pingcap/community/blob/master/GOVERNANCE.md).
# Overview Apollo is a meritocratic, consensus-based community project. Anyone with an interest in the project can join the community, contribute to the project design and participate in the decision-making process. This document describes how that participation takes place and how to set about earning merit within the project community. # Roles and Responsibilities Apollo community is composed of and operated by the following roles: - Users - Contributors - Committers - Project Management Committee (PMC) ## Users Users are community members who have a need for the project. They are the most important members of the community and without them the project would have no purpose. Anyone can be a user and there are no special requirements. ## Contributors Contributors are community members who contribute in concrete ways to the project. ### How to become a Contributor - merged at least 1 pull request You are also encouraged to participate in the projects in the following ways: - Actively answer technical questions raised by community users in GitHub issues. - Help test the projects - Help review the pull requests (PRs) submitted by others - Help improve technical documents - Submit valuable issues - Report or fix known and unknown bugs - Write articles about source code analysis and usage cases for a project. - Give representations of Apollo topic in conferences. - Take part in our discussions of features, enhancements, etc. ## Committers Committers are contributors who have shown that they are committed to the continued development of the project through ongoing engagement with the community and recognized by PMCs for their outstanding contributions. ### How to become a Committer A Committer must have accomplished one or more of the following items: - Demonstrated a good sense of responsibility in PR reviews. - Demonstrated deep understanding of Apollo components by contributing significantly as: - Finished 2 or more tasks of Medium difficulty - Fixed 1 or more tasks of Hard difficulty - Nominated by one PMC member and gained more +1 than -1. ### Privileges and responsibilities - Control overall code quality of projects - Guide Contributors to contribute to the community continuously - Participate in design discussions ## Project Management Committee The PMC(Project Management Committee) functions as the core management team that oversees the Apollo community. The PMC has additional responsibilities over and above those of Committers. These responsibilities ensure the smooth running of the project. ### How to become a PMC member - Membership of the PMC is by invitation from the existing PMC members. - A nomination will result in discussion and then a vote by the existing PMC members. - PMC membership votes are subject to consensus approval of the current PMC members. ### Privileges and responsibilities - Handle reported security issues (CVE, etc.) - Nominate new committers and PMC members - Vote on new committers and new PMC members - Make major decisions for the future with respect to Apollo, such as project-level governance policies, management of sub-structures, security processes and so on - Make decisions when community consensus cannot be reached # Decision-making and voting Proposals and ideas can be submitted for agreement via a GitHub issue, PR, or GitHub Discussion. Major changes such as feature proposals and organization or process changes should be brought to the PMC. For the change to happen, the change must earn more +1 than -1. # Conflict resolution In general, we prefer that technical issues and other disputes upon which consensus can't be reached are amicably worked out between the persons involved. If a dispute cannot be decided independently, the PMC can be called in to resolve the issue by voting. The same PR can be used, or a separate PR can be opened for voting. # Changes in Governance Any change in this Governance document, or similar nature of changes to other governance related documents, shall go through the voting process as described in [Decision-making and voting](#decision-making-and-voting). # Credits The contents of this document are based on <http://oss-watch.ac.uk/resources/meritocraticgovernancemodel> by Ross Gardler and Gabriel Hanganu, and [TiDB Governance](https://github.com/pingcap/community/blob/master/GOVERNANCE.md).
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/multiple-user-selector.html
<select class="{{id}}" style="width: 450px;" multiple="multiple"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 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;" multiple="multiple"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT 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,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/usage/dotnet-sdk-user-guide.md
TODO
TODO
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/common/nav.html
<nav class="navbar navbar-default"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="container-fluid"> <div class="navbar-header"> <img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/show_sidebar.png' | prefixPath }}" onMouseOver="this.style.background='#f1f2f7'" onMouseOut="this.style.background='#fff'" data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.ShowNavBar' | translate }}" ng-show="viewMode == 2 && !showSideBar" ng-click="showSideBar = !showSideBar"> <img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/hide_sidebar.png' | prefixPath }}" onMouseOver="this.style.background='#f1f2f7'" onMouseOut="this.style.background='#fff'" data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.HideNavBar' | translate }}" ng-show="viewMode == 2 && showSideBar" ng-click="showSideBar = !showSideBar"> <a class="navbar-brand logo" href="{{ '/' | prefixPath }}"> <img src="{{ '/img/logo-simple.png' | prefixPath }}" style="height:45px; margin-top: -13px"> </a> </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li> <a href="{{pageSetting.wikiAddress}}" target="_blank"> <span class="glyphicon glyphicon-question-sign"></span> {{'Common.Nav.Help' | translate }} </a> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon .glyphicon-glyphicon-font"></span>&nbsp;Language<span class="caret"></span></a> <ul class="dropdown-menu"> <li value="en"><a href="javascript:void(0)" ng-click="changeLanguage('en')">English</a></li> <li value="zh-CN"><a href="javascript:void(0)" ng-click="changeLanguage('zh-CN')">简体中文</a></li> </ul> </li> <!-- admin tool --> <li class="dropdown" ng-if="hasRootPermission == true"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-cog"></span>&nbsp;{{'Common.Nav.AdminTools' | translate }} <span class="caret"></span></a> <ul class="dropdown-menu" > <li><a ng-href="{{ '/user-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.UserManage' | translate }}</a></li> <li><a href="{{ '/system-role-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemRoleManage' | translate }}</a></li> <li><a href="{{ '/open/manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.OpenMange' | translate }}</a></li> <li><a href="{{ '/server_config.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemConfig' | translate }}</a></li> <li><a href="{{ '/delete_app_cluster_namespace.html' | prefixPath }}" target="_blank">{{'Common.Nav.DeleteApp-Cluster-Namespace' | translate }}</a></li> <li><a href="{{ '/system_info.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemInfo' | translate }}</a></li> <li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li> </ul> </li> <!-- normal user tool (not admin)--> <li class="dropdown" ng-if="hasRootPermission == false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-cog"></span>&nbsp;{{'Common.Nav.NonAdminTools' | translate }} <span class="caret"></span></a> <ul class="dropdown-menu" > <li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li> </ul> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-user"></span>&nbsp;{{userDisplayName}}({{userName}}) <span class="caret"></span></a> <ul class="dropdown-menu"> <li><a href="{{ '/user/logout' | prefixPath }}">{{'Common.Nav.Logout' | translate }}</a></li> </ul> </li> </ul> <div class="navbar-form navbar-right form-inline" role="search"> <div class="form-group app-search-list"> <select id="app-search-list" style="width: 350px"></select> </div> </div> </div> </div> </nav>
<nav class="navbar navbar-default"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="container-fluid"> <div class="navbar-header"> <img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/show_sidebar.png' | prefixPath }}" onMouseOver="this.style.background='#f1f2f7'" onMouseOut="this.style.background='#fff'" data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.ShowNavBar' | translate }}" ng-show="viewMode == 2 && !showSideBar" ng-click="showSideBar = !showSideBar"> <img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/hide_sidebar.png' | prefixPath }}" onMouseOver="this.style.background='#f1f2f7'" onMouseOut="this.style.background='#fff'" data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.HideNavBar' | translate }}" ng-show="viewMode == 2 && showSideBar" ng-click="showSideBar = !showSideBar"> <a class="navbar-brand logo" href="{{ '/' | prefixPath }}"> <img src="{{ '/img/logo-simple.png' | prefixPath }}" style="height:45px; margin-top: -13px"> </a> </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> <li> <a href="{{pageSetting.wikiAddress}}" target="_blank"> <span class="glyphicon glyphicon-question-sign"></span> {{'Common.Nav.Help' | translate }} </a> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon .glyphicon-glyphicon-font"></span>&nbsp;Language<span class="caret"></span></a> <ul class="dropdown-menu"> <li value="en"><a href="javascript:void(0)" ng-click="changeLanguage('en')">English</a></li> <li value="zh-CN"><a href="javascript:void(0)" ng-click="changeLanguage('zh-CN')">简体中文</a></li> </ul> </li> <!-- admin tool --> <li class="dropdown" ng-if="hasRootPermission == true"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-cog"></span>&nbsp;{{'Common.Nav.AdminTools' | translate }} <span class="caret"></span></a> <ul class="dropdown-menu" > <li><a ng-href="{{ '/user-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.UserManage' | translate }}</a></li> <li><a href="{{ '/system-role-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemRoleManage' | translate }}</a></li> <li><a href="{{ '/open/manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.OpenMange' | translate }}</a></li> <li><a href="{{ '/server_config.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemConfig' | translate }}</a></li> <li><a href="{{ '/delete_app_cluster_namespace.html' | prefixPath }}" target="_blank">{{'Common.Nav.DeleteApp-Cluster-Namespace' | translate }}</a></li> <li><a href="{{ '/system_info.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemInfo' | translate }}</a></li> <li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li> </ul> </li> <!-- normal user tool (not admin)--> <li class="dropdown" ng-if="hasRootPermission == false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-cog"></span>&nbsp;{{'Common.Nav.NonAdminTools' | translate }} <span class="caret"></span></a> <ul class="dropdown-menu" > <li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li> </ul> </li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <span class="glyphicon glyphicon-user"></span>&nbsp;{{userDisplayName}}({{userName}}) <span class="caret"></span></a> <ul class="dropdown-menu"> <li><a href="{{ '/user/logout' | prefixPath }}">{{'Common.Nav.Logout' | translate }}</a></li> </ul> </li> </ul> <div class="navbar-form navbar-right form-inline" role="search"> <div class="form-group app-search-list"> <select id="app-search-list" style="width: 350px"></select> </div> </div> </div> </div> </nav>
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/delete_app_cluster_namespace.html
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="delete_app_cluster_namespace"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css"> <title>{{'Delete.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid" ng-controller="DeleteAppClusterNamespaceController"> <div class="col-md-10 col-md-offset-1 panel"> <section class="panel-body" ng-show="isRootUser"> <!-- delete app --> <section class="row"> <h5>{{'Delete.DeleteApp' | translate }} <small> {{'Delete.DeleteAppTips' | translate }} </small> </h5> <hr> <form class="form-horizontal"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="app.appId"> <small> {{'Delete.AppIdTips' | translate }}</small> </div> <div class="col-sm-1"> <button class="btn btn-info" ng-click="getAppInfo()">{{'Common.Search' | translate }}</button> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> {{'Delete.AppInfo' | translate }}</label> <div class="col-sm-5"> <h5 ng-show="app.info" ng-bind="app.info"></h5> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="deleteAppBtnDisabled" ng-click="deleteApp()"> {{'Delete.DeleteApp' | translate }} </button> </div> </div> </form> </section> <!-- delete cluster --> <section class="row"> <h5>{{'Delete.DeleteCluster' | translate }} <small> {{'Delete.DeleteClusterTips' | translate }} </small> </h5> <hr> <form class="form-horizontal"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="cluster.appId"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Delete.EnvName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="cluster.env"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.ClusterName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="cluster.name"> <small>{{'Delete.ClusterNameTips' | translate }}</small> </div> <div class="col-sm-1"> <button class="btn btn-info" ng-click="getClusterInfo()">{{'Common.Search' | translate }}</button> </div> </div> <div class="form-group" viv clform-group> <label class="col-sm-2 control-label"> {{'Delete.ClusterInfo' | translate }}</label> <div class="col-sm-5"> <h5 ng-show="cluster.info" ng-bind="cluster.info"></h5> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="deleteClusterBtnDisabled" ng-click="deleteCluster()"> {{'Delete.DeleteCluster' | translate }} </button> </div> </div> </form> </section> <!-- delete app namespace --> <section class="row"> <h5>{{'Delete.DeleteNamespace' | translate }} <small>{{'Delete.DeleteNamespaceTips' | translate }}</small> </h5> <small> {{'Delete.DeleteNamespaceTips2' | translate }} </small> <hr> <form class="form-horizontal"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="appNamespace.appId"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Delete.AppNamespaceName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="appNamespace.name"> <small>{{'Delete.AppNamespaceNameTips' | translate }}</small> </div> <div class="col-sm-1"> <button class="btn btn-info" ng-click="getAppNamespaceInfo()">{{'Common.Search' | translate }}</button> </div> </div> <div class="form-group" viv clform-group> <label class="col-sm-2 control-label"> {{'Delete.AppNamespaceInfo' | translate }}</label> <div class="col-sm-5"> <h5 ng-show="appNamespace.info" ng-bind="appNamespace.info"></h5> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="deleteAppNamespaceBtnDisabled" ng-click="deleteAppNamespace()"> {{'Delete.DeleteNamespace' | translate }} </button> </div> </div> </form> </section> </section> <section class="panel-body text-center" ng-if="!isRootUser"> <h4>{{'Common.IsRootUser' | translate }}</h4> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-route.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!--valdr--> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/lodash.min.js"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/ClusterService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/PageCommon.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/valdr.js"></script> <script type="application/javascript" src="scripts/controller/DeleteAppClusterNamespaceController.js"></script> </body> </html>
<!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!doctype html> <html ng-app="delete_app_cluster_namespace"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="icon" href="img/config.png"> <!-- styles --> <link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css"> <link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css"> <title>{{'Delete.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid" ng-controller="DeleteAppClusterNamespaceController"> <div class="col-md-10 col-md-offset-1 panel"> <section class="panel-body" ng-show="isRootUser"> <!-- delete app --> <section class="row"> <h5>{{'Delete.DeleteApp' | translate }} <small> {{'Delete.DeleteAppTips' | translate }} </small> </h5> <hr> <form class="form-horizontal"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="app.appId"> <small> {{'Delete.AppIdTips' | translate }}</small> </div> <div class="col-sm-1"> <button class="btn btn-info" ng-click="getAppInfo()">{{'Common.Search' | translate }}</button> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> {{'Delete.AppInfo' | translate }}</label> <div class="col-sm-5"> <h5 ng-show="app.info" ng-bind="app.info"></h5> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="deleteAppBtnDisabled" ng-click="deleteApp()"> {{'Delete.DeleteApp' | translate }} </button> </div> </div> </form> </section> <!-- delete cluster --> <section class="row"> <h5>{{'Delete.DeleteCluster' | translate }} <small> {{'Delete.DeleteClusterTips' | translate }} </small> </h5> <hr> <form class="form-horizontal"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="cluster.appId"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Delete.EnvName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="cluster.env"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.ClusterName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="cluster.name"> <small>{{'Delete.ClusterNameTips' | translate }}</small> </div> <div class="col-sm-1"> <button class="btn btn-info" ng-click="getClusterInfo()">{{'Common.Search' | translate }}</button> </div> </div> <div class="form-group" viv clform-group> <label class="col-sm-2 control-label"> {{'Delete.ClusterInfo' | translate }}</label> <div class="col-sm-5"> <h5 ng-show="cluster.info" ng-bind="cluster.info"></h5> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="deleteClusterBtnDisabled" ng-click="deleteCluster()"> {{'Delete.DeleteCluster' | translate }} </button> </div> </div> </form> </section> <!-- delete app namespace --> <section class="row"> <h5>{{'Delete.DeleteNamespace' | translate }} <small>{{'Delete.DeleteNamespaceTips' | translate }}</small> </h5> <small> {{'Delete.DeleteNamespaceTips2' | translate }} </small> <hr> <form class="form-horizontal"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="appNamespace.appId"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Delete.AppNamespaceName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" ng-model="appNamespace.name"> <small>{{'Delete.AppNamespaceNameTips' | translate }}</small> </div> <div class="col-sm-1"> <button class="btn btn-info" ng-click="getAppNamespaceInfo()">{{'Common.Search' | translate }}</button> </div> </div> <div class="form-group" viv clform-group> <label class="col-sm-2 control-label"> {{'Delete.AppNamespaceInfo' | translate }}</label> <div class="col-sm-5"> <h5 ng-show="appNamespace.info" ng-bind="appNamespace.info"></h5> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="deleteAppNamespaceBtnDisabled" ng-click="deleteAppNamespace()"> {{'Delete.DeleteNamespace' | translate }} </button> </div> </div> </form> </section> </section> <section class="panel-body text-center" ng-if="!isRootUser"> <h4>{{'Common.IsRootUser' | translate }}</h4> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-route.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!--valdr--> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/lodash.min.js"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/ClusterService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/PageCommon.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/valdr.js"></script> <script type="application/javascript" src="scripts/controller/DeleteAppClusterNamespaceController.js"></script> </body> </html>
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/delete-namespace-modal.html
<div id="deleteNamespaceModal" class="modal fade"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title"> {{'Component.DeleteNamespace.Title' | translate }} </h4> </div> <div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic"> {{'Component.DeleteNamespace.PublicContent' | translate }} </div> <div class="modal-body form-horizontal" ng-show="!toDeleteNamespace.isPublic"> {{'Component.DeleteNamespace.PrivateContent' | translate }} </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal"> {{'Common.Cancel' | translate }} </button> <button type="button" class="btn btn-danger" data-dismiss="modal" ng-click="doDeleteNamespace()"> {{'Common.Ok' | translate }} </button> </div> </div> </div> </div>
<div id="deleteNamespaceModal" class="modal fade"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title"> {{'Component.DeleteNamespace.Title' | translate }} </h4> </div> <div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic"> {{'Component.DeleteNamespace.PublicContent' | translate }} </div> <div class="modal-body form-horizontal" ng-show="!toDeleteNamespace.isPublic"> {{'Component.DeleteNamespace.PrivateContent' | translate }} </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal"> {{'Common.Cancel' | translate }} </button> <button type="button" class="btn btn-danger" data-dismiss="modal" ng-click="doDeleteNamespace()"> {{'Common.Ok' | translate }} </button> </div> </div> </div> </div>
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [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,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [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,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/deployment/quick-start-docker.md
如果您对Docker非常熟悉,可以使用Docker的方式快速部署Apollo,从而快速的了解Apollo。如果您对Docker并不是很了解,请参考[常规方式部署Quick Start](zh/deployment/quick-start)。 另外需要说明的是,不管是Docker方式部署Quick Start还是常规方式部署的,Quick Start只是用来快速入门、了解Apollo。如果部署Apollo在公司中使用,请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)。 > 由于Docker对windows的支持并不是很好,所以不建议您在windows环境下使用Docker方式部署,除非您对windows docker非常了解 ## 一、 准备工作 ### 1.1 安装Docker 具体步骤可以参考[Docker安装指南](https://yeasy.gitbooks.io/docker_practice/content/install/),通过以下命令测试是否成功安装 ``` docker -v ``` 为了加速Docker镜像下载,建议[配置镜像加速器](https://yeasy.gitbooks.io/docker_practice/content/install/mirror.html)。 ### 1.2 下载Docker Quick Start配置文件 确保[docker-quick-start](https://github.com/ctripcorp/apollo/tree/master/scripts/docker-quick-start)文件夹已经在本地存在,如果本地已经clone过Apollo的代码,则可以跳过此步骤。 ## 二、启动Apollo配置中心 在docker-quick-start目录下执行`docker-compose up`,第一次执行会触发下载镜像等操作,需要耐心等待一些时间。 搜索所有`apollo-quick-start`开头的日志,看到以下日志说明启动成功: ```log apollo-quick-start | ==== starting service ==== apollo-quick-start | Service logging file is ./service/apollo-service.log apollo-quick-start | Started [45] apollo-quick-start | Waiting for config service startup....... apollo-quick-start | Config service started. You may visit http://localhost:8080 for service status now! apollo-quick-start | Waiting for admin service startup...... apollo-quick-start | Admin service started apollo-quick-start | ==== starting portal ==== apollo-quick-start | Portal logging file is ./portal/apollo-portal.log apollo-quick-start | Started [254] apollo-quick-start | Waiting for portal startup....... apollo-quick-start | Portal started. You can visit http://localhost:8070 now! ``` > 注1:数据库的端口映射为13306,所以如果希望在宿主机上访问数据库,可以通过localhost:13306,用户名是root,密码留空。 > 注2:如要查看更多服务的日志,可以通过`docker exec -it apollo-quick-start bash`登录, 然后到`/apollo-quick-start/service`和`/apollo-quick-start/portal`下查看日志信息。 ## 三、使用Apollo配置中心 使用相关步骤可以参考[Quick Start - 四、使用Apollo配置中心](zh/deployment/quick-start#四、使用apollo配置中心) 需要注意的是,在Docker环境下需要通过下面的命令运行Demo客户端: ```bash docker exec -i apollo-quick-start /apollo-quick-start/demo.sh client ``` 默认情况下 apollo-configservice 只会注册内网 IP,只有通过上述命令启动的客户端能连通,如果希望外部的客户端也能访问,请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。
如果您对Docker非常熟悉,可以使用Docker的方式快速部署Apollo,从而快速的了解Apollo。如果您对Docker并不是很了解,请参考[常规方式部署Quick Start](zh/deployment/quick-start)。 另外需要说明的是,不管是Docker方式部署Quick Start还是常规方式部署的,Quick Start只是用来快速入门、了解Apollo。如果部署Apollo在公司中使用,请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)。 > 由于Docker对windows的支持并不是很好,所以不建议您在windows环境下使用Docker方式部署,除非您对windows docker非常了解 ## 一、 准备工作 ### 1.1 安装Docker 具体步骤可以参考[Docker安装指南](https://yeasy.gitbooks.io/docker_practice/content/install/),通过以下命令测试是否成功安装 ``` docker -v ``` 为了加速Docker镜像下载,建议[配置镜像加速器](https://yeasy.gitbooks.io/docker_practice/content/install/mirror.html)。 ### 1.2 下载Docker Quick Start配置文件 确保[docker-quick-start](https://github.com/ctripcorp/apollo/tree/master/scripts/docker-quick-start)文件夹已经在本地存在,如果本地已经clone过Apollo的代码,则可以跳过此步骤。 ## 二、启动Apollo配置中心 在docker-quick-start目录下执行`docker-compose up`,第一次执行会触发下载镜像等操作,需要耐心等待一些时间。 搜索所有`apollo-quick-start`开头的日志,看到以下日志说明启动成功: ```log apollo-quick-start | ==== starting service ==== apollo-quick-start | Service logging file is ./service/apollo-service.log apollo-quick-start | Started [45] apollo-quick-start | Waiting for config service startup....... apollo-quick-start | Config service started. You may visit http://localhost:8080 for service status now! apollo-quick-start | Waiting for admin service startup...... apollo-quick-start | Admin service started apollo-quick-start | ==== starting portal ==== apollo-quick-start | Portal logging file is ./portal/apollo-portal.log apollo-quick-start | Started [254] apollo-quick-start | Waiting for portal startup....... apollo-quick-start | Portal started. You can visit http://localhost:8070 now! ``` > 注1:数据库的端口映射为13306,所以如果希望在宿主机上访问数据库,可以通过localhost:13306,用户名是root,密码留空。 > 注2:如要查看更多服务的日志,可以通过`docker exec -it apollo-quick-start bash`登录, 然后到`/apollo-quick-start/service`和`/apollo-quick-start/portal`下查看日志信息。 ## 三、使用Apollo配置中心 使用相关步骤可以参考[Quick Start - 四、使用Apollo配置中心](zh/deployment/quick-start#四、使用apollo配置中心) 需要注意的是,在Docker环境下需要通过下面的命令运行Demo客户端: ```bash docker exec -i apollo-quick-start /apollo-quick-start/demo.sh client ``` 默认情况下 apollo-configservice 只会注册内网 IP,只有通过上述命令启动的客户端能连通,如果希望外部的客户端也能访问,请参考[网络策略](zh/deployment/distributed-deployment-guide?id=_14-网络策略)。
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/usage/apollo-open-api-platform.md
### 一、 什么是开放平台? Apollo提供了一套的Http REST接口,使第三方应用能够自己管理配置。虽然Apollo系统本身提供了Portal来管理配置,但是在有些情景下,应用需要通过程序去管理配置。 ### 二、 第三方应用接入Apollo开放平台 #### 2.1 注册第三方应用 第三方应用负责人需要向Apollo管理员提供一些第三方应用基本信息。 基本信息如下: * 第三方应用的AppId、应用名、部门 * 第三方应用负责人 Apollo管理员在 http://{portal_address}/open/manage.html 创建第三方应用,创建之前最好先查询此AppId是否已经创建。创建成功之后会生成一个token,如下图所示: ![开放平台管理](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-open-manage.png) #### 2.2 给已注册的第三方应用授权 第三方应用不应该能操作任何Namespace的配置,所以需要给token绑定可以操作的Namespace。Apollo管理员在 http://{portal_address}/open/manage.html 页面给token赋权。赋权之后,第三方应用就可以通过Apollo提供的Http REST接口来管理已授权的Namespace的配置了。 #### 2.3 第三方应用调用Apollo Open API ##### 2.3.1 调用Http REST接口 任何语言的第三方应用都可以调用Apollo的Open API,在调用接口时,需要设置注意以下两点: * Http Header中增加一个Authorization字段,字段值为申请的token * Http Header的Content-Type字段需要设置成application/json;charset=UTF-8 ##### 2.3.2 Java应用通过apollo-openapi调用Apollo Open API 从1.1.0版本开始,Apollo提供了[apollo-openapi](https://github.com/ctripcorp/apollo/tree/master/apollo-openapi)客户端,所以Java语言的第三方应用可以更方便地调用Apollo Open API。 首先引入`apollo-openapi`依赖: ```xml <dependency> <groupId>com.ctrip.framework.apollo</groupId> <artifactId>apollo-openapi</artifactId> <version>1.7.0</version> </dependency> ``` 在程序中构造`ApolloOpenApiClient`: ```java String portalUrl = "http://localhost:8070"; // portal url String token = "e16e5cd903fd0c97a116c873b448544b9d086de9"; // 申请的token ApolloOpenApiClient client = ApolloOpenApiClient.newBuilder() .withPortalUrl(portalUrl) .withToken(token) .build(); ``` 后续就可以通过`ApolloOpenApiClient`的接口直接操作Apollo Open API了,接口说明参见下面的Rest接口文档。 ##### 2.3.3 .Net core应用调用Apollo Open API .Net core也提供了open api的客户端,详见https://github.com/ctripcorp/apollo.net/pull/77 ### 三、 接口文档 #### 3.1 URL路径参数说明 参数名 | 参数说明 --- | --- env | 所管理的配置环境 appId | 所管理的配置AppId clusterName | 所管理的配置集群名, 一般情况下传入 default 即可。如果是特殊集群,传入相应集群的名称即可 namespaceName | 所管理的Namespace的名称,如果是非properties格式,需要加上后缀名,如`sample.yml` #### 3.2 API接口列表 ##### 3.2.1 获取App的环境,集群信息 * **URL** : http://{portal_address}/openapi/v1/apps/{appId}/envclusters * **Method** : GET * **Request Params** : 无 * **返回值Sample**: ``` json [ { "env":"FAT", "clusters":[ //集群列表 "default", "FAT381" ] }, { "env":"UAT", "clusters":[ "default" ] }, { "env":"PRO", "clusters":[ "default", "SHAOY", "SHAJQ" ] } ] ``` ##### 3.2.2 获取App信息 * **URL** : http://{portal_address}/openapi/v1/apps * **Method** : GET * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- appIds | false | String | appId列表,以逗号分隔,如果为空则返回所有App信息 * **返回值Sample**: ``` json [ { "name":"first_app", "appId":"100003171", "orgId":"development", "orgName":"研发部", "ownerName":"apollo", "ownerEmail":"test@test.com", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2019-05-08T09:13:31.000+0800", "dataChangeLastModifiedTime":"2019-05-08T09:13:31.000+0800" }, { "name":"apollo-demo", "appId":"100004458", "orgId":"development", "orgName":"产品研发部", "ownerName":"apollo", "ownerEmail":"apollo@cmcm.com", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800", "dataChangeLastModifiedTime":"2019-04-08T13:58:36.000+0800" } ] ``` ##### 3.2.3 获取集群接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName} * **Method** : GET * **Request Params** :无 * **返回值Sample**: ``` json { "name":"default", "appId":"100004458", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800", "dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800" } ``` ##### 3.2.4 创建集群接口 可以通过此接口创建集群,调用此接口需要授予第三方APP对目标APP的管理权限。 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters * **Method** : POST * **Request Params** :无 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- name | true | String | Cluster的名字 appId | true | String | Cluster所属的AppId dataChangeCreatedBy | true | String | namespace的创建人,格式为域账号,也就是sso系统的User ID * **返回值 Sample** : ``` json { "name":"someClusterName", "appId":"100004458", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800", "dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800" } ``` ##### 3.2.5 获取集群下所有Namespace信息接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces * **Method**: GET * **Request Params**: 无 * **返回值Sample**: ``` json [ { "appId": "100003171", "clusterName": "default", "namespaceName": "application", "comment": "default app namespace", "format": "properties", //Namespace格式可能取值为:properties、xml、json、yml、yaml "isPublic": false, //是否为公共的Namespace "items": [ // Namespace下所有的配置集合 { "key": "batch", "value": "100", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800", "dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800" } ], "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800", "dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800" }, { "appId": "100003171", "clusterName": "default", "namespaceName": "FX.apollo", "comment": "apollo public namespace", "format": "properties", "isPublic": true, "items": [ { "key": "request.timeout", "value": "3000", "comment": "", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:08:30.000+0800", "dataChangeLastModifiedTime": "2016-08-01T13:56:25.000+0800" }, { "id": 1116, "key": "batch", "value": "3000", "comment": "", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-28T15:13:42.000+0800", "dataChangeLastModifiedTime": "2016-08-01T13:51:00.000+0800" } ], "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:08:13.000+0800", "dataChangeLastModifiedTime": "2016-07-20T14:08:13.000+0800" } ] ``` ##### 3.2.6 获取某个Namespace信息接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName} * **Method** : GET * **Request Params** :无 * **返回值Sample** : ``` json { "appId": "100003171", "clusterName": "default", "namespaceName": "application", "comment": "default app namespace", "format": "properties", //Namespace格式可能取值为:properties、xml、json、yml、yaml "isPublic": false, //是否为公共的Namespace "items": [ // Namespace下所有的配置集合 { "key": "batch", "value": "100", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800", "dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800" } ], "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800", "dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800" } ``` ##### 3.2.7 创建Namespace 可以通过此接口创建Namespace,调用此接口需要授予第三方APP对目标APP的管理权限。 * **URL** : http://{portal_address}/openapi/v1/apps/{appId}/appnamespaces * **Method** : POST * **Request Params** :无 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- name | true | String | Namespace的名字 appId | true | String | Namespace所属的AppId format |true | String | Namespace的格式,**只能是以下类型: properties、xml、json、yml、yaml** isPublic |true | boolean | 是否是公共文件 comment |false | String | Namespace说明 dataChangeCreatedBy | true | String | namespace的创建人,格式为域账号,也就是sso系统的User ID * **返回值 Sample** : ``` json { "name": "FX.public-0420-11", "appId": "100003173", "format": "properties", "isPublic": true, "comment": "test", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2017-04-20T18:25:49.033+0800", "dataChangeLastModifiedTime": "2017-04-20T18:25:49.033+0800" } ``` * **返回值说明** : > 如果是properties文件,name = ${appId所属的部门}.${传入的name值} ,例如调用接口传入的name=xy-z, format=properties,应用的部门为框架(FX),那么name=FX.xy-z > 如果不是properties文件 name = ${appId所属的部门}.${传入的name值}.${format},例如调用接口传入的name=xy-z, format=json,应用的部门为框架(FX),那么name=FX.xy-z.json ##### 3.2.8 获取某个Namespace当前编辑人接口 Apollo在生产环境(PRO)有限制规则:每次发布只能有一个人编辑配置,且该次发布的人不能是该次发布的编辑人。 也就是说如果一个用户A修改了某个namespace的配置,那么在这个namespace发布前,只能由A修改,其它用户无法修改。同时,该用户A无法发布自己修改的配置,必须找另一个有发布权限的人操作。 这个接口就是用来获取当前namespace是否有人锁定的接口。在非生产环境(FAT、UAT),该接口始终返回没有人锁定。 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock * **Method** : GET * **Request Params** :无 * **返回值 Sample(未锁定)** : ``` json { "namespaceName": "application", "isLocked": false } ``` * **返回值Sample(被锁定)** : ``` json { "namespaceName": "application", "isLocked": true, "lockedBy": "song_s" //锁owner } ``` ##### 3.2.9 读取配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key} * **Method** : GET * **Request Params** :无 * **返回值Sample** : ``` json { "key": "timeout", "value": "3000", "comment": "超时时间", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800", "dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800" } ``` ##### 3.2.10 新增配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items * **Method** : POST * **Request Params** :无 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- key | true | String | 配置的key,长度不能超过128个字符。非properties格式,key固定为`content` value | true | String | 配置的value,长度不能超过20000个字符,非properties格式,value为文件全部内容 comment | false | String | 配置的备注,长度不能超过256个字符 dataChangeCreatedBy | true | String | item的创建人,格式为域账号,也就是sso系统的User ID * **Request body sample** : ``` json { "key":"timeout", "value":"3000", "comment":"超时时间", "dataChangeCreatedBy":"zhanglea" } ``` * **返回值Sample** : ``` json { "key": "timeout", "value": "3000", "comment": "超时时间", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800", "dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800" } ``` ##### 3.2.11 修改配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key} * **Method** : PUT * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- createIfNotExists | false | Boolean | 当配置不存在时是否自动创建 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- key | true | String | 配置的key,需和url中的key值一致。非properties格式,key固定为`content` value | true | String | 配置的value,长度不能超过20000个字符,非properties格式,value为文件全部内容 comment | false | String | 配置的备注,长度不能超过256个字符 dataChangeLastModifiedBy | true | String | item的修改人,格式为域账号,也就是sso系统的User ID dataChangeCreatedBy | false | String | 当createIfNotExists为true时必选。item的创建人,格式为域账号,也就是sso系统的User ID * **Request body sample** : ```json { "key":"timeout", "value":"3000", "comment":"超时时间", "dataChangeLastModifiedBy":"zhanglea" } ``` * **返回值** :无 ##### 3.2.12 删除配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}?operator={operator} * **Method** : DELETE * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- key | true | String | 配置的key。非properties格式,key固定为`content` operator | true | String | 删除配置的操作者,域账号 * **返回值** : 无 ##### 3.2.13 发布配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases * **Method** : POST * **Request Params** :无 * **Request Body** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- releaseTitle | true | String | 此次发布的标题,长度不能超过64个字符 releaseComment | false | String | 发布的备注,长度不能超过256个字符 releasedBy | true | String | 发布人,域账号,注意:如果`ApolloConfigDB.ServerConfig`中的`namespace.lock.switch`设置为true的话(默认是false),那么该环境不允许发布人和编辑人为同一人。所以如果编辑人是zhanglea,发布人就不能再是zhanglea。 * **Request Body example** : ```json { "releaseTitle":"2016-08-11", "releaseComment":"修改timeout值", "releasedBy":"zhanglea" } ``` * **返回值Sample** : ``` json { "appId": "test-0620-01", "clusterName": "test", "namespaceName": "application", "name": "2016-08-11", "configurations": { "timeout": "3000", }, "comment": "修改timeout值", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800", "dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800" } ``` ##### 3.2.14 获取某个Namespace当前生效的已发布配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest * **Method** : GET * **Request Params** :无 * **返回值Sample** : ``` json { "appId": "test-0620-01", "clusterName": "test", "namespaceName": "application", "name": "2016-08-11", "configurations": { "timeout": "3000", }, "comment": "修改timeout值", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800", "dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800" } ``` ##### 3.2.15 回滚已发布配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/releases/{releaseId}/rollback * **Method** : PUT * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- operator | true | String | 删除配置的操作者,域账号 * **返回值** : 无 ### 四、错误码说明 正常情况下,接口返回的Http状态码是200,下面列举了Apollo会返回的非200错误码说明。 #### 4.1 400 - Bad Request 客户端传入参数的错误,如操作人不存在,namespace不存在等等,客户端需要根据提示信息检查对应的参数是否正确。 #### 4.2 401 - Unauthorized 接口传入的token非法或者已过期,客户端需要检查token是否传入正确。 #### 4.3 403 - Forbidden 接口要访问的资源未得到授权,比如只授权了对A应用下Namespace的管理权限,但是却尝试管理B应用下的配置。 #### 4.4 404 - Not Found 接口要访问的资源不存在,一般是URL或URL的参数错误。 #### 4.5 405 - Method Not Allowed 接口访问的Method不正确,比如应该使用POST的接口使用了GET访问等,客户端需要检查接口访问方式是否正确。 #### 4.6 500 - Internal Server Error 其它类型的错误默认都会返回500,对这类错误如果应用无法根据提示信息找到原因的话,可以找Apollo研发团队一起排查问题。
### 一、 什么是开放平台? Apollo提供了一套的Http REST接口,使第三方应用能够自己管理配置。虽然Apollo系统本身提供了Portal来管理配置,但是在有些情景下,应用需要通过程序去管理配置。 ### 二、 第三方应用接入Apollo开放平台 #### 2.1 注册第三方应用 第三方应用负责人需要向Apollo管理员提供一些第三方应用基本信息。 基本信息如下: * 第三方应用的AppId、应用名、部门 * 第三方应用负责人 Apollo管理员在 http://{portal_address}/open/manage.html 创建第三方应用,创建之前最好先查询此AppId是否已经创建。创建成功之后会生成一个token,如下图所示: ![开放平台管理](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-open-manage.png) #### 2.2 给已注册的第三方应用授权 第三方应用不应该能操作任何Namespace的配置,所以需要给token绑定可以操作的Namespace。Apollo管理员在 http://{portal_address}/open/manage.html 页面给token赋权。赋权之后,第三方应用就可以通过Apollo提供的Http REST接口来管理已授权的Namespace的配置了。 #### 2.3 第三方应用调用Apollo Open API ##### 2.3.1 调用Http REST接口 任何语言的第三方应用都可以调用Apollo的Open API,在调用接口时,需要设置注意以下两点: * Http Header中增加一个Authorization字段,字段值为申请的token * Http Header的Content-Type字段需要设置成application/json;charset=UTF-8 ##### 2.3.2 Java应用通过apollo-openapi调用Apollo Open API 从1.1.0版本开始,Apollo提供了[apollo-openapi](https://github.com/ctripcorp/apollo/tree/master/apollo-openapi)客户端,所以Java语言的第三方应用可以更方便地调用Apollo Open API。 首先引入`apollo-openapi`依赖: ```xml <dependency> <groupId>com.ctrip.framework.apollo</groupId> <artifactId>apollo-openapi</artifactId> <version>1.7.0</version> </dependency> ``` 在程序中构造`ApolloOpenApiClient`: ```java String portalUrl = "http://localhost:8070"; // portal url String token = "e16e5cd903fd0c97a116c873b448544b9d086de9"; // 申请的token ApolloOpenApiClient client = ApolloOpenApiClient.newBuilder() .withPortalUrl(portalUrl) .withToken(token) .build(); ``` 后续就可以通过`ApolloOpenApiClient`的接口直接操作Apollo Open API了,接口说明参见下面的Rest接口文档。 ##### 2.3.3 .Net core应用调用Apollo Open API .Net core也提供了open api的客户端,详见https://github.com/ctripcorp/apollo.net/pull/77 ### 三、 接口文档 #### 3.1 URL路径参数说明 参数名 | 参数说明 --- | --- env | 所管理的配置环境 appId | 所管理的配置AppId clusterName | 所管理的配置集群名, 一般情况下传入 default 即可。如果是特殊集群,传入相应集群的名称即可 namespaceName | 所管理的Namespace的名称,如果是非properties格式,需要加上后缀名,如`sample.yml` #### 3.2 API接口列表 ##### 3.2.1 获取App的环境,集群信息 * **URL** : http://{portal_address}/openapi/v1/apps/{appId}/envclusters * **Method** : GET * **Request Params** : 无 * **返回值Sample**: ``` json [ { "env":"FAT", "clusters":[ //集群列表 "default", "FAT381" ] }, { "env":"UAT", "clusters":[ "default" ] }, { "env":"PRO", "clusters":[ "default", "SHAOY", "SHAJQ" ] } ] ``` ##### 3.2.2 获取App信息 * **URL** : http://{portal_address}/openapi/v1/apps * **Method** : GET * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- appIds | false | String | appId列表,以逗号分隔,如果为空则返回所有App信息 * **返回值Sample**: ``` json [ { "name":"first_app", "appId":"100003171", "orgId":"development", "orgName":"研发部", "ownerName":"apollo", "ownerEmail":"test@test.com", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2019-05-08T09:13:31.000+0800", "dataChangeLastModifiedTime":"2019-05-08T09:13:31.000+0800" }, { "name":"apollo-demo", "appId":"100004458", "orgId":"development", "orgName":"产品研发部", "ownerName":"apollo", "ownerEmail":"apollo@cmcm.com", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800", "dataChangeLastModifiedTime":"2019-04-08T13:58:36.000+0800" } ] ``` ##### 3.2.3 获取集群接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName} * **Method** : GET * **Request Params** :无 * **返回值Sample**: ``` json { "name":"default", "appId":"100004458", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800", "dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800" } ``` ##### 3.2.4 创建集群接口 可以通过此接口创建集群,调用此接口需要授予第三方APP对目标APP的管理权限。 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters * **Method** : POST * **Request Params** :无 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- name | true | String | Cluster的名字 appId | true | String | Cluster所属的AppId dataChangeCreatedBy | true | String | namespace的创建人,格式为域账号,也就是sso系统的User ID * **返回值 Sample** : ``` json { "name":"someClusterName", "appId":"100004458", "dataChangeCreatedBy":"apollo", "dataChangeLastModifiedBy":"apollo", "dataChangeCreatedTime":"2018-12-23T12:35:16.000+0800", "dataChangeLastModifiedTime":"2018-12-23T12:35:16.000+0800" } ``` ##### 3.2.5 获取集群下所有Namespace信息接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces * **Method**: GET * **Request Params**: 无 * **返回值Sample**: ``` json [ { "appId": "100003171", "clusterName": "default", "namespaceName": "application", "comment": "default app namespace", "format": "properties", //Namespace格式可能取值为:properties、xml、json、yml、yaml "isPublic": false, //是否为公共的Namespace "items": [ // Namespace下所有的配置集合 { "key": "batch", "value": "100", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800", "dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800" } ], "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800", "dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800" }, { "appId": "100003171", "clusterName": "default", "namespaceName": "FX.apollo", "comment": "apollo public namespace", "format": "properties", "isPublic": true, "items": [ { "key": "request.timeout", "value": "3000", "comment": "", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:08:30.000+0800", "dataChangeLastModifiedTime": "2016-08-01T13:56:25.000+0800" }, { "id": 1116, "key": "batch", "value": "3000", "comment": "", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-28T15:13:42.000+0800", "dataChangeLastModifiedTime": "2016-08-01T13:51:00.000+0800" } ], "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:08:13.000+0800", "dataChangeLastModifiedTime": "2016-07-20T14:08:13.000+0800" } ] ``` ##### 3.2.6 获取某个Namespace信息接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName} * **Method** : GET * **Request Params** :无 * **返回值Sample** : ``` json { "appId": "100003171", "clusterName": "default", "namespaceName": "application", "comment": "default app namespace", "format": "properties", //Namespace格式可能取值为:properties、xml、json、yml、yaml "isPublic": false, //是否为公共的Namespace "items": [ // Namespace下所有的配置集合 { "key": "batch", "value": "100", "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-21T16:03:43.000+0800", "dataChangeLastModifiedTime": "2016-07-21T16:03:43.000+0800" } ], "dataChangeCreatedBy": "song_s", "dataChangeLastModifiedBy": "song_s", "dataChangeCreatedTime": "2016-07-20T14:05:58.000+0800", "dataChangeLastModifiedTime": "2016-07-20T14:05:58.000+0800" } ``` ##### 3.2.7 创建Namespace 可以通过此接口创建Namespace,调用此接口需要授予第三方APP对目标APP的管理权限。 * **URL** : http://{portal_address}/openapi/v1/apps/{appId}/appnamespaces * **Method** : POST * **Request Params** :无 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- name | true | String | Namespace的名字 appId | true | String | Namespace所属的AppId format |true | String | Namespace的格式,**只能是以下类型: properties、xml、json、yml、yaml** isPublic |true | boolean | 是否是公共文件 comment |false | String | Namespace说明 dataChangeCreatedBy | true | String | namespace的创建人,格式为域账号,也就是sso系统的User ID * **返回值 Sample** : ``` json { "name": "FX.public-0420-11", "appId": "100003173", "format": "properties", "isPublic": true, "comment": "test", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2017-04-20T18:25:49.033+0800", "dataChangeLastModifiedTime": "2017-04-20T18:25:49.033+0800" } ``` * **返回值说明** : > 如果是properties文件,name = ${appId所属的部门}.${传入的name值} ,例如调用接口传入的name=xy-z, format=properties,应用的部门为框架(FX),那么name=FX.xy-z > 如果不是properties文件 name = ${appId所属的部门}.${传入的name值}.${format},例如调用接口传入的name=xy-z, format=json,应用的部门为框架(FX),那么name=FX.xy-z.json ##### 3.2.8 获取某个Namespace当前编辑人接口 Apollo在生产环境(PRO)有限制规则:每次发布只能有一个人编辑配置,且该次发布的人不能是该次发布的编辑人。 也就是说如果一个用户A修改了某个namespace的配置,那么在这个namespace发布前,只能由A修改,其它用户无法修改。同时,该用户A无法发布自己修改的配置,必须找另一个有发布权限的人操作。 这个接口就是用来获取当前namespace是否有人锁定的接口。在非生产环境(FAT、UAT),该接口始终返回没有人锁定。 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/lock * **Method** : GET * **Request Params** :无 * **返回值 Sample(未锁定)** : ``` json { "namespaceName": "application", "isLocked": false } ``` * **返回值Sample(被锁定)** : ``` json { "namespaceName": "application", "isLocked": true, "lockedBy": "song_s" //锁owner } ``` ##### 3.2.9 读取配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key} * **Method** : GET * **Request Params** :无 * **返回值Sample** : ``` json { "key": "timeout", "value": "3000", "comment": "超时时间", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800", "dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800" } ``` ##### 3.2.10 新增配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items * **Method** : POST * **Request Params** :无 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- key | true | String | 配置的key,长度不能超过128个字符。非properties格式,key固定为`content` value | true | String | 配置的value,长度不能超过20000个字符,非properties格式,value为文件全部内容 comment | false | String | 配置的备注,长度不能超过256个字符 dataChangeCreatedBy | true | String | item的创建人,格式为域账号,也就是sso系统的User ID * **Request body sample** : ``` json { "key":"timeout", "value":"3000", "comment":"超时时间", "dataChangeCreatedBy":"zhanglea" } ``` * **返回值Sample** : ``` json { "key": "timeout", "value": "3000", "comment": "超时时间", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T12:06:41.818+0800", "dataChangeLastModifiedTime": "2016-08-11T12:06:41.818+0800" } ``` ##### 3.2.11 修改配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key} * **Method** : PUT * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- createIfNotExists | false | Boolean | 当配置不存在时是否自动创建 * **请求内容(Request Body, JSON格式)** : 参数名 | 必选 | 类型 | 说明 ---- | --- | --- | --- key | true | String | 配置的key,需和url中的key值一致。非properties格式,key固定为`content` value | true | String | 配置的value,长度不能超过20000个字符,非properties格式,value为文件全部内容 comment | false | String | 配置的备注,长度不能超过256个字符 dataChangeLastModifiedBy | true | String | item的修改人,格式为域账号,也就是sso系统的User ID dataChangeCreatedBy | false | String | 当createIfNotExists为true时必选。item的创建人,格式为域账号,也就是sso系统的User ID * **Request body sample** : ```json { "key":"timeout", "value":"3000", "comment":"超时时间", "dataChangeLastModifiedBy":"zhanglea" } ``` * **返回值** :无 ##### 3.2.12 删除配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{key}?operator={operator} * **Method** : DELETE * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- key | true | String | 配置的key。非properties格式,key固定为`content` operator | true | String | 删除配置的操作者,域账号 * **返回值** : 无 ##### 3.2.13 发布配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases * **Method** : POST * **Request Params** :无 * **Request Body** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- releaseTitle | true | String | 此次发布的标题,长度不能超过64个字符 releaseComment | false | String | 发布的备注,长度不能超过256个字符 releasedBy | true | String | 发布人,域账号,注意:如果`ApolloConfigDB.ServerConfig`中的`namespace.lock.switch`设置为true的话(默认是false),那么该环境不允许发布人和编辑人为同一人。所以如果编辑人是zhanglea,发布人就不能再是zhanglea。 * **Request Body example** : ```json { "releaseTitle":"2016-08-11", "releaseComment":"修改timeout值", "releasedBy":"zhanglea" } ``` * **返回值Sample** : ``` json { "appId": "test-0620-01", "clusterName": "test", "namespaceName": "application", "name": "2016-08-11", "configurations": { "timeout": "3000", }, "comment": "修改timeout值", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800", "dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800" } ``` ##### 3.2.14 获取某个Namespace当前生效的已发布配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases/latest * **Method** : GET * **Request Params** :无 * **返回值Sample** : ``` json { "appId": "test-0620-01", "clusterName": "test", "namespaceName": "application", "name": "2016-08-11", "configurations": { "timeout": "3000", }, "comment": "修改timeout值", "dataChangeCreatedBy": "zhanglea", "dataChangeLastModifiedBy": "zhanglea", "dataChangeCreatedTime": "2016-08-11T14:03:46.232+0800", "dataChangeLastModifiedTime": "2016-08-11T14:03:46.235+0800" } ``` ##### 3.2.15 回滚已发布配置接口 * **URL** : http://{portal_address}/openapi/v1/envs/{env}/releases/{releaseId}/rollback * **Method** : PUT * **Request Params** : 参数名 | 必选 | 类型 | 说明 --- | --- | --- | --- operator | true | String | 删除配置的操作者,域账号 * **返回值** : 无 ### 四、错误码说明 正常情况下,接口返回的Http状态码是200,下面列举了Apollo会返回的非200错误码说明。 #### 4.1 400 - Bad Request 客户端传入参数的错误,如操作人不存在,namespace不存在等等,客户端需要根据提示信息检查对应的参数是否正确。 #### 4.2 401 - Unauthorized 接口传入的token非法或者已过期,客户端需要检查token是否传入正确。 #### 4.3 403 - Forbidden 接口要访问的资源未得到授权,比如只授权了对A应用下Namespace的管理权限,但是却尝试管理B应用下的配置。 #### 4.4 404 - Not Found 接口要访问的资源不存在,一般是URL或URL的参数错误。 #### 4.5 405 - Method Not Allowed 接口访问的Method不正确,比如应该使用POST的接口使用了GET访问等,客户端需要检查接口访问方式是否正确。 #### 4.6 500 - Internal Server Error 其它类型的错误默认都会返回500,对这类错误如果应用无法根据提示信息找到原因的话,可以找Apollo研发团队一起排查问题。
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/community/team.md
# Apollo Team The Apollo team is comprised of Members and Contributors. Members have direct access to the source of Apollo project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to Apollo are greatly appreciated, whether for trivial cleanups, big new features or other material rewards. For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md). ## Members Members include Project Management Committee members and committers. The list is in alphabet order. ### Project Management Committee | Github ID | Name | Organization | | ---------- | ---------- | ------------ | | JaredTan95 | Jared Tan | DaoCloud | | kezhenxu94 | Zhenxu Ke | Tetrate | | nobodyiam | Jason Song | Ant Group | | zouyx | Joe Zou | Shein | ### Committer | Github ID | Name | Organization | | ----------- | ------------- | ------------ | | Anilople | Xiaoquan Wang | Some Bank | | klboke | Kailing Chen | TapTap | | lepdou | Le Zhang | Ant Group | | nisiyong | Stephen Ni | Qihoo 360 | | pengweiqhca | Wei Peng | Tuhu | | vdisk-group | Lvqiu Ye | Hundsun | ## Contributors ### Apollo main repository <img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /> ### apollo.net <img src="https://opencollective.com/apollonet/contributors.svg?width=880&button=false" /> ## Becoming a Committer Please refer [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer).
# Apollo Team The Apollo team is comprised of Members and Contributors. Members have direct access to the source of Apollo project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to Apollo are greatly appreciated, whether for trivial cleanups, big new features or other material rewards. For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md). ## Members Members include Project Management Committee members and committers. The list is in alphabet order. ### Project Management Committee | Github ID | Name | Organization | | ---------- | ---------- | ------------ | | JaredTan95 | Jared Tan | DaoCloud | | kezhenxu94 | Zhenxu Ke | Tetrate | | nobodyiam | Jason Song | Ant Group | | zouyx | Joe Zou | Shein | ### Committer | Github ID | Name | Organization | | ----------- | ------------- | ------------ | | Anilople | Xiaoquan Wang | Some Bank | | klboke | Kailing Chen | TapTap | | lepdou | Le Zhang | Ant Group | | nisiyong | Stephen Ni | Qihoo 360 | | pengweiqhca | Wei Peng | Tuhu | | vdisk-group | Lvqiu Ye | Hundsun | ## Contributors ### Apollo main repository <img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /> ### apollo.net <img src="https://opencollective.com/apollonet/contributors.svg?width=880&button=false" /> ## Becoming a Committer Please refer [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer).
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [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,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/cluster.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="cluster"> <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>{{'Cluster.CreateCluster' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container hidden" ng-controller="ClusterController"> <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"> <h4>{{'Cluster.CreateCluster' | translate }}</h4> </div> <div class="col-md-6 text-right"> <a type="button" class="btn btn-info" href="config.html?#/appid={{appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> </header> <div class="panel-body"> <div class="alert alert-info no-radius" role="alert"> <strong>Tips:</strong> <ul> <li>{{'Cluster.Tips.1' | translate }}</li> <li>{{'Cluster.Tips.2' | translate }}</li> <li>{{'Cluster.Tips.3' | translate }}</li> <li>{{'Cluster.Tips.4' | translate }}</li> </ul> </div> <form class="form-horizontal" name="clusterForm" valdr-type="Cluster" ng-show="step == 1" ng-submit="create()"> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }}</label> <div class="col-sm-6"> <label class="form-control-static" ng-bind="appId"></label> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.ClusterName' | translate }}</label> <div class="col-sm-6"> <input type="text" class="form-control" name="clusterName" ng-model="clusterName"> <small>{{'Cluster.CreateNameTips' | translate }}</small> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Cluster.ChooseEnvironment' | translate }}</label> <div class="col-sm-5"> <table class="table table-hover" style="width: 100px"> <tbody> <tr style="cursor: pointer" ng-repeat="env in envs" ng-click="toggleEnvCheckedStatus(env)"> <td width="10%"><input type="checkbox" ng-checked="env.checked" ng-click="switchChecked(env, $event)"></td> <td width="30%" ng-bind="env.name"></td> </tr> </tbody> </table> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <button type="submit" class="btn btn-primary" ng-disabled="clusterForm.$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> <!--valdr--> <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/ClusterService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/controller/ClusterController.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="cluster"> <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>{{'Cluster.CreateCluster' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container hidden" ng-controller="ClusterController"> <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"> <h4>{{'Cluster.CreateCluster' | translate }}</h4> </div> <div class="col-md-6 text-right"> <a type="button" class="btn btn-info" href="config.html?#/appid={{appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> </header> <div class="panel-body"> <div class="alert alert-info no-radius" role="alert"> <strong>Tips:</strong> <ul> <li>{{'Cluster.Tips.1' | translate }}</li> <li>{{'Cluster.Tips.2' | translate }}</li> <li>{{'Cluster.Tips.3' | translate }}</li> <li>{{'Cluster.Tips.4' | translate }}</li> </ul> </div> <form class="form-horizontal" name="clusterForm" valdr-type="Cluster" ng-show="step == 1" ng-submit="create()"> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }}</label> <div class="col-sm-6"> <label class="form-control-static" ng-bind="appId"></label> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.ClusterName' | translate }}</label> <div class="col-sm-6"> <input type="text" class="form-control" name="clusterName" ng-model="clusterName"> <small>{{'Cluster.CreateNameTips' | translate }}</small> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Cluster.ChooseEnvironment' | translate }}</label> <div class="col-sm-5"> <table class="table table-hover" style="width: 100px"> <tbody> <tr style="cursor: pointer" ng-repeat="env in envs" ng-click="toggleEnvCheckedStatus(env)"> <td width="10%"><input type="checkbox" ng-checked="env.checked" ng-click="switchChecked(env, $event)"></td> <td width="30%" ng-bind="env.name"></td> </tr> </tbody> </table> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <button type="submit" class="btn btn-primary" ng-disabled="clusterForm.$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> <!--valdr--> <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/ClusterService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/controller/ClusterController.js"></script> <script src="scripts/valdr.js" type="text/javascript"></script> </body> </html>
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./CONTRIBUTING.md
## Contributing to apollo Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. ### Sign the Contributor License Agreement Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. ### Code Conventions Our code style is in line with [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). We provide template files [intellij-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) for IntelliJ IDEA and [eclipse-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) for Eclipse. If you use other IDEs, then you may config manually by referencing the template files. * Make sure all new .java files have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. * Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests should be added for a new feature or an important bug fix. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). * Normally, we would squash commits for one feature into one commit. There are 2 ways to do this: 1. To rebase and squash based on the remote branch * `git rebase -i <remote>/master` * merge commits via `fixup`, etc 2. Create a new branch and merge these commits into one * `git checkout -b <some-branch-name> <remote>/master` * `git merge --squash <current-feature-branch>` * When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
## Contributing to apollo Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. ### Sign the Contributor License Agreement Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. ### Code Conventions Our code style is in line with [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). We provide template files [intellij-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) for IntelliJ IDEA and [eclipse-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) for Eclipse. If you use other IDEs, then you may config manually by referencing the template files. * Make sure all new .java files have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. * Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests should be added for a new feature or an important bug fix. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). * Normally, we would squash commits for one feature into one commit. There are 2 ways to do this: 1. To rebase and squash based on the remote branch * `git rebase -i <remote>/master` * merge commits via `fixup`, etc 2. Create a new branch and merge these commits into one * `git checkout -b <some-branch-name> <remote>/master` * `git merge --squash <current-feature-branch>` * When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/_sidebar.md
- [**Home**](en/README.md) - Design Document - [Apollo Config Center Design](en/design/apollo-design.md) - [Apollo Config Center Introduction](en/design/apollo-introduction.md) - [Apollo Core Concept Namespace](en/design/apollo-core-concept-namespace.md) - [Apollo Source Code Analysis](http://www.iocoder.cn/categories/Apollo/) - Deployment Document - [Quick Start](en/deployment/quick-start.md) - [Deployment Quick Start By Docker](en/deployment/quick-start-docker.md) - [Distributed Deployment Guide](en/deployment/distributed-deployment-guide.md) - Development Document - [Apollo Development Guide](en/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 Implement User Login Function](en/development/portal-how-to-implement-user-login-function.md) - [Portal Enable Email Service](en/development/portal-how-to-enable-email-service.md) - [Portal Enable Session Store](en/development/portal-how-to-enable-session-store.md) - [Portal Enable Webhook Notification](en/development/portal-how-to-enable-webhook-notification.md) - Usage Document - [Apollo Usage Guide](en/usage/apollo-user-guide.md) - [Java Client Usage Guide](en/usage/java-sdk-user-guide.md) - [.Net Client Usage Guide](en/usage/dotnet-sdk-user-guide.md) - [Go、Python、NodeJS、PHP etc. Client Usage Guide](en/usage/third-party-sdks-user-guide.md) - [Other Language Client User Guide](en/usage/other-language-client-user-guide.md) - [Apollo Openapi Guide](en/usage/apollo-open-api-platform.md) - [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases) - [Apollo User Practices](en/usage/apollo-user-practices.md) - [Apollo Security Best Practices](en/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) - FAQ - [Frequently Asked Question](en/faq/faq.md) - [Common Issues In Deployment & Development Phase](en/faq/common-issues-in-deployment-and-development-phase.md) - Other - [Release History](https://github.com/ctripcorp/apollo/releases) - [Apollo Benchmark](en/misc/apollo-benchmark.md) - Community - [Team](en/community/team.md) - [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) - [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) - [Acknowledgements](en/community/thank-you.md)
- [**Home**](en/README.md) - Design Document - [Apollo Config Center Design](en/design/apollo-design.md) - [Apollo Config Center Introduction](en/design/apollo-introduction.md) - [Apollo Core Concept Namespace](en/design/apollo-core-concept-namespace.md) - [Apollo Source Code Analysis](http://www.iocoder.cn/categories/Apollo/) - Deployment Document - [Quick Start](en/deployment/quick-start.md) - [Deployment Quick Start By Docker](en/deployment/quick-start-docker.md) - [Distributed Deployment Guide](en/deployment/distributed-deployment-guide.md) - Development Document - [Apollo Development Guide](en/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 Implement User Login Function](en/development/portal-how-to-implement-user-login-function.md) - [Portal Enable Email Service](en/development/portal-how-to-enable-email-service.md) - [Portal Enable Session Store](en/development/portal-how-to-enable-session-store.md) - [Portal Enable Webhook Notification](en/development/portal-how-to-enable-webhook-notification.md) - Usage Document - [Apollo Usage Guide](en/usage/apollo-user-guide.md) - [Java Client Usage Guide](en/usage/java-sdk-user-guide.md) - [.Net Client Usage Guide](en/usage/dotnet-sdk-user-guide.md) - [Go、Python、NodeJS、PHP etc. Client Usage Guide](en/usage/third-party-sdks-user-guide.md) - [Other Language Client User Guide](en/usage/other-language-client-user-guide.md) - [Apollo Openapi Guide](en/usage/apollo-open-api-platform.md) - [Apollo Use Cases](https://github.com/ctripcorp/apollo-use-cases) - [Apollo User Practices](en/usage/apollo-user-practices.md) - [Apollo Security Best Practices](en/usage/apollo-user-guide?id=_71-%e5%ae%89%e5%85%a8%e7%9b%b8%e5%85%b3) - FAQ - [Frequently Asked Question](en/faq/faq.md) - [Common Issues In Deployment & Development Phase](en/faq/common-issues-in-deployment-and-development-phase.md) - Other - [Release History](https://github.com/ctripcorp/apollo/releases) - [Apollo Benchmark](en/misc/apollo-benchmark.md) - Community - [Team](en/community/team.md) - [Community Governance](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md) - [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) - [Acknowledgements](en/community/thank-you.md)
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/design/apollo-introduction.md
# &nbsp; # 1、What is Apollo ## 1.1 背景 随着程序功能的日益复杂,程序的配置日益增多:各种功能的开关、参数的配置、服务器的地址…… 对程序配置的期望值也越来越高:配置修改后实时生效,灰度发布,分环境、分集群管理配置,完善的权限、审核机制…… 在这样的大环境下,传统的通过配置文件、数据库等方式已经越来越无法满足开发人员对配置管理的需求。 Apollo配置中心应运而生! ## 1.2 Apollo简介 Apollo(阿波罗)是携程框架部门研发的开源配置管理中心,能够集中化管理应用不同环境、不同集群的配置,配置修改后能够实时推送到应用端,并且具备规范的权限、流程治理等特性。 Apollo支持4个维度管理Key-Value格式的配置: 1. application (应用) 2. environment (环境) 3. cluster (集群) 4. namespace (命名空间) 同时,Apollo基于开源模式开发,开源地址:<a href="https://github.com/ctripcorp/apollo" target="_blank">https://github.com/ctripcorp/apollo</a> ## 1.2 配置基本概念 既然Apollo定位于配置中心,那么在这里有必要先简单介绍一下什么是配置。 按照我们的理解,配置有以下几个属性: * **配置是独立于程序的只读变量** * 配置首先是独立于程序的,同一份程序在不同的配置下会有不同的行为。 * 其次,配置对于程序是只读的,程序通过读取配置来改变自己的行为,但是程序不应该去改变配置。 * 常见的配置有:DB Connection Str、Thread Pool Size、Buffer Size、Request Timeout、Feature Switch、Server Urls等。 * **配置伴随应用的整个生命周期** * 配置贯穿于应用的整个生命周期,应用在启动时通过读取配置来初始化,在运行时根据配置调整行为。 * **配置可以有多种加载方式** * 配置也有很多种加载方式,常见的有程序内部hard code,配置文件,环境变量,启动参数,基于数据库等 * **配置需要治理** * 权限控制 * 由于配置能改变程序的行为,不正确的配置甚至能引起灾难,所以对配置的修改必须有比较完善的权限控制 * 不同环境、集群配置管理 * 同一份程序在不同的环境(开发,测试,生产)、不同的集群(如不同的数据中心)经常需要有不同的配置,所以需要有完善的环境、集群配置管理 * 框架类组件配置管理 * 还有一类比较特殊的配置 - 框架类组件配置,比如CAT客户端的配置。 * 虽然这类框架类组件是由其他团队开发、维护,但是运行时是在业务实际应用内的,所以本质上可以认为框架类组件也是应用的一部分。 * 这类组件对应的配置也需要有比较完善的管理方式。 # 2、Why Apollo 正是基于配置的特殊性,所以Apollo从设计之初就立志于成为一个有治理能力的配置发布平台,目前提供了以下的特性: * **统一管理不同环境、不同集群的配置** * Apollo提供了一个统一界面集中式管理不同环境(environment)、不同集群(cluster)、不同命名空间(namespace)的配置。 * 同一份代码部署在不同的集群,可以有不同的配置,比如zookeeper的地址等 * 通过命名空间(namespace)可以很方便地支持多个不同应用共享同一份配置,同时还允许应用对共享的配置进行覆盖 * **配置修改实时生效(热发布)** * 用户在Apollo修改完配置并发布后,客户端能实时(1秒)接收到最新的配置,并通知到应用程序 * **版本发布管理** * 所有的配置发布都有版本概念,从而可以方便地支持配置的回滚 * **灰度发布** * 支持配置的灰度发布,比如点了发布后,只对部分应用实例生效,等观察一段时间没问题后再推给所有应用实例 * **权限管理、发布审核、操作审计** * 应用和配置的管理都有完善的权限管理机制,对配置的管理还分为了编辑和发布两个环节,从而减少人为的错误。 * 所有的操作都有审计日志,可以方便地追踪问题 * **客户端配置信息监控** * 可以在界面上方便地看到配置在被哪些实例使用 * **提供Java和.Net原生客户端** * 提供了Java和.Net的原生客户端,方便应用集成 * 支持Spring Placeholder, Annotation和Spring Boot的ConfigurationProperties,方便应用使用(需要Spring 3.1.1+) * 同时提供了Http接口,非Java和.Net应用也可以方便地使用 * **提供开放平台API** * Apollo自身提供了比较完善的统一配置管理界面,支持多环境、多数据中心配置管理、权限、流程治理等特性。不过Apollo出于通用性考虑,不会对配置的修改做过多限制,只要符合基本的格式就能保存,不会针对不同的配置值进行针对性的校验,如数据库用户名、密码,Redis服务地址等 * 对于这类应用配置,Apollo支持应用方通过开放平台API在Apollo进行配置的修改和发布,并且具备完善的授权和权限控制 * **部署简单** * 配置中心作为基础服务,可用性要求非常高,这就要求Apollo对外部依赖尽可能地少 * 目前唯一的外部依赖是MySQL,所以部署非常简单,只要安装好Java和MySQL就可以让Apollo跑起来 * Apollo还提供了打包脚本,一键就可以生成所有需要的安装包,并且支持自定义运行时参数 # 3、Apollo at a glance ## 3.1 基础模型 如下即是Apollo的基础模型: 1. 用户在配置中心对配置进行修改并发布 2. 配置中心通知Apollo客户端有配置更新 3. Apollo客户端从配置中心拉取最新的配置、更新本地配置并通知到应用 ![basic-architecture](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/basic-architecture.png) ## 3.2 界面概览 ![apollo-home-screenshot](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-home-screenshot.jpg) 上图是Apollo配置中心中一个项目的配置首页 * 在页面左上方的环境列表模块展示了所有的环境和集群,用户可以随时切换。 * 页面中央展示了两个namespace(application和FX.apollo)的配置信息,默认按照表格模式展示、编辑。用户也可以切换到文本模式,以文件形式查看、编辑。 * 页面上可以方便地进行发布、回滚、灰度、授权、查看更改历史和发布历史等操作 ## 3.3 添加/修改配置项 用户可以通过配置中心界面方便的添加/修改配置项,更多使用说明请参见[应用接入指南](zh/usage/apollo-user-guide) ![edit-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/edit-item-entry.png) 输入配置信息: ![edit-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/edit-item.png) ## 3.4 发布配置 通过配置中心发布配置: ![publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/publish-items-entry.png) 填写发布信息: ![publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/publish-items.png) ## 3.5 客户端获取配置(Java API样例) 配置发布后,就能在客户端获取到了,以Java为例,获取配置的示例代码如下。Apollo客户端还支持和Spring整合,更多客户端使用说明请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)和[.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide)。 ```java Config config = ConfigService.getAppConfig(); Integer defaultRequestTimeout = 200; Integer requestTimeout = config.getIntProperty("requestTimeout", defaultRequestTimeout); ``` ## 3.6 客户端监听配置变化 通过上述获取配置代码,应用就能实时获取到最新的配置了。 不过在某些场景下,应用还需要在配置变化时获得通知,比如数据库连接的切换等,所以Apollo还提供了监听配置变化的功能,Java示例如下: ```java Config config = ConfigService.getAppConfig(); config.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { for (String key : changeEvent.changedKeys()) { ConfigChange change = changeEvent.getChange(key); System.out.println(String.format( "Found change - key: %s, oldValue: %s, newValue: %s, changeType: %s", change.getPropertyName(), change.getOldValue(), change.getNewValue(), change.getChangeType())); } } }); ``` ## 3.7 Spring集成样例 Apollo和Spring也可以很方便地集成,只需要标注`@EnableApolloConfig`后就可以通过`@Value`获取配置信息: ```java @Configuration @EnableApolloConfig public class AppConfig {} ``` ```java @Component public class SomeBean { //timeout的值会自动更新 @Value("${request.timeout:200}") private int timeout; } ``` # 4、Apollo in depth 通过上面的介绍,相信大家已经对Apollo有了一个初步的了解,并且相信已经覆盖到了大部分的使用场景。 接下来会主要介绍Apollo的cluster管理(集群)、namespace管理(命名空间)和对应的配置获取规则。 ## 4.1 Core Concepts 在介绍高级特性前,我们有必要先来了解一下Apollo中的几个核心概念: 1. **application (应用)** * 这个很好理解,就是实际使用配置的应用,Apollo客户端在运行时需要知道当前应用是谁,从而可以去获取对应的配置 * 每个应用都需要有唯一的身份标识 -- appId,我们认为应用身份是跟着代码走的,所以需要在代码中配置,具体信息请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)。 2. **environment (环境)** * 配置对应的环境,Apollo客户端在运行时需要知道当前应用处于哪个环境,从而可以去获取应用的配置 * 我们认为环境和代码无关,同一份代码部署在不同的环境就应该能够获取到不同环境的配置 * 所以环境默认是通过读取机器上的配置(server.properties中的env属性)指定的,不过为了开发方便,我们也支持运行时通过System Property等指定,具体信息请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)。 3. **cluster (集群)** * 一个应用下不同实例的分组,比如典型的可以按照数据中心分,把上海机房的应用实例分为一个集群,把北京机房的应用实例分为另一个集群。 * 对不同的cluster,同一个配置可以有不一样的值,如zookeeper地址。 * 集群默认是通过读取机器上的配置(server.properties中的idc属性)指定的,不过也支持运行时通过System Property指定,具体信息请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)。 4. **namespace (命名空间)** * 一个应用下不同配置的分组,可以简单地把namespace类比为文件,不同类型的配置存放在不同的文件中,如数据库配置文件,RPC配置文件,应用自身的配置文件等 * 应用可以直接读取到公共组件的配置namespace,如DAL,RPC等 * 应用也可以通过继承公共组件的配置namespace来对公共组件的配置做调整,如DAL的初始数据库连接数 ## 4.2 自定义Cluster > 【本节内容仅对应用需要对不同集群应用不同配置才需要,如没有相关需求,可以跳过本节】 比如我们有应用在A数据中心和B数据中心都有部署,那么如果希望两个数据中心的配置不一样的话,我们可以通过新建cluster来解决。 ### 4.2.1 新建Cluster 新建Cluster只有项目的管理员才有权限,管理员可以在页面左侧看到“添加集群”按钮。 ![create-cluster](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster.png) 点击后就进入到集群添加页面,一般情况下可以按照数据中心来划分集群,如SHAJQ、SHAOY等。 不过也支持自定义集群,比如可以为A机房的某一台机器和B机房的某一台机创建一个集群,使用一套配置。 ![create-cluster-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster-detail.png) ### 4.2.2 在Cluster中添加配置并发布 集群添加成功后,就可以为该集群添加配置了,首先需要按照下图所示切换到SHAJQ集群,之后配置添加流程和[3.3 添加/修改配置项](#_33-添加修改配置项)一样,这里就不再赘述了。 ![cluster-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/cluster-created.png) ### 4.2.3 指定应用实例所属的Cluster Apollo会默认使用应用实例所在的数据中心作为cluster,所以如果两者一致的话,不需要额外配置。 如果cluster和数据中心不一致的话,那么就需要通过System Property方式来指定运行时cluster: * -Dapollo.cluster=SomeCluster * 这里注意`apollo.cluster`为全小写 ## 4.3 自定义Namespace > 【本节仅对公共组件配置或需要多个应用共享配置才需要,如没有相关需求,可以跳过本节】 如果应用有公共组件(如hermes-producer,cat-client等)供其它应用使用,就需要通过自定义namespace来实现公共组件的配置。 ### 4.3.1 新建Namespace 以hermes-producer为例,需要先新建一个namespace,新建namespace只有项目的管理员才有权限,管理员可以在页面左侧看到“添加Namespace”按钮。 ![create-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace.png) 点击后就进入namespace添加页面,Apollo会把应用所属的部门作为namespace的前缀,如FX。 ![create-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-detail.png) ### 4.3.2 关联到环境和集群 Namespace创建完,需要选择在哪些环境和集群下使用 ![link-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-namespace-detail.png) ### 4.3.3 在Namespace中添加配置项 接下来在这个新建的namespace下添加配置项 ![add-item-in-new-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/add-item-in-new-namespace.png) 添加完成后就能在FX.Hermes.Producer的namespace中看到配置。 ![item-created-in-new-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/item-created-in-new-namespace.png) ### 4.3.4 发布namespace的配置 ![publish-items-in-new-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/publish-items-in-new-namespace.png) ### 4.3.5 客户端获取Namespace配置 对自定义namespace的配置获取,稍有不同,需要程序传入namespace的名字。Apollo客户端还支持和Spring整合,更多客户端使用说明请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)和[.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide)。 ```java Config config = ConfigService.getConfig("FX.Hermes.Producer"); Integer defaultSenderBatchSize = 200; Integer senderBatchSize = config.getIntProperty("sender.batchsize", defaultSenderBatchSize); ``` ### 4.3.6 客户端监听Namespace配置变化 ```java Config config = ConfigService.getConfig("FX.Hermes.Producer"); config.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { System.out.println("Changes for namespace " + changeEvent.getNamespace()); for (String key : changeEvent.changedKeys()) { ConfigChange change = changeEvent.getChange(key); System.out.println(String.format( "Found change - key: %s, oldValue: %s, newValue: %s, changeType: %s", change.getPropertyName(), change.getOldValue(), change.getNewValue(), change.getChangeType())); } } }); ``` ### 4.3.7 Spring集成样例 ```java @Configuration @EnableApolloConfig("FX.Hermes.Producer") public class AppConfig {} ``` ```java @Component public class SomeBean { //timeout的值会自动更新 @Value("${request.timeout:200}") private int timeout; } ``` ## 4.4 配置获取规则 > 【本节仅当应用自定义了集群或namespace才需要,如无相关需求,可以跳过本节】 在有了cluster概念后,配置的规则就显得重要了。 比如应用部署在A机房,但是并没有在Apollo新建cluster,这个时候Apollo的行为是怎样的? 或者在运行时指定了cluster=SomeCluster,但是并没有在Apollo新建cluster,这个时候Apollo的行为是怎样的? 接下来就来介绍一下配置获取的规则。 ### 4.4.1 应用自身配置的获取规则 当应用使用下面的语句获取配置时,我们称之为获取应用自身的配置,也就是应用自身的application namespace的配置。 ```java Config config = ConfigService.getAppConfig(); ``` 对这种情况的配置获取规则,简而言之如下: 1. 首先查找运行时cluster的配置(通过apollo.cluster指定) 2. 如果没有找到,则查找数据中心cluster的配置 3. 如果还是没有找到,则返回默认cluster的配置 图示如下: ![application-config-precedence](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/application-config-precedence.png) 所以如果应用部署在A数据中心,但是用户没有在Apollo创建cluster,那么获取的配置就是默认cluster(default)的。 如果应用部署在A数据中心,同时在运行时指定了SomeCluster,但是没有在Apollo创建cluster,那么获取的配置就是A数据中心cluster的配置,如果A数据中心cluster没有配置的话,那么获取的配置就是默认cluster(default)的。 ### 4.4.2 公共组件配置的获取规则 以`FX.Hermes.Producer`为例,hermes producer是hermes发布的公共组件。当使用下面的语句获取配置时,我们称之为获取公共组件的配置。 ```java Config config = ConfigService.getConfig("FX.Hermes.Producer"); ``` 对这种情况的配置获取规则,简而言之如下: 1. 首先获取当前应用下的`FX.Hermes.Producer` namespace的配置 2. 然后获取hermes应用下`FX.Hermes.Producer` namespace的配置 3. 上面两部分配置的并集就是最终使用的配置,如有key一样的部分,以当前应用优先 图示如下: ![public-namespace-config-precedence](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-config-precedence.png) 通过这种方式,就实现了对框架类组件的配置管理,框架组件提供方提供配置的默认值,应用如果有特殊需求,可以自行覆盖。 ## 4.5 总体设计 ![overall-architecture](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/overall-architecture.png) 上图简要描述了Apollo的总体设计,我们可以从下往上看: * Config Service提供配置的读取、推送等功能,服务对象是Apollo客户端 * Admin Service提供配置的修改、发布等功能,服务对象是Apollo Portal(管理界面) * Config Service和Admin Service都是多实例、无状态部署,所以需要将自己注册到Eureka中并保持心跳 * 在Eureka之上我们架了一层Meta Server用于封装Eureka的服务发现接口 * Client通过域名访问Meta Server获取Config Service服务列表(IP+Port),而后直接通过IP+Port访问服务,同时在Client侧会做load balance、错误重试 * Portal通过域名访问Meta Server获取Admin Service服务列表(IP+Port),而后直接通过IP+Port访问服务,同时在Portal侧会做load balance、错误重试 * 为了简化部署,我们实际上会把Config Service、Eureka和Meta Server三个逻辑角色部署在同一个JVM进程中 ### 4.5.1 Why Eureka 为什么我们采用Eureka作为服务注册中心,而不是使用传统的zk、etcd呢?我大致总结了一下,有以下几方面的原因: * 它提供了完整的Service Registry和Service Discovery实现 * 首先是提供了完整的实现,并且也经受住了Netflix自己的生产环境考验,相对使用起来会比较省心。 * 和Spring Cloud无缝集成 * 我们的项目本身就使用了Spring Cloud和Spring Boot,同时Spring Cloud还有一套非常完善的开源代码来整合Eureka,所以使用起来非常方便。 * 另外,Eureka还支持在我们应用自身的容器中启动,也就是说我们的应用启动完之后,既充当了Eureka的角色,同时也是服务的提供者。这样就极大的提高了服务的可用性。 * **这一点是我们选择Eureka而不是zk、etcd等的主要原因,为了提高配置中心的可用性和降低部署复杂度,我们需要尽可能地减少外部依赖。** * Open Source * 最后一点是开源,由于代码是开源的,所以非常便于我们了解它的实现原理和排查问题。 ## 4.6 客户端设计 ![client-architecture](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/client-architecture.png) 上图简要描述了Apollo客户端的实现原理: 1. 客户端和服务端保持了一个长连接,从而能第一时间获得配置更新的推送。 2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。 * 这是一个fallback机制,为了防止推送机制失效导致配置不更新 * 客户端定时拉取会上报本地版本,所以一般情况下,对于定时拉取的操作,服务端都会返回304 - Not Modified * 定时频率默认为每5分钟拉取一次,客户端也可以通过在运行时指定System Property: `apollo.refreshInterval`来覆盖,单位为分钟。 3. 客户端从Apollo配置中心服务端获取到应用的最新配置后,会保存在内存中 4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份 * 在遇到服务不可用,或网络不通的时候,依然能从本地恢复配置 5. 应用程序从Apollo客户端获取最新的配置、订阅配置更新通知 ### 4.6.1 配置更新推送实现 前面提到了Apollo客户端和服务端保持了一个长连接,从而能第一时间获得配置更新的推送。 长连接实际上我们是通过Http Long Polling实现的,具体而言: * 客户端发起一个Http请求到服务端 * 服务端会保持住这个连接60秒 * 如果在60秒内有客户端关心的配置变化,被保持住的客户端请求会立即返回,并告知客户端有配置变化的namespace信息,客户端会据此拉取对应namespace的最新配置 * 如果在60秒内没有客户端关心的配置变化,那么会返回Http状态码304给客户端 * 客户端在收到服务端请求后会立即重新发起连接,回到第一步 考虑到会有数万客户端向服务端发起长连,在服务端我们使用了async servlet(Spring DeferredResult)来服务Http Long Polling请求。 ## 4.7 可用性考虑 配置中心作为基础服务,可用性要求非常高,下面的表格描述了不同场景下Apollo的可用性: | 场景 | 影响 | 降级 | 原因 | |------------------------|--------------------------------------|---------------------------------------|-----------------------------------------------------------------------------------------| | 某台config service下线 | 无影响 | | Config service无状态,客户端重连其它config service | | 所有config service下线 | 客户端无法读取最新配置,Portal无影响 | 客户端重启时,可以读取本地缓存配置文件 | | | 某台admin service下线 | 无影响 | | Admin service无状态,Portal重连其它admin service | | 所有admin service下线 | 客户端无影响,portal无法更新配置 | | | | 某台portal下线 | 无影响 | | Portal域名通过slb绑定多台服务器,重试后指向可用的服务器 | | 全部portal下线 | 客户端无影响,portal无法更新配置 | | | | 某个数据中心下线 | 无影响 | | 多数据中心部署,数据完全同步,Meta Server/Portal域名通过slb自动切换到其它存活的数据中心 | # 5、Contribute to Apollo Apollo从开发之初就是以开源模式开发的,所以也非常欢迎有兴趣、有余力的朋友一起加入进来。 服务端开发使用的是Java,基于Spring Cloud和Spring Boot框架。客户端目前提供了Java和.Net两种实现。 Github地址:<a href="https://github.com/ctripcorp/apollo" target="_blank">https://github.com/ctripcorp/apollo</a> 欢迎大家发起Pull Request!
# &nbsp; # 1、What is Apollo ## 1.1 背景 随着程序功能的日益复杂,程序的配置日益增多:各种功能的开关、参数的配置、服务器的地址…… 对程序配置的期望值也越来越高:配置修改后实时生效,灰度发布,分环境、分集群管理配置,完善的权限、审核机制…… 在这样的大环境下,传统的通过配置文件、数据库等方式已经越来越无法满足开发人员对配置管理的需求。 Apollo配置中心应运而生! ## 1.2 Apollo简介 Apollo(阿波罗)是携程框架部门研发的开源配置管理中心,能够集中化管理应用不同环境、不同集群的配置,配置修改后能够实时推送到应用端,并且具备规范的权限、流程治理等特性。 Apollo支持4个维度管理Key-Value格式的配置: 1. application (应用) 2. environment (环境) 3. cluster (集群) 4. namespace (命名空间) 同时,Apollo基于开源模式开发,开源地址:<a href="https://github.com/ctripcorp/apollo" target="_blank">https://github.com/ctripcorp/apollo</a> ## 1.2 配置基本概念 既然Apollo定位于配置中心,那么在这里有必要先简单介绍一下什么是配置。 按照我们的理解,配置有以下几个属性: * **配置是独立于程序的只读变量** * 配置首先是独立于程序的,同一份程序在不同的配置下会有不同的行为。 * 其次,配置对于程序是只读的,程序通过读取配置来改变自己的行为,但是程序不应该去改变配置。 * 常见的配置有:DB Connection Str、Thread Pool Size、Buffer Size、Request Timeout、Feature Switch、Server Urls等。 * **配置伴随应用的整个生命周期** * 配置贯穿于应用的整个生命周期,应用在启动时通过读取配置来初始化,在运行时根据配置调整行为。 * **配置可以有多种加载方式** * 配置也有很多种加载方式,常见的有程序内部hard code,配置文件,环境变量,启动参数,基于数据库等 * **配置需要治理** * 权限控制 * 由于配置能改变程序的行为,不正确的配置甚至能引起灾难,所以对配置的修改必须有比较完善的权限控制 * 不同环境、集群配置管理 * 同一份程序在不同的环境(开发,测试,生产)、不同的集群(如不同的数据中心)经常需要有不同的配置,所以需要有完善的环境、集群配置管理 * 框架类组件配置管理 * 还有一类比较特殊的配置 - 框架类组件配置,比如CAT客户端的配置。 * 虽然这类框架类组件是由其他团队开发、维护,但是运行时是在业务实际应用内的,所以本质上可以认为框架类组件也是应用的一部分。 * 这类组件对应的配置也需要有比较完善的管理方式。 # 2、Why Apollo 正是基于配置的特殊性,所以Apollo从设计之初就立志于成为一个有治理能力的配置发布平台,目前提供了以下的特性: * **统一管理不同环境、不同集群的配置** * Apollo提供了一个统一界面集中式管理不同环境(environment)、不同集群(cluster)、不同命名空间(namespace)的配置。 * 同一份代码部署在不同的集群,可以有不同的配置,比如zookeeper的地址等 * 通过命名空间(namespace)可以很方便地支持多个不同应用共享同一份配置,同时还允许应用对共享的配置进行覆盖 * **配置修改实时生效(热发布)** * 用户在Apollo修改完配置并发布后,客户端能实时(1秒)接收到最新的配置,并通知到应用程序 * **版本发布管理** * 所有的配置发布都有版本概念,从而可以方便地支持配置的回滚 * **灰度发布** * 支持配置的灰度发布,比如点了发布后,只对部分应用实例生效,等观察一段时间没问题后再推给所有应用实例 * **权限管理、发布审核、操作审计** * 应用和配置的管理都有完善的权限管理机制,对配置的管理还分为了编辑和发布两个环节,从而减少人为的错误。 * 所有的操作都有审计日志,可以方便地追踪问题 * **客户端配置信息监控** * 可以在界面上方便地看到配置在被哪些实例使用 * **提供Java和.Net原生客户端** * 提供了Java和.Net的原生客户端,方便应用集成 * 支持Spring Placeholder, Annotation和Spring Boot的ConfigurationProperties,方便应用使用(需要Spring 3.1.1+) * 同时提供了Http接口,非Java和.Net应用也可以方便地使用 * **提供开放平台API** * Apollo自身提供了比较完善的统一配置管理界面,支持多环境、多数据中心配置管理、权限、流程治理等特性。不过Apollo出于通用性考虑,不会对配置的修改做过多限制,只要符合基本的格式就能保存,不会针对不同的配置值进行针对性的校验,如数据库用户名、密码,Redis服务地址等 * 对于这类应用配置,Apollo支持应用方通过开放平台API在Apollo进行配置的修改和发布,并且具备完善的授权和权限控制 * **部署简单** * 配置中心作为基础服务,可用性要求非常高,这就要求Apollo对外部依赖尽可能地少 * 目前唯一的外部依赖是MySQL,所以部署非常简单,只要安装好Java和MySQL就可以让Apollo跑起来 * Apollo还提供了打包脚本,一键就可以生成所有需要的安装包,并且支持自定义运行时参数 # 3、Apollo at a glance ## 3.1 基础模型 如下即是Apollo的基础模型: 1. 用户在配置中心对配置进行修改并发布 2. 配置中心通知Apollo客户端有配置更新 3. Apollo客户端从配置中心拉取最新的配置、更新本地配置并通知到应用 ![basic-architecture](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/basic-architecture.png) ## 3.2 界面概览 ![apollo-home-screenshot](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/apollo-home-screenshot.jpg) 上图是Apollo配置中心中一个项目的配置首页 * 在页面左上方的环境列表模块展示了所有的环境和集群,用户可以随时切换。 * 页面中央展示了两个namespace(application和FX.apollo)的配置信息,默认按照表格模式展示、编辑。用户也可以切换到文本模式,以文件形式查看、编辑。 * 页面上可以方便地进行发布、回滚、灰度、授权、查看更改历史和发布历史等操作 ## 3.3 添加/修改配置项 用户可以通过配置中心界面方便的添加/修改配置项,更多使用说明请参见[应用接入指南](zh/usage/apollo-user-guide) ![edit-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/edit-item-entry.png) 输入配置信息: ![edit-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/edit-item.png) ## 3.4 发布配置 通过配置中心发布配置: ![publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/publish-items-entry.png) 填写发布信息: ![publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/publish-items.png) ## 3.5 客户端获取配置(Java API样例) 配置发布后,就能在客户端获取到了,以Java为例,获取配置的示例代码如下。Apollo客户端还支持和Spring整合,更多客户端使用说明请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)和[.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide)。 ```java Config config = ConfigService.getAppConfig(); Integer defaultRequestTimeout = 200; Integer requestTimeout = config.getIntProperty("requestTimeout", defaultRequestTimeout); ``` ## 3.6 客户端监听配置变化 通过上述获取配置代码,应用就能实时获取到最新的配置了。 不过在某些场景下,应用还需要在配置变化时获得通知,比如数据库连接的切换等,所以Apollo还提供了监听配置变化的功能,Java示例如下: ```java Config config = ConfigService.getAppConfig(); config.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { for (String key : changeEvent.changedKeys()) { ConfigChange change = changeEvent.getChange(key); System.out.println(String.format( "Found change - key: %s, oldValue: %s, newValue: %s, changeType: %s", change.getPropertyName(), change.getOldValue(), change.getNewValue(), change.getChangeType())); } } }); ``` ## 3.7 Spring集成样例 Apollo和Spring也可以很方便地集成,只需要标注`@EnableApolloConfig`后就可以通过`@Value`获取配置信息: ```java @Configuration @EnableApolloConfig public class AppConfig {} ``` ```java @Component public class SomeBean { //timeout的值会自动更新 @Value("${request.timeout:200}") private int timeout; } ``` # 4、Apollo in depth 通过上面的介绍,相信大家已经对Apollo有了一个初步的了解,并且相信已经覆盖到了大部分的使用场景。 接下来会主要介绍Apollo的cluster管理(集群)、namespace管理(命名空间)和对应的配置获取规则。 ## 4.1 Core Concepts 在介绍高级特性前,我们有必要先来了解一下Apollo中的几个核心概念: 1. **application (应用)** * 这个很好理解,就是实际使用配置的应用,Apollo客户端在运行时需要知道当前应用是谁,从而可以去获取对应的配置 * 每个应用都需要有唯一的身份标识 -- appId,我们认为应用身份是跟着代码走的,所以需要在代码中配置,具体信息请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)。 2. **environment (环境)** * 配置对应的环境,Apollo客户端在运行时需要知道当前应用处于哪个环境,从而可以去获取应用的配置 * 我们认为环境和代码无关,同一份代码部署在不同的环境就应该能够获取到不同环境的配置 * 所以环境默认是通过读取机器上的配置(server.properties中的env属性)指定的,不过为了开发方便,我们也支持运行时通过System Property等指定,具体信息请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)。 3. **cluster (集群)** * 一个应用下不同实例的分组,比如典型的可以按照数据中心分,把上海机房的应用实例分为一个集群,把北京机房的应用实例分为另一个集群。 * 对不同的cluster,同一个配置可以有不一样的值,如zookeeper地址。 * 集群默认是通过读取机器上的配置(server.properties中的idc属性)指定的,不过也支持运行时通过System Property指定,具体信息请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)。 4. **namespace (命名空间)** * 一个应用下不同配置的分组,可以简单地把namespace类比为文件,不同类型的配置存放在不同的文件中,如数据库配置文件,RPC配置文件,应用自身的配置文件等 * 应用可以直接读取到公共组件的配置namespace,如DAL,RPC等 * 应用也可以通过继承公共组件的配置namespace来对公共组件的配置做调整,如DAL的初始数据库连接数 ## 4.2 自定义Cluster > 【本节内容仅对应用需要对不同集群应用不同配置才需要,如没有相关需求,可以跳过本节】 比如我们有应用在A数据中心和B数据中心都有部署,那么如果希望两个数据中心的配置不一样的话,我们可以通过新建cluster来解决。 ### 4.2.1 新建Cluster 新建Cluster只有项目的管理员才有权限,管理员可以在页面左侧看到“添加集群”按钮。 ![create-cluster](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster.png) 点击后就进入到集群添加页面,一般情况下可以按照数据中心来划分集群,如SHAJQ、SHAOY等。 不过也支持自定义集群,比如可以为A机房的某一台机器和B机房的某一台机创建一个集群,使用一套配置。 ![create-cluster-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster-detail.png) ### 4.2.2 在Cluster中添加配置并发布 集群添加成功后,就可以为该集群添加配置了,首先需要按照下图所示切换到SHAJQ集群,之后配置添加流程和[3.3 添加/修改配置项](#_33-添加修改配置项)一样,这里就不再赘述了。 ![cluster-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/cluster-created.png) ### 4.2.3 指定应用实例所属的Cluster Apollo会默认使用应用实例所在的数据中心作为cluster,所以如果两者一致的话,不需要额外配置。 如果cluster和数据中心不一致的话,那么就需要通过System Property方式来指定运行时cluster: * -Dapollo.cluster=SomeCluster * 这里注意`apollo.cluster`为全小写 ## 4.3 自定义Namespace > 【本节仅对公共组件配置或需要多个应用共享配置才需要,如没有相关需求,可以跳过本节】 如果应用有公共组件(如hermes-producer,cat-client等)供其它应用使用,就需要通过自定义namespace来实现公共组件的配置。 ### 4.3.1 新建Namespace 以hermes-producer为例,需要先新建一个namespace,新建namespace只有项目的管理员才有权限,管理员可以在页面左侧看到“添加Namespace”按钮。 ![create-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace.png) 点击后就进入namespace添加页面,Apollo会把应用所属的部门作为namespace的前缀,如FX。 ![create-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-detail.png) ### 4.3.2 关联到环境和集群 Namespace创建完,需要选择在哪些环境和集群下使用 ![link-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-namespace-detail.png) ### 4.3.3 在Namespace中添加配置项 接下来在这个新建的namespace下添加配置项 ![add-item-in-new-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/add-item-in-new-namespace.png) 添加完成后就能在FX.Hermes.Producer的namespace中看到配置。 ![item-created-in-new-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/item-created-in-new-namespace.png) ### 4.3.4 发布namespace的配置 ![publish-items-in-new-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/publish-items-in-new-namespace.png) ### 4.3.5 客户端获取Namespace配置 对自定义namespace的配置获取,稍有不同,需要程序传入namespace的名字。Apollo客户端还支持和Spring整合,更多客户端使用说明请参见[Java客户端使用指南](zh/usage/java-sdk-user-guide)和[.Net客户端使用指南](zh/usage/dotnet-sdk-user-guide)。 ```java Config config = ConfigService.getConfig("FX.Hermes.Producer"); Integer defaultSenderBatchSize = 200; Integer senderBatchSize = config.getIntProperty("sender.batchsize", defaultSenderBatchSize); ``` ### 4.3.6 客户端监听Namespace配置变化 ```java Config config = ConfigService.getConfig("FX.Hermes.Producer"); config.addChangeListener(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { System.out.println("Changes for namespace " + changeEvent.getNamespace()); for (String key : changeEvent.changedKeys()) { ConfigChange change = changeEvent.getChange(key); System.out.println(String.format( "Found change - key: %s, oldValue: %s, newValue: %s, changeType: %s", change.getPropertyName(), change.getOldValue(), change.getNewValue(), change.getChangeType())); } } }); ``` ### 4.3.7 Spring集成样例 ```java @Configuration @EnableApolloConfig("FX.Hermes.Producer") public class AppConfig {} ``` ```java @Component public class SomeBean { //timeout的值会自动更新 @Value("${request.timeout:200}") private int timeout; } ``` ## 4.4 配置获取规则 > 【本节仅当应用自定义了集群或namespace才需要,如无相关需求,可以跳过本节】 在有了cluster概念后,配置的规则就显得重要了。 比如应用部署在A机房,但是并没有在Apollo新建cluster,这个时候Apollo的行为是怎样的? 或者在运行时指定了cluster=SomeCluster,但是并没有在Apollo新建cluster,这个时候Apollo的行为是怎样的? 接下来就来介绍一下配置获取的规则。 ### 4.4.1 应用自身配置的获取规则 当应用使用下面的语句获取配置时,我们称之为获取应用自身的配置,也就是应用自身的application namespace的配置。 ```java Config config = ConfigService.getAppConfig(); ``` 对这种情况的配置获取规则,简而言之如下: 1. 首先查找运行时cluster的配置(通过apollo.cluster指定) 2. 如果没有找到,则查找数据中心cluster的配置 3. 如果还是没有找到,则返回默认cluster的配置 图示如下: ![application-config-precedence](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/application-config-precedence.png) 所以如果应用部署在A数据中心,但是用户没有在Apollo创建cluster,那么获取的配置就是默认cluster(default)的。 如果应用部署在A数据中心,同时在运行时指定了SomeCluster,但是没有在Apollo创建cluster,那么获取的配置就是A数据中心cluster的配置,如果A数据中心cluster没有配置的话,那么获取的配置就是默认cluster(default)的。 ### 4.4.2 公共组件配置的获取规则 以`FX.Hermes.Producer`为例,hermes producer是hermes发布的公共组件。当使用下面的语句获取配置时,我们称之为获取公共组件的配置。 ```java Config config = ConfigService.getConfig("FX.Hermes.Producer"); ``` 对这种情况的配置获取规则,简而言之如下: 1. 首先获取当前应用下的`FX.Hermes.Producer` namespace的配置 2. 然后获取hermes应用下`FX.Hermes.Producer` namespace的配置 3. 上面两部分配置的并集就是最终使用的配置,如有key一样的部分,以当前应用优先 图示如下: ![public-namespace-config-precedence](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-config-precedence.png) 通过这种方式,就实现了对框架类组件的配置管理,框架组件提供方提供配置的默认值,应用如果有特殊需求,可以自行覆盖。 ## 4.5 总体设计 ![overall-architecture](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/overall-architecture.png) 上图简要描述了Apollo的总体设计,我们可以从下往上看: * Config Service提供配置的读取、推送等功能,服务对象是Apollo客户端 * Admin Service提供配置的修改、发布等功能,服务对象是Apollo Portal(管理界面) * Config Service和Admin Service都是多实例、无状态部署,所以需要将自己注册到Eureka中并保持心跳 * 在Eureka之上我们架了一层Meta Server用于封装Eureka的服务发现接口 * Client通过域名访问Meta Server获取Config Service服务列表(IP+Port),而后直接通过IP+Port访问服务,同时在Client侧会做load balance、错误重试 * Portal通过域名访问Meta Server获取Admin Service服务列表(IP+Port),而后直接通过IP+Port访问服务,同时在Portal侧会做load balance、错误重试 * 为了简化部署,我们实际上会把Config Service、Eureka和Meta Server三个逻辑角色部署在同一个JVM进程中 ### 4.5.1 Why Eureka 为什么我们采用Eureka作为服务注册中心,而不是使用传统的zk、etcd呢?我大致总结了一下,有以下几方面的原因: * 它提供了完整的Service Registry和Service Discovery实现 * 首先是提供了完整的实现,并且也经受住了Netflix自己的生产环境考验,相对使用起来会比较省心。 * 和Spring Cloud无缝集成 * 我们的项目本身就使用了Spring Cloud和Spring Boot,同时Spring Cloud还有一套非常完善的开源代码来整合Eureka,所以使用起来非常方便。 * 另外,Eureka还支持在我们应用自身的容器中启动,也就是说我们的应用启动完之后,既充当了Eureka的角色,同时也是服务的提供者。这样就极大的提高了服务的可用性。 * **这一点是我们选择Eureka而不是zk、etcd等的主要原因,为了提高配置中心的可用性和降低部署复杂度,我们需要尽可能地减少外部依赖。** * Open Source * 最后一点是开源,由于代码是开源的,所以非常便于我们了解它的实现原理和排查问题。 ## 4.6 客户端设计 ![client-architecture](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/client-architecture.png) 上图简要描述了Apollo客户端的实现原理: 1. 客户端和服务端保持了一个长连接,从而能第一时间获得配置更新的推送。 2. 客户端还会定时从Apollo配置中心服务端拉取应用的最新配置。 * 这是一个fallback机制,为了防止推送机制失效导致配置不更新 * 客户端定时拉取会上报本地版本,所以一般情况下,对于定时拉取的操作,服务端都会返回304 - Not Modified * 定时频率默认为每5分钟拉取一次,客户端也可以通过在运行时指定System Property: `apollo.refreshInterval`来覆盖,单位为分钟。 3. 客户端从Apollo配置中心服务端获取到应用的最新配置后,会保存在内存中 4. 客户端会把从服务端获取到的配置在本地文件系统缓存一份 * 在遇到服务不可用,或网络不通的时候,依然能从本地恢复配置 5. 应用程序从Apollo客户端获取最新的配置、订阅配置更新通知 ### 4.6.1 配置更新推送实现 前面提到了Apollo客户端和服务端保持了一个长连接,从而能第一时间获得配置更新的推送。 长连接实际上我们是通过Http Long Polling实现的,具体而言: * 客户端发起一个Http请求到服务端 * 服务端会保持住这个连接60秒 * 如果在60秒内有客户端关心的配置变化,被保持住的客户端请求会立即返回,并告知客户端有配置变化的namespace信息,客户端会据此拉取对应namespace的最新配置 * 如果在60秒内没有客户端关心的配置变化,那么会返回Http状态码304给客户端 * 客户端在收到服务端请求后会立即重新发起连接,回到第一步 考虑到会有数万客户端向服务端发起长连,在服务端我们使用了async servlet(Spring DeferredResult)来服务Http Long Polling请求。 ## 4.7 可用性考虑 配置中心作为基础服务,可用性要求非常高,下面的表格描述了不同场景下Apollo的可用性: | 场景 | 影响 | 降级 | 原因 | |------------------------|--------------------------------------|---------------------------------------|-----------------------------------------------------------------------------------------| | 某台config service下线 | 无影响 | | Config service无状态,客户端重连其它config service | | 所有config service下线 | 客户端无法读取最新配置,Portal无影响 | 客户端重启时,可以读取本地缓存配置文件 | | | 某台admin service下线 | 无影响 | | Admin service无状态,Portal重连其它admin service | | 所有admin service下线 | 客户端无影响,portal无法更新配置 | | | | 某台portal下线 | 无影响 | | Portal域名通过slb绑定多台服务器,重试后指向可用的服务器 | | 全部portal下线 | 客户端无影响,portal无法更新配置 | | | | 某个数据中心下线 | 无影响 | | 多数据中心部署,数据完全同步,Meta Server/Portal域名通过slb自动切换到其它存活的数据中心 | # 5、Contribute to Apollo Apollo从开发之初就是以开源模式开发的,所以也非常欢迎有兴趣、有余力的朋友一起加入进来。 服务端开发使用的是Java,基于Spring Cloud和Spring Boot框架。客户端目前提供了Java和.Net两种实现。 Github地址:<a href="https://github.com/ctripcorp/apollo" target="_blank">https://github.com/ctripcorp/apollo</a> 欢迎大家发起Pull Request!
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/faq/common-issues-in-deployment-and-development-phase.md
TODO
TODO
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/deployment/quick-start-docker.md
TODO
TODO
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-core/src/test/resources/META-INF/services/com.ctrip.framework.apollo.tracer.spi.MessageProducerManager
com.ctrip.framework.apollo.tracer.internals.MockMessageProducerManager
com.ctrip.framework.apollo.tracer.internals.MockMessageProducerManager
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/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,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/metaservice/controller/ServiceControllerTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.metaservice.controller; import static org.junit.Assert.*; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.core.ServiceNameConsts; import com.ctrip.framework.apollo.core.dto.ServiceDTO; import com.ctrip.framework.apollo.metaservice.service.DiscoveryService; import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ServiceControllerTest { @Mock private DiscoveryService discoveryService; @Mock private List<ServiceDTO> someServices; private ServiceController serviceController; @Before public void setUp() throws Exception { serviceController = new ServiceController(discoveryService); } @Test public void testGetMetaService() { assertTrue(serviceController.getMetaService().isEmpty()); } @Test public void testGetConfigService() { String someAppId = "someAppId"; String someClientIp = "someClientIp"; when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getConfigService(someAppId, someClientIp)); } @Test public void testGetAdminService() { when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_ADMINSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getAdminService()); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.metaservice.controller; import static org.junit.Assert.*; import static org.mockito.Mockito.when; import com.ctrip.framework.apollo.core.ServiceNameConsts; import com.ctrip.framework.apollo.core.dto.ServiceDTO; import com.ctrip.framework.apollo.metaservice.service.DiscoveryService; import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ServiceControllerTest { @Mock private DiscoveryService discoveryService; @Mock private List<ServiceDTO> someServices; private ServiceController serviceController; @Before public void setUp() throws Exception { serviceController = new ServiceController(discoveryService); } @Test public void testGetMetaService() { assertTrue(serviceController.getMetaService().isEmpty()); } @Test public void testGetConfigService() { String someAppId = "someAppId"; String someClientIp = "someClientIp"; when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_CONFIGSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getConfigService(someAppId, someClientIp)); } @Test public void testGetAdminService() { when(discoveryService.getServiceInstances(ServiceNameConsts.APOLLO_ADMINSERVICE)) .thenReturn(someServices); assertEquals(someServices, serviceController.getAdminService()); } }
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppRepository.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.biz.repository; import com.ctrip.framework.apollo.common.entity.App; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import java.util.List; public interface AppRepository extends PagingAndSortingRepository<App, Long> { @Query("SELECT a from App a WHERE a.name LIKE %:name%") List<App> findByName(@Param("name") String name); App 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.biz.repository; import com.ctrip.framework.apollo.common.entity.App; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import java.util.List; public interface AppRepository extends PagingAndSortingRepository<App, Long> { @Query("SELECT a from App a WHERE a.name LIKE %:name%") List<App> findByName(@Param("name") String name); App findByAppId(String appId); }
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/AbstractConfigTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import com.ctrip.framework.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.enums.ConfigSourceType; import com.ctrip.framework.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.google.common.util.concurrent.SettableFuture; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; import org.mockito.Matchers; /** * @author wxq */ public class AbstractConfigTest { /** * @see AbstractConfig#fireConfigChange(ConfigChangeEvent) */ @Test public void testFireConfigChange_cannot_notify() throws InterruptedException { AbstractConfig abstractConfig = spy(new ErrorConfig()); final String namespace = "app-namespace-0"; ConfigChangeListener configChangeListener = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { } }); abstractConfig .addChangeListener(configChangeListener, Collections.singleton("cannot-be-match-key")); Map<String, ConfigChange> changes = new HashMap<>(); changes.put("key1", new ConfigChange(namespace, "key1", null, "new-value", PropertyChangeType.ADDED)); ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes); abstractConfig.fireConfigChange(configChangeEvent); abstractConfig.fireConfigChange(namespace, changes); // wait a minute for invoking Thread.sleep(100); verify(configChangeListener, times(0)).onChange(Matchers.<ConfigChangeEvent>any()); } @Test public void testFireConfigChange_event_notify_once() throws ExecutionException, InterruptedException, TimeoutException { AbstractConfig abstractConfig = new ErrorConfig(); final String namespace = "app-namespace-1"; final String key = "great-key"; final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create(); final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create(); final AtomicInteger invokeCount = new AtomicInteger(); final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future1.set(changeEvent); } }); final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future2.set(changeEvent); } }); abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key)); abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key)); Map<String, ConfigChange> changes = new HashMap<>(); changes.put(key, new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED)); ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes); abstractConfig.fireConfigChange(configChangeEvent); assertEquals(configChangeEvent, future1.get(500, TimeUnit.MILLISECONDS)); assertEquals(configChangeEvent, future2.get(500, TimeUnit.MILLISECONDS)); assertEquals(2, invokeCount.get()); verify(configChangeListener1, times(1)).onChange(Matchers.eq(configChangeEvent)); verify(configChangeListener2, times(1)).onChange(Matchers.eq(configChangeEvent)); } @Test public void testFireConfigChange_changes_notify_once() throws ExecutionException, InterruptedException, TimeoutException { AbstractConfig abstractConfig = new ErrorConfig(); final String namespace = "app-namespace-1"; final String key = "great-key"; final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create(); final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create(); final AtomicInteger invokeCount = new AtomicInteger(); final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future1.set(changeEvent); } }); final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future2.set(changeEvent); } }); abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key)); abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key)); Map<String, ConfigChange> changes = new HashMap<>(); changes.put(key, new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED)); abstractConfig.fireConfigChange(namespace, changes); assertEquals(Collections.singleton(key), future1.get(500, TimeUnit.MILLISECONDS).changedKeys()); assertEquals(Collections.singleton(key), future2.get(500, TimeUnit.MILLISECONDS).changedKeys()); assertEquals(2, invokeCount.get()); verify(configChangeListener1, times(1)).onChange(Matchers.<ConfigChangeEvent>any()); verify(configChangeListener2, times(1)).onChange(Matchers.<ConfigChangeEvent>any()); } /** * Only for current test usage. * * @author wxq */ private static class ErrorConfig extends AbstractConfig { @Override public String getProperty(String key, String defaultValue) { throw new UnsupportedOperationException(); } @Override public Set<String> getPropertyNames() { throw new UnsupportedOperationException(); } @Override public ConfigSourceType getSourceType() { throw new UnsupportedOperationException(); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.internals; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import com.ctrip.framework.apollo.ConfigChangeListener; import com.ctrip.framework.apollo.enums.ConfigSourceType; import com.ctrip.framework.apollo.enums.PropertyChangeType; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; import com.google.common.util.concurrent.SettableFuture; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; import org.mockito.Matchers; /** * @author wxq */ public class AbstractConfigTest { /** * @see AbstractConfig#fireConfigChange(ConfigChangeEvent) */ @Test public void testFireConfigChange_cannot_notify() throws InterruptedException { AbstractConfig abstractConfig = spy(new ErrorConfig()); final String namespace = "app-namespace-0"; ConfigChangeListener configChangeListener = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { } }); abstractConfig .addChangeListener(configChangeListener, Collections.singleton("cannot-be-match-key")); Map<String, ConfigChange> changes = new HashMap<>(); changes.put("key1", new ConfigChange(namespace, "key1", null, "new-value", PropertyChangeType.ADDED)); ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes); abstractConfig.fireConfigChange(configChangeEvent); abstractConfig.fireConfigChange(namespace, changes); // wait a minute for invoking Thread.sleep(100); verify(configChangeListener, times(0)).onChange(Matchers.<ConfigChangeEvent>any()); } @Test public void testFireConfigChange_event_notify_once() throws ExecutionException, InterruptedException, TimeoutException { AbstractConfig abstractConfig = new ErrorConfig(); final String namespace = "app-namespace-1"; final String key = "great-key"; final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create(); final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create(); final AtomicInteger invokeCount = new AtomicInteger(); final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future1.set(changeEvent); } }); final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future2.set(changeEvent); } }); abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key)); abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key)); Map<String, ConfigChange> changes = new HashMap<>(); changes.put(key, new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED)); ConfigChangeEvent configChangeEvent = new ConfigChangeEvent(namespace, changes); abstractConfig.fireConfigChange(configChangeEvent); assertEquals(configChangeEvent, future1.get(500, TimeUnit.MILLISECONDS)); assertEquals(configChangeEvent, future2.get(500, TimeUnit.MILLISECONDS)); assertEquals(2, invokeCount.get()); verify(configChangeListener1, times(1)).onChange(Matchers.eq(configChangeEvent)); verify(configChangeListener2, times(1)).onChange(Matchers.eq(configChangeEvent)); } @Test public void testFireConfigChange_changes_notify_once() throws ExecutionException, InterruptedException, TimeoutException { AbstractConfig abstractConfig = new ErrorConfig(); final String namespace = "app-namespace-1"; final String key = "great-key"; final SettableFuture<ConfigChangeEvent> future1 = SettableFuture.create(); final SettableFuture<ConfigChangeEvent> future2 = SettableFuture.create(); final AtomicInteger invokeCount = new AtomicInteger(); final ConfigChangeListener configChangeListener1 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future1.set(changeEvent); } }); final ConfigChangeListener configChangeListener2 = spy(new ConfigChangeListener() { @Override public void onChange(ConfigChangeEvent changeEvent) { invokeCount.incrementAndGet(); future2.set(changeEvent); } }); abstractConfig.addChangeListener(configChangeListener1, Collections.singleton(key)); abstractConfig.addChangeListener(configChangeListener2, Collections.singleton(key)); Map<String, ConfigChange> changes = new HashMap<>(); changes.put(key, new ConfigChange(namespace, key, "old-value", "new-value", PropertyChangeType.MODIFIED)); abstractConfig.fireConfigChange(namespace, changes); assertEquals(Collections.singleton(key), future1.get(500, TimeUnit.MILLISECONDS).changedKeys()); assertEquals(Collections.singleton(key), future2.get(500, TimeUnit.MILLISECONDS).changedKeys()); assertEquals(2, invokeCount.get()); verify(configChangeListener1, times(1)).onChange(Matchers.<ConfigChangeEvent>any()); verify(configChangeListener2, times(1)).onChange(Matchers.<ConfigChangeEvent>any()); } /** * Only for current test usage. * * @author wxq */ private static class ErrorConfig extends AbstractConfig { @Override public String getProperty(String key, String defaultValue) { throw new UnsupportedOperationException(); } @Override public Set<String> getPropertyNames() { throw new UnsupportedOperationException(); } @Override public ConfigSourceType getSourceType() { throw new UnsupportedOperationException(); } } }
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/resources/integration-test/test-gray-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 GrayReleaseRule (`Id`, `AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `Rules`, `ReleaseId`, `BranchStatus`) VALUES (1, 'someAppId', 'default', 'application', 'gray-branch-1', '[{"clientAppId":"someAppId","clientIpList":["1.1.1.1"]}]', 986, 1); INSERT INTO GrayReleaseRule (`Id`, `AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `Rules`, `ReleaseId`, `BranchStatus`) VALUES (2, 'somePublicAppId', 'default', 'somePublicNamespace', 'gray-branch-2', '[{"clientAppId":"someAppId","clientIpList":["1.1.1.1"]}]', 985, 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. -- INSERT INTO GrayReleaseRule (`Id`, `AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `Rules`, `ReleaseId`, `BranchStatus`) VALUES (1, 'someAppId', 'default', 'application', 'gray-branch-1', '[{"clientAppId":"someAppId","clientIpList":["1.1.1.1"]}]', 986, 1); INSERT INTO GrayReleaseRule (`Id`, `AppId`, `ClusterName`, `NamespaceName`, `BranchName`, `Rules`, `ReleaseId`, `BranchStatus`) VALUES (2, 'somePublicAppId', 'default', 'somePublicNamespace', 'gray-branch-2', '[{"clientAppId":"someAppId","clientIpList":["1.1.1.1"]}]', 985, 1);
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/clipboard.min.js
/*! * clipboard.js v1.5.12 * https://zenorocha.github.io/clipboard.js * * Licensed MIT © Zeno Rocha */ !function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.Clipboard=t()}}(function(){var t,e,n;return function t(e,n,o){function i(a,c){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!c&&s)return s(a,!0);if(r)return r(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var u=n[a]={exports:{}};e[a][0].call(u.exports,function(t){var n=e[a][1][t];return i(n?n:t)},u,u.exports,t,e,n,o)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a<o.length;a++)i(o[a]);return i}({1:[function(t,e,n){var o=t("matches-selector");e.exports=function(t,e,n){for(var i=n?t:t.parentNode;i&&i!==document;){if(o(i,e))return i;i=i.parentNode}}},{"matches-selector":5}],2:[function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function i(t,e,n,o){return function(n){n.delegateTarget=r(n.target,e,!0),n.delegateTarget&&o.call(t,n)}}var r=t("closest");e.exports=o},{closest:1}],3:[function(t,e,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){var e=Object.prototype.toString.call(t);return"[object Function]"===e}},{}],4:[function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return i(t,e,n);if(c.nodeList(t))return r(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function i(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function r(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return s(document.body,t,e,n)}var c=t("./is"),s=t("delegate");e.exports=o},{"./is":3,delegate:2}],5:[function(t,e,n){function o(t,e){if(r)return r.call(t,e);for(var n=t.parentNode.querySelectorAll(e),o=0;o<n.length;++o)if(n[o]==t)return!0;return!1}var i=Element.prototype,r=i.matchesSelector||i.webkitMatchesSelector||i.mozMatchesSelector||i.msMatchesSelector||i.oMatchesSelector;e.exports=o},{}],6:[function(t,e,n){function o(t){var e;if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName)t.focus(),t.setSelectionRange(0,t.value.length),e=t.value;else{t.hasAttribute("contenteditable")&&t.focus();var n=window.getSelection(),o=document.createRange();o.selectNodeContents(t),n.removeAllRanges(),n.addRange(o),e=n.toString()}return e}e.exports=o},{}],7:[function(t,e,n){function o(){}o.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){i.off(t,o),e.apply(n,arguments)}var i=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,i=n.length;for(o;i>o;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],i=[];if(o&&e)for(var r=0,a=o.length;a>r;r++)o[r].fn!==e&&o[r].fn._!==e&&i.push(o[r]);return i.length?n[t]=i:delete n[t],this}},e.exports=o},{}],8:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","select"],r);else if("undefined"!=typeof o)r(n,e("select"));else{var a={exports:{}};r(a,i.select),i.clipboardAction=a.exports}}(this,function(t,e){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var i=n(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),c=function(){function t(e){o(this,t),this.resolveOptions(e),this.initSelection()}return t.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action=e.action,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""},t.prototype.initSelection=function t(){this.text?this.selectFake():this.target&&this.selectTarget()},t.prototype.selectFake=function t(){var e=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return e.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px",this.fakeElem.style.top=(window.pageYOffset||document.documentElement.scrollTop)+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,i.default)(this.fakeElem),this.copyText()},t.prototype.removeFake=function t(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)},t.prototype.selectTarget=function t(){this.selectedText=(0,i.default)(this.target),this.copyText()},t.prototype.copyText=function t(){var e=void 0;try{e=document.execCommand(this.action)}catch(n){e=!1}this.handleResult(e)},t.prototype.handleResult=function t(e){e?this.emitter.emit("success",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)}):this.emitter.emit("error",{action:this.action,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})},t.prototype.clearSelection=function t(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()},t.prototype.destroy=function t(){this.removeFake()},a(t,[{key:"action",set:function t(){var e=arguments.length<=0||void 0===arguments[0]?"copy":arguments[0];if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function t(){return this._action}},{key:"target",set:function t(e){if(void 0!==e){if(!e||"object"!==("undefined"==typeof e?"undefined":r(e))||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=e}},get:function t(){return this._target}}]),t}();t.exports=c})},{select:6}],9:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof o)r(n,e("./clipboard-action"),e("tiny-emitter"),e("good-listener"));else{var a={exports:{}};r(a,i.clipboardAction,i.tinyEmitter,i.goodListener),i.clipboard=a.exports}}(this,function(t,e,n,o){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}var l=i(e),u=i(n),f=i(o),d=function(t){function e(n,o){r(this,e);var i=a(this,t.call(this));return i.resolveOptions(o),i.listenClick(n),i}return c(e,t),e.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText},e.prototype.listenClick=function t(e){var n=this;this.listener=(0,f.default)(e,"click",function(t){return n.onClick(t)})},e.prototype.onClick=function t(e){var n=e.delegateTarget||e.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})},e.prototype.defaultAction=function t(e){return s("action",e)},e.prototype.defaultTarget=function t(e){var n=s("target",e);return n?document.querySelector(n):void 0},e.prototype.defaultText=function t(e){return s("text",e)},e.prototype.destroy=function t(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)},e}(u.default);t.exports=d})},{"./clipboard-action":8,"good-listener":4,"tiny-emitter":7}]},{},[9])(9)});
/*! * clipboard.js v1.5.12 * https://zenorocha.github.io/clipboard.js * * Licensed MIT © Zeno Rocha */ !function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.Clipboard=t()}}(function(){var t,e,n;return function t(e,n,o){function i(a,c){if(!n[a]){if(!e[a]){var s="function"==typeof require&&require;if(!c&&s)return s(a,!0);if(r)return r(a,!0);var l=new Error("Cannot find module '"+a+"'");throw l.code="MODULE_NOT_FOUND",l}var u=n[a]={exports:{}};e[a][0].call(u.exports,function(t){var n=e[a][1][t];return i(n?n:t)},u,u.exports,t,e,n,o)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a<o.length;a++)i(o[a]);return i}({1:[function(t,e,n){var o=t("matches-selector");e.exports=function(t,e,n){for(var i=n?t:t.parentNode;i&&i!==document;){if(o(i,e))return i;i=i.parentNode}}},{"matches-selector":5}],2:[function(t,e,n){function o(t,e,n,o,r){var a=i.apply(this,arguments);return t.addEventListener(n,a,r),{destroy:function(){t.removeEventListener(n,a,r)}}}function i(t,e,n,o){return function(n){n.delegateTarget=r(n.target,e,!0),n.delegateTarget&&o.call(t,n)}}var r=t("closest");e.exports=o},{closest:1}],3:[function(t,e,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){var e=Object.prototype.toString.call(t);return"[object Function]"===e}},{}],4:[function(t,e,n){function o(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!c.string(e))throw new TypeError("Second argument must be a String");if(!c.fn(n))throw new TypeError("Third argument must be a Function");if(c.node(t))return i(t,e,n);if(c.nodeList(t))return r(t,e,n);if(c.string(t))return a(t,e,n);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList")}function i(t,e,n){return t.addEventListener(e,n),{destroy:function(){t.removeEventListener(e,n)}}}function r(t,e,n){return Array.prototype.forEach.call(t,function(t){t.addEventListener(e,n)}),{destroy:function(){Array.prototype.forEach.call(t,function(t){t.removeEventListener(e,n)})}}}function a(t,e,n){return s(document.body,t,e,n)}var c=t("./is"),s=t("delegate");e.exports=o},{"./is":3,delegate:2}],5:[function(t,e,n){function o(t,e){if(r)return r.call(t,e);for(var n=t.parentNode.querySelectorAll(e),o=0;o<n.length;++o)if(n[o]==t)return!0;return!1}var i=Element.prototype,r=i.matchesSelector||i.webkitMatchesSelector||i.mozMatchesSelector||i.msMatchesSelector||i.oMatchesSelector;e.exports=o},{}],6:[function(t,e,n){function o(t){var e;if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName)t.focus(),t.setSelectionRange(0,t.value.length),e=t.value;else{t.hasAttribute("contenteditable")&&t.focus();var n=window.getSelection(),o=document.createRange();o.selectNodeContents(t),n.removeAllRanges(),n.addRange(o),e=n.toString()}return e}e.exports=o},{}],7:[function(t,e,n){function o(){}o.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){function o(){i.off(t,o),e.apply(n,arguments)}var i=this;return o._=e,this.on(t,o,n)},emit:function(t){var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,i=n.length;for(o;i>o;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],i=[];if(o&&e)for(var r=0,a=o.length;a>r;r++)o[r].fn!==e&&o[r].fn._!==e&&i.push(o[r]);return i.length?n[t]=i:delete n[t],this}},e.exports=o},{}],8:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","select"],r);else if("undefined"!=typeof o)r(n,e("select"));else{var a={exports:{}};r(a,i.select),i.clipboardAction=a.exports}}(this,function(t,e){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var i=n(e),r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,n,o){return n&&t(e.prototype,n),o&&t(e,o),e}}(),c=function(){function t(e){o(this,t),this.resolveOptions(e),this.initSelection()}return t.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action=e.action,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""},t.prototype.initSelection=function t(){this.text?this.selectFake():this.target&&this.selectTarget()},t.prototype.selectFake=function t(){var e=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return e.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px",this.fakeElem.style.top=(window.pageYOffset||document.documentElement.scrollTop)+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,i.default)(this.fakeElem),this.copyText()},t.prototype.removeFake=function t(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)},t.prototype.selectTarget=function t(){this.selectedText=(0,i.default)(this.target),this.copyText()},t.prototype.copyText=function t(){var e=void 0;try{e=document.execCommand(this.action)}catch(n){e=!1}this.handleResult(e)},t.prototype.handleResult=function t(e){e?this.emitter.emit("success",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)}):this.emitter.emit("error",{action:this.action,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})},t.prototype.clearSelection=function t(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()},t.prototype.destroy=function t(){this.removeFake()},a(t,[{key:"action",set:function t(){var e=arguments.length<=0||void 0===arguments[0]?"copy":arguments[0];if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function t(){return this._action}},{key:"target",set:function t(e){if(void 0!==e){if(!e||"object"!==("undefined"==typeof e?"undefined":r(e))||1!==e.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&e.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(e.hasAttribute("readonly")||e.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=e}},get:function t(){return this._target}}]),t}();t.exports=c})},{select:6}],9:[function(e,n,o){!function(i,r){if("function"==typeof t&&t.amd)t(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof o)r(n,e("./clipboard-action"),e("tiny-emitter"),e("good-listener"));else{var a={exports:{}};r(a,i.clipboardAction,i.tinyEmitter,i.goodListener),i.clipboard=a.exports}}(this,function(t,e,n,o){"use strict";function i(t){return t&&t.__esModule?t:{"default":t}}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function a(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function c(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}var l=i(e),u=i(n),f=i(o),d=function(t){function e(n,o){r(this,e);var i=a(this,t.call(this));return i.resolveOptions(o),i.listenClick(n),i}return c(e,t),e.prototype.resolveOptions=function t(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText},e.prototype.listenClick=function t(e){var n=this;this.listener=(0,f.default)(e,"click",function(t){return n.onClick(t)})},e.prototype.onClick=function t(e){var n=e.delegateTarget||e.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})},e.prototype.defaultAction=function t(e){return s("action",e)},e.prototype.defaultTarget=function t(e){var n=s("target",e);return n?document.querySelector(n):void 0},e.prototype.defaultText=function t(e){return s("text",e)},e.prototype.destroy=function t(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)},e}(u.default);t.exports=d})},{"./clipboard-action":8,"good-listener":4,"tiny-emitter":7}]},{},[9])(9)});
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/bootstrap/js/bootstrap-treeview.min.js
!function(a,b,c,d){"use strict";var e="treeview",f={};f.settings={injectStyle:!0,levels:2,expandIcon:"glyphicon glyphicon-plus",collapseIcon:"glyphicon glyphicon-minus",emptyIcon:"glyphicon",nodeIcon:"",selectedIcon:"",checkedIcon:"glyphicon glyphicon-check",uncheckedIcon:"glyphicon glyphicon-unchecked",color:d,backColor:d,borderColor:d,onhoverColor:"#F5F5F5",selectedColor:"#FFFFFF",selectedBackColor:"#428bca",searchResultColor:"#D9534F",searchResultBackColor:d,enableLinks:!1,highlightSelected:!0,highlightSearchResults:!0,showBorder:!0,showIcon:!0,showCheckbox:!1,showTags:!1,multiSelect:!1,onNodeChecked:d,onNodeCollapsed:d,onNodeDisabled:d,onNodeEnabled:d,onNodeExpanded:d,onNodeSelected:d,onNodeUnchecked:d,onNodeUnselected:d,onSearchComplete:d,onSearchCleared:d},f.options={silent:!1,ignoreChildren:!1},f.searchOptions={ignoreCase:!0,exactMatch:!1,revealResults:!0};var g=function(b,c){return this.$element=a(b),this.elementId=b.id,this.styleId=this.elementId+"-style",this.init(c),{options:this.options,init:a.proxy(this.init,this),remove:a.proxy(this.remove,this),getNode:a.proxy(this.getNode,this),getParent:a.proxy(this.getParent,this),getSiblings:a.proxy(this.getSiblings,this),getSelected:a.proxy(this.getSelected,this),getUnselected:a.proxy(this.getUnselected,this),getExpanded:a.proxy(this.getExpanded,this),getCollapsed:a.proxy(this.getCollapsed,this),getChecked:a.proxy(this.getChecked,this),getUnchecked:a.proxy(this.getUnchecked,this),getDisabled:a.proxy(this.getDisabled,this),getEnabled:a.proxy(this.getEnabled,this),selectNode:a.proxy(this.selectNode,this),unselectNode:a.proxy(this.unselectNode,this),toggleNodeSelected:a.proxy(this.toggleNodeSelected,this),collapseAll:a.proxy(this.collapseAll,this),collapseNode:a.proxy(this.collapseNode,this),expandAll:a.proxy(this.expandAll,this),expandNode:a.proxy(this.expandNode,this),toggleNodeExpanded:a.proxy(this.toggleNodeExpanded,this),revealNode:a.proxy(this.revealNode,this),checkAll:a.proxy(this.checkAll,this),checkNode:a.proxy(this.checkNode,this),uncheckAll:a.proxy(this.uncheckAll,this),uncheckNode:a.proxy(this.uncheckNode,this),toggleNodeChecked:a.proxy(this.toggleNodeChecked,this),disableAll:a.proxy(this.disableAll,this),disableNode:a.proxy(this.disableNode,this),enableAll:a.proxy(this.enableAll,this),enableNode:a.proxy(this.enableNode,this),toggleNodeDisabled:a.proxy(this.toggleNodeDisabled,this),search:a.proxy(this.search,this),clearSearch:a.proxy(this.clearSearch,this)}};g.prototype.init=function(b){this.tree=[],this.nodes=[],b.data&&("string"==typeof b.data&&(b.data=a.parseJSON(b.data)),this.tree=a.extend(!0,[],b.data),delete b.data),this.options=a.extend({},f.settings,b),this.destroy(),this.subscribeEvents(),this.setInitialStates({nodes:this.tree},0),this.render()},g.prototype.remove=function(){this.destroy(),a.removeData(this,e),a("#"+this.styleId).remove()},g.prototype.destroy=function(){this.initialized&&(this.$wrapper.remove(),this.$wrapper=null,this.unsubscribeEvents(),this.initialized=!1)},g.prototype.unsubscribeEvents=function(){this.$element.off("click"),this.$element.off("nodeChecked"),this.$element.off("nodeCollapsed"),this.$element.off("nodeDisabled"),this.$element.off("nodeEnabled"),this.$element.off("nodeExpanded"),this.$element.off("nodeSelected"),this.$element.off("nodeUnchecked"),this.$element.off("nodeUnselected"),this.$element.off("searchComplete"),this.$element.off("searchCleared")},g.prototype.subscribeEvents=function(){this.unsubscribeEvents(),this.$element.on("click",a.proxy(this.clickHandler,this)),"function"==typeof this.options.onNodeChecked&&this.$element.on("nodeChecked",this.options.onNodeChecked),"function"==typeof this.options.onNodeCollapsed&&this.$element.on("nodeCollapsed",this.options.onNodeCollapsed),"function"==typeof this.options.onNodeDisabled&&this.$element.on("nodeDisabled",this.options.onNodeDisabled),"function"==typeof this.options.onNodeEnabled&&this.$element.on("nodeEnabled",this.options.onNodeEnabled),"function"==typeof this.options.onNodeExpanded&&this.$element.on("nodeExpanded",this.options.onNodeExpanded),"function"==typeof this.options.onNodeSelected&&this.$element.on("nodeSelected",this.options.onNodeSelected),"function"==typeof this.options.onNodeUnchecked&&this.$element.on("nodeUnchecked",this.options.onNodeUnchecked),"function"==typeof this.options.onNodeUnselected&&this.$element.on("nodeUnselected",this.options.onNodeUnselected),"function"==typeof this.options.onSearchComplete&&this.$element.on("searchComplete",this.options.onSearchComplete),"function"==typeof this.options.onSearchCleared&&this.$element.on("searchCleared",this.options.onSearchCleared)},g.prototype.setInitialStates=function(b,c){if(b.nodes){c+=1;var d=b,e=this;a.each(b.nodes,function(a,b){b.nodeId=e.nodes.length,b.parentId=d.nodeId,b.hasOwnProperty("selectable")||(b.selectable=!0),b.state=b.state||{},b.state.hasOwnProperty("checked")||(b.state.checked=!1),b.state.hasOwnProperty("disabled")||(b.state.disabled=!1),b.state.hasOwnProperty("expanded")||(!b.state.disabled&&c<e.options.levels&&b.nodes&&b.nodes.length>0?b.state.expanded=!0:b.state.expanded=!1),b.state.hasOwnProperty("selected")||(b.state.selected=!1),e.nodes.push(b),b.nodes&&e.setInitialStates(b,c)})}},g.prototype.clickHandler=function(b){this.options.enableLinks||b.preventDefault();var c=a(b.target),d=this.findNode(c);if(d&&!d.state.disabled){var e=c.attr("class")?c.attr("class").split(" "):[];-1!==e.indexOf("expand-icon")?(this.toggleExpandedState(d,f.options),this.render()):-1!==e.indexOf("check-icon")?(this.toggleCheckedState(d,f.options),this.render()):(d.selectable?this.toggleSelectedState(d,f.options):this.toggleExpandedState(d,f.options),this.render())}},g.prototype.findNode=function(a){var b=a.closest("li.list-group-item").attr("data-nodeid"),c=this.nodes[b];return c||console.log("Error: node does not exist"),c},g.prototype.toggleExpandedState=function(a,b){a&&this.setExpandedState(a,!a.state.expanded,b)},g.prototype.setExpandedState=function(b,c,d){c!==b.state.expanded&&(c&&b.nodes?(b.state.expanded=!0,d.silent||this.$element.trigger("nodeExpanded",a.extend(!0,{},b))):c||(b.state.expanded=!1,d.silent||this.$element.trigger("nodeCollapsed",a.extend(!0,{},b)),b.nodes&&!d.ignoreChildren&&a.each(b.nodes,a.proxy(function(a,b){this.setExpandedState(b,!1,d)},this))))},g.prototype.toggleSelectedState=function(a,b){a&&this.setSelectedState(a,!a.state.selected,b)},g.prototype.setSelectedState=function(b,c,d){c!==b.state.selected&&(c?(this.options.multiSelect||a.each(this.findNodes("true","g","state.selected"),a.proxy(function(a,b){this.setSelectedState(b,!1,d)},this)),b.state.selected=!0,d.silent||this.$element.trigger("nodeSelected",a.extend(!0,{},b))):(b.state.selected=!1,d.silent||this.$element.trigger("nodeUnselected",a.extend(!0,{},b))))},g.prototype.toggleCheckedState=function(a,b){a&&this.setCheckedState(a,!a.state.checked,b)},g.prototype.setCheckedState=function(b,c,d){c!==b.state.checked&&(c?(b.state.checked=!0,d.silent||this.$element.trigger("nodeChecked",a.extend(!0,{},b))):(b.state.checked=!1,d.silent||this.$element.trigger("nodeUnchecked",a.extend(!0,{},b))))},g.prototype.setDisabledState=function(b,c,d){c!==b.state.disabled&&(c?(b.state.disabled=!0,this.setExpandedState(b,!1,d),this.setSelectedState(b,!1,d),this.setCheckedState(b,!1,d),d.silent||this.$element.trigger("nodeDisabled",a.extend(!0,{},b))):(b.state.disabled=!1,d.silent||this.$element.trigger("nodeEnabled",a.extend(!0,{},b))))},g.prototype.render=function(){this.initialized||(this.$element.addClass(e),this.$wrapper=a(this.template.list),this.injectStyle(),this.initialized=!0),this.$element.empty().append(this.$wrapper.empty()),this.buildTree(this.tree,0)},g.prototype.buildTree=function(b,c){if(b){c+=1;var d=this;a.each(b,function(b,e){for(var f=a(d.template.item).addClass("node-"+d.elementId).addClass(e.state.checked?"node-checked":"").addClass(e.state.disabled?"node-disabled":"").addClass(e.state.selected?"node-selected":"").addClass(e.searchResult?"search-result":"").attr("data-nodeid",e.nodeId).attr("style",d.buildStyleOverride(e)),g=0;c-1>g;g++)f.append(d.template.indent);var h=[];if(e.nodes?(h.push("expand-icon"),h.push(e.state.expanded?d.options.collapseIcon:d.options.expandIcon)):h.push(d.options.emptyIcon),f.append(a(d.template.icon).addClass(h.join(" "))),d.options.showIcon){var h=["node-icon"];h.push(e.icon||d.options.nodeIcon),e.state.selected&&(h.pop(),h.push(e.selectedIcon||d.options.selectedIcon||e.icon||d.options.nodeIcon)),f.append(a(d.template.icon).addClass(h.join(" ")))}if(d.options.showCheckbox){var h=["check-icon"];h.push(e.state.checked?d.options.checkedIcon:d.options.uncheckedIcon),f.append(a(d.template.icon).addClass(h.join(" ")))}return f.append(d.options.enableLinks?a(d.template.link).attr("href",e.href).append(e.text):e.text),d.options.showTags&&e.tags&&a.each(e.tags,function(b,c){f.append(a(d.template.badge).append(c))}),d.$wrapper.append(f),e.nodes&&e.state.expanded&&!e.state.disabled?d.buildTree(e.nodes,c):void 0})}},g.prototype.buildStyleOverride=function(a){if(a.state.disabled)return"";var b=a.color,c=a.backColor;return this.options.highlightSelected&&a.state.selected&&(this.options.selectedColor&&(b=this.options.selectedColor),this.options.selectedBackColor&&(c=this.options.selectedBackColor)),this.options.highlightSearchResults&&a.searchResult&&!a.state.disabled&&(this.options.searchResultColor&&(b=this.options.searchResultColor),this.options.searchResultBackColor&&(c=this.options.searchResultBackColor)),"color:"+b+";background-color:"+c+";"},g.prototype.injectStyle=function(){this.options.injectStyle&&!c.getElementById(this.styleId)&&a('<style type="text/css" id="'+this.styleId+'"> '+this.buildStyle()+" </style>").appendTo("head")},g.prototype.buildStyle=function(){var a=".node-"+this.elementId+"{";return this.options.color&&(a+="color:"+this.options.color+";"),this.options.backColor&&(a+="background-color:"+this.options.backColor+";"),this.options.showBorder?this.options.borderColor&&(a+="border:1px solid "+this.options.borderColor+";"):a+="border:none;",a+="}",this.options.onhoverColor&&(a+=".node-"+this.elementId+":not(.node-disabled):hover{background-color:"+this.options.onhoverColor+";}"),this.css+a},g.prototype.template={list:'<ul class="list-group"></ul>',item:'<li class="list-group-item"></li>',indent:'<span class="indent"></span>',icon:'<span class="icon"></span>',link:'<a href="#" style="color:inherit;"></a>',badge:'<span class="badge"></span>'},g.prototype.css=".treeview .list-group-item{cursor:pointer}.treeview span.indent{margin-left:10px;margin-right:10px}.treeview span.icon{width:12px;margin-right:5px}.treeview .node-disabled{color:silver;cursor:not-allowed}",g.prototype.getNode=function(a){return this.nodes[a]},g.prototype.getParent=function(a){var b=this.identifyNode(a);return this.nodes[b.parentId]},g.prototype.getSiblings=function(a){var b=this.identifyNode(a),c=this.getParent(b),d=c?c.nodes:this.tree;return d.filter(function(a){return a.nodeId!==b.nodeId})},g.prototype.getSelected=function(){return this.findNodes("true","g","state.selected")},g.prototype.getUnselected=function(){return this.findNodes("false","g","state.selected")},g.prototype.getExpanded=function(){return this.findNodes("true","g","state.expanded")},g.prototype.getCollapsed=function(){return this.findNodes("false","g","state.expanded")},g.prototype.getChecked=function(){return this.findNodes("true","g","state.checked")},g.prototype.getUnchecked=function(){return this.findNodes("false","g","state.checked")},g.prototype.getDisabled=function(){return this.findNodes("true","g","state.disabled")},g.prototype.getEnabled=function(){return this.findNodes("false","g","state.disabled")},g.prototype.selectNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setSelectedState(a,!0,b)},this)),this.render()},g.prototype.unselectNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setSelectedState(a,!1,b)},this)),this.render()},g.prototype.toggleNodeSelected=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.toggleSelectedState(a,b)},this)),this.render()},g.prototype.collapseAll=function(b){var c=this.findNodes("true","g","state.expanded");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setExpandedState(a,!1,b)},this)),this.render()},g.prototype.collapseNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setExpandedState(a,!1,b)},this)),this.render()},g.prototype.expandAll=function(b){if(b=a.extend({},f.options,b),b&&b.levels)this.expandLevels(this.tree,b.levels,b);else{var c=this.findNodes("false","g","state.expanded");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setExpandedState(a,!0,b)},this))}this.render()},g.prototype.expandNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setExpandedState(a,!0,b),a.nodes&&b&&b.levels&&this.expandLevels(a.nodes,b.levels-1,b)},this)),this.render()},g.prototype.expandLevels=function(b,c,d){d=a.extend({},f.options,d),a.each(b,a.proxy(function(a,b){this.setExpandedState(b,c>0?!0:!1,d),b.nodes&&this.expandLevels(b.nodes,c-1,d)},this))},g.prototype.revealNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){for(var c=this.getParent(a);c;)this.setExpandedState(c,!0,b),c=this.getParent(c)},this)),this.render()},g.prototype.toggleNodeExpanded=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.toggleExpandedState(a,b)},this)),this.render()},g.prototype.checkAll=function(b){var c=this.findNodes("false","g","state.checked");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setCheckedState(a,!0,b)},this)),this.render()},g.prototype.checkNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setCheckedState(a,!0,b)},this)),this.render()},g.prototype.uncheckAll=function(b){var c=this.findNodes("true","g","state.checked");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setCheckedState(a,!1,b)},this)),this.render()},g.prototype.uncheckNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setCheckedState(a,!1,b)},this)),this.render()},g.prototype.toggleNodeChecked=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.toggleCheckedState(a,b)},this)),this.render()},g.prototype.disableAll=function(b){var c=this.findNodes("false","g","state.disabled");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setDisabledState(a,!0,b)},this)),this.render()},g.prototype.disableNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setDisabledState(a,!0,b)},this)),this.render()},g.prototype.enableAll=function(b){var c=this.findNodes("true","g","state.disabled");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setDisabledState(a,!1,b)},this)),this.render()},g.prototype.enableNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setDisabledState(a,!1,b)},this)),this.render()},g.prototype.toggleNodeDisabled=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setDisabledState(a,!a.state.disabled,b)},this)),this.render()},g.prototype.forEachIdentifier=function(b,c,d){c=a.extend({},f.options,c),b instanceof Array||(b=[b]),a.each(b,a.proxy(function(a,b){d(this.identifyNode(b),c)},this))},g.prototype.identifyNode=function(a){return"number"==typeof a?this.nodes[a]:a},g.prototype.search=function(b,c){c=a.extend({},f.searchOptions,c),this.clearSearch({render:!1});var d=[];if(b&&b.length>0){c.exactMatch&&(b="^"+b+"$");var e="g";c.ignoreCase&&(e+="i"),d=this.findNodes(b,e),a.each(d,function(a,b){b.searchResult=!0})}return c.revealResults?this.revealNode(d):this.render(),this.$element.trigger("searchComplete",a.extend(!0,{},d)),d},g.prototype.clearSearch=function(b){b=a.extend({},{render:!0},b);var c=a.each(this.findNodes("true","g","searchResult"),function(a,b){b.searchResult=!1});b.render&&this.render(),this.$element.trigger("searchCleared",a.extend(!0,{},c))},g.prototype.findNodes=function(b,c,d){c=c||"g",d=d||"text";var e=this;return a.grep(this.nodes,function(a){var f=e.getNodeValue(a,d);return"string"==typeof f?f.match(new RegExp(b,c)):void 0})},g.prototype.getNodeValue=function(a,b){var c=b.indexOf(".");if(c>0){var e=a[b.substring(0,c)],f=b.substring(c+1,b.length);return this.getNodeValue(e,f)}return a.hasOwnProperty(b)?a[b].toString():d};var h=function(a){b.console&&b.console.error(a)};a.fn[e]=function(b,c){var d;return this.each(function(){var f=a.data(this,e);"string"==typeof b?f?a.isFunction(f[b])&&"_"!==b.charAt(0)?(c instanceof Array||(c=[c]),d=f[b].apply(f,c)):h("No such method : "+b):h("Not initialized, can not call method : "+b):"boolean"==typeof b?d=f:a.data(this,e,new g(this,a.extend(!0,{},b)))}),d||this}}(jQuery,window,document);
!function(a,b,c,d){"use strict";var e="treeview",f={};f.settings={injectStyle:!0,levels:2,expandIcon:"glyphicon glyphicon-plus",collapseIcon:"glyphicon glyphicon-minus",emptyIcon:"glyphicon",nodeIcon:"",selectedIcon:"",checkedIcon:"glyphicon glyphicon-check",uncheckedIcon:"glyphicon glyphicon-unchecked",color:d,backColor:d,borderColor:d,onhoverColor:"#F5F5F5",selectedColor:"#FFFFFF",selectedBackColor:"#428bca",searchResultColor:"#D9534F",searchResultBackColor:d,enableLinks:!1,highlightSelected:!0,highlightSearchResults:!0,showBorder:!0,showIcon:!0,showCheckbox:!1,showTags:!1,multiSelect:!1,onNodeChecked:d,onNodeCollapsed:d,onNodeDisabled:d,onNodeEnabled:d,onNodeExpanded:d,onNodeSelected:d,onNodeUnchecked:d,onNodeUnselected:d,onSearchComplete:d,onSearchCleared:d},f.options={silent:!1,ignoreChildren:!1},f.searchOptions={ignoreCase:!0,exactMatch:!1,revealResults:!0};var g=function(b,c){return this.$element=a(b),this.elementId=b.id,this.styleId=this.elementId+"-style",this.init(c),{options:this.options,init:a.proxy(this.init,this),remove:a.proxy(this.remove,this),getNode:a.proxy(this.getNode,this),getParent:a.proxy(this.getParent,this),getSiblings:a.proxy(this.getSiblings,this),getSelected:a.proxy(this.getSelected,this),getUnselected:a.proxy(this.getUnselected,this),getExpanded:a.proxy(this.getExpanded,this),getCollapsed:a.proxy(this.getCollapsed,this),getChecked:a.proxy(this.getChecked,this),getUnchecked:a.proxy(this.getUnchecked,this),getDisabled:a.proxy(this.getDisabled,this),getEnabled:a.proxy(this.getEnabled,this),selectNode:a.proxy(this.selectNode,this),unselectNode:a.proxy(this.unselectNode,this),toggleNodeSelected:a.proxy(this.toggleNodeSelected,this),collapseAll:a.proxy(this.collapseAll,this),collapseNode:a.proxy(this.collapseNode,this),expandAll:a.proxy(this.expandAll,this),expandNode:a.proxy(this.expandNode,this),toggleNodeExpanded:a.proxy(this.toggleNodeExpanded,this),revealNode:a.proxy(this.revealNode,this),checkAll:a.proxy(this.checkAll,this),checkNode:a.proxy(this.checkNode,this),uncheckAll:a.proxy(this.uncheckAll,this),uncheckNode:a.proxy(this.uncheckNode,this),toggleNodeChecked:a.proxy(this.toggleNodeChecked,this),disableAll:a.proxy(this.disableAll,this),disableNode:a.proxy(this.disableNode,this),enableAll:a.proxy(this.enableAll,this),enableNode:a.proxy(this.enableNode,this),toggleNodeDisabled:a.proxy(this.toggleNodeDisabled,this),search:a.proxy(this.search,this),clearSearch:a.proxy(this.clearSearch,this)}};g.prototype.init=function(b){this.tree=[],this.nodes=[],b.data&&("string"==typeof b.data&&(b.data=a.parseJSON(b.data)),this.tree=a.extend(!0,[],b.data),delete b.data),this.options=a.extend({},f.settings,b),this.destroy(),this.subscribeEvents(),this.setInitialStates({nodes:this.tree},0),this.render()},g.prototype.remove=function(){this.destroy(),a.removeData(this,e),a("#"+this.styleId).remove()},g.prototype.destroy=function(){this.initialized&&(this.$wrapper.remove(),this.$wrapper=null,this.unsubscribeEvents(),this.initialized=!1)},g.prototype.unsubscribeEvents=function(){this.$element.off("click"),this.$element.off("nodeChecked"),this.$element.off("nodeCollapsed"),this.$element.off("nodeDisabled"),this.$element.off("nodeEnabled"),this.$element.off("nodeExpanded"),this.$element.off("nodeSelected"),this.$element.off("nodeUnchecked"),this.$element.off("nodeUnselected"),this.$element.off("searchComplete"),this.$element.off("searchCleared")},g.prototype.subscribeEvents=function(){this.unsubscribeEvents(),this.$element.on("click",a.proxy(this.clickHandler,this)),"function"==typeof this.options.onNodeChecked&&this.$element.on("nodeChecked",this.options.onNodeChecked),"function"==typeof this.options.onNodeCollapsed&&this.$element.on("nodeCollapsed",this.options.onNodeCollapsed),"function"==typeof this.options.onNodeDisabled&&this.$element.on("nodeDisabled",this.options.onNodeDisabled),"function"==typeof this.options.onNodeEnabled&&this.$element.on("nodeEnabled",this.options.onNodeEnabled),"function"==typeof this.options.onNodeExpanded&&this.$element.on("nodeExpanded",this.options.onNodeExpanded),"function"==typeof this.options.onNodeSelected&&this.$element.on("nodeSelected",this.options.onNodeSelected),"function"==typeof this.options.onNodeUnchecked&&this.$element.on("nodeUnchecked",this.options.onNodeUnchecked),"function"==typeof this.options.onNodeUnselected&&this.$element.on("nodeUnselected",this.options.onNodeUnselected),"function"==typeof this.options.onSearchComplete&&this.$element.on("searchComplete",this.options.onSearchComplete),"function"==typeof this.options.onSearchCleared&&this.$element.on("searchCleared",this.options.onSearchCleared)},g.prototype.setInitialStates=function(b,c){if(b.nodes){c+=1;var d=b,e=this;a.each(b.nodes,function(a,b){b.nodeId=e.nodes.length,b.parentId=d.nodeId,b.hasOwnProperty("selectable")||(b.selectable=!0),b.state=b.state||{},b.state.hasOwnProperty("checked")||(b.state.checked=!1),b.state.hasOwnProperty("disabled")||(b.state.disabled=!1),b.state.hasOwnProperty("expanded")||(!b.state.disabled&&c<e.options.levels&&b.nodes&&b.nodes.length>0?b.state.expanded=!0:b.state.expanded=!1),b.state.hasOwnProperty("selected")||(b.state.selected=!1),e.nodes.push(b),b.nodes&&e.setInitialStates(b,c)})}},g.prototype.clickHandler=function(b){this.options.enableLinks||b.preventDefault();var c=a(b.target),d=this.findNode(c);if(d&&!d.state.disabled){var e=c.attr("class")?c.attr("class").split(" "):[];-1!==e.indexOf("expand-icon")?(this.toggleExpandedState(d,f.options),this.render()):-1!==e.indexOf("check-icon")?(this.toggleCheckedState(d,f.options),this.render()):(d.selectable?this.toggleSelectedState(d,f.options):this.toggleExpandedState(d,f.options),this.render())}},g.prototype.findNode=function(a){var b=a.closest("li.list-group-item").attr("data-nodeid"),c=this.nodes[b];return c||console.log("Error: node does not exist"),c},g.prototype.toggleExpandedState=function(a,b){a&&this.setExpandedState(a,!a.state.expanded,b)},g.prototype.setExpandedState=function(b,c,d){c!==b.state.expanded&&(c&&b.nodes?(b.state.expanded=!0,d.silent||this.$element.trigger("nodeExpanded",a.extend(!0,{},b))):c||(b.state.expanded=!1,d.silent||this.$element.trigger("nodeCollapsed",a.extend(!0,{},b)),b.nodes&&!d.ignoreChildren&&a.each(b.nodes,a.proxy(function(a,b){this.setExpandedState(b,!1,d)},this))))},g.prototype.toggleSelectedState=function(a,b){a&&this.setSelectedState(a,!a.state.selected,b)},g.prototype.setSelectedState=function(b,c,d){c!==b.state.selected&&(c?(this.options.multiSelect||a.each(this.findNodes("true","g","state.selected"),a.proxy(function(a,b){this.setSelectedState(b,!1,d)},this)),b.state.selected=!0,d.silent||this.$element.trigger("nodeSelected",a.extend(!0,{},b))):(b.state.selected=!1,d.silent||this.$element.trigger("nodeUnselected",a.extend(!0,{},b))))},g.prototype.toggleCheckedState=function(a,b){a&&this.setCheckedState(a,!a.state.checked,b)},g.prototype.setCheckedState=function(b,c,d){c!==b.state.checked&&(c?(b.state.checked=!0,d.silent||this.$element.trigger("nodeChecked",a.extend(!0,{},b))):(b.state.checked=!1,d.silent||this.$element.trigger("nodeUnchecked",a.extend(!0,{},b))))},g.prototype.setDisabledState=function(b,c,d){c!==b.state.disabled&&(c?(b.state.disabled=!0,this.setExpandedState(b,!1,d),this.setSelectedState(b,!1,d),this.setCheckedState(b,!1,d),d.silent||this.$element.trigger("nodeDisabled",a.extend(!0,{},b))):(b.state.disabled=!1,d.silent||this.$element.trigger("nodeEnabled",a.extend(!0,{},b))))},g.prototype.render=function(){this.initialized||(this.$element.addClass(e),this.$wrapper=a(this.template.list),this.injectStyle(),this.initialized=!0),this.$element.empty().append(this.$wrapper.empty()),this.buildTree(this.tree,0)},g.prototype.buildTree=function(b,c){if(b){c+=1;var d=this;a.each(b,function(b,e){for(var f=a(d.template.item).addClass("node-"+d.elementId).addClass(e.state.checked?"node-checked":"").addClass(e.state.disabled?"node-disabled":"").addClass(e.state.selected?"node-selected":"").addClass(e.searchResult?"search-result":"").attr("data-nodeid",e.nodeId).attr("style",d.buildStyleOverride(e)),g=0;c-1>g;g++)f.append(d.template.indent);var h=[];if(e.nodes?(h.push("expand-icon"),h.push(e.state.expanded?d.options.collapseIcon:d.options.expandIcon)):h.push(d.options.emptyIcon),f.append(a(d.template.icon).addClass(h.join(" "))),d.options.showIcon){var h=["node-icon"];h.push(e.icon||d.options.nodeIcon),e.state.selected&&(h.pop(),h.push(e.selectedIcon||d.options.selectedIcon||e.icon||d.options.nodeIcon)),f.append(a(d.template.icon).addClass(h.join(" ")))}if(d.options.showCheckbox){var h=["check-icon"];h.push(e.state.checked?d.options.checkedIcon:d.options.uncheckedIcon),f.append(a(d.template.icon).addClass(h.join(" ")))}return f.append(d.options.enableLinks?a(d.template.link).attr("href",e.href).append(e.text):e.text),d.options.showTags&&e.tags&&a.each(e.tags,function(b,c){f.append(a(d.template.badge).append(c))}),d.$wrapper.append(f),e.nodes&&e.state.expanded&&!e.state.disabled?d.buildTree(e.nodes,c):void 0})}},g.prototype.buildStyleOverride=function(a){if(a.state.disabled)return"";var b=a.color,c=a.backColor;return this.options.highlightSelected&&a.state.selected&&(this.options.selectedColor&&(b=this.options.selectedColor),this.options.selectedBackColor&&(c=this.options.selectedBackColor)),this.options.highlightSearchResults&&a.searchResult&&!a.state.disabled&&(this.options.searchResultColor&&(b=this.options.searchResultColor),this.options.searchResultBackColor&&(c=this.options.searchResultBackColor)),"color:"+b+";background-color:"+c+";"},g.prototype.injectStyle=function(){this.options.injectStyle&&!c.getElementById(this.styleId)&&a('<style type="text/css" id="'+this.styleId+'"> '+this.buildStyle()+" </style>").appendTo("head")},g.prototype.buildStyle=function(){var a=".node-"+this.elementId+"{";return this.options.color&&(a+="color:"+this.options.color+";"),this.options.backColor&&(a+="background-color:"+this.options.backColor+";"),this.options.showBorder?this.options.borderColor&&(a+="border:1px solid "+this.options.borderColor+";"):a+="border:none;",a+="}",this.options.onhoverColor&&(a+=".node-"+this.elementId+":not(.node-disabled):hover{background-color:"+this.options.onhoverColor+";}"),this.css+a},g.prototype.template={list:'<ul class="list-group"></ul>',item:'<li class="list-group-item"></li>',indent:'<span class="indent"></span>',icon:'<span class="icon"></span>',link:'<a href="#" style="color:inherit;"></a>',badge:'<span class="badge"></span>'},g.prototype.css=".treeview .list-group-item{cursor:pointer}.treeview span.indent{margin-left:10px;margin-right:10px}.treeview span.icon{width:12px;margin-right:5px}.treeview .node-disabled{color:silver;cursor:not-allowed}",g.prototype.getNode=function(a){return this.nodes[a]},g.prototype.getParent=function(a){var b=this.identifyNode(a);return this.nodes[b.parentId]},g.prototype.getSiblings=function(a){var b=this.identifyNode(a),c=this.getParent(b),d=c?c.nodes:this.tree;return d.filter(function(a){return a.nodeId!==b.nodeId})},g.prototype.getSelected=function(){return this.findNodes("true","g","state.selected")},g.prototype.getUnselected=function(){return this.findNodes("false","g","state.selected")},g.prototype.getExpanded=function(){return this.findNodes("true","g","state.expanded")},g.prototype.getCollapsed=function(){return this.findNodes("false","g","state.expanded")},g.prototype.getChecked=function(){return this.findNodes("true","g","state.checked")},g.prototype.getUnchecked=function(){return this.findNodes("false","g","state.checked")},g.prototype.getDisabled=function(){return this.findNodes("true","g","state.disabled")},g.prototype.getEnabled=function(){return this.findNodes("false","g","state.disabled")},g.prototype.selectNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setSelectedState(a,!0,b)},this)),this.render()},g.prototype.unselectNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setSelectedState(a,!1,b)},this)),this.render()},g.prototype.toggleNodeSelected=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.toggleSelectedState(a,b)},this)),this.render()},g.prototype.collapseAll=function(b){var c=this.findNodes("true","g","state.expanded");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setExpandedState(a,!1,b)},this)),this.render()},g.prototype.collapseNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setExpandedState(a,!1,b)},this)),this.render()},g.prototype.expandAll=function(b){if(b=a.extend({},f.options,b),b&&b.levels)this.expandLevels(this.tree,b.levels,b);else{var c=this.findNodes("false","g","state.expanded");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setExpandedState(a,!0,b)},this))}this.render()},g.prototype.expandNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setExpandedState(a,!0,b),a.nodes&&b&&b.levels&&this.expandLevels(a.nodes,b.levels-1,b)},this)),this.render()},g.prototype.expandLevels=function(b,c,d){d=a.extend({},f.options,d),a.each(b,a.proxy(function(a,b){this.setExpandedState(b,c>0?!0:!1,d),b.nodes&&this.expandLevels(b.nodes,c-1,d)},this))},g.prototype.revealNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){for(var c=this.getParent(a);c;)this.setExpandedState(c,!0,b),c=this.getParent(c)},this)),this.render()},g.prototype.toggleNodeExpanded=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.toggleExpandedState(a,b)},this)),this.render()},g.prototype.checkAll=function(b){var c=this.findNodes("false","g","state.checked");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setCheckedState(a,!0,b)},this)),this.render()},g.prototype.checkNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setCheckedState(a,!0,b)},this)),this.render()},g.prototype.uncheckAll=function(b){var c=this.findNodes("true","g","state.checked");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setCheckedState(a,!1,b)},this)),this.render()},g.prototype.uncheckNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setCheckedState(a,!1,b)},this)),this.render()},g.prototype.toggleNodeChecked=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.toggleCheckedState(a,b)},this)),this.render()},g.prototype.disableAll=function(b){var c=this.findNodes("false","g","state.disabled");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setDisabledState(a,!0,b)},this)),this.render()},g.prototype.disableNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setDisabledState(a,!0,b)},this)),this.render()},g.prototype.enableAll=function(b){var c=this.findNodes("true","g","state.disabled");this.forEachIdentifier(c,b,a.proxy(function(a,b){this.setDisabledState(a,!1,b)},this)),this.render()},g.prototype.enableNode=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setDisabledState(a,!1,b)},this)),this.render()},g.prototype.toggleNodeDisabled=function(b,c){this.forEachIdentifier(b,c,a.proxy(function(a,b){this.setDisabledState(a,!a.state.disabled,b)},this)),this.render()},g.prototype.forEachIdentifier=function(b,c,d){c=a.extend({},f.options,c),b instanceof Array||(b=[b]),a.each(b,a.proxy(function(a,b){d(this.identifyNode(b),c)},this))},g.prototype.identifyNode=function(a){return"number"==typeof a?this.nodes[a]:a},g.prototype.search=function(b,c){c=a.extend({},f.searchOptions,c),this.clearSearch({render:!1});var d=[];if(b&&b.length>0){c.exactMatch&&(b="^"+b+"$");var e="g";c.ignoreCase&&(e+="i"),d=this.findNodes(b,e),a.each(d,function(a,b){b.searchResult=!0})}return c.revealResults?this.revealNode(d):this.render(),this.$element.trigger("searchComplete",a.extend(!0,{},d)),d},g.prototype.clearSearch=function(b){b=a.extend({},{render:!0},b);var c=a.each(this.findNodes("true","g","searchResult"),function(a,b){b.searchResult=!1});b.render&&this.render(),this.$element.trigger("searchCleared",a.extend(!0,{},c))},g.prototype.findNodes=function(b,c,d){c=c||"g",d=d||"text";var e=this;return a.grep(this.nodes,function(a){var f=e.getNodeValue(a,d);return"string"==typeof f?f.match(new RegExp(b,c)):void 0})},g.prototype.getNodeValue=function(a,b){var c=b.indexOf(".");if(c>0){var e=a[b.substring(0,c)],f=b.substring(c+1,b.length);return this.getNodeValue(e,f)}return a.hasOwnProperty(b)?a[b].toString():d};var h=function(a){b.console&&b.console.error(a)};a.fn[e]=function(b,c){var d;return this.each(function(){var f=a.data(this,e);"string"==typeof b?f?a.isFunction(f[b])&&"_"!==b.charAt(0)?(c instanceof Array||(c=[c]),d=f[b].apply(f,c)):h("No such method : "+b):h("Not initialized, can not call method : "+b):"boolean"==typeof b?d=f:a.data(this,e,new g(this,a.extend(!0,{},b)))}),d||this}}(jQuery,window,document);
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/ctrip_sso_heartbeat.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 lang="en"> <head> <meta charset="UTF-8"> <title>SSO Heartbeat</title> <script type="text/javascript"> var reloading = false; setInterval(function () { if (document.cookie.indexOf('memCacheAssertionID=') == -1) { if (reloading) { return; } reloading = true; console.log("sso memCacheAssertionID expires, try reloading"); location.reload(true); } }, 1000); </script> </head> <body> </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 lang="en"> <head> <meta charset="UTF-8"> <title>SSO Heartbeat</title> <script type="text/javascript"> var reloading = false; setInterval(function () { if (document.cookie.indexOf('memCacheAssertionID=') == -1) { if (reloading) { return; } reloading = true; console.log("sso memCacheAssertionID expires, try reloading"); location.reload(true); } }, 1000); </script> </head> <body> </body> </html>
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/controller/open/OpenManageController.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. * */ open_manage_module.controller('OpenManageController', ['$scope', '$translate', 'toastr', 'AppUtil', 'OrganizationService', 'ConsumerService', 'PermissionService', 'EnvService', OpenManageController]); function OpenManageController($scope, $translate, toastr, AppUtil, OrganizationService, ConsumerService, PermissionService, EnvService) { var $orgWidget = $('#organization'); $scope.consumer = {}; $scope.consumerRole = { type: 'NamespaceRole' }; $scope.submitBtnDisabled = false; $scope.userSelectWidgetId = 'toAssignMasterRoleUser'; $scope.getTokenByAppId = getTokenByAppId; $scope.createConsumer = createConsumer; $scope.assignRoleToConsumer = assignRoleToConsumer; function init() { initOrganization(); initPermission(); initEnv(); } 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); }); $orgWidget.select2({ placeholder: $translate.instant('Common.PleaseChooseDepartment'), width: '100%', data: organizations }); }, function (result) { toastr.error(AppUtil.errorMsg(result), "load organizations error"); }); } function initPermission() { PermissionService.has_root_permission() .then(function (result) { $scope.isRootUser = result.hasPermission; }); } function initEnv() { EnvService.find_all_envs() .then(function (result) { $scope.envs = new Array(); for (var iLoop = 0; iLoop < result.length; iLoop++) { $scope.envs.push({ checked: false, env: result[iLoop] }); $scope.envsChecked = new Array(); } $scope.switchSelect = function (item) { item.checked = !item.checked; $scope.envsChecked = new Array(); for (var iLoop = 0; iLoop < $scope.envs.length; iLoop++) { var env = $scope.envs[iLoop]; if (env.checked) { $scope.envsChecked.push(env.env); } } }; }); } function getTokenByAppId() { if (!$scope.consumer.appId) { toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId')); return; } ConsumerService.getConsumerTokenByAppId($scope.consumer.appId) .then(function (consumerToken) { if (consumerToken.token) { $scope.consumerToken = consumerToken; $scope.consumerRole.token = consumerToken.token; } else { $scope.consumerToken = { token: $translate.instant('Open.Manage.AppNotCreated', { appId: $scope.consumer.appId }) }; } }); } function createConsumer() { $scope.submitBtnDisabled = true; if (!$scope.consumer.appId) { toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId')); return; } var selectedOrg = $orgWidget.select2('data')[0]; if (!selectedOrg.id) { toastr.warning($translate.instant('Common.PleaseChooseDepartment')); return; } $scope.consumer.orgId = selectedOrg.id; $scope.consumer.orgName = selectedOrg.name; // owner var owner = $('.ownerSelector').select2('data')[0]; if (!owner) { toastr.warning($translate.instant('Common.PleaseChooseOwner')); return; } $scope.consumer.ownerName = owner.id; ConsumerService.createConsumer($scope.consumer) .then(function (consumerToken) { toastr.success($translate.instant('Common.Created')); $scope.consumerToken = consumerToken; $scope.consumerRole.token = consumerToken.token; $scope.submitBtnDisabled = false; $scope.consumer = {}; }, function (response) { AppUtil.showErrorMsg(response, $translate.instant('Common.CreateFailed')); $scope.submitBtnDisabled = false; }) } function assignRoleToConsumer() { ConsumerService.assignRoleToConsumer($scope.consumerRole.token, $scope.consumerRole.type, $scope.consumerRole.appId, $scope.consumerRole.namespaceName, $scope.envsChecked) .then(function (consumerRoles) { toastr.success($translate.instant('Open.Manage.GrantSuccessfully')); }, function (response) { AppUtil.showErrorMsg(response, $translate.instant('Open.Manage.GrantFailed')); }) } init(); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ open_manage_module.controller('OpenManageController', ['$scope', '$translate', 'toastr', 'AppUtil', 'OrganizationService', 'ConsumerService', 'PermissionService', 'EnvService', OpenManageController]); function OpenManageController($scope, $translate, toastr, AppUtil, OrganizationService, ConsumerService, PermissionService, EnvService) { var $orgWidget = $('#organization'); $scope.consumer = {}; $scope.consumerRole = { type: 'NamespaceRole' }; $scope.submitBtnDisabled = false; $scope.userSelectWidgetId = 'toAssignMasterRoleUser'; $scope.getTokenByAppId = getTokenByAppId; $scope.createConsumer = createConsumer; $scope.assignRoleToConsumer = assignRoleToConsumer; function init() { initOrganization(); initPermission(); initEnv(); } 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); }); $orgWidget.select2({ placeholder: $translate.instant('Common.PleaseChooseDepartment'), width: '100%', data: organizations }); }, function (result) { toastr.error(AppUtil.errorMsg(result), "load organizations error"); }); } function initPermission() { PermissionService.has_root_permission() .then(function (result) { $scope.isRootUser = result.hasPermission; }); } function initEnv() { EnvService.find_all_envs() .then(function (result) { $scope.envs = new Array(); for (var iLoop = 0; iLoop < result.length; iLoop++) { $scope.envs.push({ checked: false, env: result[iLoop] }); $scope.envsChecked = new Array(); } $scope.switchSelect = function (item) { item.checked = !item.checked; $scope.envsChecked = new Array(); for (var iLoop = 0; iLoop < $scope.envs.length; iLoop++) { var env = $scope.envs[iLoop]; if (env.checked) { $scope.envsChecked.push(env.env); } } }; }); } function getTokenByAppId() { if (!$scope.consumer.appId) { toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId')); return; } ConsumerService.getConsumerTokenByAppId($scope.consumer.appId) .then(function (consumerToken) { if (consumerToken.token) { $scope.consumerToken = consumerToken; $scope.consumerRole.token = consumerToken.token; } else { $scope.consumerToken = { token: $translate.instant('Open.Manage.AppNotCreated', { appId: $scope.consumer.appId }) }; } }); } function createConsumer() { $scope.submitBtnDisabled = true; if (!$scope.consumer.appId) { toastr.warning($translate.instant('Open.Manage.PleaseEnterAppId')); return; } var selectedOrg = $orgWidget.select2('data')[0]; if (!selectedOrg.id) { toastr.warning($translate.instant('Common.PleaseChooseDepartment')); return; } $scope.consumer.orgId = selectedOrg.id; $scope.consumer.orgName = selectedOrg.name; // owner var owner = $('.ownerSelector').select2('data')[0]; if (!owner) { toastr.warning($translate.instant('Common.PleaseChooseOwner')); return; } $scope.consumer.ownerName = owner.id; ConsumerService.createConsumer($scope.consumer) .then(function (consumerToken) { toastr.success($translate.instant('Common.Created')); $scope.consumerToken = consumerToken; $scope.consumerRole.token = consumerToken.token; $scope.submitBtnDisabled = false; $scope.consumer = {}; }, function (response) { AppUtil.showErrorMsg(response, $translate.instant('Common.CreateFailed')); $scope.submitBtnDisabled = false; }) } function assignRoleToConsumer() { ConsumerService.assignRoleToConsumer($scope.consumerRole.token, $scope.consumerRole.type, $scope.consumerRole.appId, $scope.consumerRole.namespaceName, $scope.envsChecked) .then(function (consumerRoles) { toastr.success($translate.instant('Open.Manage.GrantSuccessfully')); }, function (response) { AppUtil.showErrorMsg(response, $translate.instant('Open.Manage.GrantFailed')); }) } init(); }
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/img/comment.png
PNG  IHDRX IDATx^QRQ_Tc +0xw݀ x!U_͍jqfݒW|׏ZRkԀ B ِ ,&@ G <<H1@:<qT%hJf:4GUBDh#@qT%hJf:4GUBDh#@qT%hJf:4GUBDh#ЫA.g2 +j$gM3//I riUh f_Mq?U8E->Ywm[xc|6nnh'FjKk`W5\}G3p*KQ8]vb$A olH &ٙXw4 G#T L[%A*L@t+ }scw|$@wi6lj)Z#LDϴS-AD=1- $p<nGPe]+a΍r!2ȹ5y ȍ ObUZ\[%! Nے 6/Υ?uA.nos#4κuǒi -fM`xuG&/cD@sNIA֒ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟@5iG+ [Nx=h[6 ^$%=S 8fokv৮cDZĀ/ mOYwe;79BƱzCPAͺu.1W ]XCPA>~rNy?]bc3?|}p]EQY^0\5L<güb sJHԧy>"( 'oצަl`?A5w( narRp :;Қ+S:|WE/9ԝ=(1S '=^ë_d#`ɜNe!bD3Z|7ܚZ!\:,BO#mqS?T[2?Ed9°XCdeǸ21: ,/{x\嬯A4/;%?/9KO{P60EA#eZFFaA?`gO{LX]1F0eAB^s{Ъp:nM7i@/H 6Bs Ճ5r!i9F3Ś5f]K>Cb]%ğFzXKc/mM{2 r䷯#9ƯM {(LbUQA4e+{=\Xo;=CM;kEI#=<bu3ȼ!eŁo[X͟Sl=|Oo4ɾ{9@c;_ G9ֱrCP≿~KU"au( #q6e9jVp;y'9c<j - ,u;Z &GS{"Н*fqP]hfB4"@ԥ7A^.٭ " unh!0EKov+$@1.4H]z[!DuAқ B` RVHcx]hfB4"@ԥ7A^.٭ " unh!0EKov+$@1.4H]z[!DuAқ B` @/ۚݯue%X^hݑFc/n?OCh'a> ,O [/& :'EBhZ!ݹ }s;c< FŻɁ_:m:X hO &a W\A5χ{'NN&mw6fips4wu ³Rs G|NyGK!$'\=6׬sڝAfgG~q$g6$$ dfJ ou5obIBe9\o_\~1oFT:8YvC9L'S;@ .록͖6tu1] ;T pIw݇KjۅLlP=є4USl.ο p.T:z3Hׂ''po/#y 5n66$;.xjHQC/4TTWX7u,7$K.z:鈦ZA  2"pa^ RBAmFd+§ȠisZ edW %@=?ڈj~}1zab Ai |45ȸhf1^otD<D9T}n@/ cV%rmɧZ_-ft<$:V:d|pҊv!b<tTHLDNDB؈+~}C"# "U@lEOx Rm!to)  cZٿ!*(ʌ#HE!*,VⷦA ;صt][B.xBPzC"' "Uh!*4Nx Rm롩V  Jb-4VwVDFDBX0밥AJQ2b~Ac  $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I_&x#1#IENDB`
PNG  IHDRX IDATx^QRQ_Tc +0xw݀ x!U_͍jqfݒW|׏ZRkԀ B ِ ,&@ G <<H1@:<qT%hJf:4GUBDh#@qT%hJf:4GUBDh#@qT%hJf:4GUBDh#ЫA.g2 +j$gM3//I riUh f_Mq?U8E->Ywm[xc|6nnh'FjKk`W5\}G3p*KQ8]vb$A olH &ٙXw4 G#T L[%A*L@t+ }scw|$@wi6lj)Z#LDϴS-AD=1- $p<nGPe]+a΍r!2ȹ5y ȍ ObUZ\[%! Nے 6/Υ?uA.nos#4κuǒi -fM`xuG&/cD@sNIA֒ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟ /N]A֟@5iG+ [Nx=h[6 ^$%=S 8fokv৮cDZĀ/ mOYwe;79BƱzCPAͺu.1W ]XCPA>~rNy?]bc3?|}p]EQY^0\5L<güb sJHԧy>"( 'oצަl`?A5w( narRp :;Қ+S:|WE/9ԝ=(1S '=^ë_d#`ɜNe!bD3Z|7ܚZ!\:,BO#mqS?T[2?Ed9°XCdeǸ21: ,/{x\嬯A4/;%?/9KO{P60EA#eZFFaA?`gO{LX]1F0eAB^s{Ъp:nM7i@/H 6Bs Ճ5r!i9F3Ś5f]K>Cb]%ğFzXKc/mM{2 r䷯#9ƯM {(LbUQA4e+{=\Xo;=CM;kEI#=<bu3ȼ!eŁo[X͟Sl=|Oo4ɾ{9@c;_ G9ֱrCP≿~KU"au( #q6e9jVp;y'9c<j - ,u;Z &GS{"Н*fqP]hfB4"@ԥ7A^.٭ " unh!0EKov+$@1.4H]z[!DuAқ B` RVHcx]hfB4"@ԥ7A^.٭ " unh!0EKov+$@1.4H]z[!DuAқ B` @/ۚݯue%X^hݑFc/n?OCh'a> ,O [/& :'EBhZ!ݹ }s;c< FŻɁ_:m:X hO &a W\A5χ{'NN&mw6fips4wu ³Rs G|NyGK!$'\=6׬sڝAfgG~q$g6$$ dfJ ou5obIBe9\o_\~1oFT:8YvC9L'S;@ .록͖6tu1] ;T pIw݇KjۅLlP=є4USl.ο p.T:z3Hׂ''po/#y 5n66$;.xjHQC/4TTWX7u,7$K.z:鈦ZA  2"pa^ RBAmFd+§ȠisZ edW %@=?ڈj~}1zab Ai |45ȸhf1^otD<D9T}n@/ cV%rmɧZ_-ft<$:V:d|pҊv!b<tTHLDNDB؈+~}C"# "U@lEOx Rm!to)  cZٿ!*(ʌ#HE!*,VⷦA ;صt][B.xBPzC"' "Uh!*4Nx Rm롩V  Jb-4VwVDFDBX0밥AJQ2b~Ac  $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I)RV6 $I_&x#1#IENDB`
-1
apolloconfig/apollo
3,856
feat: add history details for not key-value type of namespace
## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
wilsonwu
2021-07-27T14:32:04Z
2021-07-27T14:37:49Z
8d227ff5152369e61a83d43f0ceae3435881fafb
a44e2515bf35097cff023a4e41ec3fb2fa1c2b21
feat: add history details for not key-value type of namespace. ## What's the purpose of this PR Add history details for not key-value type of namespace ## Which issue(s) this PR fixes: Fixes #3715 ## Brief changelog After change: ![image](https://user-images.githubusercontent.com/1269496/127172053-dbed56ba-cd21-4cbf-b0c4-170ad134d745.png) With tooltip: ![image](https://user-images.githubusercontent.com/1269496/127172435-5a493e07-075f-4aad-a10a-29efe41f792c.png) Show details by click: ![image](https://user-images.githubusercontent.com/1269496/127172578-70a12f55-fd05-4da9-9411-033efff2ef34.png) Follow this checklist to help us incorporate your contribution quickly and easily: - [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/usage/apollo-user-guide.md
# &nbsp; # 名词解释 * 普通应用 * 普通应用指的是独立运行的程序,如 * Web应用程序 * 带有main函数的程序 * 公共组件 * 公共组件指的是发布的类库、客户端程序,不会自己独立运行,如 * Java的jar包 * .Net的dll文件 # 一、普通应用接入指南 ## 1.1 创建项目 要使用Apollo,第一步需要创建项目。 1. 打开apollo-portal主页 2. 点击“创建项目” ![create-app-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app-entry.png) 3. 输入项目信息 * 部门:选择应用所在的部门 * 应用AppId:用来标识应用身份的唯一id,格式为string,需要和客户端app.properties中配置的app.id对应 * 应用名称:应用名,仅用于界面展示 * 应用负责人:选择的人默认会成为该项目的管理员,具备项目权限管理、集群创建、Namespace创建等权限 ![create-app](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app.png) 4. 点击提交 创建成功后,会自动跳转到项目首页 ![app-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-created.png) ## 1.2 项目权限分配 ### 1.2.1 项目管理员权限 项目管理员拥有以下权限: 1. 可以管理项目的权限分配 2. 可以创建集群 3. 可以创建Namespace 创建项目时填写的应用负责人默认会成为项目的管理员之一,如果还需要其他人也成为项目管理员,可以按照下面步骤操作: 1. 点击页面左侧的“管理项目” * ![app-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-entry.png) 2. 搜索需要添加的成员并点击添加 * ![app-permission-search-user](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-search-user.png) * ![app-permission-user-added](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-user-added.png) ### 1.2.2 配置编辑、发布权限 配置权限分为编辑和发布: * 编辑权限允许用户在Apollo界面上创建、修改、删除配置 * 配置修改后只在Apollo界面上变化,不会影响到应用实际使用的配置 * 发布权限允许用户在Apollo界面上发布、回滚配置 * 配置只有在发布、回滚动作后才会被应用实际使用到 * Apollo在用户操作发布、回滚动作后实时通知到应用,并使最新配置生效 项目创建完,默认没有分配配置的编辑和发布权限,需要项目管理员进行授权。 1. 点击application这个namespace的授权按钮 * ![namespace-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-entry.png) 2. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 3. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) ## 1.3 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 ### 1.3.1 通过表格模式添加配置 1. 点击新增配置 * ![create-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-entry.png) 2. 输入配置项 * ![create-item-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-detail.png) 3. 点击提交 * ![item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/item-created.png) ### 1.3.2 通过文本模式编辑 Apollo除了支持表格模式,逐个添加、修改配置外,还提供文本模式批量添加、修改。 这个对于从已有的properties文件迁移尤其有用。 1. 切换到文本编辑模式 ![text-mode-config-overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-overview.png) 2. 点击右侧的修改配置按钮 ![text-mode-config-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-entry.png) 3. 输入配置项,并点击提交修改 ![text-mode-config-submit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-submit.png) ## 1.4 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-entry.png) 2. 填写发布相关信息,点击发布 ![publish-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-detail.png) ## 1.5 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) ## 1.6 回滚已发布配置 如果发现已发布的配置有问题,可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。 这里的回滚机制类似于发布系统,发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本,但代码仓库中的代码是不会回滚的,从而开发可以在修复代码后重新发布。 Apollo中的回滚也是类似的机制,点击回滚后是将发布到客户端的配置回滚到上一个已发布版本,也就是说客户端读取到的配置会恢复到上一个版本,但页面上编辑状态的配置是不会回滚的,从而开发可以在修复配置后重新发布。 # 二、公共组件接入指南 ## 2.1 公共组件和普通应用的区别 公共组件是指那些发布给其它应用使用的客户端代码,比如CAT客户端、Hermes Producer客户端等。 虽然这类组件是由其他团队开发、维护,但是运行时是在业务实际应用内的,所以本质上可以认为是应用的一部分。 通常情况下,这类组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 ## 2.2 公共组件接入步骤 公共组件的接入步骤,和普通应用几乎一致,唯一的区别是公共组件需要创建自己唯一的Namespace。 所以,首先执行普通应用接入文档中的以下几个步骤,然后再按照本章节后面的步骤操作。 1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE) 2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90) ### 2.2.1 创建Namespace 创建Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权。 1. 点击页面左侧的添加Namespace * ![create-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace.png) 2. 点击“创建新的Namespace” * ![create-namespace-select-type](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-select-type.png) 3. 输入公共组件的Namespace名称,需要注意的是Namespace名称全局唯一 * Apollo会默认把部门代号添加在最前面 * ![create-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-detail.png) 4. 点击提交后,页面会自动跳转到关联Namespace页面 * 首先,选中所有需要有这个Namespace的环境和集群,一般建议全选 * 其次,选中刚刚创建的namespace * 最后,点击提交 * ![link-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-namespace-detail.png) 5. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 6. 点击“返回”回到项目页面 ### 2.2.2 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 #### 2.2.2.1 通过表格模式添加配置 1. 点击新增配置 ![public-namespace-edit-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item-entry.png) 2. 输入配置项 ![public-namespace-edit-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item.png) 3. 点击提交 ![public-namespace-item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-item-created.png) #### 2.2.2.2 通过文本模式编辑 这部分和普通应用一致,具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。 ### 2.2.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![public-namespace-publish-items-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items-entry.png) 2. 填写发布相关信息,点击发布 ![public-namespace-publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items.png) ### 2.2.4 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) 对于公共组件的配置读取,可以参考上述文档中的“获取公共Namespace的配置”部分。 ## 2.3 应用覆盖公用组件配置步骤 前面提到,通常情况下,公共组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 这里就讲一下应用如何覆盖公用组件的配置,简单起见,假设apollo-portal应用使用了hermes producer客户端,并且希望调整hermes的批量发送大小。 ### 2.3.1 关联公共组件Namespace 1. 进入使用公共组件的应用项目首页,点击左侧的添加Namespace按钮 * 所以,在这个例子中,我们需要进入apollo-portal的首页。 * (添加Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权) * ![link-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace-entry.png) 2. 找到hermes producer的namespace,并选择需要关联到哪些环境和集群 ![link-public-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace.png) 3. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 4. 点击“返回”回到项目页面 ### 2.3.2 覆盖公用组件配置 1. 点击新增配置 ![override-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-entry.png) 2. 输入要覆盖的配置项 ![override-public-namespace-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item.png) 3. 点击提交 ![override-public-namespace-item-done](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-done.png) ### 2.3.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![override-public-namespace-item-publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish-entry.png) 2. 填写发布相关信息,点击发布 ![override-public-namespace-item-publish](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish.png) 3. 配置发布成功后,hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。 # 三、集群独立配置说明 在有些特殊情况下,应用有需求对不同的集群做不同的配置,比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。 在这种情况下,可以通过在Apollo创建不同的集群来解决。 ## 3.1 创建集群 创建集群需要项目管理员权限,如果发现没有添加集群按钮,可以找项目管理员授权。 1. 点击页面左侧的“添加集群”按钮 * ![create-cluster](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster.png) 2. 输入集群名称,选择环境并提交 * ![create-cluster-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster-detail.png) 3. 切换到对应的集群,修改配置并发布即可 * ![config-in-cluster-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/cluster-created.png) 4. 通过上述配置,部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置 5. 如果应用还在其它机房部署了应用,那么在上述的配置下,会读到default集群下的配置。 # 四、多个AppId使用同一份配置 在一些情况下,尽管应用本身不是公共组件,但还是需要在多个AppId之间共用同一份配置,比如同一个产品的不同项目:XX-Web, XX-Service, XX-Job等。 这种情况下如果希望实现多个AppId使用同一份配置的话,基本概念和公共组件的配置是一致的。 具体来说,就是在其中一个AppId下创建一个namespace,写入公共的配置信息,然后在各个项目中读取该namespace的配置即可。 如果某个AppId需要覆盖公共的配置信息,那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。 具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。 # 五、灰度发布使用指南 通过灰度发布功能,可以实现: 1. 对于一些对程序有比较大影响的配置,可以先在一个或者多个实例生效,观察一段时间没问题后再全量发布配置。 2. 对于一些需要调优的配置参数,可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置,不断调整、测评一段时间后找出较优的配置再全量发布配置。 下面将结合一个实际例子来描述如何使用灰度发布功能。 ## 5.1 场景介绍 100004458(apollo-demo)项目有两个客户端: 1. 10.32.21.19 2. 10.32.21.22 ![initial-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-instance-list.png) **灰度目标:** * 当前有一个配置timeout=2000,我们希望对10.32.21.22灰度发布timeout=3000,对10.32.21.19仍然是timeout=2000。 ![initial-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-config.png) ## 5.2 创建灰度 首先点击application namespace右上角的`创建灰度`按钮。 ![create-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/create-gray-release.png) 点击确定后,灰度版本就创建成功了,页面会自动切换到`灰度版本`Tab。 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-gray-release-tab.png) ## 5.3 灰度配置 点击`主版本的配置`中,timeout配置最右侧的`对此配置灰度`按钮 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/edit-gray-release-config.png) 在弹出框中填入要灰度的值:3000,点击提交。 ![submit-gray-release-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/submit-gray-release-config.png) ![gray-release-config-submitted](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-config-submitted.png) ## 5.4 配置灰度规则 切换到`灰度规则`Tab,点击`新增规则`按钮 ![new-gray-release-rule](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/new-gray-release-rule.png) 在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表,选择我们要灰度的IP,点击完成。 ![select-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/select-gray-release-ip.png) ![gray-release-ip-selected](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-ip-selected.png) ![gray-release-rule-saved](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-rule-saved.png) 如果下拉框中没找到需要的IP,说明机器还没从Apollo取过配置,可以点击手动输入IP来输入,输入完后点击添加按钮 ![manual-input-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip.png) ![manual-input-gray-release-ip-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip-2.png) >注:对于公共Namespace的灰度规则,需要先指定要灰度的appId,然后再选择IP。 ## 5.5 灰度发布 配置规则已经生效,不过灰度配置还没有发布。切换到`配置`Tab。 再次检查灰度的配置部分,如果没有问题,点击`灰度发布`。 ![prepare-to-do-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-do-gray-release.png) 在弹出框中可以看到主版本的值是2000,灰度版本即将发布的值是3000。填入其它信息后,点击发布。 ![gray-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-confirm-dialog.png) 发布后,切换到`灰度实例列表`Tab,就能看到10.32.21.22已经使用了灰度发布的值。 ![gray-release-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-instance-list.png) 切换到`主版本`的`实例列表`,会看到主版本配置只有10.32.21.19在使用了。 ![master-branch-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list.png) 后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效,规则的修改在规则点击完成后就会实时生效。 ## 5.6 全量发布 如果灰度的配置测试下来比较理想,符合预期,那么就可以操作`全量发布`。 全量发布的效果是: 1. 灰度版本的配置会合并回主版本,在这个例子中,就是主版本的timeout会被更新成3000 2. 主版本的配置会自动进行一次发布 3. 在全量发布页面,可以选择是否保留当前灰度版本,默认为不保留。 ![prepare-to-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-full-release.png) ![full-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog.png) ![full-release-confirm-dialog-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog-2.png) 我选择了不保留灰度版本,所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表,可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。 ![master-branch-instance-list-after-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list-after-full-release.png) ## 5.7 放弃灰度 如果灰度版本不理想或者不需要了,可以点击`放弃灰度`。 ![abandon-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/abandon-gray-release.png) ## 5.8 发布历史 点击主版本的`发布历史`按钮,可以看到当前namespace的主版本以及灰度版本的发布历史。 ![view-release-history](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history.png) ![view-release-history-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history-detail.png) # 六、其它功能配置 ## 6.1 配置查看权限 从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) ## 6.2 配置访问密钥 Apollo从1.6.0版本开始增加访问密钥机制,从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥,客户端需要配置密钥,否则无法获取配置。 1. 项目管理员打开管理密钥页面 ![管理密钥入口](https://user-images.githubusercontent.com/837658/94990081-f4d3cd80-05ab-11eb-9470-fed5ec6de92e.png) 2. 为项目的每个环境生成访问密钥,注意默认是禁用的,建议在客户端都配置完成后再开启 ![密钥配置页面](https://user-images.githubusercontent.com/837658/94990150-788dba00-05ac-11eb-9a12-727fdb872e42.png) 3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥) # 七、最佳实践 ## 7.1 安全相关 配置中心作为基础服务,存储着公司非常重要的配置信息,所以安全因素需要大家重点关注,下面列举了一些注意事项供大家参考,也欢迎大家分享自己的实践案例。 ### 7.1.1 认证 建议接入公司统一的身份认证系统,如 SSO、LDAP 等,接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function) > 如果使用Apollo提供的Spring Security简单认证,务必记得要修改超级管理员apollo的密码 ### 7.1.2 授权 Apollo 支持细粒度的权限控制,请务必根据实际情况做好权限控制: 1. [项目管理员权限](#_121-项目管理员权限) * Apollo 默认允许所有登录用户创建项目,如果只允许部分用户创建项目,可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制) 2. [配置编辑、发布权限](#_122-配置编辑、发布权限) * 配置编辑、发布权限支持按环境配置,比如开发环境开发人员可以自行完成配置编辑和发布的过程,但是生产环境发布权限交由测试或运维人员 * 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关,用于发布审核),从而控制一次配置发布只能由一个人修改,另一个人发布,确保配置修改得到充分检查 3. [配置查看权限](#_61-配置查看权限) * 可以指定某个环境只允许项目成员查看私有Namespace的配置,从而避免敏感配置泄露,如生产环境 ### 7.1.3 系统访问 除了用户权限,在系统访问上也需要加以考虑: 1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的,所以出于安全考虑,禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网 2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5),从而只有经过身份验证的客户端才能访问敏感配置 3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制),从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口,增强安全性
# &nbsp; # 名词解释 * 普通应用 * 普通应用指的是独立运行的程序,如 * Web应用程序 * 带有main函数的程序 * 公共组件 * 公共组件指的是发布的类库、客户端程序,不会自己独立运行,如 * Java的jar包 * .Net的dll文件 # 一、普通应用接入指南 ## 1.1 创建项目 要使用Apollo,第一步需要创建项目。 1. 打开apollo-portal主页 2. 点击“创建项目” ![create-app-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app-entry.png) 3. 输入项目信息 * 部门:选择应用所在的部门 * 应用AppId:用来标识应用身份的唯一id,格式为string,需要和客户端app.properties中配置的app.id对应 * 应用名称:应用名,仅用于界面展示 * 应用负责人:选择的人默认会成为该项目的管理员,具备项目权限管理、集群创建、Namespace创建等权限 ![create-app](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app.png) 4. 点击提交 创建成功后,会自动跳转到项目首页 ![app-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-created.png) ## 1.2 项目权限分配 ### 1.2.1 项目管理员权限 项目管理员拥有以下权限: 1. 可以管理项目的权限分配 2. 可以创建集群 3. 可以创建Namespace 创建项目时填写的应用负责人默认会成为项目的管理员之一,如果还需要其他人也成为项目管理员,可以按照下面步骤操作: 1. 点击页面左侧的“管理项目” * ![app-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-entry.png) 2. 搜索需要添加的成员并点击添加 * ![app-permission-search-user](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-search-user.png) * ![app-permission-user-added](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-user-added.png) ### 1.2.2 配置编辑、发布权限 配置权限分为编辑和发布: * 编辑权限允许用户在Apollo界面上创建、修改、删除配置 * 配置修改后只在Apollo界面上变化,不会影响到应用实际使用的配置 * 发布权限允许用户在Apollo界面上发布、回滚配置 * 配置只有在发布、回滚动作后才会被应用实际使用到 * Apollo在用户操作发布、回滚动作后实时通知到应用,并使最新配置生效 项目创建完,默认没有分配配置的编辑和发布权限,需要项目管理员进行授权。 1. 点击application这个namespace的授权按钮 * ![namespace-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-entry.png) 2. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 3. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) ## 1.3 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 ### 1.3.1 通过表格模式添加配置 1. 点击新增配置 * ![create-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-entry.png) 2. 输入配置项 * ![create-item-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-detail.png) 3. 点击提交 * ![item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/item-created.png) ### 1.3.2 通过文本模式编辑 Apollo除了支持表格模式,逐个添加、修改配置外,还提供文本模式批量添加、修改。 这个对于从已有的properties文件迁移尤其有用。 1. 切换到文本编辑模式 ![text-mode-config-overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-overview.png) 2. 点击右侧的修改配置按钮 ![text-mode-config-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-entry.png) 3. 输入配置项,并点击提交修改 ![text-mode-config-submit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-submit.png) ## 1.4 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-entry.png) 2. 填写发布相关信息,点击发布 ![publish-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-detail.png) ## 1.5 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) ## 1.6 回滚已发布配置 如果发现已发布的配置有问题,可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。 这里的回滚机制类似于发布系统,发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本,但代码仓库中的代码是不会回滚的,从而开发可以在修复代码后重新发布。 Apollo中的回滚也是类似的机制,点击回滚后是将发布到客户端的配置回滚到上一个已发布版本,也就是说客户端读取到的配置会恢复到上一个版本,但页面上编辑状态的配置是不会回滚的,从而开发可以在修复配置后重新发布。 # 二、公共组件接入指南 ## 2.1 公共组件和普通应用的区别 公共组件是指那些发布给其它应用使用的客户端代码,比如CAT客户端、Hermes Producer客户端等。 虽然这类组件是由其他团队开发、维护,但是运行时是在业务实际应用内的,所以本质上可以认为是应用的一部分。 通常情况下,这类组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 ## 2.2 公共组件接入步骤 公共组件的接入步骤,和普通应用几乎一致,唯一的区别是公共组件需要创建自己唯一的Namespace。 所以,首先执行普通应用接入文档中的以下几个步骤,然后再按照本章节后面的步骤操作。 1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE) 2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90) ### 2.2.1 创建Namespace 创建Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权。 1. 点击页面左侧的添加Namespace * ![create-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace.png) 2. 点击“创建新的Namespace” * ![create-namespace-select-type](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-select-type.png) 3. 输入公共组件的Namespace名称,需要注意的是Namespace名称全局唯一 * Apollo会默认把部门代号添加在最前面 * ![create-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-detail.png) 4. 点击提交后,页面会自动跳转到关联Namespace页面 * 首先,选中所有需要有这个Namespace的环境和集群,一般建议全选 * 其次,选中刚刚创建的namespace * 最后,点击提交 * ![link-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-namespace-detail.png) 5. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 6. 点击“返回”回到项目页面 ### 2.2.2 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 #### 2.2.2.1 通过表格模式添加配置 1. 点击新增配置 ![public-namespace-edit-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item-entry.png) 2. 输入配置项 ![public-namespace-edit-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item.png) 3. 点击提交 ![public-namespace-item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-item-created.png) #### 2.2.2.2 通过文本模式编辑 这部分和普通应用一致,具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。 ### 2.2.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![public-namespace-publish-items-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items-entry.png) 2. 填写发布相关信息,点击发布 ![public-namespace-publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items.png) ### 2.2.4 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) 对于公共组件的配置读取,可以参考上述文档中的“获取公共Namespace的配置”部分。 ## 2.3 应用覆盖公用组件配置步骤 前面提到,通常情况下,公共组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 这里就讲一下应用如何覆盖公用组件的配置,简单起见,假设apollo-portal应用使用了hermes producer客户端,并且希望调整hermes的批量发送大小。 ### 2.3.1 关联公共组件Namespace 1. 进入使用公共组件的应用项目首页,点击左侧的添加Namespace按钮 * 所以,在这个例子中,我们需要进入apollo-portal的首页。 * (添加Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权) * ![link-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace-entry.png) 2. 找到hermes producer的namespace,并选择需要关联到哪些环境和集群 ![link-public-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace.png) 3. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 4. 点击“返回”回到项目页面 ### 2.3.2 覆盖公用组件配置 1. 点击新增配置 ![override-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-entry.png) 2. 输入要覆盖的配置项 ![override-public-namespace-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item.png) 3. 点击提交 ![override-public-namespace-item-done](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-done.png) ### 2.3.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![override-public-namespace-item-publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish-entry.png) 2. 填写发布相关信息,点击发布 ![override-public-namespace-item-publish](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish.png) 3. 配置发布成功后,hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。 # 三、集群独立配置说明 在有些特殊情况下,应用有需求对不同的集群做不同的配置,比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。 在这种情况下,可以通过在Apollo创建不同的集群来解决。 ## 3.1 创建集群 创建集群需要项目管理员权限,如果发现没有添加集群按钮,可以找项目管理员授权。 1. 点击页面左侧的“添加集群”按钮 * ![create-cluster](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster.png) 2. 输入集群名称,选择环境并提交 * ![create-cluster-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster-detail.png) 3. 切换到对应的集群,修改配置并发布即可 * ![config-in-cluster-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/cluster-created.png) 4. 通过上述配置,部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置 5. 如果应用还在其它机房部署了应用,那么在上述的配置下,会读到default集群下的配置。 # 四、多个AppId使用同一份配置 在一些情况下,尽管应用本身不是公共组件,但还是需要在多个AppId之间共用同一份配置,比如同一个产品的不同项目:XX-Web, XX-Service, XX-Job等。 这种情况下如果希望实现多个AppId使用同一份配置的话,基本概念和公共组件的配置是一致的。 具体来说,就是在其中一个AppId下创建一个namespace,写入公共的配置信息,然后在各个项目中读取该namespace的配置即可。 如果某个AppId需要覆盖公共的配置信息,那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。 具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。 # 五、灰度发布使用指南 通过灰度发布功能,可以实现: 1. 对于一些对程序有比较大影响的配置,可以先在一个或者多个实例生效,观察一段时间没问题后再全量发布配置。 2. 对于一些需要调优的配置参数,可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置,不断调整、测评一段时间后找出较优的配置再全量发布配置。 下面将结合一个实际例子来描述如何使用灰度发布功能。 ## 5.1 场景介绍 100004458(apollo-demo)项目有两个客户端: 1. 10.32.21.19 2. 10.32.21.22 ![initial-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-instance-list.png) **灰度目标:** * 当前有一个配置timeout=2000,我们希望对10.32.21.22灰度发布timeout=3000,对10.32.21.19仍然是timeout=2000。 ![initial-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-config.png) ## 5.2 创建灰度 首先点击application namespace右上角的`创建灰度`按钮。 ![create-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/create-gray-release.png) 点击确定后,灰度版本就创建成功了,页面会自动切换到`灰度版本`Tab。 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-gray-release-tab.png) ## 5.3 灰度配置 点击`主版本的配置`中,timeout配置最右侧的`对此配置灰度`按钮 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/edit-gray-release-config.png) 在弹出框中填入要灰度的值:3000,点击提交。 ![submit-gray-release-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/submit-gray-release-config.png) ![gray-release-config-submitted](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-config-submitted.png) ## 5.4 配置灰度规则 切换到`灰度规则`Tab,点击`新增规则`按钮 ![new-gray-release-rule](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/new-gray-release-rule.png) 在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表,选择我们要灰度的IP,点击完成。 ![select-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/select-gray-release-ip.png) ![gray-release-ip-selected](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-ip-selected.png) ![gray-release-rule-saved](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-rule-saved.png) 如果下拉框中没找到需要的IP,说明机器还没从Apollo取过配置,可以点击手动输入IP来输入,输入完后点击添加按钮 ![manual-input-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip.png) ![manual-input-gray-release-ip-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip-2.png) >注:对于公共Namespace的灰度规则,需要先指定要灰度的appId,然后再选择IP。 ## 5.5 灰度发布 配置规则已经生效,不过灰度配置还没有发布。切换到`配置`Tab。 再次检查灰度的配置部分,如果没有问题,点击`灰度发布`。 ![prepare-to-do-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-do-gray-release.png) 在弹出框中可以看到主版本的值是2000,灰度版本即将发布的值是3000。填入其它信息后,点击发布。 ![gray-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-confirm-dialog.png) 发布后,切换到`灰度实例列表`Tab,就能看到10.32.21.22已经使用了灰度发布的值。 ![gray-release-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-instance-list.png) 切换到`主版本`的`实例列表`,会看到主版本配置只有10.32.21.19在使用了。 ![master-branch-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list.png) 后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效,规则的修改在规则点击完成后就会实时生效。 ## 5.6 全量发布 如果灰度的配置测试下来比较理想,符合预期,那么就可以操作`全量发布`。 全量发布的效果是: 1. 灰度版本的配置会合并回主版本,在这个例子中,就是主版本的timeout会被更新成3000 2. 主版本的配置会自动进行一次发布 3. 在全量发布页面,可以选择是否保留当前灰度版本,默认为不保留。 ![prepare-to-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-full-release.png) ![full-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog.png) ![full-release-confirm-dialog-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog-2.png) 我选择了不保留灰度版本,所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表,可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。 ![master-branch-instance-list-after-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list-after-full-release.png) ## 5.7 放弃灰度 如果灰度版本不理想或者不需要了,可以点击`放弃灰度`。 ![abandon-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/abandon-gray-release.png) ## 5.8 发布历史 点击主版本的`发布历史`按钮,可以看到当前namespace的主版本以及灰度版本的发布历史。 ![view-release-history](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history.png) ![view-release-history-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history-detail.png) # 六、其它功能配置 ## 6.1 配置查看权限 从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) ## 6.2 配置访问密钥 Apollo从1.6.0版本开始增加访问密钥机制,从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥,客户端需要配置密钥,否则无法获取配置。 1. 项目管理员打开管理密钥页面 ![管理密钥入口](https://user-images.githubusercontent.com/837658/94990081-f4d3cd80-05ab-11eb-9470-fed5ec6de92e.png) 2. 为项目的每个环境生成访问密钥,注意默认是禁用的,建议在客户端都配置完成后再开启 ![密钥配置页面](https://user-images.githubusercontent.com/837658/94990150-788dba00-05ac-11eb-9a12-727fdb872e42.png) 3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥) # 七、最佳实践 ## 7.1 安全相关 配置中心作为基础服务,存储着公司非常重要的配置信息,所以安全因素需要大家重点关注,下面列举了一些注意事项供大家参考,也欢迎大家分享自己的实践案例。 ### 7.1.1 认证 建议接入公司统一的身份认证系统,如 SSO、LDAP 等,接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function) > 如果使用Apollo提供的Spring Security简单认证,务必记得要修改超级管理员apollo的密码 ### 7.1.2 授权 Apollo 支持细粒度的权限控制,请务必根据实际情况做好权限控制: 1. [项目管理员权限](#_121-项目管理员权限) * Apollo 默认允许所有登录用户创建项目,如果只允许部分用户创建项目,可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制) 2. [配置编辑、发布权限](#_122-配置编辑、发布权限) * 配置编辑、发布权限支持按环境配置,比如开发环境开发人员可以自行完成配置编辑和发布的过程,但是生产环境发布权限交由测试或运维人员 * 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关,用于发布审核),从而控制一次配置发布只能由一个人修改,另一个人发布,确保配置修改得到充分检查 3. [配置查看权限](#_61-配置查看权限) * 可以指定某个环境只允许项目成员查看私有Namespace的配置,从而避免敏感配置泄露,如生产环境 ### 7.1.3 系统访问 除了用户权限,在系统访问上也需要加以考虑: 1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的,所以出于安全考虑,禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网 2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5),从而只有经过身份验证的客户端才能访问敏感配置 3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制),从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口,增强安全性
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] 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) * [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840) * [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849) * [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847) * [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856) ------------------ 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) * [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849) * [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847) * [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856) * [fix show-text-modal number display](https://github.com/ctripcorp/apollo/pull/3851) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/directive/show-text-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('showtextmodal', showTextModalDirective); function showTextModalDirective(AppUtil) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/show-text-modal.html', transclude: true, replace: true, scope: { text: '=' }, link: function (scope) { scope.$watch('text', init); function init() { scope.jsonObject = undefined; if (isJsonText(scope.text)) { scope.jsonObject = JSON.parse(scope.text); } } function isJsonText(text) { try { return typeof JSON.parse(text) === "object"; } catch (e) { return false; } } } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ directive_module.directive('showtextmodal', showTextModalDirective) .filter('jsonBigIntFilter', function () { return function (text) { if (typeof(text) === "undefined" || typeof JSON.parse(text) !== "object" || !text) { return; } const numberRegex = /\d{16,}/g; const splitRegex = /"\d\d+"/; const splitArray = text.split(splitRegex); const matchResult = text.match(numberRegex); if (!matchResult) { return text; } let resultStr = ''; let index = 0; Object.keys(splitArray).forEach(function (key) { resultStr = resultStr.concat(splitArray[key]); if (typeof(matchResult[index]) !== "undefined") { resultStr = resultStr.concat(matchResult[index++]) } }) return resultStr; } }); function showTextModalDirective(AppUtil) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/show-text-modal.html', transclude: true, replace: true, scope: { text: '=' }, link: function (scope) { scope.$watch('text', init); function init() { scope.jsonObject = undefined; if (isJsonText(scope.text)) { scope.jsonObject = parseBigInt(scope.text); } } function isJsonText(text) { try { return typeof JSON.parse(text) === "object"; } catch (e) { return false; } } function parseBigInt(str) { if (/\d{16,}/.test(str)) { let replaceMap = []; let n = 0; str = str.replace(/"(\\?[\s\S])*?"/g, function (match) { if (/\d{16,}/.test(match)) { replaceMap.push(match); return '"""'; } return match; }).replace(/[+\-\d.eE]{16,}/g, function (match) { if (/^\d{16,}$/.test(match)) { return '"' + match + '"'; } return match; }).replace(/"""/g, function () { return replaceMap[n++]; }) } return JSON.parse(str); } } } }
1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/show-text-modal.html
<div id="showTextModal" class="modal fade" tabindex="-1" role="dialog"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog"> <div class="modal-content no-radius"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title">{{'Component.ShowText.Title' | translate }}</h4> </div> <pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="!jsonObject" ng-bind="text"> </pre> <pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="jsonObject" ng-bind="jsonObject | json:4"> </pre> </div> </div> </div>
<div id="showTextModal" class="modal fade" tabindex="-1" role="dialog"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog"> <div class="modal-content no-radius"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title">{{'Component.ShowText.Title' | translate }}</h4> </div> <pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="!jsonObject" ng-bind="text"> </pre> <pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="jsonObject" ng-bind="jsonObject | json:4 | jsonBigIntFilter"> </pre> </div> </div> </div>
1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/services/InstanceService.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('InstanceService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_instances_by_release: { method: 'GET', url: AppUtil.prefixPath() + '/envs/:env/instances/by-release' }, find_instances_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace' }, find_by_releases_not_in: { method: 'GET', isArray: true, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace-and-releases-not-in' }, get_instance_count_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + "/envs/:env/instances/by-namespace/count" } }); var instanceService = { findInstancesByRelease: function (env, releaseId, page, size) { if (!size) { size = 20; } var d = $q.defer(); resource.find_instances_by_release({ env: env, releaseId: releaseId, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, findInstancesByNamespace: function (appId, env, clusterName, namespaceName, instanceAppId, page, size) { if (!size) { size = 20; } var d = $q.defer(); var instanceAppIdRequest = instanceAppId; instanceService.lastInstanceAppIdRequest = instanceAppIdRequest; resource.find_instances_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, instanceAppId: instanceAppId, page: page, size: size }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.resolve(result); }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.reject(result); }); return d.promise; }, findByReleasesNotIn: function (appId, env, clusterName, namespaceName, releaseIds) { var d = $q.defer(); resource.find_by_releases_not_in({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, releaseIds: releaseIds }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, getInstanceCountByNamespace: function (appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.get_instance_count_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } }; return instanceService; }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('InstanceService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_instances_by_release: { method: 'GET', url: AppUtil.prefixPath() + '/envs/:env/instances/by-release' }, find_instances_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace' }, find_by_releases_not_in: { method: 'GET', isArray: true, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace-and-releases-not-in' }, get_instance_count_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + "/envs/:env/instances/by-namespace/count" } }); var instanceService = { findInstancesByRelease: function (env, releaseId, page, size) { if (!size) { size = 20; } var d = $q.defer(); resource.find_instances_by_release({ env: env, releaseId: releaseId, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, findInstancesByNamespace: function (appId, env, clusterName, namespaceName, instanceAppId, page, size) { if (!size) { size = 20; } var d = $q.defer(); var instanceAppIdRequest = instanceAppId; instanceService.lastInstanceAppIdRequest = instanceAppIdRequest; resource.find_instances_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, instanceAppId: instanceAppId, page: page, size: size }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.resolve(result); }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.reject(result); }); return d.promise; }, findByReleasesNotIn: function (appId, env, clusterName, namespaceName, releaseIds) { var d = $q.defer(); resource.find_by_releases_not_in({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, releaseIds: releaseIds }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, getInstanceCountByNamespace: function (appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.get_instance_count_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } }; return instanceService; }]);
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/angular/ui-bootstrap-tpls-0.13.0.min.js
/* * angular-ui-bootstrap * http://angular-ui.github.io/bootstrap/ * Version: 0.13.0 - 2015-05-02 * License: MIT */ angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) { return { link: function (b, c, d) { function e() { c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f) } function f() { c.removeClass("collapsing"), c.css({height: "auto"}) } function g() { c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h) } function h() { c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse") } b.$watch(d.collapse, function (a) { a ? g() : e() }) } } }]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) { this.groups = [], this.closeOthers = function (d) { var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers; e && angular.forEach(this.groups, function (a) { a !== d && (a.isOpen = !1) }) }, this.addGroup = function (a) { var b = this; this.groups.push(a), a.$on("$destroy", function () { b.removeGroup(a) }) }, this.removeGroup = function (a) { var b = this.groups.indexOf(a); -1 !== b && this.groups.splice(b, 1) } }]).directive("accordion", function () { return { restrict: "EA", controller: "AccordionController", transclude: !0, replace: !1, templateUrl: "template/accordion/accordion.html" } }).directive("accordionGroup", function () { return { require: "^accordion", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/accordion/accordion-group.html", scope: {heading: "@", isOpen: "=?", isDisabled: "=?"}, controller: function () { this.setHeading = function (a) { this.heading = a } }, link: function (a, b, c, d) { d.addGroup(a), a.$watch("isOpen", function (b) { b && d.closeOthers(a) }), a.toggleOpen = function () { a.isDisabled || (a.isOpen = !a.isOpen) } } } }).directive("accordionHeading", function () { return { restrict: "EA", transclude: !0, template: "", replace: !0, require: "^accordionGroup", link: function (a, b, c, d, e) { d.setHeading(e(a, angular.noop)) } } }).directive("accordionTransclude", function () { return { require: "^accordionGroup", link: function (a, b, c, d) { a.$watch(function () { return d[c.accordionTransclude] }, function (a) { a && (b.html(""), b.append(a)) }) } } }), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) { a.closeable = "close" in b, this.close = a.close }]).directive("alert", function () { return { restrict: "EA", controller: "AlertController", templateUrl: "template/alert/alert.html", transclude: !0, replace: !0, scope: {type: "@", close: "&"} } }).directive("dismissOnTimeout", ["$timeout", function (a) { return { require: "alert", link: function (b, c, d, e) { a(function () { e.close() }, parseInt(d.dismissOnTimeout, 10)) } } }]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () { return function (a, b, c) { b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) { b.html(a || "") }) } }), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", { activeClass: "active", toggleEvent: "click" }).controller("ButtonsController", ["buttonConfig", function (a) { this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click" }]).directive("btnRadio", function () { return { require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f.$render = function () { b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio))) }, b.bind(e.toggleEvent, function () { var d = b.hasClass(e.activeClass); (!d || angular.isDefined(c.uncheckable)) && a.$apply(function () { f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render() }) }) } } }).directive("btnCheckbox", function () { return { require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { function e() { return g(c.btnCheckboxTrue, !0) } function f() { return g(c.btnCheckboxFalse, !1) } function g(b, c) { var d = a.$eval(b); return angular.isDefined(d) ? d : c } var h = d[0], i = d[1]; i.$render = function () { b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e())) }, b.bind(h.toggleEvent, function () { a.$apply(function () { i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render() }) }) } } }), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) { function d(a) { if (angular.isUndefined(k[a].index))return k[a]; { var b; k.length } for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b] } function e() { f(); var c = +a.interval; !isNaN(c) && c > 0 && (h = b(g, c)) } function f() { h && (b.cancel(h), h = null) } function g() { var b = +a.interval; i && !isNaN(b) && b > 0 ? a.next() : a.pause() } var h, i, j = this, k = j.slides = a.slides = [], l = -1; j.currentSlide = null; var m = !1; j.select = a.select = function (b, d) { function f() { m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, { direction: d, active: !1 }), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () { a.$currentTransition = null })), j.currentSlide = b, l = g, e()) } var g = j.indexOfSlide(b); void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f() }, a.$on("$destroy", function () { m = !0 }), j.getCurrentIndex = function () { return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l }, j.indexOfSlide = function (a) { return angular.isDefined(a.index) ? +a.index : k.indexOf(a) }, a.next = function () { var b = (j.getCurrentIndex() + 1) % k.length; return a.$currentTransition ? void 0 : j.select(d(b), "next") }, a.prev = function () { var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1; return a.$currentTransition ? void 0 : j.select(d(b), "prev") }, a.isActive = function (a) { return j.currentSlide === a }, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () { i || (i = !0, e()) }, a.pause = function () { a.noPause || (i = !1, f()) }, j.addSlide = function (b, c) { b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1 }, j.removeSlide = function (a) { angular.isDefined(a.index) && k.sort(function (a, b) { return +a.index > +b.index }); var b = k.indexOf(a); k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l-- } }]).directive("carousel", [function () { return { restrict: "EA", transclude: !0, replace: !0, controller: "CarouselController", require: "carousel", templateUrl: "template/carousel/carousel.html", scope: {interval: "=", noTransition: "=", noPause: "="} } }]).directive("slide", function () { return { require: "^carousel", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/carousel/slide.html", scope: {active: "=?", index: "=?"}, link: function (a, b, c, d) { d.addSlide(a, b), a.$on("$destroy", function () { d.removeSlide(a) }), a.$watch("active", function (b) { b && d.select(a) }) } } }).animation(".item", ["$animate", function (a) { return { beforeAddClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return b.addClass(f), a.addClass(b, g).then(function () { e || b.removeClass(g + " " + f), d() }), function () { e = !0 } } d() }, beforeRemoveClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return a.addClass(b, g).then(function () { e || b.removeClass(g), d() }), function () { e = !0 } } d() } } }]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) { function c(a) { var c = [], d = a.split(""); return angular.forEach(f, function (b, e) { var f = a.indexOf(e); if (f > -1) { a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$"; for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$"; a = a.join(""), c.push({index: f, apply: b.apply}) } }), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")} } function d(a, b, c) { return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0 } var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g; this.parsers = {}; var f = { yyyy: { regex: "\\d{4}", apply: function (a) { this.year = +a } }, yy: { regex: "\\d{2}", apply: function (a) { this.year = +a + 2e3 } }, y: { regex: "\\d{1,4}", apply: function (a) { this.year = +a } }, MMMM: { regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.MONTH.indexOf(b) } }, MMM: { regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b) } }, MM: { regex: "0[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, M: { regex: "[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, dd: { regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, d: { regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")}, EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")}, HH: { regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, H: { regex: "1?[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, mm: { regex: "[0-5][0-9]", apply: function (a) { this.minutes = +a } }, m: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.minutes = +a } }, sss: { regex: "[0-9][0-9][0-9]", apply: function (a) { this.milliseconds = +a } }, ss: { regex: "[0-5][0-9]", apply: function (a) { this.seconds = +a } }, s: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.seconds = +a } } }; this.parse = function (b, f, g) { if (!angular.isString(b) || !f)return b; f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f)); var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i); if (k && k.length) { var l, m; l = g ? { year: g.getFullYear(), month: g.getMonth(), date: g.getDate(), hours: g.getHours(), minutes: g.getMinutes(), seconds: g.getSeconds(), milliseconds: g.getMilliseconds() } : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0}; for (var n = 1, o = k.length; o > n; n++) { var p = j[n - 1]; p.apply && p.apply.call(l, k[n]) } return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m } } }]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) { function c(a, c) { return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c] } function d(a) { return "static" === (c(a, "position") || "static") } var e = function (b) { for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent; return e || c }; return { position: function (b) { var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]); f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft); var g = b[0].getBoundingClientRect(); return { width: g.width || b.prop("offsetWidth"), height: g.height || b.prop("offsetHeight"), top: c.top - d.top, left: c.left - d.left } }, offset: function (c) { var d = c[0].getBoundingClientRect(); return { width: d.width || c.prop("offsetWidth"), height: d.height || c.prop("offsetHeight"), top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop), left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft) } }, positionElements: function (a, b, c, d) { var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center"; e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight"); var l = { center: function () { return e.left + e.width / 2 - f / 2 }, left: function () { return e.left }, right: function () { return e.left + e.width } }, m = { center: function () { return e.top + e.height / 2 - g / 2 }, top: function () { return e.top }, bottom: function () { return e.top + e.height } }; switch (j) { case"right": h = {top: m[k](), left: l[j]()}; break; case"left": h = {top: m[k](), left: e.left - f}; break; case"bottom": h = {top: m[j](), left: l[k]()}; break; default: h = {top: e.top - g, left: l[k]()} } return h } } }]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", { formatDay: "dd", formatMonth: "MMMM", formatYear: "yyyy", formatDayHeader: "EEE", formatDayTitle: "MMMM yyyy", formatMonthTitle: "yyyy", datepickerMode: "day", minMode: "day", maxMode: "year", showWeeks: !0, startingDay: 0, yearRange: 20, minDate: null, maxDate: null, shortcutPropagation: !1 }).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) { var i = this, j = {$setViewValue: angular.noop}; this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) { i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c] }), angular.forEach(["minDate", "maxDate"], function (d) { b[d] ? a.$parent.$watch(c(b[d]), function (a) { i[d] = a ? new Date(a) : null, i.refreshView() }) : i[d] = h[d] ? new Date(h[d]) : null }), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) { a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView()) })) : this.activeDate = new Date, a.isActive = function (b) { return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1 }, this.init = function (a) { j = a, j.$render = function () { i.render() } }, this.render = function () { if (j.$viewValue) { var a = new Date(j.$viewValue), b = !isNaN(a); b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b) } this.refreshView() }, this.refreshView = function () { if (this.element) { this._refreshView(); var a = j.$viewValue ? new Date(j.$viewValue) : null; j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a)) } }, this.createDateObject = function (a, b) { var c = j.$viewValue ? new Date(j.$viewValue) : null; return { date: a, label: g(a, b), selected: c && 0 === this.compare(a, c), disabled: this.isDisabled(a), current: 0 === this.compare(a, new Date), customClass: this.customClass(a) } }, this.isDisabled = function (c) { return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({ date: c, mode: a.datepickerMode }) }, this.customClass = function (b) { return a.customClass({date: b, mode: a.datepickerMode}) }, this.split = function (a, b) { for (var c = []; a.length > 0;)c.push(a.splice(0, b)); return c }, a.select = function (b) { if (a.datepickerMode === i.minMode) { var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0); c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render() } else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1] }, a.move = function (a) { var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0); i.activeDate.setFullYear(b, c, 1), i.refreshView() }, a.toggleMode = function (b) { b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b]) }, a.keys = { 13: "enter", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 37: "left", 38: "up", 39: "right", 40: "down" }; var k = function () { e(function () { i.element[0].focus() }, 0, !1) }; a.$on("datepicker.focus", k), a.keydown = function (b) { var c = a.keys[b.which]; if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) { if (i.isDisabled(i.activeDate))return; a.select(i.activeDate), k() } else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k()) } }]).directive("datepicker", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/datepicker.html", scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"}, require: ["datepicker", "?^ngModel"], controller: "DatepickerController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f) } } }).directive("daypicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/day.html", require: "^datepicker", link: function (b, c, d, e) { function f(a, b) { return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29 } function g(a, b) { var c = new Array(b), d = new Date(a), e = 0; for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1); return c } function h(a) { var b = new Date(a); b.setDate(b.getDate() + 4 - (b.getDay() || 7)); var c = b.getTime(); return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1 } b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c; var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; e._refreshView = function () { var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f); j > 0 && k.setDate(-j + 1); for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), { secondary: l[m].getMonth() !== d, uid: b.uniqueId + "-" + m }); b.labels = new Array(7); for (var n = 0; 7 > n; n++)b.labels[n] = { abbr: a(l[n].date, e.formatDayHeader), full: a(l[n].date, "EEEE") }; if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) { b.weekNumbers = []; for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date)) } }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getDate(); if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1); e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b) } else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth())); e.activeDate.setDate(b) }, e.refreshView() } } }]).directive("monthpicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/month.html", require: "^datepicker", link: function (b, c, d, e) { e.step = {years: 1}, e.element = c, e._refreshView = function () { for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f}); b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3) }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getMonth(); if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1); e.activeDate.setFullYear(c) } else"home" === a ? b = 0 : "end" === a && (b = 11); e.activeDate.setMonth(b) }, e.refreshView() } } }]).directive("yearpicker", ["dateFilter", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/year.html", require: "^datepicker", link: function (a, b, c, d) { function e(a) { return parseInt((a - 1) / f, 10) * f + 1 } var f = d.yearRange; d.step = {years: f}, d.element = b, d._refreshView = function () { for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c}); a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5) }, d.compare = function (a, b) { return a.getFullYear() - b.getFullYear() }, d.handleKeyDown = function (a) { var b = d.activeDate.getFullYear(); "left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b) }, d.refreshView() } } }]).constant("datepickerPopupConfig", { datepickerPopup: "yyyy-MM-dd", html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"}, currentText: "Today", clearText: "Clear", closeText: "Done", closeOnDateSelection: !0, appendToBody: !1, showButtonBar: !0 }).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) { return { restrict: "EA", require: "ngModel", scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"}, link: function (h, i, j, k) { function l(a) { return a.replace(/([A-Z])/g, function (a) { return "-" + a.toLowerCase() }) } function m(a) { if (angular.isNumber(a) && (a = new Date(a)), a) { if (angular.isDate(a) && !isNaN(a))return a; if (angular.isString(a)) { var b = f.parse(a, o, h.date) || new Date(a); return isNaN(b) ? void 0 : b } return void 0 } return null } function n(a, b) { var c = a || b; if (angular.isNumber(c) && (c = new Date(c)), c) { if (angular.isDate(c) && !isNaN(c))return !0; if (angular.isString(c)) { var d = f.parse(c, o) || new Date(c); return !isNaN(d) } return !1 } return !0 } var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody; h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) { return h[a + "Text"] || g[a + "Text"] }; var r = !1; if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) { var b = a || g.datepickerPopup; if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.") })), !o)throw new Error("datepickerPopup must have a date format specified."); if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats."); var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>"); s.attr({"ng-model": "date", "ng-change": "dateSelection()"}); var t = angular.element(s.children()[0]); if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) { var u = h.$parent.$eval(j.datepickerOptions); u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) { t.attr(l(b), a) }) } h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) { if (j[a]) { var c = b(j[a]); if (h.$parent.$watch(c, function (b) { h.watchData[a] = b }), t.attr(l(a), "watchData." + a), "datepickerMode" === a) { var d = c.assign; h.$watch("watchData." + a, function (a, b) { a !== b && d(h.$parent, a) }) } } }), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) { return h.date = a, a }) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) { return h.date = a, k.$isEmpty(a) ? a : e(a, o) })), h.dateSelection = function (a) { angular.isDefined(a) && (h.date = a); var b = h.date ? e(h.date, o) : ""; i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus()) }, k.$viewChangeListeners.push(function () { h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue) }); var v = function (a) { h.isOpen && a.target !== i[0] && h.$apply(function () { h.isOpen = !1 }) }, w = function (a) { h.keydown(a) }; i.bind("keydown", w), h.keydown = function (a) { 27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0) }, h.$watch("isOpen", function (a) { a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v) }), h.select = function (a) { if ("today" === a) { var b = new Date; angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0)) } h.dateSelection(a) }, h.close = function () { h.isOpen = !1, i[0].focus() }; var x = a(s)(h); s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () { x.remove(), i.unbind("keydown", w), c.unbind("click", v) }) } } }]).directive("datepickerPopupWrap", function () { return { restrict: "EA", replace: !0, transclude: !0, templateUrl: "template/datepicker/popup.html", link: function (a, b) { b.bind("click", function (a) { a.preventDefault(), a.stopPropagation() }) } } }), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) { var c = null; this.open = function (b) { c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b }, this.close = function (b) { c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e)) }; var d = function (a) { if (c && (!a || "disabled" !== c.getAutoClose())) { var d = c.getToggleElement(); if (!(a && d && d[0].contains(a.target))) { var e = c.getElement(); a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply()) } } }, e = function (a) { 27 === a.which && (c.focusToggleElement(), d()) } }]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) { var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1; this.init = function (d) { j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) { k.isOpen = !!a })), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () { j.dropdownMenu.remove() })) }, this.toggle = function (a) { return k.isOpen = arguments.length ? !!a : !k.isOpen }, this.isOpen = function () { return k.isOpen }, k.getToggleElement = function () { return j.toggleElement }, k.getAutoClose = function () { return b.autoClose || "always" }, k.getElement = function () { return j.$element }, k.focusToggleElement = function () { j.toggleElement && j.toggleElement[0].focus() }, k.$watch("isOpen", function (b, c) { if (o && j.dropdownMenu) { var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0); j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"}) } f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b}) }), a.$on("$locationChangeSuccess", function () { k.isOpen = !1 }), a.$on("$destroy", function () { k.$destroy() }) }]).directive("dropdown", function () { return { controller: "DropdownController", link: function (a, b, c, d) { d.init(b) } } }).directive("dropdownMenu", function () { return { restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) { d && (d.dropdownMenu = b) } } }).directive("dropdownToggle", function () { return { require: "?^dropdown", link: function (a, b, c, d) { if (d) { d.toggleElement = b; var e = function (e) { e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () { d.toggle() }) }; b.bind("click", e), b.attr({ "aria-haspopup": !0, "aria-expanded": !1 }), a.$watch(d.isOpen, function (a) { b.attr("aria-expanded", !!a) }), a.$on("$destroy", function () { b.unbind("click", e) }) } } } }), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () { return { createNew: function () { var a = []; return { add: function (b, c) { a.push({key: b, value: c}) }, get: function (b) { for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c] }, keys: function () { for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key); return b }, top: function () { return a[a.length - 1] }, remove: function (b) { for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) { c = d; break } return a.splice(c, 1)[0] }, removeTop: function () { return a.splice(a.length - 1, 1)[0] }, length: function () { return a.length } } } } }).directive("modalBackdrop", ["$timeout", function (a) { function b(b) { b.animate = !1, a(function () { b.animate = !0 }) } return { restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) { return a.addClass(c.backdropClass), b } } }]).directive("modalWindow", ["$modalStack", "$q", function (a, b) { return { restrict: "EA", scope: {index: "@", animate: "="}, replace: !0, transclude: !0, templateUrl: function (a, b) { return b.templateUrl || "template/modal/window.html" }, link: function (c, d, e) { d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) { var c = a.getTop(); c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click")) }, c.$isRendered = !0; var f = b.defer(); e.$observe("modalRender", function (a) { "true" == a && f.resolve() }), f.promise.then(function () { c.animate = !0; var b = d[0].querySelectorAll("[autofocus]"); b.length ? b[0].focus() : d[0].focus(); var e = a.getTop(); e && a.modalRendered(e.key) }) } } }]).directive("modalAnimationClass", [function () { return { compile: function (a, b) { b.modalAnimation && a.addClass(b.modalAnimationClass) } } }]).directive("modalTransclude", function () { return { link: function (a, b, c, d, e) { e(a.$parent, function (a) { b.empty(), b.append(a) }) } } }).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) { function g() { for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c); return a } function h(a) { var b = c.find("body").eq(0), d = o.get(a).value; o.remove(a), j(d.modalDomEl, d.modalScope, function () { b.toggleClass(n, o.length() > 0), i() }) } function i() { if (l && -1 == g()) { var a = m; j(l, m, function () { a = null }), l = void 0, m = void 0 } } function j(c, d, f) { function g() { g.done || (g.done = !0, c.remove(), d.$destroy(), f && f()) } d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () { e.$evalAsync(g) }) : b(g) } function k(a, b, c) { return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented } var l, m, n = "modal-open", o = f.createNew(), p = {}; return e.$watch(g, function (a) { m && (m.index = a) }), c.bind("keydown", function (a) { var b; 27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () { p.dismiss(b.key, "escape key press") }))) }), p.open = function (a, b) { var f = c[0].activeElement; o.add(a, { deferred: b.deferred, renderDeferred: b.renderDeferred, modalScope: b.scope, backdrop: b.backdrop, keyboard: b.keyboard }); var h = c.find("body").eq(0), i = g(); if (i >= 0 && !l) { m = e.$new(!0), m.index = i; var j = angular.element('<div modal-backdrop="modal-backdrop"></div>'); j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l) } var k = angular.element('<div modal-window="modal-window"></div>'); k.attr({ "template-url": b.windowTemplateUrl, "window-class": b.windowClass, size: b.size, index: o.length() - 1, animate: "animate" }).html(b.content), b.animation && k.attr("modal-animation", "true"); var p = d(k)(b.scope); o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n) }, p.close = function (a, b) { var c = o.get(a); return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismiss = function (a, b) { var c = o.get(a); return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismissAll = function (a) { for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop() }, p.getTop = function () { return o.top() }, p.modalRendered = function (a) { var b = o.get(a); b && b.value.renderDeferred.resolve() }, p }]).provider("$modal", function () { var a = { options: {animation: !0, backdrop: !0, keyboard: !0}, $get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) { function h(a) { return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl) } function i(a) { var c = []; return angular.forEach(a, function (a) { (angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a))) }), c } var j = {}; return j.open = function (b) { var e = d.defer(), j = d.defer(), k = d.defer(), l = { result: e.promise, opened: j.promise, rendered: k.promise, close: function (a) { return g.close(l, a) }, dismiss: function (a) { return g.dismiss(l, a) } }; if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required."); var m = d.all([h(b)].concat(i(b.resolve))); return m.then(function (a) { var d = (b.scope || c).$new(); d.$close = l.close, d.$dismiss = l.dismiss; var h, i = {}, j = 1; b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) { i[c] = a[j++] }), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, { scope: d, deferred: e, renderDeferred: k, content: a[0], animation: b.animation, backdrop: b.backdrop, keyboard: b.keyboard, backdropClass: b.backdropClass, windowClass: b.windowClass, windowTemplateUrl: b.windowTemplateUrl, size: b.size }) }, function (a) { e.reject(a) }), m.then(function () { j.resolve(!0) }, function (a) { j.reject(a) }), l }, j }] }; return a }), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) { var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop; this.init = function (g, h) { e = g, this.config = h, e.$render = function () { d.render() }, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) { d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages() }) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () { a.totalPages = d.calculateTotalPages() }), a.$watch("totalPages", function (b) { f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render() }) }, this.calculateTotalPages = function () { var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage); return Math.max(b || 0, 1) }, this.render = function () { a.page = parseInt(e.$viewValue, 10) || 1 }, a.selectPage = function (b, c) { a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render()) }, a.getText = function (b) { return a[b + "Text"] || d.config[b + "Text"] }, a.noPrevious = function () { return 1 === a.page }, a.noNext = function () { return a.page === a.totalPages } }]).constant("paginationConfig", { itemsPerPage: 10, boundaryLinks: !1, directionLinks: !0, firstText: "First", previousText: "Previous", nextText: "Next", lastText: "Last", rotate: !0 }).directive("pagination", ["$parse", "paginationConfig", function (a, b) { return { restrict: "EA", scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"}, require: ["pagination", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pagination.html", replace: !0, link: function (c, d, e, f) { function g(a, b, c) { return {number: a, text: b, active: c} } function h(a, b) { var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k; f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b))); for (var h = d; e >= h; h++) { var i = g(h, h, h === a); c.push(i) } if (f && !l) { if (d > 1) { var j = g(d - 1, "...", !1); c.unshift(j) } if (b > e) { var m = g(e + 1, "...", !1); c.push(m) } } return c } var i = f[0], j = f[1]; if (j) { var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate; c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) { k = parseInt(a, 10), i.render() }); var m = i.render; i.render = function () { m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages)) } } } } }]).constant("pagerConfig", { itemsPerPage: 10, previousText: "« Previous", nextText: "Next »", align: !0 }).directive("pager", ["pagerConfig", function (a) { return { restrict: "EA", scope: {totalItems: "=", previousText: "@", nextText: "@"}, require: ["pager", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pager.html", replace: !0, link: function (b, c, d, e) { var f = e[0], g = e[1]; g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a)) } } }]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () { function a(a) { var b = /[A-Z]/g, c = "-"; return a.replace(b, function (a, b) { return (b ? c : "") + a.toLowerCase() }) } var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = { mouseenter: "mouseleave", click: "click", focus: "blur" }, d = {}; this.options = function (a) { angular.extend(d, a) }, this.setTriggers = function (a) { angular.extend(c, a) }, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) { return function (e, k, l, m) { function n(a) { var b = a || m.trigger || l, d = c[b] || b; return {show: b, hide: d} } m = angular.extend({}, b, d, m); var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>'; return { restrict: "EA", compile: function () { var a = f(r); return function (b, c, d) { function f() { E.isOpen ? l() : j() } function j() { (!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) { a() })) : o()()) } function l() { b.$apply(function () { p() }) } function o() { return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({ top: 0, left: 0, display: "block" }), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop } function p() { E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r() } function q() { x && r(), y = E.$new(), x = a(y, function (a) { B ? h.find("body").append(a) : c.after(a) }), y.$watch(function () { g(F, 0, !1) }), m.useContentExp && y.$watch("contentExp()", function (a) { !a && E.isOpen && p() }) } function r() { z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null) } function s() { t(), u(), v() } function t() { E.popupClass = d[k + "Class"] } function u() { var a = d[k + "Placement"]; E.placement = angular.isDefined(a) ? a : m.placement } function v() { var a = d[k + "PopupDelay"], b = parseInt(a, 10); E.popupDelay = isNaN(b) ? m.popupDelay : b } function w() { var a = d[k + "Trigger"]; G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l)) } var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () { if (x) { var a = i.positionElements(c, x, E.placement, B); a.top += "px", a.left += "px", x.css(a) } }; E.origScope = b, E.isOpen = !1, E.contentExp = function () { return b.$eval(d[e]) }, m.useContentExp || d.$observe(e, function (a) { E.content = a, !a && E.isOpen && p() }), d.$observe("disabled", function (a) { a && E.isOpen && p() }), d.$observe(k + "Title", function (a) { E.title = a }); var G = function () { c.unbind(C.show, j), c.unbind(C.hide, l) }; w(); var H = b.$eval(d[k + "Animation"]); E.animation = angular.isDefined(H) ? !!H : m.animation; var I = b.$eval(d[k + "AppendToBody"]); B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () { E.isOpen && p() }), b.$on("$destroy", function () { g.cancel(z), g.cancel(A), G(), r(), E = null }) } } } } }] }).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) { return { link: function (e, f, g) { var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () { i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () { i = null }), i = j, j = null) }; e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) { var g = ++l; b ? (d(b, !0).then(function (d) { if (g === l) { var e = k.$new(), i = d, n = c(i)(e, function (b) { m(), a.enter(b, f) }); h = e, j = n, h.$emit("$includeContentLoaded", b) } }, function () { g === l && (m(), e.$emit("$includeContentError", b)) }), e.$emit("$includeContentRequested", b)) : m() }), e.$on("$destroy", m) } } }]).directive("tooltipClasses", function () { return { restrict: "A", link: function (a, b, c) { a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass) } } }).directive("tooltipPopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-popup.html" } }).directive("tooltip", ["$tooltip", function (a) { return a("tooltip", "tooltip", "mouseenter") }]).directive("tooltipTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"}, templateUrl: "template/tooltip/tooltip-template-popup.html" } }).directive("tooltipTemplate", ["$tooltip", function (a) { return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlPopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-popup.html" } }).directive("tooltipHtml", ["$tooltip", function (a) { return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlUnsafePopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html" } }).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) { return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter") }]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: { title: "@", contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&" }, templateUrl: "template/popover/popover-template.html" } }).directive("popoverTemplate", ["$tooltip", function (a) { return a("popoverTemplate", "popover", "click", {useContentExp: !0}) }]).directive("popoverPopup", function () { return { restrict: "EA", replace: !0, scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/popover/popover.html" } }).directive("popover", ["$tooltip", function (a) { return a("popover", "popover", "click") }]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", { animate: !0, max: 100 }).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) { var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate; this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) { e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) { b.percent = +(100 * c / a.max).toFixed(2) }), b.$on("$destroy", function () { c = null, d.removeBar(b) }) }, this.removeBar = function (a) { this.bars.splice(this.bars.indexOf(a), 1) } }]).directive("progress", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", require: "progress", scope: {}, templateUrl: "template/progressbar/progress.html" } }).directive("bar", function () { return { restrict: "EA", replace: !0, transclude: !0, require: "^progress", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/bar.html", link: function (a, b, c, d) { d.addBar(a, b) } } }).directive("progressbar", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/progressbar.html", link: function (a, b, c, d) { d.addBar(a, angular.element(b.children()[0])) } } }), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", { max: 5, stateOn: null, stateOff: null }).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) { var d = {$setViewValue: angular.noop}; this.init = function (e) { d = e, d.$render = this.render, d.$formatters.push(function (a) { return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a }), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff; var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max); a.range = this.buildTemplateObjects(f) }, this.buildTemplateObjects = function (a) { for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, { stateOn: this.stateOn, stateOff: this.stateOff }, a[b]); return a }, a.rate = function (b) { !a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render()) }, a.enter = function (b) { a.readonly || (a.value = b), a.onHover({value: b}) }, a.reset = function () { a.value = d.$viewValue, a.onLeave() }, a.onKeydown = function (b) { /(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1))) }, this.render = function () { a.value = d.$viewValue } }]).directive("rating", function () { return { restrict: "EA", require: ["rating", "ngModel"], scope: {readonly: "=?", onHover: "&", onLeave: "&"}, controller: "RatingController", templateUrl: "template/rating/rating.html", replace: !0, link: function (a, b, c, d) { var e = d[0], f = d[1]; e.init(f) } } }), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) { var b = this, c = b.tabs = a.tabs = []; b.select = function (a) { angular.forEach(c, function (b) { b.active && b !== a && (b.active = !1, b.onDeselect()) }), a.active = !0, a.onSelect() }, b.addTab = function (a) { c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1 }, b.removeTab = function (a) { var e = c.indexOf(a); if (a.active && c.length > 1 && !d) { var f = e == c.length - 1 ? e - 1 : e + 1; b.select(c[f]) } c.splice(e, 1) }; var d; a.$on("$destroy", function () { d = !0 }) }]).directive("tabset", function () { return { restrict: "EA", transclude: !0, replace: !0, scope: {type: "@"}, controller: "TabsetController", templateUrl: "template/tabs/tabset.html", link: function (a, b, c) { a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1 } } }).directive("tab", ["$parse", "$log", function (a, b) { return { require: "^tabset", restrict: "EA", replace: !0, templateUrl: "template/tabs/tab.html", transclude: !0, scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"}, controller: function () { }, compile: function (c, d, e) { return function (c, d, f, g) { c.$watch("active", function (a) { a && g.select(c) }), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) { c.disabled = !!a }), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) { c.disabled = !!a })), c.select = function () { c.disabled || (c.active = !0) }, g.addTab(c), c.$on("$destroy", function () { g.removeTab(c) }), c.$transcludeFn = e } } } }]).directive("tabHeadingTransclude", [function () { return { restrict: "A", require: "^tab", link: function (a, b) { a.$watch("headingElement", function (a) { a && (b.html(""), b.append(a)) }) } } }]).directive("tabContentTransclude", function () { function a(a) { return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase()) } return { restrict: "A", require: "^tabset", link: function (b, c, d) { var e = b.$eval(d.tabContentTransclude); e.$transcludeFn(e.$parent, function (b) { angular.forEach(b, function (b) { a(b) ? e.headingElement = b : c.append(b) }) }) } } }), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", { hourStep: 1, minuteStep: 1, showMeridian: !0, meridians: null, readonlyInput: !1, mousewheel: !0, arrowkeys: !0 }).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) { function g() { var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b; return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0 } function h() { var b = parseInt(a.minutes, 10); return b >= 0 && 60 > b ? b : void 0 } function i(a) { return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString() } function j(a) { k(), o.$setViewValue(new Date(n)), l(a) } function k() { o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1 } function l(b) { var c = n.getHours(), d = n.getMinutes(); a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1] } function m(a) { var b = new Date(n.getTime() + 6e4 * a); n.setHours(b.getHours(), b.getMinutes()), j() } var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS; this.init = function (c, d) { o = c, o.$render = this.render, o.$formatters.unshift(function (a) { return a ? new Date(a) : null }); var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel; h && this.setupMousewheelEvents(e, g); var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys; i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g) }; var q = f.hourStep; b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) { q = parseInt(a, 10) }); var r = f.minuteStep; b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) { r = parseInt(a, 10) }), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) { if (a.showMeridian = !!b, o.$error.time) { var c = g(), d = h(); angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j()) } else l() }), this.setupMousewheelEvents = function (b, c) { var d = function (a) { a.originalEvent && (a = a.originalEvent); var b = a.wheelDelta ? a.wheelDelta : -a.deltaY; return a.detail || b > 0 }; b.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault() }), c.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault() }) }, this.setupArrowkeyEvents = function (b, c) { b.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply()) }), c.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply()) }) }, this.setupInputEvents = function (b, c) { if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop); var d = function (b, c) { o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c) }; a.updateHours = function () { var a = g(); angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0) }, b.bind("blur", function () { !a.invalidHours && a.hours < 10 && a.$apply(function () { a.hours = i(a.hours) }) }), a.updateMinutes = function () { var a = h(); angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0) }, c.bind("blur", function () { !a.invalidMinutes && a.minutes < 10 && a.$apply(function () { a.minutes = i(a.minutes) }) }) }, this.render = function () { var a = o.$viewValue; isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l()) }, a.incrementHours = function () { m(60 * q) }, a.decrementHours = function () { m(60 * -q) }, a.incrementMinutes = function () { m(r) }, a.decrementMinutes = function () { m(-r) }, a.toggleMeridian = function () { m(720 * (n.getHours() < 12 ? 1 : -1)) } }]).directive("timepicker", function () { return { restrict: "EA", require: ["timepicker", "?^ngModel"], controller: "TimepickerController", replace: !0, scope: {}, templateUrl: "template/timepicker/timepicker.html", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f, b.find("input")) } } }), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) { function f(a) { for (var b in a)if (void 0 !== h.style[b])return a[b] } e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead."); var g = function (d, e, f) { f = f || {}; var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () { c.$apply(function () { d.unbind(i, j), h.resolve(d) }) }; return i && d.bind(i, j), b(function () { angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d) }), h.promise.cancel = function () { i && d.unbind(i, j), h.reject("Transition cancelled") }, h.promise }, h = document.createElement("trans"), i = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd", transition: "transitionend" }, j = { WebkitTransition: "webkitAnimationEnd", MozTransition: "animationend", OTransition: "oAnimationEnd", transition: "animationend" }; return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g }]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) { var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/; return { parse: function (c) { var d = c.match(b); if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".'); return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])} } } }]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) { var h = [9, 13, 27, 38, 40]; return { require: "ngModel", link: function (i, j, k, l) { var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new(); i.$on("$destroy", function () { x.$destroy() }); var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random()); j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y}); var z = angular.element("<div typeahead-popup></div>"); z.attr({ id: y, matches: "matches", active: "activeIdx", select: "select(activeIdx)", query: "query", position: "position" }), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl); var A = function () { x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1) }, B = function (a) { return y + "-option-" + a }; x.$watch("activeIdx", function (a) { 0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a)) }); var C = function (a) { var b = {$viewValue: a}; q(i, !0), c.when(w.source(i, b)).then(function (c) { var d = a === l.$viewValue; if (d && m)if (c && c.length > 0) { x.activeIdx = u ? 0 : -1, x.matches.length = 0; for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({ id: B(e), label: w.viewMapper(x, b), model: c[e] }); x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0) } else A(); d && q(i, !1) }, function () { A(), q(i, !1) }) }; A(), x.query = void 0; var D, E = function (a) { D = d(function () { C(a) }, o) }, F = function () { D && d.cancel(D) }; l.$parsers.unshift(function (a) { return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a) }), l.$formatters.push(function (a) { var b, c, d = {}; return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a) }), x.select = function (a) { var b, c, e = {}; e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, { $item: c, $model: b, $label: w.viewMapper(i, e) }), A(), d(function () { j[0].focus() }, 0, !1) }, j.bind("keydown", function (a) { 0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () { x.select(x.activeIdx) }) : 27 === a.which && (a.stopPropagation(), A(), x.$digest())) }), j.bind("blur", function () { m = !1 }); var G = function (a) { j[0] !== a.target && (A(), x.$digest()) }; e.bind("click", G), i.$on("$destroy", function () { e.unbind("click", G), t && H.remove(), z.remove() }); var H = a(z)(x); t ? e.find("body").append(H) : j.after(H) } } }]).directive("typeaheadPopup", function () { return { restrict: "EA", scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"}, replace: !0, templateUrl: "template/typeahead/typeahead-popup.html", link: function (a, b, c) { a.templateUrl = c.templateUrl, a.isOpen = function () { return a.matches.length > 0 }, a.isActive = function (b) { return a.active == b }, a.selectActive = function (b) { a.active = b }, a.selectMatch = function (b) { a.select({activeIdx: b}) } } } }).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) { return { restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) { var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html"; a(g).then(function (a) { b(a.trim())(d, function (a) { e.replaceWith(a) }) }) } } }]).filter("typeaheadHighlight", function () { function a(a) { return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") } return function (b, c) { return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b } }), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>') }]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) { a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">&times;</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n') }]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) { a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n') }]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) { a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n') }]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>') }]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n') }]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) { a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n') }]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) { a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n') }]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>') }]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>') }]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n') }]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n') }]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n') }]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>') }]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n') }]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) { a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>') }]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n') }]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n') }]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) { a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>') }]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n') }]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
/* * angular-ui-bootstrap * http://angular-ui.github.io/bootstrap/ * Version: 0.13.0 - 2015-05-02 * License: MIT */ angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) { return { link: function (b, c, d) { function e() { c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f) } function f() { c.removeClass("collapsing"), c.css({height: "auto"}) } function g() { c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h) } function h() { c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse") } b.$watch(d.collapse, function (a) { a ? g() : e() }) } } }]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) { this.groups = [], this.closeOthers = function (d) { var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers; e && angular.forEach(this.groups, function (a) { a !== d && (a.isOpen = !1) }) }, this.addGroup = function (a) { var b = this; this.groups.push(a), a.$on("$destroy", function () { b.removeGroup(a) }) }, this.removeGroup = function (a) { var b = this.groups.indexOf(a); -1 !== b && this.groups.splice(b, 1) } }]).directive("accordion", function () { return { restrict: "EA", controller: "AccordionController", transclude: !0, replace: !1, templateUrl: "template/accordion/accordion.html" } }).directive("accordionGroup", function () { return { require: "^accordion", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/accordion/accordion-group.html", scope: {heading: "@", isOpen: "=?", isDisabled: "=?"}, controller: function () { this.setHeading = function (a) { this.heading = a } }, link: function (a, b, c, d) { d.addGroup(a), a.$watch("isOpen", function (b) { b && d.closeOthers(a) }), a.toggleOpen = function () { a.isDisabled || (a.isOpen = !a.isOpen) } } } }).directive("accordionHeading", function () { return { restrict: "EA", transclude: !0, template: "", replace: !0, require: "^accordionGroup", link: function (a, b, c, d, e) { d.setHeading(e(a, angular.noop)) } } }).directive("accordionTransclude", function () { return { require: "^accordionGroup", link: function (a, b, c, d) { a.$watch(function () { return d[c.accordionTransclude] }, function (a) { a && (b.html(""), b.append(a)) }) } } }), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) { a.closeable = "close" in b, this.close = a.close }]).directive("alert", function () { return { restrict: "EA", controller: "AlertController", templateUrl: "template/alert/alert.html", transclude: !0, replace: !0, scope: {type: "@", close: "&"} } }).directive("dismissOnTimeout", ["$timeout", function (a) { return { require: "alert", link: function (b, c, d, e) { a(function () { e.close() }, parseInt(d.dismissOnTimeout, 10)) } } }]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () { return function (a, b, c) { b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) { b.html(a || "") }) } }), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", { activeClass: "active", toggleEvent: "click" }).controller("ButtonsController", ["buttonConfig", function (a) { this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click" }]).directive("btnRadio", function () { return { require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f.$render = function () { b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio))) }, b.bind(e.toggleEvent, function () { var d = b.hasClass(e.activeClass); (!d || angular.isDefined(c.uncheckable)) && a.$apply(function () { f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render() }) }) } } }).directive("btnCheckbox", function () { return { require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { function e() { return g(c.btnCheckboxTrue, !0) } function f() { return g(c.btnCheckboxFalse, !1) } function g(b, c) { var d = a.$eval(b); return angular.isDefined(d) ? d : c } var h = d[0], i = d[1]; i.$render = function () { b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e())) }, b.bind(h.toggleEvent, function () { a.$apply(function () { i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render() }) }) } } }), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) { function d(a) { if (angular.isUndefined(k[a].index))return k[a]; { var b; k.length } for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b] } function e() { f(); var c = +a.interval; !isNaN(c) && c > 0 && (h = b(g, c)) } function f() { h && (b.cancel(h), h = null) } function g() { var b = +a.interval; i && !isNaN(b) && b > 0 ? a.next() : a.pause() } var h, i, j = this, k = j.slides = a.slides = [], l = -1; j.currentSlide = null; var m = !1; j.select = a.select = function (b, d) { function f() { m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, { direction: d, active: !1 }), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () { a.$currentTransition = null })), j.currentSlide = b, l = g, e()) } var g = j.indexOfSlide(b); void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f() }, a.$on("$destroy", function () { m = !0 }), j.getCurrentIndex = function () { return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l }, j.indexOfSlide = function (a) { return angular.isDefined(a.index) ? +a.index : k.indexOf(a) }, a.next = function () { var b = (j.getCurrentIndex() + 1) % k.length; return a.$currentTransition ? void 0 : j.select(d(b), "next") }, a.prev = function () { var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1; return a.$currentTransition ? void 0 : j.select(d(b), "prev") }, a.isActive = function (a) { return j.currentSlide === a }, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () { i || (i = !0, e()) }, a.pause = function () { a.noPause || (i = !1, f()) }, j.addSlide = function (b, c) { b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1 }, j.removeSlide = function (a) { angular.isDefined(a.index) && k.sort(function (a, b) { return +a.index > +b.index }); var b = k.indexOf(a); k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l-- } }]).directive("carousel", [function () { return { restrict: "EA", transclude: !0, replace: !0, controller: "CarouselController", require: "carousel", templateUrl: "template/carousel/carousel.html", scope: {interval: "=", noTransition: "=", noPause: "="} } }]).directive("slide", function () { return { require: "^carousel", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/carousel/slide.html", scope: {active: "=?", index: "=?"}, link: function (a, b, c, d) { d.addSlide(a, b), a.$on("$destroy", function () { d.removeSlide(a) }), a.$watch("active", function (b) { b && d.select(a) }) } } }).animation(".item", ["$animate", function (a) { return { beforeAddClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return b.addClass(f), a.addClass(b, g).then(function () { e || b.removeClass(g + " " + f), d() }), function () { e = !0 } } d() }, beforeRemoveClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return a.addClass(b, g).then(function () { e || b.removeClass(g), d() }), function () { e = !0 } } d() } } }]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) { function c(a) { var c = [], d = a.split(""); return angular.forEach(f, function (b, e) { var f = a.indexOf(e); if (f > -1) { a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$"; for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$"; a = a.join(""), c.push({index: f, apply: b.apply}) } }), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")} } function d(a, b, c) { return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0 } var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g; this.parsers = {}; var f = { yyyy: { regex: "\\d{4}", apply: function (a) { this.year = +a } }, yy: { regex: "\\d{2}", apply: function (a) { this.year = +a + 2e3 } }, y: { regex: "\\d{1,4}", apply: function (a) { this.year = +a } }, MMMM: { regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.MONTH.indexOf(b) } }, MMM: { regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b) } }, MM: { regex: "0[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, M: { regex: "[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, dd: { regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, d: { regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")}, EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")}, HH: { regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, H: { regex: "1?[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, mm: { regex: "[0-5][0-9]", apply: function (a) { this.minutes = +a } }, m: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.minutes = +a } }, sss: { regex: "[0-9][0-9][0-9]", apply: function (a) { this.milliseconds = +a } }, ss: { regex: "[0-5][0-9]", apply: function (a) { this.seconds = +a } }, s: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.seconds = +a } } }; this.parse = function (b, f, g) { if (!angular.isString(b) || !f)return b; f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f)); var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i); if (k && k.length) { var l, m; l = g ? { year: g.getFullYear(), month: g.getMonth(), date: g.getDate(), hours: g.getHours(), minutes: g.getMinutes(), seconds: g.getSeconds(), milliseconds: g.getMilliseconds() } : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0}; for (var n = 1, o = k.length; o > n; n++) { var p = j[n - 1]; p.apply && p.apply.call(l, k[n]) } return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m } } }]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) { function c(a, c) { return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c] } function d(a) { return "static" === (c(a, "position") || "static") } var e = function (b) { for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent; return e || c }; return { position: function (b) { var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]); f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft); var g = b[0].getBoundingClientRect(); return { width: g.width || b.prop("offsetWidth"), height: g.height || b.prop("offsetHeight"), top: c.top - d.top, left: c.left - d.left } }, offset: function (c) { var d = c[0].getBoundingClientRect(); return { width: d.width || c.prop("offsetWidth"), height: d.height || c.prop("offsetHeight"), top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop), left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft) } }, positionElements: function (a, b, c, d) { var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center"; e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight"); var l = { center: function () { return e.left + e.width / 2 - f / 2 }, left: function () { return e.left }, right: function () { return e.left + e.width } }, m = { center: function () { return e.top + e.height / 2 - g / 2 }, top: function () { return e.top }, bottom: function () { return e.top + e.height } }; switch (j) { case"right": h = {top: m[k](), left: l[j]()}; break; case"left": h = {top: m[k](), left: e.left - f}; break; case"bottom": h = {top: m[j](), left: l[k]()}; break; default: h = {top: e.top - g, left: l[k]()} } return h } } }]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", { formatDay: "dd", formatMonth: "MMMM", formatYear: "yyyy", formatDayHeader: "EEE", formatDayTitle: "MMMM yyyy", formatMonthTitle: "yyyy", datepickerMode: "day", minMode: "day", maxMode: "year", showWeeks: !0, startingDay: 0, yearRange: 20, minDate: null, maxDate: null, shortcutPropagation: !1 }).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) { var i = this, j = {$setViewValue: angular.noop}; this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) { i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c] }), angular.forEach(["minDate", "maxDate"], function (d) { b[d] ? a.$parent.$watch(c(b[d]), function (a) { i[d] = a ? new Date(a) : null, i.refreshView() }) : i[d] = h[d] ? new Date(h[d]) : null }), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) { a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView()) })) : this.activeDate = new Date, a.isActive = function (b) { return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1 }, this.init = function (a) { j = a, j.$render = function () { i.render() } }, this.render = function () { if (j.$viewValue) { var a = new Date(j.$viewValue), b = !isNaN(a); b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b) } this.refreshView() }, this.refreshView = function () { if (this.element) { this._refreshView(); var a = j.$viewValue ? new Date(j.$viewValue) : null; j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a)) } }, this.createDateObject = function (a, b) { var c = j.$viewValue ? new Date(j.$viewValue) : null; return { date: a, label: g(a, b), selected: c && 0 === this.compare(a, c), disabled: this.isDisabled(a), current: 0 === this.compare(a, new Date), customClass: this.customClass(a) } }, this.isDisabled = function (c) { return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({ date: c, mode: a.datepickerMode }) }, this.customClass = function (b) { return a.customClass({date: b, mode: a.datepickerMode}) }, this.split = function (a, b) { for (var c = []; a.length > 0;)c.push(a.splice(0, b)); return c }, a.select = function (b) { if (a.datepickerMode === i.minMode) { var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0); c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render() } else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1] }, a.move = function (a) { var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0); i.activeDate.setFullYear(b, c, 1), i.refreshView() }, a.toggleMode = function (b) { b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b]) }, a.keys = { 13: "enter", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 37: "left", 38: "up", 39: "right", 40: "down" }; var k = function () { e(function () { i.element[0].focus() }, 0, !1) }; a.$on("datepicker.focus", k), a.keydown = function (b) { var c = a.keys[b.which]; if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) { if (i.isDisabled(i.activeDate))return; a.select(i.activeDate), k() } else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k()) } }]).directive("datepicker", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/datepicker.html", scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"}, require: ["datepicker", "?^ngModel"], controller: "DatepickerController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f) } } }).directive("daypicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/day.html", require: "^datepicker", link: function (b, c, d, e) { function f(a, b) { return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29 } function g(a, b) { var c = new Array(b), d = new Date(a), e = 0; for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1); return c } function h(a) { var b = new Date(a); b.setDate(b.getDate() + 4 - (b.getDay() || 7)); var c = b.getTime(); return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1 } b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c; var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; e._refreshView = function () { var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f); j > 0 && k.setDate(-j + 1); for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), { secondary: l[m].getMonth() !== d, uid: b.uniqueId + "-" + m }); b.labels = new Array(7); for (var n = 0; 7 > n; n++)b.labels[n] = { abbr: a(l[n].date, e.formatDayHeader), full: a(l[n].date, "EEEE") }; if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) { b.weekNumbers = []; for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date)) } }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getDate(); if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1); e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b) } else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth())); e.activeDate.setDate(b) }, e.refreshView() } } }]).directive("monthpicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/month.html", require: "^datepicker", link: function (b, c, d, e) { e.step = {years: 1}, e.element = c, e._refreshView = function () { for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f}); b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3) }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getMonth(); if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1); e.activeDate.setFullYear(c) } else"home" === a ? b = 0 : "end" === a && (b = 11); e.activeDate.setMonth(b) }, e.refreshView() } } }]).directive("yearpicker", ["dateFilter", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/year.html", require: "^datepicker", link: function (a, b, c, d) { function e(a) { return parseInt((a - 1) / f, 10) * f + 1 } var f = d.yearRange; d.step = {years: f}, d.element = b, d._refreshView = function () { for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c}); a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5) }, d.compare = function (a, b) { return a.getFullYear() - b.getFullYear() }, d.handleKeyDown = function (a) { var b = d.activeDate.getFullYear(); "left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b) }, d.refreshView() } } }]).constant("datepickerPopupConfig", { datepickerPopup: "yyyy-MM-dd", html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"}, currentText: "Today", clearText: "Clear", closeText: "Done", closeOnDateSelection: !0, appendToBody: !1, showButtonBar: !0 }).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) { return { restrict: "EA", require: "ngModel", scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"}, link: function (h, i, j, k) { function l(a) { return a.replace(/([A-Z])/g, function (a) { return "-" + a.toLowerCase() }) } function m(a) { if (angular.isNumber(a) && (a = new Date(a)), a) { if (angular.isDate(a) && !isNaN(a))return a; if (angular.isString(a)) { var b = f.parse(a, o, h.date) || new Date(a); return isNaN(b) ? void 0 : b } return void 0 } return null } function n(a, b) { var c = a || b; if (angular.isNumber(c) && (c = new Date(c)), c) { if (angular.isDate(c) && !isNaN(c))return !0; if (angular.isString(c)) { var d = f.parse(c, o) || new Date(c); return !isNaN(d) } return !1 } return !0 } var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody; h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) { return h[a + "Text"] || g[a + "Text"] }; var r = !1; if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) { var b = a || g.datepickerPopup; if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.") })), !o)throw new Error("datepickerPopup must have a date format specified."); if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats."); var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>"); s.attr({"ng-model": "date", "ng-change": "dateSelection()"}); var t = angular.element(s.children()[0]); if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) { var u = h.$parent.$eval(j.datepickerOptions); u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) { t.attr(l(b), a) }) } h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) { if (j[a]) { var c = b(j[a]); if (h.$parent.$watch(c, function (b) { h.watchData[a] = b }), t.attr(l(a), "watchData." + a), "datepickerMode" === a) { var d = c.assign; h.$watch("watchData." + a, function (a, b) { a !== b && d(h.$parent, a) }) } } }), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) { return h.date = a, a }) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) { return h.date = a, k.$isEmpty(a) ? a : e(a, o) })), h.dateSelection = function (a) { angular.isDefined(a) && (h.date = a); var b = h.date ? e(h.date, o) : ""; i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus()) }, k.$viewChangeListeners.push(function () { h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue) }); var v = function (a) { h.isOpen && a.target !== i[0] && h.$apply(function () { h.isOpen = !1 }) }, w = function (a) { h.keydown(a) }; i.bind("keydown", w), h.keydown = function (a) { 27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0) }, h.$watch("isOpen", function (a) { a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v) }), h.select = function (a) { if ("today" === a) { var b = new Date; angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0)) } h.dateSelection(a) }, h.close = function () { h.isOpen = !1, i[0].focus() }; var x = a(s)(h); s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () { x.remove(), i.unbind("keydown", w), c.unbind("click", v) }) } } }]).directive("datepickerPopupWrap", function () { return { restrict: "EA", replace: !0, transclude: !0, templateUrl: "template/datepicker/popup.html", link: function (a, b) { b.bind("click", function (a) { a.preventDefault(), a.stopPropagation() }) } } }), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) { var c = null; this.open = function (b) { c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b }, this.close = function (b) { c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e)) }; var d = function (a) { if (c && (!a || "disabled" !== c.getAutoClose())) { var d = c.getToggleElement(); if (!(a && d && d[0].contains(a.target))) { var e = c.getElement(); a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply()) } } }, e = function (a) { 27 === a.which && (c.focusToggleElement(), d()) } }]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) { var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1; this.init = function (d) { j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) { k.isOpen = !!a })), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () { j.dropdownMenu.remove() })) }, this.toggle = function (a) { return k.isOpen = arguments.length ? !!a : !k.isOpen }, this.isOpen = function () { return k.isOpen }, k.getToggleElement = function () { return j.toggleElement }, k.getAutoClose = function () { return b.autoClose || "always" }, k.getElement = function () { return j.$element }, k.focusToggleElement = function () { j.toggleElement && j.toggleElement[0].focus() }, k.$watch("isOpen", function (b, c) { if (o && j.dropdownMenu) { var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0); j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"}) } f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b}) }), a.$on("$locationChangeSuccess", function () { k.isOpen = !1 }), a.$on("$destroy", function () { k.$destroy() }) }]).directive("dropdown", function () { return { controller: "DropdownController", link: function (a, b, c, d) { d.init(b) } } }).directive("dropdownMenu", function () { return { restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) { d && (d.dropdownMenu = b) } } }).directive("dropdownToggle", function () { return { require: "?^dropdown", link: function (a, b, c, d) { if (d) { d.toggleElement = b; var e = function (e) { e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () { d.toggle() }) }; b.bind("click", e), b.attr({ "aria-haspopup": !0, "aria-expanded": !1 }), a.$watch(d.isOpen, function (a) { b.attr("aria-expanded", !!a) }), a.$on("$destroy", function () { b.unbind("click", e) }) } } } }), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () { return { createNew: function () { var a = []; return { add: function (b, c) { a.push({key: b, value: c}) }, get: function (b) { for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c] }, keys: function () { for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key); return b }, top: function () { return a[a.length - 1] }, remove: function (b) { for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) { c = d; break } return a.splice(c, 1)[0] }, removeTop: function () { return a.splice(a.length - 1, 1)[0] }, length: function () { return a.length } } } } }).directive("modalBackdrop", ["$timeout", function (a) { function b(b) { b.animate = !1, a(function () { b.animate = !0 }) } return { restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) { return a.addClass(c.backdropClass), b } } }]).directive("modalWindow", ["$modalStack", "$q", function (a, b) { return { restrict: "EA", scope: {index: "@", animate: "="}, replace: !0, transclude: !0, templateUrl: function (a, b) { return b.templateUrl || "template/modal/window.html" }, link: function (c, d, e) { d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) { var c = a.getTop(); c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click")) }, c.$isRendered = !0; var f = b.defer(); e.$observe("modalRender", function (a) { "true" == a && f.resolve() }), f.promise.then(function () { c.animate = !0; var b = d[0].querySelectorAll("[autofocus]"); b.length ? b[0].focus() : d[0].focus(); var e = a.getTop(); e && a.modalRendered(e.key) }) } } }]).directive("modalAnimationClass", [function () { return { compile: function (a, b) { b.modalAnimation && a.addClass(b.modalAnimationClass) } } }]).directive("modalTransclude", function () { return { link: function (a, b, c, d, e) { e(a.$parent, function (a) { b.empty(), b.append(a) }) } } }).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) { function g() { for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c); return a } function h(a) { var b = c.find("body").eq(0), d = o.get(a).value; o.remove(a), j(d.modalDomEl, d.modalScope, function () { b.toggleClass(n, o.length() > 0), i() }) } function i() { if (l && -1 == g()) { var a = m; j(l, m, function () { a = null }), l = void 0, m = void 0 } } function j(c, d, f) { function g() { g.done || (g.done = !0, c.remove(), d.$destroy(), f && f()) } d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () { e.$evalAsync(g) }) : b(g) } function k(a, b, c) { return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented } var l, m, n = "modal-open", o = f.createNew(), p = {}; return e.$watch(g, function (a) { m && (m.index = a) }), c.bind("keydown", function (a) { var b; 27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () { p.dismiss(b.key, "escape key press") }))) }), p.open = function (a, b) { var f = c[0].activeElement; o.add(a, { deferred: b.deferred, renderDeferred: b.renderDeferred, modalScope: b.scope, backdrop: b.backdrop, keyboard: b.keyboard }); var h = c.find("body").eq(0), i = g(); if (i >= 0 && !l) { m = e.$new(!0), m.index = i; var j = angular.element('<div modal-backdrop="modal-backdrop"></div>'); j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l) } var k = angular.element('<div modal-window="modal-window"></div>'); k.attr({ "template-url": b.windowTemplateUrl, "window-class": b.windowClass, size: b.size, index: o.length() - 1, animate: "animate" }).html(b.content), b.animation && k.attr("modal-animation", "true"); var p = d(k)(b.scope); o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n) }, p.close = function (a, b) { var c = o.get(a); return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismiss = function (a, b) { var c = o.get(a); return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismissAll = function (a) { for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop() }, p.getTop = function () { return o.top() }, p.modalRendered = function (a) { var b = o.get(a); b && b.value.renderDeferred.resolve() }, p }]).provider("$modal", function () { var a = { options: {animation: !0, backdrop: !0, keyboard: !0}, $get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) { function h(a) { return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl) } function i(a) { var c = []; return angular.forEach(a, function (a) { (angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a))) }), c } var j = {}; return j.open = function (b) { var e = d.defer(), j = d.defer(), k = d.defer(), l = { result: e.promise, opened: j.promise, rendered: k.promise, close: function (a) { return g.close(l, a) }, dismiss: function (a) { return g.dismiss(l, a) } }; if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required."); var m = d.all([h(b)].concat(i(b.resolve))); return m.then(function (a) { var d = (b.scope || c).$new(); d.$close = l.close, d.$dismiss = l.dismiss; var h, i = {}, j = 1; b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) { i[c] = a[j++] }), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, { scope: d, deferred: e, renderDeferred: k, content: a[0], animation: b.animation, backdrop: b.backdrop, keyboard: b.keyboard, backdropClass: b.backdropClass, windowClass: b.windowClass, windowTemplateUrl: b.windowTemplateUrl, size: b.size }) }, function (a) { e.reject(a) }), m.then(function () { j.resolve(!0) }, function (a) { j.reject(a) }), l }, j }] }; return a }), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) { var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop; this.init = function (g, h) { e = g, this.config = h, e.$render = function () { d.render() }, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) { d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages() }) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () { a.totalPages = d.calculateTotalPages() }), a.$watch("totalPages", function (b) { f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render() }) }, this.calculateTotalPages = function () { var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage); return Math.max(b || 0, 1) }, this.render = function () { a.page = parseInt(e.$viewValue, 10) || 1 }, a.selectPage = function (b, c) { a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render()) }, a.getText = function (b) { return a[b + "Text"] || d.config[b + "Text"] }, a.noPrevious = function () { return 1 === a.page }, a.noNext = function () { return a.page === a.totalPages } }]).constant("paginationConfig", { itemsPerPage: 10, boundaryLinks: !1, directionLinks: !0, firstText: "First", previousText: "Previous", nextText: "Next", lastText: "Last", rotate: !0 }).directive("pagination", ["$parse", "paginationConfig", function (a, b) { return { restrict: "EA", scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"}, require: ["pagination", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pagination.html", replace: !0, link: function (c, d, e, f) { function g(a, b, c) { return {number: a, text: b, active: c} } function h(a, b) { var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k; f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b))); for (var h = d; e >= h; h++) { var i = g(h, h, h === a); c.push(i) } if (f && !l) { if (d > 1) { var j = g(d - 1, "...", !1); c.unshift(j) } if (b > e) { var m = g(e + 1, "...", !1); c.push(m) } } return c } var i = f[0], j = f[1]; if (j) { var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate; c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) { k = parseInt(a, 10), i.render() }); var m = i.render; i.render = function () { m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages)) } } } } }]).constant("pagerConfig", { itemsPerPage: 10, previousText: "« Previous", nextText: "Next »", align: !0 }).directive("pager", ["pagerConfig", function (a) { return { restrict: "EA", scope: {totalItems: "=", previousText: "@", nextText: "@"}, require: ["pager", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pager.html", replace: !0, link: function (b, c, d, e) { var f = e[0], g = e[1]; g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a)) } } }]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () { function a(a) { var b = /[A-Z]/g, c = "-"; return a.replace(b, function (a, b) { return (b ? c : "") + a.toLowerCase() }) } var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = { mouseenter: "mouseleave", click: "click", focus: "blur" }, d = {}; this.options = function (a) { angular.extend(d, a) }, this.setTriggers = function (a) { angular.extend(c, a) }, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) { return function (e, k, l, m) { function n(a) { var b = a || m.trigger || l, d = c[b] || b; return {show: b, hide: d} } m = angular.extend({}, b, d, m); var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>'; return { restrict: "EA", compile: function () { var a = f(r); return function (b, c, d) { function f() { E.isOpen ? l() : j() } function j() { (!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) { a() })) : o()()) } function l() { b.$apply(function () { p() }) } function o() { return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({ top: 0, left: 0, display: "block" }), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop } function p() { E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r() } function q() { x && r(), y = E.$new(), x = a(y, function (a) { B ? h.find("body").append(a) : c.after(a) }), y.$watch(function () { g(F, 0, !1) }), m.useContentExp && y.$watch("contentExp()", function (a) { !a && E.isOpen && p() }) } function r() { z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null) } function s() { t(), u(), v() } function t() { E.popupClass = d[k + "Class"] } function u() { var a = d[k + "Placement"]; E.placement = angular.isDefined(a) ? a : m.placement } function v() { var a = d[k + "PopupDelay"], b = parseInt(a, 10); E.popupDelay = isNaN(b) ? m.popupDelay : b } function w() { var a = d[k + "Trigger"]; G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l)) } var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () { if (x) { var a = i.positionElements(c, x, E.placement, B); a.top += "px", a.left += "px", x.css(a) } }; E.origScope = b, E.isOpen = !1, E.contentExp = function () { return b.$eval(d[e]) }, m.useContentExp || d.$observe(e, function (a) { E.content = a, !a && E.isOpen && p() }), d.$observe("disabled", function (a) { a && E.isOpen && p() }), d.$observe(k + "Title", function (a) { E.title = a }); var G = function () { c.unbind(C.show, j), c.unbind(C.hide, l) }; w(); var H = b.$eval(d[k + "Animation"]); E.animation = angular.isDefined(H) ? !!H : m.animation; var I = b.$eval(d[k + "AppendToBody"]); B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () { E.isOpen && p() }), b.$on("$destroy", function () { g.cancel(z), g.cancel(A), G(), r(), E = null }) } } } } }] }).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) { return { link: function (e, f, g) { var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () { i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () { i = null }), i = j, j = null) }; e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) { var g = ++l; b ? (d(b, !0).then(function (d) { if (g === l) { var e = k.$new(), i = d, n = c(i)(e, function (b) { m(), a.enter(b, f) }); h = e, j = n, h.$emit("$includeContentLoaded", b) } }, function () { g === l && (m(), e.$emit("$includeContentError", b)) }), e.$emit("$includeContentRequested", b)) : m() }), e.$on("$destroy", m) } } }]).directive("tooltipClasses", function () { return { restrict: "A", link: function (a, b, c) { a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass) } } }).directive("tooltipPopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-popup.html" } }).directive("tooltip", ["$tooltip", function (a) { return a("tooltip", "tooltip", "mouseenter") }]).directive("tooltipTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"}, templateUrl: "template/tooltip/tooltip-template-popup.html" } }).directive("tooltipTemplate", ["$tooltip", function (a) { return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlPopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-popup.html" } }).directive("tooltipHtml", ["$tooltip", function (a) { return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlUnsafePopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html" } }).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) { return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter") }]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: { title: "@", contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&" }, templateUrl: "template/popover/popover-template.html" } }).directive("popoverTemplate", ["$tooltip", function (a) { return a("popoverTemplate", "popover", "click", {useContentExp: !0}) }]).directive("popoverPopup", function () { return { restrict: "EA", replace: !0, scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/popover/popover.html" } }).directive("popover", ["$tooltip", function (a) { return a("popover", "popover", "click") }]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", { animate: !0, max: 100 }).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) { var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate; this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) { e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) { b.percent = +(100 * c / a.max).toFixed(2) }), b.$on("$destroy", function () { c = null, d.removeBar(b) }) }, this.removeBar = function (a) { this.bars.splice(this.bars.indexOf(a), 1) } }]).directive("progress", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", require: "progress", scope: {}, templateUrl: "template/progressbar/progress.html" } }).directive("bar", function () { return { restrict: "EA", replace: !0, transclude: !0, require: "^progress", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/bar.html", link: function (a, b, c, d) { d.addBar(a, b) } } }).directive("progressbar", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/progressbar.html", link: function (a, b, c, d) { d.addBar(a, angular.element(b.children()[0])) } } }), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", { max: 5, stateOn: null, stateOff: null }).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) { var d = {$setViewValue: angular.noop}; this.init = function (e) { d = e, d.$render = this.render, d.$formatters.push(function (a) { return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a }), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff; var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max); a.range = this.buildTemplateObjects(f) }, this.buildTemplateObjects = function (a) { for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, { stateOn: this.stateOn, stateOff: this.stateOff }, a[b]); return a }, a.rate = function (b) { !a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render()) }, a.enter = function (b) { a.readonly || (a.value = b), a.onHover({value: b}) }, a.reset = function () { a.value = d.$viewValue, a.onLeave() }, a.onKeydown = function (b) { /(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1))) }, this.render = function () { a.value = d.$viewValue } }]).directive("rating", function () { return { restrict: "EA", require: ["rating", "ngModel"], scope: {readonly: "=?", onHover: "&", onLeave: "&"}, controller: "RatingController", templateUrl: "template/rating/rating.html", replace: !0, link: function (a, b, c, d) { var e = d[0], f = d[1]; e.init(f) } } }), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) { var b = this, c = b.tabs = a.tabs = []; b.select = function (a) { angular.forEach(c, function (b) { b.active && b !== a && (b.active = !1, b.onDeselect()) }), a.active = !0, a.onSelect() }, b.addTab = function (a) { c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1 }, b.removeTab = function (a) { var e = c.indexOf(a); if (a.active && c.length > 1 && !d) { var f = e == c.length - 1 ? e - 1 : e + 1; b.select(c[f]) } c.splice(e, 1) }; var d; a.$on("$destroy", function () { d = !0 }) }]).directive("tabset", function () { return { restrict: "EA", transclude: !0, replace: !0, scope: {type: "@"}, controller: "TabsetController", templateUrl: "template/tabs/tabset.html", link: function (a, b, c) { a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1 } } }).directive("tab", ["$parse", "$log", function (a, b) { return { require: "^tabset", restrict: "EA", replace: !0, templateUrl: "template/tabs/tab.html", transclude: !0, scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"}, controller: function () { }, compile: function (c, d, e) { return function (c, d, f, g) { c.$watch("active", function (a) { a && g.select(c) }), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) { c.disabled = !!a }), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) { c.disabled = !!a })), c.select = function () { c.disabled || (c.active = !0) }, g.addTab(c), c.$on("$destroy", function () { g.removeTab(c) }), c.$transcludeFn = e } } } }]).directive("tabHeadingTransclude", [function () { return { restrict: "A", require: "^tab", link: function (a, b) { a.$watch("headingElement", function (a) { a && (b.html(""), b.append(a)) }) } } }]).directive("tabContentTransclude", function () { function a(a) { return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase()) } return { restrict: "A", require: "^tabset", link: function (b, c, d) { var e = b.$eval(d.tabContentTransclude); e.$transcludeFn(e.$parent, function (b) { angular.forEach(b, function (b) { a(b) ? e.headingElement = b : c.append(b) }) }) } } }), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", { hourStep: 1, minuteStep: 1, showMeridian: !0, meridians: null, readonlyInput: !1, mousewheel: !0, arrowkeys: !0 }).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) { function g() { var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b; return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0 } function h() { var b = parseInt(a.minutes, 10); return b >= 0 && 60 > b ? b : void 0 } function i(a) { return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString() } function j(a) { k(), o.$setViewValue(new Date(n)), l(a) } function k() { o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1 } function l(b) { var c = n.getHours(), d = n.getMinutes(); a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1] } function m(a) { var b = new Date(n.getTime() + 6e4 * a); n.setHours(b.getHours(), b.getMinutes()), j() } var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS; this.init = function (c, d) { o = c, o.$render = this.render, o.$formatters.unshift(function (a) { return a ? new Date(a) : null }); var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel; h && this.setupMousewheelEvents(e, g); var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys; i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g) }; var q = f.hourStep; b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) { q = parseInt(a, 10) }); var r = f.minuteStep; b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) { r = parseInt(a, 10) }), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) { if (a.showMeridian = !!b, o.$error.time) { var c = g(), d = h(); angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j()) } else l() }), this.setupMousewheelEvents = function (b, c) { var d = function (a) { a.originalEvent && (a = a.originalEvent); var b = a.wheelDelta ? a.wheelDelta : -a.deltaY; return a.detail || b > 0 }; b.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault() }), c.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault() }) }, this.setupArrowkeyEvents = function (b, c) { b.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply()) }), c.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply()) }) }, this.setupInputEvents = function (b, c) { if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop); var d = function (b, c) { o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c) }; a.updateHours = function () { var a = g(); angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0) }, b.bind("blur", function () { !a.invalidHours && a.hours < 10 && a.$apply(function () { a.hours = i(a.hours) }) }), a.updateMinutes = function () { var a = h(); angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0) }, c.bind("blur", function () { !a.invalidMinutes && a.minutes < 10 && a.$apply(function () { a.minutes = i(a.minutes) }) }) }, this.render = function () { var a = o.$viewValue; isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l()) }, a.incrementHours = function () { m(60 * q) }, a.decrementHours = function () { m(60 * -q) }, a.incrementMinutes = function () { m(r) }, a.decrementMinutes = function () { m(-r) }, a.toggleMeridian = function () { m(720 * (n.getHours() < 12 ? 1 : -1)) } }]).directive("timepicker", function () { return { restrict: "EA", require: ["timepicker", "?^ngModel"], controller: "TimepickerController", replace: !0, scope: {}, templateUrl: "template/timepicker/timepicker.html", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f, b.find("input")) } } }), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) { function f(a) { for (var b in a)if (void 0 !== h.style[b])return a[b] } e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead."); var g = function (d, e, f) { f = f || {}; var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () { c.$apply(function () { d.unbind(i, j), h.resolve(d) }) }; return i && d.bind(i, j), b(function () { angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d) }), h.promise.cancel = function () { i && d.unbind(i, j), h.reject("Transition cancelled") }, h.promise }, h = document.createElement("trans"), i = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd", transition: "transitionend" }, j = { WebkitTransition: "webkitAnimationEnd", MozTransition: "animationend", OTransition: "oAnimationEnd", transition: "animationend" }; return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g }]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) { var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/; return { parse: function (c) { var d = c.match(b); if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".'); return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])} } } }]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) { var h = [9, 13, 27, 38, 40]; return { require: "ngModel", link: function (i, j, k, l) { var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new(); i.$on("$destroy", function () { x.$destroy() }); var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random()); j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y}); var z = angular.element("<div typeahead-popup></div>"); z.attr({ id: y, matches: "matches", active: "activeIdx", select: "select(activeIdx)", query: "query", position: "position" }), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl); var A = function () { x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1) }, B = function (a) { return y + "-option-" + a }; x.$watch("activeIdx", function (a) { 0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a)) }); var C = function (a) { var b = {$viewValue: a}; q(i, !0), c.when(w.source(i, b)).then(function (c) { var d = a === l.$viewValue; if (d && m)if (c && c.length > 0) { x.activeIdx = u ? 0 : -1, x.matches.length = 0; for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({ id: B(e), label: w.viewMapper(x, b), model: c[e] }); x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0) } else A(); d && q(i, !1) }, function () { A(), q(i, !1) }) }; A(), x.query = void 0; var D, E = function (a) { D = d(function () { C(a) }, o) }, F = function () { D && d.cancel(D) }; l.$parsers.unshift(function (a) { return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a) }), l.$formatters.push(function (a) { var b, c, d = {}; return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a) }), x.select = function (a) { var b, c, e = {}; e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, { $item: c, $model: b, $label: w.viewMapper(i, e) }), A(), d(function () { j[0].focus() }, 0, !1) }, j.bind("keydown", function (a) { 0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () { x.select(x.activeIdx) }) : 27 === a.which && (a.stopPropagation(), A(), x.$digest())) }), j.bind("blur", function () { m = !1 }); var G = function (a) { j[0] !== a.target && (A(), x.$digest()) }; e.bind("click", G), i.$on("$destroy", function () { e.unbind("click", G), t && H.remove(), z.remove() }); var H = a(z)(x); t ? e.find("body").append(H) : j.after(H) } } }]).directive("typeaheadPopup", function () { return { restrict: "EA", scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"}, replace: !0, templateUrl: "template/typeahead/typeahead-popup.html", link: function (a, b, c) { a.templateUrl = c.templateUrl, a.isOpen = function () { return a.matches.length > 0 }, a.isActive = function (b) { return a.active == b }, a.selectActive = function (b) { a.active = b }, a.selectMatch = function (b) { a.select({activeIdx: b}) } } } }).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) { return { restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) { var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html"; a(g).then(function (a) { b(a.trim())(d, function (a) { e.replaceWith(a) }) }) } } }]).filter("typeaheadHighlight", function () { function a(a) { return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") } return function (b, c) { return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b } }), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>') }]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) { a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">&times;</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n') }]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) { a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n') }]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) { a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n') }]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>') }]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n') }]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) { a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n') }]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) { a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n') }]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>') }]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>') }]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n') }]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n') }]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n') }]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>') }]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n') }]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) { a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>') }]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n') }]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n') }]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) { a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>') }]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n') }]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/controller/ServerConfigController.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. * */ server_config_module.controller('ServerConfigController', ['$scope', '$window', '$translate', 'toastr', 'ServerConfigService', 'AppUtil', 'PermissionService', function ($scope, $window, $translate, toastr, ServerConfigService, AppUtil, PermissionService) { $scope.serverConfig = {}; $scope.saveBtnDisabled = true; initPermission(); function initPermission() { PermissionService.has_root_permission() .then(function (result) { $scope.isRootUser = result.hasPermission; }) } $scope.create = function () { ServerConfigService.create($scope.serverConfig).then(function (result) { toastr.success($translate.instant('ServiceConfig.Saved')); $scope.saveBtnDisabled = true; $scope.serverConfig = result; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ServiceConfig.SaveFailed')); }); }; $scope.getServerConfigInfo = function () { if (!$scope.serverConfig.key) { toastr.warning($translate.instant('ServiceConfig.PleaseEnterKey')); return; } ServerConfigService.getServerConfigInfo($scope.serverConfig.key).then(function (result) { $scope.saveBtnDisabled = false; if (!result.key) { toastr.info($translate.instant('ServiceConfig.KeyNotExistsAndCreateTip', { key: $scope.serverConfig.key })); return; } toastr.info($translate.instant('ServiceConfig.KeyExistsAndSaveTip', { key: $scope.serverConfig.key })); $scope.serverConfig = result; }, function (result) { AppUtil.showErrorMsg(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. * */ server_config_module.controller('ServerConfigController', ['$scope', '$window', '$translate', 'toastr', 'ServerConfigService', 'AppUtil', 'PermissionService', function ($scope, $window, $translate, toastr, ServerConfigService, AppUtil, PermissionService) { $scope.serverConfig = {}; $scope.saveBtnDisabled = true; initPermission(); function initPermission() { PermissionService.has_root_permission() .then(function (result) { $scope.isRootUser = result.hasPermission; }) } $scope.create = function () { ServerConfigService.create($scope.serverConfig).then(function (result) { toastr.success($translate.instant('ServiceConfig.Saved')); $scope.saveBtnDisabled = true; $scope.serverConfig = result; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ServiceConfig.SaveFailed')); }); }; $scope.getServerConfigInfo = function () { if (!$scope.serverConfig.key) { toastr.warning($translate.instant('ServiceConfig.PleaseEnterKey')); return; } ServerConfigService.getServerConfigInfo($scope.serverConfig.key).then(function (result) { $scope.saveBtnDisabled = false; if (!result.key) { toastr.info($translate.instant('ServiceConfig.KeyNotExistsAndCreateTip', { key: $scope.serverConfig.key })); return; } toastr.info($translate.instant('ServiceConfig.KeyExistsAndSaveTip', { key: $scope.serverConfig.key })); $scope.serverConfig = result; }, function (result) { AppUtil.showErrorMsg(result); }) } }]);
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/views/component/rollback-modal.html
<form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <div class="modal-title text-center"> <span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span> <span style="font-size: 18px;"> &nbsp;{{'Component.Rollback.To' | translate }}&nbsp;</span> <span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span> </div> </div> <div class="modal-body"> <div ng-if="!isRollbackTo" class="alert alert-warning" role="alert"> {{'Component.Rollback.Tips' | translate }} <a target="_blank" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a> </div> <div ng-if="isRollbackTo" class="alert alert-warning" role="alert"> {{'Component.RollbackTo.Tips' | translate }} </div> <div class="form-group" style="margin-top: 15px;"> <!--properties format--> <div class="col-sm-12" ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat"> <table class="table table-bordered table-striped text-center table-hover" ng-if="toRollbackNamespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Rollback.ItemType' | translate }} </th> <th> {{'Component.Rollback.ItemKey' | translate }} </th> <th> {{'Component.Rollback.RollbackBeforeValue' | translate }} </th> <th> {{'Component.Rollback.RollbackAfterValue' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="change in toRollbackNamespace.releaseCompareResult"> <td width="10%"> <span ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span> <span ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span> <span ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span> </td> <td width="20%" ng-bind="change.entity.firstEntity.key"> </td> <td width="35%" ng-bind="change.entity.firstEntity.value"> </td> <td width="35%" ng-bind="change.entity.secondEntity.value"> </td> </tr> </tbody> </table> </div> <!--file format --> <div class="col-sm-12" ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat"> <div ng-repeat="change in toRollbackNamespace.releaseCompareResult" ng-if="!toRollbackNamespace.isPropertiesFormat"> <h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="change.entity.firstEntity.value"> </textarea> <hr> <h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="change.entity.secondEntity.value"> </textarea> </div> </div> <div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0"> <h4> {{'Component.Rollback.NoChange' | translate }} </h4> </div> </div> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">{{'Common.Cancel' | translate }}</button> <button type="submit" class="btn btn-danger" ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }} </button> </div> </div> </div> </form>
<form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <div class="modal-title text-center"> <span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span> <span style="font-size: 18px;"> &nbsp;{{'Component.Rollback.To' | translate }}&nbsp;</span> <span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span> </div> </div> <div class="modal-body"> <div ng-if="!isRollbackTo" class="alert alert-warning" role="alert"> {{'Component.Rollback.Tips' | translate }} <a target="_blank" href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a> </div> <div ng-if="isRollbackTo" class="alert alert-warning" role="alert"> {{'Component.RollbackTo.Tips' | translate }} </div> <div class="form-group" style="margin-top: 15px;"> <!--properties format--> <div class="col-sm-12" ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat"> <table class="table table-bordered table-striped text-center table-hover" ng-if="toRollbackNamespace.isPropertiesFormat"> <thead> <tr> <th> {{'Component.Rollback.ItemType' | translate }} </th> <th> {{'Component.Rollback.ItemKey' | translate }} </th> <th> {{'Component.Rollback.RollbackBeforeValue' | translate }} </th> <th> {{'Component.Rollback.RollbackAfterValue' | translate }} </th> </tr> </thead> <tbody> <tr ng-repeat="change in toRollbackNamespace.releaseCompareResult"> <td width="10%"> <span ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span> <span ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span> <span ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span> </td> <td width="20%" ng-bind="change.entity.firstEntity.key"> </td> <td width="35%" ng-bind="change.entity.firstEntity.value"> </td> <td width="35%" ng-bind="change.entity.secondEntity.value"> </td> </tr> </tbody> </table> </div> <!--file format --> <div class="col-sm-12" ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat"> <div ng-repeat="change in toRollbackNamespace.releaseCompareResult" ng-if="!toRollbackNamespace.isPropertiesFormat"> <h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="change.entity.firstEntity.value"> </textarea> <hr> <h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5> <textarea class="form-control no-radius" rows="20" ng-disabled="true" ng-bind="change.entity.secondEntity.value"> </textarea> </div> </div> <div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0"> <h4> {{'Component.Rollback.NoChange' | translate }} </h4> </div> </div> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal">{{'Common.Cancel' | translate }}</button> <button type="submit" class="btn btn-danger" ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }} </button> </div> </div> </div> </form>
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/scripts/services/ConsumerService.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('ConsumerService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { create_consumer: { method: 'POST', isArray: false, url: AppUtil.prefixPath() + '/consumers' }, get_consumer_token_by_appId: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/consumers/by-appId' }, assign_role_to_consumer: { method: 'POST', isArray: true, url: AppUtil.prefixPath() + '/consumers/:token/assign-role' } }); return { createConsumer: function (consumer) { return AppUtil.ajax(resource.create_consumer, {}, consumer); }, getConsumerTokenByAppId: function (appId) { return AppUtil.ajax(resource.get_consumer_token_by_appId, { appId: appId }); }, assignRoleToConsumer: function (token, type, appId, namespaceName, envs) { return AppUtil.ajax(resource.assign_role_to_consumer, { token: token, type: type, envs: envs }, { appId: appId, namespaceName: namespaceName } ) } } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ appService.service('ConsumerService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { create_consumer: { method: 'POST', isArray: false, url: AppUtil.prefixPath() + '/consumers' }, get_consumer_token_by_appId: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/consumers/by-appId' }, assign_role_to_consumer: { method: 'POST', isArray: true, url: AppUtil.prefixPath() + '/consumers/:token/assign-role' } }); return { createConsumer: function (consumer) { return AppUtil.ajax(resource.create_consumer, {}, consumer); }, getConsumerTokenByAppId: function (appId) { return AppUtil.ajax(resource.get_consumer_token_by_appId, { appId: appId }); }, assignRoleToConsumer: function (token, type, appId, namespaceName, envs) { return AppUtil.ajax(resource.assign_role_to_consumer, { token: token, type: type, envs: envs }, { appId: appId, namespaceName: namespaceName } ) } } }]);
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] 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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/namespace/role.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="role"> <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>{{'Namespace.Role.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container"> <section class="panel col-md-offset-1 col-md-10" ng-controller="NamespaceRoleController"> <header class="panel-heading"> <div class="row"> <div class="col-md-9"> <h4 class="modal-title"> {{'Namespace.Role.Title' | translate }}<small>({{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> {{'Common.Namespace' | translate }}:<label ng-bind="pageContext.namespaceName"></label>)</small> </h4> </div> <div class="col-md-3 text-right"> <a type="button" class="btn btn-info" data-dismiss="modal" href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> </header> <div class="panel-body" ng-show="hasAssignUserPermission"> <div class="row"> <div class="form-horizontal"> <div class="form-group"> <label class="col-sm-2 control-label">{{'Namespace.Role.GrantModifyTo' | translate }}<br><small>{{'Namespace.Role.GrantModifyTo2' | translate }}</small></label> <div class="col-sm-8"> <form class="form-inline" ng-submit="assignRoleToUser('ModifyNamespace')"> <div class="form-group"> <apollouserselector apollo-id="modifyRoleWidgetId"></apollouserselector> <select class="form-control input-sm" ng-model="modifyRoleSelectedEnv"> <option value="">{{'Namespace.Role.AllEnv' | translate }}</option> <option ng-repeat="env in envs" ng-value="env">{{env}}</option> </select> </div> <button type="submit" class="btn btn-default" style="margin-left: 20px;" ng-disabled="modifyRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button> </form> <!-- Split button --> <div class="item-container"> <h5>{{'Namespace.Role.AllEnv' | translate }}</h5> <div class="btn-group item-info" ng-repeat="user in rolesAssignedUsers.modifyRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ModifyNamespace', user.userId, null)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> <div class="item-container" ng-repeat="env in envs"> <h5>{{env}}</h5> <div class="btn-group item-info" ng-repeat="user in envRolesAssignedUsers[env].modifyRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ModifyNamespace', user.userId, env)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> </div> </div> </div> <hr> <div class="row" style="margin-top: 10px;"> <div class="form-horizontal"> <div class="col-sm-2 text-right"> <label class="control-label">{{'Namespace.Role.GrantPublishTo' | translate }}<br><small>{{'Namespace.Role.GrantPublishTo2' | translate }}</small></label> </div> <div class="col-sm-8"> <form class="form-inline" ng-submit="assignRoleToUser('ReleaseNamespace')"> <div class="form-group"> <apollouserselector apollo-id="releaseRoleWidgetId"></apollouserselector> <select class="form-control input-sm" ng-model="releaseRoleSelectedEnv"> <option value="">{{'Namespace.Role.AllEnv' | translate }}</option> <option ng-repeat="env in envs" ng-value="env">{{env}}</option> </select> </div> <button type="submit" class="btn btn-default" style="margin-left: 20px;" ng-disabled="ReleaseRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button> </form> <!-- Split button --> <div class="item-container"> <h5>{{'Namespace.Role.AllEnv' | translate }}</h5> <div class="btn-group item-info" ng-repeat="user in rolesAssignedUsers.releaseRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ReleaseNamespace', user.userId, null)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> <div class="item-container" ng-repeat="env in envs"> <h5>{{env}}</h5> <div class="btn-group item-info" ng-repeat="user in envRolesAssignedUsers[env].releaseRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ReleaseNamespace', user.userId, env)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> </div> </div> </div> </div> </div> <div class="panel-body text-center" ng-show="!hasAssignUserPermission"> <h2>{{'Namespace.Role.NoPermission' | translate }}</h2> </div> </section> </div> <div ng-include="'../views/common/footer.html'"></div> <!-- jquery.js --> <script src="../vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="../vendor/angular/angular.min.js"></script> <script src="../vendor/angular/angular-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/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="../scripts/app.js"></script> <script type="application/javascript" src="../scripts/services/AppService.js"></script> <script type="application/javascript" src="../scripts/services/EnvService.js"></script> <script type="application/javascript" src="../scripts/services/UserService.js"></script> <script type="application/javascript" src="../scripts/services/CommonService.js"></script> <script type="application/javascript" src="../scripts/services/PermissionService.js"></script> <script type="application/javascript" src="../scripts/AppUtils.js"></script> <script type="application/javascript" src="../scripts/PageCommon.js"></script> <script type="application/javascript" src="../scripts/directive/directive.js"></script> <script type="application/javascript" src="../scripts/controller/role/NamespaceRoleController.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="role"> <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>{{'Namespace.Role.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container"> <section class="panel col-md-offset-1 col-md-10" ng-controller="NamespaceRoleController"> <header class="panel-heading"> <div class="row"> <div class="col-md-9"> <h4 class="modal-title"> {{'Namespace.Role.Title' | translate }}<small>({{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> {{'Common.Namespace' | translate }}:<label ng-bind="pageContext.namespaceName"></label>)</small> </h4> </div> <div class="col-md-3 text-right"> <a type="button" class="btn btn-info" data-dismiss="modal" href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> </header> <div class="panel-body" ng-show="hasAssignUserPermission"> <div class="row"> <div class="form-horizontal"> <div class="form-group"> <label class="col-sm-2 control-label">{{'Namespace.Role.GrantModifyTo' | translate }}<br><small>{{'Namespace.Role.GrantModifyTo2' | translate }}</small></label> <div class="col-sm-8"> <form class="form-inline" ng-submit="assignRoleToUser('ModifyNamespace')"> <div class="form-group"> <apollouserselector apollo-id="modifyRoleWidgetId"></apollouserselector> <select class="form-control input-sm" ng-model="modifyRoleSelectedEnv"> <option value="">{{'Namespace.Role.AllEnv' | translate }}</option> <option ng-repeat="env in envs" ng-value="env">{{env}}</option> </select> </div> <button type="submit" class="btn btn-default" style="margin-left: 20px;" ng-disabled="modifyRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button> </form> <!-- Split button --> <div class="item-container"> <h5>{{'Namespace.Role.AllEnv' | translate }}</h5> <div class="btn-group item-info" ng-repeat="user in rolesAssignedUsers.modifyRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ModifyNamespace', user.userId, null)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> <div class="item-container" ng-repeat="env in envs"> <h5>{{env}}</h5> <div class="btn-group item-info" ng-repeat="user in envRolesAssignedUsers[env].modifyRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ModifyNamespace', user.userId, env)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> </div> </div> </div> <hr> <div class="row" style="margin-top: 10px;"> <div class="form-horizontal"> <div class="col-sm-2 text-right"> <label class="control-label">{{'Namespace.Role.GrantPublishTo' | translate }}<br><small>{{'Namespace.Role.GrantPublishTo2' | translate }}</small></label> </div> <div class="col-sm-8"> <form class="form-inline" ng-submit="assignRoleToUser('ReleaseNamespace')"> <div class="form-group"> <apollouserselector apollo-id="releaseRoleWidgetId"></apollouserselector> <select class="form-control input-sm" ng-model="releaseRoleSelectedEnv"> <option value="">{{'Namespace.Role.AllEnv' | translate }}</option> <option ng-repeat="env in envs" ng-value="env">{{env}}</option> </select> </div> <button type="submit" class="btn btn-default" style="margin-left: 20px;" ng-disabled="ReleaseRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button> </form> <!-- Split button --> <div class="item-container"> <h5>{{'Namespace.Role.AllEnv' | translate }}</h5> <div class="btn-group item-info" ng-repeat="user in rolesAssignedUsers.releaseRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ReleaseNamespace', user.userId, null)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> <div class="item-container" ng-repeat="env in envs"> <h5>{{env}}</h5> <div class="btn-group item-info" ng-repeat="user in envRolesAssignedUsers[env].releaseRoleUsers"> <button type="button" class="btn btn-default" ng-bind="user.userId"></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ReleaseNamespace', user.userId, env)"> <span class="glyphicon glyphicon-remove"></span> </button> </div> </div> </div> </div> </div> </div> </div> <div class="panel-body text-center" ng-show="!hasAssignUserPermission"> <h2>{{'Namespace.Role.NoPermission' | translate }}</h2> </div> </section> </div> <div ng-include="'../views/common/footer.html'"></div> <!-- jquery.js --> <script src="../vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="../vendor/angular/angular.min.js"></script> <script src="../vendor/angular/angular-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/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="../scripts/app.js"></script> <script type="application/javascript" src="../scripts/services/AppService.js"></script> <script type="application/javascript" src="../scripts/services/EnvService.js"></script> <script type="application/javascript" src="../scripts/services/UserService.js"></script> <script type="application/javascript" src="../scripts/services/CommonService.js"></script> <script type="application/javascript" src="../scripts/services/PermissionService.js"></script> <script type="application/javascript" src="../scripts/AppUtils.js"></script> <script type="application/javascript" src="../scripts/PageCommon.js"></script> <script type="application/javascript" src="../scripts/directive/directive.js"></script> <script type="application/javascript" src="../scripts/controller/role/NamespaceRoleController.js"></script> </body> </html>
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] 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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/community/thank-you.md
# 致谢 <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" > Apollo 团队使用 [IntelliJ IDEA](https://www.jetbrains.com/idea/) 开发开源项目,非常感谢 [JetBrains](https://www.jetbrains.com/) 赞助许可证。 <hr /> <img src="en/images/community/docsify.svg" alt="docsify" style="height: 80px"> Apollo 团队使用 [docsify](https://docsify.js.org/) 生成文档站点。
# 致谢 <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" > Apollo 团队使用 [IntelliJ IDEA](https://www.jetbrains.com/idea/) 开发开源项目,非常感谢 [JetBrains](https://www.jetbrains.com/) 赞助许可证。 <hr /> <img src="en/images/community/docsify.svg" alt="docsify" style="height: 80px"> Apollo 团队使用 [docsify](https://docsify.js.org/) 生成文档站点。
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./.github/ISSUE_TEMPLATE/bug_report_zh.md
--- name: 报告Bug/使用疑问 about: 提交Apollo Bug/使用疑问,使用这个模板 title: '' labels: '' assignees: '' --- <!-- 这段文字不会显示在你的内容中。为了避免重复的信息,方便后续的检索,在提issue之前,请检查如下事项。如果是比较新手级别的问题,推荐到讨论区https://github.com/ctripcorp/apollo/discussions 提问 --> - [ ] 我已经检查过[discussions](https://github.com/ctripcorp/apollo/discussions) - [ ] 我已经搜索过[issues](https://github.com/ctripcorp/apollo/issues) - [ ] 我已经仔细检查过[FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) **描述bug** 简洁明了地描述一下bug **复现** 通过如下步骤可以复现: 1. 2. 3. 4. **期望** 简介明了地描述你希望正常情况下应该发生什么 **截图** 如果可以,附上截图来描述你的问题 ### 额外的细节和日志 - 版本: - 错误日志 - 配置: - 平台和操作系统
--- name: 报告Bug/使用疑问 about: 提交Apollo Bug/使用疑问,使用这个模板 title: '' labels: '' assignees: '' --- <!-- 这段文字不会显示在你的内容中。为了避免重复的信息,方便后续的检索,在提issue之前,请检查如下事项。如果是比较新手级别的问题,推荐到讨论区https://github.com/ctripcorp/apollo/discussions 提问 --> - [ ] 我已经检查过[discussions](https://github.com/ctripcorp/apollo/discussions) - [ ] 我已经搜索过[issues](https://github.com/ctripcorp/apollo/issues) - [ ] 我已经仔细检查过[FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) **描述bug** 简洁明了地描述一下bug **复现** 通过如下步骤可以复现: 1. 2. 3. 4. **期望** 简介明了地描述你希望正常情况下应该发生什么 **截图** 如果可以,附上截图来描述你的问题 ### 额外的细节和日志 - 版本: - 错误日志 - 配置: - 平台和操作系统
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] 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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/ui-ace/mode-xml.js
define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(e){var t="[_:a-zA-Z\u00c0-\uffff][-_:.a-zA-Z0-9\u00c0-\uffff]*";this.$rules={start:[{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:["punctuation.instruction.xml","keyword.instruction.xml"],regex:"(<\\?)("+t+")",next:"processing_instruction"},{token:"comment.start.xml",regex:"<\\!--",next:"comment"},{token:["xml-pe.doctype.xml","xml-pe.doctype.xml"],regex:"(<\\!)(DOCTYPE)(?=[\\s])",next:"doctype",caseInsensitive:!0},{include:"tag"},{token:"text.end-tag-open.xml",regex:"</"},{token:"text.tag-open.xml",regex:"<"},{include:"reference"},{defaultToken:"text.xml"}],processing_instruction:[{token:"entity.other.attribute-name.decl-attribute-name.xml",regex:t},{token:"keyword.operator.decl-attribute-equals.xml",regex:"="},{include:"whitespace"},{include:"string"},{token:"punctuation.xml-decl.xml",regex:"\\?>",next:"start"}],doctype:[{include:"whitespace"},{include:"string"},{token:"xml-pe.doctype.xml",regex:">",next:"start"},{token:"xml-pe.xml",regex:"[-_a-zA-Z0-9:]+"},{token:"punctuation.int-subset",regex:"\\[",push:"int_subset"}],int_subset:[{token:"text.xml",regex:"\\s+"},{token:"punctuation.int-subset.xml",regex:"]",next:"pop"},{token:["punctuation.markup-decl.xml","keyword.markup-decl.xml"],regex:"(<\\!)("+t+")",push:[{token:"text",regex:"\\s+"},{token:"punctuation.markup-decl.xml",regex:">",next:"pop"},{include:"string"}]}],cdata:[{token:"string.cdata.xml",regex:"\\]\\]>",next:"start"},{token:"text.xml",regex:"\\s+"},{token:"text.xml",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment.end.xml",regex:"-->",next:"start"},{defaultToken:"comment.xml"}],reference:[{token:"constant.language.escape.reference.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],attr_reference:[{token:"constant.language.escape.reference.attribute-value.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],tag:[{token:["meta.tag.punctuation.tag-open.xml","meta.tag.punctuation.end-tag-open.xml","meta.tag.tag-name.xml"],regex:"(?:(<)|(</))((?:"+t+":)?"+t+")",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}],tag_whitespace:[{token:"text.tag-whitespace.xml",regex:"\\s+"}],whitespace:[{token:"text.whitespace.xml",regex:"\\s+"}],string:[{token:"string.xml",regex:"'",push:[{token:"string.xml",regex:"'",next:"pop"},{defaultToken:"string.xml"}]},{token:"string.xml",regex:'"',push:[{token:"string.xml",regex:'"',next:"pop"},{defaultToken:"string.xml"}]}],attributes:[{token:"entity.other.attribute-name.xml",regex:t},{token:"keyword.operator.attribute-equals.xml",regex:"="},{include:"tag_whitespace"},{include:"attribute_value"}],attribute_value:[{token:"string.attribute-value.xml",regex:"'",push:[{token:"string.attribute-value.xml",regex:"'",next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]},{token:"string.attribute-value.xml",regex:'"',push:[{token:"string.attribute-value.xml",regex:'"',next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]}]},this.constructor===s&&this.normalizeRules()};(function(){this.embedTagRules=function(e,t,n){this.$rules.tag.unshift({token:["meta.tag.punctuation.tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(<)("+n+"(?=\\s|>|$))",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:t+"start"}]}),this.$rules[n+"-end"]=[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start",onMatch:function(e,t,n){return n.splice(0),this.token}}],this.embedRules(e,t,[{token:["meta.tag.punctuation.end-tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(</)("+n+"(?=\\s|>|$))",next:n+"-end"},{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\["},{token:"string.cdata.xml",regex:"\\]\\]>"}])}}).call(i.prototype),r.inherits(s,i),t.XmlHighlightRules=s}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";function u(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),a=function(){this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){var o=i,a=r.doc.getTextRange(n.getSelectionRange());if(a!==""&&a!=="'"&&a!='"'&&n.getWrapBehavioursEnabled())return{text:o+a+o,selection:!1};var f=n.getCursorPosition(),l=r.doc.getLine(f.row),c=l.substring(f.column,f.column+1),h=new s(r,f.row,f.column),p=h.getCurrentToken();if(c==o&&(u(p,"attribute-value")||u(p,"string")))return{text:"",selection:[1,1]};p||(p=h.stepBackward());if(!p)return;while(u(p,"tag-whitespace")||u(p,"whitespace"))p=h.stepBackward();var d=!c||c.match(/\s/);if(u(p,"attribute-equals")&&(d||c==">")||u(p,"decl-attribute-equals")&&(d||c=="?"))return{text:o+o,selection:[1,1]}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}}),this.add("autoclosing","insertion",function(e,t,n,r,i){if(i==">"){var o=n.getSelectionRange().start,a=new s(r,o.row,o.column),f=a.getCurrentToken()||a.stepBackward();if(!f||!(u(f,"tag-name")||u(f,"tag-whitespace")||u(f,"attribute-name")||u(f,"attribute-equals")||u(f,"attribute-value")))return;if(u(f,"reference.attribute-value"))return;if(u(f,"attribute-value")){var l=f.value.charAt(0);if(l=='"'||l=="'"){var c=f.value.charAt(f.value.length-1),h=a.getCurrentTokenColumn()+f.value.length;if(h>o.column||h==o.column&&l!=c)return}}while(!u(f,"tag-name")){f=a.stepBackward();if(f.value=="<"){f=a.stepForward();break}}var p=a.getCurrentTokenRow(),d=a.getCurrentTokenColumn();if(u(a.stepBackward(),"end-tag-open"))return;var v=f.value;p==o.row&&(v=v.substring(0,o.column-d));if(this.voidElements.hasOwnProperty(v.toLowerCase()))return;return{text:"></"+v+">",selection:[1,1]}}}),this.add("autoindent","insertion",function(e,t,n,r,i){if(i=="\n"){var o=n.getCursorPosition(),u=r.getLine(o.row),a=new s(r,o.row,o.column),f=a.getCurrentToken();if(f&&f.type.indexOf("tag-close")!==-1){if(f.value=="/>")return;while(f&&f.type.indexOf("tag-name")===-1)f=a.stepBackward();if(!f)return;var l=f.value,c=a.getCurrentTokenRow();f=a.stepBackward();if(!f||f.type.indexOf("end-tag")!==-1)return;if(this.voidElements&&!this.voidElements[l]){var h=r.getTokenAt(o.row,o.column+1),u=r.getLine(c),p=this.$getIndent(u),d=p+r.getTabString();return h&&h.value==="</"?{text:"\n"+d+"\n"+p,selection:[1,d.length,1,d.length]}:{text:"\n"+d}}}}})};r.inherits(a,i),t.XmlBehaviour=a}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(e,t,n){"use strict";function l(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../../lib/lang"),s=e("../../range").Range,o=e("./fold_mode").FoldMode,u=e("../../token_iterator").TokenIterator,a=t.FoldMode=function(e,t){o.call(this),this.voidElements=e||{},this.optionalEndTags=r.mixin({},this.voidElements),t&&r.mixin(this.optionalEndTags,t)};r.inherits(a,o);var f=function(){this.tagName="",this.closing=!1,this.selfClosing=!1,this.start={row:0,column:0},this.end={row:0,column:0}};(function(){this.getFoldWidget=function(e,t,n){var r=this._getFirstTagInLine(e,n);return r?r.closing||!r.tagName&&r.selfClosing?t=="markbeginend"?"end":"":!r.tagName||r.selfClosing||this.voidElements.hasOwnProperty(r.tagName.toLowerCase())?"":this._findEndTagInLine(e,n,r.tagName,r.end.column)?"":"start":this.getCommentFoldWidget(e,n)},this.getCommentFoldWidget=function(e,t){return/comment/.test(e.getState(t))&&/<!-/.test(e.getLine(t))?"start":""},this._getFirstTagInLine=function(e,t){var n=e.getTokens(t),r=new f;for(var i=0;i<n.length;i++){var s=n[i];if(l(s,"tag-open")){r.end.column=r.start.column+s.value.length,r.closing=l(s,"end-tag-open"),s=n[++i];if(!s)return null;r.tagName=s.value,r.end.column+=s.value.length;for(i++;i<n.length;i++){s=n[i],r.end.column+=s.value.length;if(l(s,"tag-close")){r.selfClosing=s.value=="/>";break}}return r}if(l(s,"tag-close"))return r.selfClosing=s.value=="/>",r;r.start.column+=s.value.length}return null},this._findEndTagInLine=function(e,t,n,r){var i=e.getTokens(t),s=0;for(var o=0;o<i.length;o++){var u=i[o];s+=u.value.length;if(s<r)continue;if(l(u,"end-tag-open")){u=i[o+1];if(u&&u.value==n)return!0}}return!1},this._readTagForward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do if(l(t,"tag-open"))n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn();else if(l(t,"tag-name"))n.tagName=t.value;else if(l(t,"tag-close"))return n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length,e.stepForward(),n;while(t=e.stepForward());return null},this._readTagBackward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do{if(l(t,"tag-open"))return n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn(),e.stepBackward(),n;l(t,"tag-name")?n.tagName=t.value:l(t,"tag-close")&&(n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length)}while(t=e.stepBackward());return null},this._pop=function(e,t){while(e.length){var n=e[e.length-1];if(!t||n.tagName==t.tagName)return e.pop();if(this.optionalEndTags.hasOwnProperty(n.tagName)){e.pop();continue}return null}},this.getFoldWidgetRange=function(e,t,n){var r=this._getFirstTagInLine(e,n);if(!r)return this.getCommentFoldWidget(e,n)&&e.getCommentFoldRange(n,e.getLine(n).length);var i=r.closing||r.selfClosing,o=[],a;if(!i){var f=new u(e,n,r.start.column),l={row:n,column:r.start.column+r.tagName.length+2};r.start.row==r.end.row&&(l.column=r.end.column);while(a=this._readTagForward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(a.closing){this._pop(o,a);if(o.length==0)return s.fromPoints(l,a.start)}else o.push(a)}}else{var f=new u(e,n,r.end.column),c={row:n,column:r.start.column};while(a=this._readTagBackward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(!a.closing){this._pop(o,a);if(o.length==0)return a.start.column+=a.tagName.length+2,a.start.row==a.end.row&&a.start.column<a.end.column&&(a.start.column=a.end.column),s.fromPoints(a.start,c)}else o.push(a)}}}}).call(a.prototype)}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text").Mode,o=e("./xml_highlight_rules").XmlHighlightRules,u=e("./behaviour/xml").XmlBehaviour,a=e("./folding/xml").FoldMode,f=e("../worker/worker_client").WorkerClient,l=function(){this.HighlightRules=o,this.$behaviour=new u,this.foldingRules=new a};r.inherits(l,s),function(){this.voidElements=i.arrayToMap([]),this.blockComment={start:"<!--",end:"-->"},this.createWorker=function(e){var t=new f(["ace"],"ace/mode/xml_worker","Worker");return t.attachToDocument(e.getDocument()),t.on("error",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/xml"}.call(l.prototype),t.Mode=l})
define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(e){var t="[_:a-zA-Z\u00c0-\uffff][-_:.a-zA-Z0-9\u00c0-\uffff]*";this.$rules={start:[{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:["punctuation.instruction.xml","keyword.instruction.xml"],regex:"(<\\?)("+t+")",next:"processing_instruction"},{token:"comment.start.xml",regex:"<\\!--",next:"comment"},{token:["xml-pe.doctype.xml","xml-pe.doctype.xml"],regex:"(<\\!)(DOCTYPE)(?=[\\s])",next:"doctype",caseInsensitive:!0},{include:"tag"},{token:"text.end-tag-open.xml",regex:"</"},{token:"text.tag-open.xml",regex:"<"},{include:"reference"},{defaultToken:"text.xml"}],processing_instruction:[{token:"entity.other.attribute-name.decl-attribute-name.xml",regex:t},{token:"keyword.operator.decl-attribute-equals.xml",regex:"="},{include:"whitespace"},{include:"string"},{token:"punctuation.xml-decl.xml",regex:"\\?>",next:"start"}],doctype:[{include:"whitespace"},{include:"string"},{token:"xml-pe.doctype.xml",regex:">",next:"start"},{token:"xml-pe.xml",regex:"[-_a-zA-Z0-9:]+"},{token:"punctuation.int-subset",regex:"\\[",push:"int_subset"}],int_subset:[{token:"text.xml",regex:"\\s+"},{token:"punctuation.int-subset.xml",regex:"]",next:"pop"},{token:["punctuation.markup-decl.xml","keyword.markup-decl.xml"],regex:"(<\\!)("+t+")",push:[{token:"text",regex:"\\s+"},{token:"punctuation.markup-decl.xml",regex:">",next:"pop"},{include:"string"}]}],cdata:[{token:"string.cdata.xml",regex:"\\]\\]>",next:"start"},{token:"text.xml",regex:"\\s+"},{token:"text.xml",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment.end.xml",regex:"-->",next:"start"},{defaultToken:"comment.xml"}],reference:[{token:"constant.language.escape.reference.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],attr_reference:[{token:"constant.language.escape.reference.attribute-value.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],tag:[{token:["meta.tag.punctuation.tag-open.xml","meta.tag.punctuation.end-tag-open.xml","meta.tag.tag-name.xml"],regex:"(?:(<)|(</))((?:"+t+":)?"+t+")",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}],tag_whitespace:[{token:"text.tag-whitespace.xml",regex:"\\s+"}],whitespace:[{token:"text.whitespace.xml",regex:"\\s+"}],string:[{token:"string.xml",regex:"'",push:[{token:"string.xml",regex:"'",next:"pop"},{defaultToken:"string.xml"}]},{token:"string.xml",regex:'"',push:[{token:"string.xml",regex:'"',next:"pop"},{defaultToken:"string.xml"}]}],attributes:[{token:"entity.other.attribute-name.xml",regex:t},{token:"keyword.operator.attribute-equals.xml",regex:"="},{include:"tag_whitespace"},{include:"attribute_value"}],attribute_value:[{token:"string.attribute-value.xml",regex:"'",push:[{token:"string.attribute-value.xml",regex:"'",next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]},{token:"string.attribute-value.xml",regex:'"',push:[{token:"string.attribute-value.xml",regex:'"',next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]}]},this.constructor===s&&this.normalizeRules()};(function(){this.embedTagRules=function(e,t,n){this.$rules.tag.unshift({token:["meta.tag.punctuation.tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(<)("+n+"(?=\\s|>|$))",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:t+"start"}]}),this.$rules[n+"-end"]=[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start",onMatch:function(e,t,n){return n.splice(0),this.token}}],this.embedRules(e,t,[{token:["meta.tag.punctuation.end-tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(</)("+n+"(?=\\s|>|$))",next:n+"-end"},{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\["},{token:"string.cdata.xml",regex:"\\]\\]>"}])}}).call(i.prototype),r.inherits(s,i),t.XmlHighlightRules=s}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";function u(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),a=function(){this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){var o=i,a=r.doc.getTextRange(n.getSelectionRange());if(a!==""&&a!=="'"&&a!='"'&&n.getWrapBehavioursEnabled())return{text:o+a+o,selection:!1};var f=n.getCursorPosition(),l=r.doc.getLine(f.row),c=l.substring(f.column,f.column+1),h=new s(r,f.row,f.column),p=h.getCurrentToken();if(c==o&&(u(p,"attribute-value")||u(p,"string")))return{text:"",selection:[1,1]};p||(p=h.stepBackward());if(!p)return;while(u(p,"tag-whitespace")||u(p,"whitespace"))p=h.stepBackward();var d=!c||c.match(/\s/);if(u(p,"attribute-equals")&&(d||c==">")||u(p,"decl-attribute-equals")&&(d||c=="?"))return{text:o+o,selection:[1,1]}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}}),this.add("autoclosing","insertion",function(e,t,n,r,i){if(i==">"){var o=n.getSelectionRange().start,a=new s(r,o.row,o.column),f=a.getCurrentToken()||a.stepBackward();if(!f||!(u(f,"tag-name")||u(f,"tag-whitespace")||u(f,"attribute-name")||u(f,"attribute-equals")||u(f,"attribute-value")))return;if(u(f,"reference.attribute-value"))return;if(u(f,"attribute-value")){var l=f.value.charAt(0);if(l=='"'||l=="'"){var c=f.value.charAt(f.value.length-1),h=a.getCurrentTokenColumn()+f.value.length;if(h>o.column||h==o.column&&l!=c)return}}while(!u(f,"tag-name")){f=a.stepBackward();if(f.value=="<"){f=a.stepForward();break}}var p=a.getCurrentTokenRow(),d=a.getCurrentTokenColumn();if(u(a.stepBackward(),"end-tag-open"))return;var v=f.value;p==o.row&&(v=v.substring(0,o.column-d));if(this.voidElements.hasOwnProperty(v.toLowerCase()))return;return{text:"></"+v+">",selection:[1,1]}}}),this.add("autoindent","insertion",function(e,t,n,r,i){if(i=="\n"){var o=n.getCursorPosition(),u=r.getLine(o.row),a=new s(r,o.row,o.column),f=a.getCurrentToken();if(f&&f.type.indexOf("tag-close")!==-1){if(f.value=="/>")return;while(f&&f.type.indexOf("tag-name")===-1)f=a.stepBackward();if(!f)return;var l=f.value,c=a.getCurrentTokenRow();f=a.stepBackward();if(!f||f.type.indexOf("end-tag")!==-1)return;if(this.voidElements&&!this.voidElements[l]){var h=r.getTokenAt(o.row,o.column+1),u=r.getLine(c),p=this.$getIndent(u),d=p+r.getTabString();return h&&h.value==="</"?{text:"\n"+d+"\n"+p,selection:[1,d.length,1,d.length]}:{text:"\n"+d}}}}})};r.inherits(a,i),t.XmlBehaviour=a}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(e,t,n){"use strict";function l(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../../lib/lang"),s=e("../../range").Range,o=e("./fold_mode").FoldMode,u=e("../../token_iterator").TokenIterator,a=t.FoldMode=function(e,t){o.call(this),this.voidElements=e||{},this.optionalEndTags=r.mixin({},this.voidElements),t&&r.mixin(this.optionalEndTags,t)};r.inherits(a,o);var f=function(){this.tagName="",this.closing=!1,this.selfClosing=!1,this.start={row:0,column:0},this.end={row:0,column:0}};(function(){this.getFoldWidget=function(e,t,n){var r=this._getFirstTagInLine(e,n);return r?r.closing||!r.tagName&&r.selfClosing?t=="markbeginend"?"end":"":!r.tagName||r.selfClosing||this.voidElements.hasOwnProperty(r.tagName.toLowerCase())?"":this._findEndTagInLine(e,n,r.tagName,r.end.column)?"":"start":this.getCommentFoldWidget(e,n)},this.getCommentFoldWidget=function(e,t){return/comment/.test(e.getState(t))&&/<!-/.test(e.getLine(t))?"start":""},this._getFirstTagInLine=function(e,t){var n=e.getTokens(t),r=new f;for(var i=0;i<n.length;i++){var s=n[i];if(l(s,"tag-open")){r.end.column=r.start.column+s.value.length,r.closing=l(s,"end-tag-open"),s=n[++i];if(!s)return null;r.tagName=s.value,r.end.column+=s.value.length;for(i++;i<n.length;i++){s=n[i],r.end.column+=s.value.length;if(l(s,"tag-close")){r.selfClosing=s.value=="/>";break}}return r}if(l(s,"tag-close"))return r.selfClosing=s.value=="/>",r;r.start.column+=s.value.length}return null},this._findEndTagInLine=function(e,t,n,r){var i=e.getTokens(t),s=0;for(var o=0;o<i.length;o++){var u=i[o];s+=u.value.length;if(s<r)continue;if(l(u,"end-tag-open")){u=i[o+1];if(u&&u.value==n)return!0}}return!1},this._readTagForward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do if(l(t,"tag-open"))n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn();else if(l(t,"tag-name"))n.tagName=t.value;else if(l(t,"tag-close"))return n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length,e.stepForward(),n;while(t=e.stepForward());return null},this._readTagBackward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do{if(l(t,"tag-open"))return n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn(),e.stepBackward(),n;l(t,"tag-name")?n.tagName=t.value:l(t,"tag-close")&&(n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length)}while(t=e.stepBackward());return null},this._pop=function(e,t){while(e.length){var n=e[e.length-1];if(!t||n.tagName==t.tagName)return e.pop();if(this.optionalEndTags.hasOwnProperty(n.tagName)){e.pop();continue}return null}},this.getFoldWidgetRange=function(e,t,n){var r=this._getFirstTagInLine(e,n);if(!r)return this.getCommentFoldWidget(e,n)&&e.getCommentFoldRange(n,e.getLine(n).length);var i=r.closing||r.selfClosing,o=[],a;if(!i){var f=new u(e,n,r.start.column),l={row:n,column:r.start.column+r.tagName.length+2};r.start.row==r.end.row&&(l.column=r.end.column);while(a=this._readTagForward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(a.closing){this._pop(o,a);if(o.length==0)return s.fromPoints(l,a.start)}else o.push(a)}}else{var f=new u(e,n,r.end.column),c={row:n,column:r.start.column};while(a=this._readTagBackward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(!a.closing){this._pop(o,a);if(o.length==0)return a.start.column+=a.tagName.length+2,a.start.row==a.end.row&&a.start.column<a.end.column&&(a.start.column=a.end.column),s.fromPoints(a.start,c)}else o.push(a)}}}}).call(a.prototype)}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text").Mode,o=e("./xml_highlight_rules").XmlHighlightRules,u=e("./behaviour/xml").XmlBehaviour,a=e("./folding/xml").FoldMode,f=e("../worker/worker_client").WorkerClient,l=function(){this.HighlightRules=o,this.$behaviour=new u,this.foldingRules=new a};r.inherits(l,s),function(){this.voidElements=i.arrayToMap([]),this.blockComment={start:"<!--",end:"-->"},this.createWorker=function(e){var t=new f(["ace"],"ace/mode/xml_worker","Worker");return t.attachToDocument(e.getDocument()),t.on("error",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/xml"}.call(l.prototype),t.Mode=l})
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/deployment/distributed-deployment-guide.md
TODO
TODO
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/user-manage.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="user"> <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>{{'UserMange.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container" ng-controller="UserController"> <div class="col-md-8 col-md-offset-2 panel"> <section class="panel-body" ng-show="isRootUser"> <div class="row"> <header class="panel-heading"> {{'UserMange.Title' | translate }} <small> {{'UserMange.TitleTips' | translate }} </small> </header> <form class="form-horizontal panel-body" name="appForm" valdr-type="App" ng-submit="createOrUpdateUser()"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.UserName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="username" ng-model="user.username"> <small>{{'UserMange.UserNameTips' | translate }}</small> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.UserDisplayName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="userDisplayName" ng-model="user.userDisplayName"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.Pwd' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="password" ng-model="user.password"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.Email' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="password" ng-model="user.email"> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="appForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }} </button> </div> </div> </form> </div> </section> <section class="panel-body text-center" ng-if="!isRootUser"> <h4>{{'Common.IsRootUser' | translate }}</h4> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!--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> <!--valdr--> <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/AppUtils.js"></script> <script type="application/javascript" src="scripts/services/OrganizationService.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/controller/UserController.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="user"> <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>{{'UserMange.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container" ng-controller="UserController"> <div class="col-md-8 col-md-offset-2 panel"> <section class="panel-body" ng-show="isRootUser"> <div class="row"> <header class="panel-heading"> {{'UserMange.Title' | translate }} <small> {{'UserMange.TitleTips' | translate }} </small> </header> <form class="form-horizontal panel-body" name="appForm" valdr-type="App" ng-submit="createOrUpdateUser()"> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.UserName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="username" ng-model="user.username"> <small>{{'UserMange.UserNameTips' | translate }}</small> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.UserDisplayName' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="userDisplayName" ng-model="user.userDisplayName"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.Pwd' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="password" ng-model="user.password"> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'UserMange.Email' | translate }} </label> <div class="col-sm-5"> <input type="text" class="form-control" name="password" ng-model="user.email"> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-9"> <button type="submit" class="btn btn-primary" ng-disabled="appForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }} </button> </div> </div> </form> </div> </section> <section class="panel-body text-center" ng-if="!isRootUser"> <h4>{{'Common.IsRootUser' | translate }}</h4> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!--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> <!--valdr--> <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/AppUtils.js"></script> <script type="application/javascript" src="scripts/services/OrganizationService.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/controller/UserController.js"></script> <script src="scripts/valdr.js" type="text/javascript"></script> </body> </html>
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/community/team.md
# Apollo Team The Apollo team is comprised of Members and Contributors. Members have direct access to the source of Apollo project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to Apollo are greatly appreciated, whether for trivial cleanups, big new features or other material rewards. For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md). ## Members Members include Project Management Committee members and committers. The list is in alphabet order. ### Project Management Committee | Github ID | Name | Organization | | ---------- | ---------- | ------------ | | JaredTan95 | Jared Tan | DaoCloud | | kezhenxu94 | Zhenxu Ke | Tetrate | | nobodyiam | Jason Song | Ant Group | | zouyx | Joe Zou | Shein | ### Committer | Github ID | Name | Organization | | ----------- | ------------- | ------------ | | Anilople | Xiaoquan Wang | Some Bank | | klboke | Kailing Chen | TapTap | | lepdou | Le Zhang | Ant Group | | nisiyong | Stephen Ni | Qihoo 360 | | pengweiqhca | Wei Peng | Tuhu | | vdisk-group | Lvqiu Ye | Hundsun | ## Contributors ### Apollo main repository <img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /> ### apollo.net <img src="https://opencollective.com/apollonet/contributors.svg?width=880&button=false" /> ## Becoming a Committer Please refer [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer).
# Apollo Team The Apollo team is comprised of Members and Contributors. Members have direct access to the source of Apollo project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. All contributions to Apollo are greatly appreciated, whether for trivial cleanups, big new features or other material rewards. For more information about the community governance model, please refer [GOVERNANCE.md](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md). ## Members Members include Project Management Committee members and committers. The list is in alphabet order. ### Project Management Committee | Github ID | Name | Organization | | ---------- | ---------- | ------------ | | JaredTan95 | Jared Tan | DaoCloud | | kezhenxu94 | Zhenxu Ke | Tetrate | | nobodyiam | Jason Song | Ant Group | | zouyx | Joe Zou | Shein | ### Committer | Github ID | Name | Organization | | ----------- | ------------- | ------------ | | Anilople | Xiaoquan Wang | Some Bank | | klboke | Kailing Chen | TapTap | | lepdou | Le Zhang | Ant Group | | nisiyong | Stephen Ni | Qihoo 360 | | pengweiqhca | Wei Peng | Tuhu | | vdisk-group | Lvqiu Ye | Hundsun | ## Contributors ### Apollo main repository <img src="https://opencollective.com/apollo/contributors.svg?width=880&button=false" /> ### apollo.net <img src="https://opencollective.com/apollonet/contributors.svg?width=880&button=false" /> ## Becoming a Committer Please refer [How to become a Committer](https://github.com/ctripcorp/apollo/blob/master/GOVERNANCE.md#how-to-become-a-committer).
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/index.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 lang="en"> <head> <meta charset="UTF-8" /> <title>Apollo</title> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="keywords" content="apollo,configuration,server,java,microservice" /> <meta name="description" content="A reliable configuration management system" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" /> <meta name="google-site-verification" content="CuvYz6OxISNH7wdJsnS8oNtJJn9IP6k0zz5x6m9uXco" /> <!-- theme --> <link rel="stylesheet" href="css/vue.css" title="vue" /> <link rel="stylesheet" href="css/dark.css" title="dark" disabled /> <link rel="stylesheet" href="css/buble.css" title="buble" disabled /> <link rel="stylesheet" href="css/pure.css" title="pure" disabled /> <style type="text/css"> .sidebar-nav >ul >li.file p >a { font-size: 15px; font-weight: 700; color: #364149; } .sidebar-nav .folder { cursor: pointer; } </style> </head> <body> <div id="app">Loading ...</div> <script> window.$docsify = { alias: { '/': 'zh/README.md', '/zh/.*/_sidebar.md': '/zh/_sidebar.md', '/en/.*/_sidebar.md': '/en/_sidebar.md', '/zh/.*/_navbar.md': '/zh/_navbar.md', '/en/.*/_navbar.md': '/en/_navbar.md', '/zh/(.*)': 'zh/$1', '/en/(.*)': 'en/$1', }, auto2top: true, // Only coverpage is loaded when visiting the home page. onlyCover: true, coverpage: true, loadSidebar: true, loadNavbar: true, mergeNavbar: true, maxLevel: 6, subMaxLevel: 5, name: 'Apollo', repo: 'https://github.com/ctripcorp/apollo/', search: { noData: { '/zh/': '没有结果!', '/en/': 'No results!', '/': '没有结果!', }, paths: 'auto', placeholder: { '/zh/': '搜索', '/en/': 'Search', '/': '搜索', }, }, // click to copy. copyCode: { buttonText: { '/zh/': '点击复制', '/en/': 'Copy to clipboard', '/': 'Copy to clipboard', }, errorText: { '/zh/': '错误', '/en/': 'Error', '/': 'Error', }, successText: { '/zh/': '复制成功', '/en': 'Copied', '/': 'Copied', }, }, // docsify-pagination pagination: { crossChapter: true, crossChapterText: true, }, plugins: [ // Edit Document Button in each page function (hook, vm) { hook.beforeEach(function (html) { if (/githubusercontent\.com/.test(vm.route.file)) { url = vm.route.file .replace('raw.githubusercontent.com', 'github.com') .replace(/\/master/, '/blob/master') } else { url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file } var editHtml = '[:memo: Edit Document](' + url + ')\n\n' return editHtml + html + '\n\n----\n\n' + '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>' }) }, ], }; </script> <script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script> <!-- plugins --> <!-- support search --> <script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script> <!-- Support docsify sidebar catalog expand and collapse --> <script src="//cdn.jsdelivr.net/npm/docsify-sidebar-collapse/dist/docsify-sidebar-collapse.min.js"></script> <!-- Medium's image zoom --> <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script> <!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs --> <script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script> <!-- docsify-pagination --> <script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script> <!-- code highlight --> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-csharp.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-java.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-properties.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-sql.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-xml-doc.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-yaml.min.js"></script> </body> <script> var _hmt = _hmt || []; (function() { var hm = document.createElement("script"); hm.src = "https://hm.baidu.com/hm.js?d47d58dcc5ba5c0c7dccab29717379c6"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); })(); </script> </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 lang="en"> <head> <meta charset="UTF-8" /> <title>Apollo</title> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta name="keywords" content="apollo,configuration,server,java,microservice" /> <meta name="description" content="A reliable configuration management system" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" /> <meta name="google-site-verification" content="CuvYz6OxISNH7wdJsnS8oNtJJn9IP6k0zz5x6m9uXco" /> <!-- theme --> <link rel="stylesheet" href="css/vue.css" title="vue" /> <link rel="stylesheet" href="css/dark.css" title="dark" disabled /> <link rel="stylesheet" href="css/buble.css" title="buble" disabled /> <link rel="stylesheet" href="css/pure.css" title="pure" disabled /> <style type="text/css"> .sidebar-nav >ul >li.file p >a { font-size: 15px; font-weight: 700; color: #364149; } .sidebar-nav .folder { cursor: pointer; } </style> </head> <body> <div id="app">Loading ...</div> <script> window.$docsify = { alias: { '/': 'zh/README.md', '/zh/.*/_sidebar.md': '/zh/_sidebar.md', '/en/.*/_sidebar.md': '/en/_sidebar.md', '/zh/.*/_navbar.md': '/zh/_navbar.md', '/en/.*/_navbar.md': '/en/_navbar.md', '/zh/(.*)': 'zh/$1', '/en/(.*)': 'en/$1', }, auto2top: true, // Only coverpage is loaded when visiting the home page. onlyCover: true, coverpage: true, loadSidebar: true, loadNavbar: true, mergeNavbar: true, maxLevel: 6, subMaxLevel: 5, name: 'Apollo', repo: 'https://github.com/ctripcorp/apollo/', search: { noData: { '/zh/': '没有结果!', '/en/': 'No results!', '/': '没有结果!', }, paths: 'auto', placeholder: { '/zh/': '搜索', '/en/': 'Search', '/': '搜索', }, }, // click to copy. copyCode: { buttonText: { '/zh/': '点击复制', '/en/': 'Copy to clipboard', '/': 'Copy to clipboard', }, errorText: { '/zh/': '错误', '/en/': 'Error', '/': 'Error', }, successText: { '/zh/': '复制成功', '/en': 'Copied', '/': 'Copied', }, }, // docsify-pagination pagination: { crossChapter: true, crossChapterText: true, }, plugins: [ // Edit Document Button in each page function (hook, vm) { hook.beforeEach(function (html) { if (/githubusercontent\.com/.test(vm.route.file)) { url = vm.route.file .replace('raw.githubusercontent.com', 'github.com') .replace(/\/master/, '/blob/master') } else { url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file } var editHtml = '[:memo: Edit Document](' + url + ')\n\n' return editHtml + html + '\n\n----\n\n' + '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>' }) }, ], }; </script> <script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script> <!-- plugins --> <!-- support search --> <script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script> <!-- Support docsify sidebar catalog expand and collapse --> <script src="//cdn.jsdelivr.net/npm/docsify-sidebar-collapse/dist/docsify-sidebar-collapse.min.js"></script> <!-- Medium's image zoom --> <script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script> <!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs --> <script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script> <!-- docsify-pagination --> <script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script> <!-- code highlight --> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-csharp.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-java.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-properties.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-sql.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-xml-doc.min.js"></script> <script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-yaml.min.js"></script> </body> <script> var _hmt = _hmt || []; (function() { var hm = document.createElement("script"); hm.src = "https://hm.baidu.com/hm.js?d47d58dcc5ba5c0c7dccab29717379c6"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); })(); </script> </html>
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/resources/static/vendor/valdr/valdr.min.js
!function(a,b){"use strict";angular.module("valdr",["ng"]).constant("valdrEvents",{revalidate:"valdr-revalidate"}).value("valdrConfig",{addFormGroupClass:!0}).value("valdrClasses",{formGroup:"form-group",valid:"ng-valid",invalid:"ng-invalid",dirty:"ng-dirty",pristine:"ng-pristine",touched:"ng-touched",untouched:"ng-untouched",invalidDirtyTouchedGroup:"valdr-invalid-dirty-touched-group"}),angular.module("valdr").factory("valdrUtil",[function(){var a=function(a){return-1===a.lastIndexOf(".")?a:a.substring(a.lastIndexOf(".")+1,a.length)},b=/[A-Z]/g,c=function(a){return a.replace(b,function(a,b){return(b?"-":"")+a.toLowerCase()})},d=function(b){if(angular.isString(b)){var d=a(b);return d=c(d),"valdr-"+d}return b};return{validatorNameToToken:d,isNaN:function(a){return this.isNumber(a)&&a!==+a},isNumber:function(a){var b=typeof a;return"number"===b||a&&"object"===b&&"[object Number]"===Object.prototype.toString.call(a)||!1},has:function(a,b){return a?Object.prototype.hasOwnProperty.call(a,b):!1},notEmpty:function(a){return this.isNaN(a)?!1:angular.isDefined(a)&&""!==a&&null!==a},isEmpty:function(a){return this.isNaN(a)?!1:!this.notEmpty(a)},startsWith:function(a,b){return angular.isString(a)&&angular.isString(b)&&0===a.lastIndexOf(b,0)}}}]),angular.module("valdr").factory("valdrRequiredValidator",["valdrUtil",function(a){return{name:"required",validate:function(b){return a.notEmpty(b)}}}]),angular.module("valdr").factory("valdrMinValidator",["valdrUtil",function(a){return{name:"min",validate:function(b,c){var d=Number(c.value),e=Number(b);return a.isNaN(b)?!1:a.isEmpty(b)||e>=d}}}]),angular.module("valdr").factory("valdrMaxValidator",["valdrUtil",function(a){return{name:"max",validate:function(b,c){var d=Number(c.value),e=Number(b);return a.isNaN(b)?!1:a.isEmpty(b)||d>=e}}}]),angular.module("valdr").factory("valdrSizeValidator",function(){return{name:"size",validate:function(a,b){var c=b.min||0,d=b.max;return a=a||"",a.length>=c&&(void 0===d||a.length<=d)}}}),angular.module("valdr").factory("valdrEmailValidator",["valdrUtil",function(a){var b=/^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;return{name:"email",validate:function(c){return a.isEmpty(c)||b.test(c)}}}]),angular.module("valdr").factory("valdrUrlValidator",["valdrUtil",function(a){var b=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;return{name:"url",validate:function(c){return a.isEmpty(c)||b.test(c)}}}]),angular.module("valdr").factory("valdrDigitsValidator",["valdrUtil",function(a){var b=new RegExp("[^.\\d]","g"),c=function(a){return Number(a).toString().replace(b,"")},d=function(a,b){return a?a.length<=b:!0},e=function(a,b){var e,f,g=b.integer,h=b.fraction;return e=c(a),f=e.split("."),d(f[0],g)&&d(f[1],h)};return{name:"digits",validate:function(b,c){return a.isEmpty(b)?!0:a.isNaN(Number(b))?!1:e(b,c)}}}]),angular.module("valdr").factory("futureAndPastSharedValidator",["valdrUtil",function(a){var b=["D-M-YYYY","D.M.YYYY","D/M/YYYY","D. M. YYYY","YYYY.M.D"];return{validate:function(c,d){var e,f=moment();if(a.isEmpty(c))return!0;e=moment(c);for(var g=0;g<b.length&&!e.isValid();g++)e=moment(c,b[g],!0);return e.isValid()&&d(e,f)}}}]),angular.module("valdr").factory("valdrPastValidator",["futureAndPastSharedValidator",function(a){return{name:"past",validate:function(b){return a.validate(b,function(a,b){return a.isBefore(b)})}}}]),angular.module("valdr").factory("valdrFutureValidator",["futureAndPastSharedValidator",function(a){return{name:"future",validate:function(b){return a.validate(b,function(a,b){return a.isAfter(b)})}}}]),angular.module("valdr").factory("valdrPatternValidator",["valdrUtil",function(a){var b=/^\/(.*)\/([gim]*)$/,c=function(a){var c;if(a.test)return a;if(c=a.match(b))return new RegExp(c[1],c[2]);throw"Expected "+a+" to be a RegExp"};return{name:"pattern",validate:function(b,d){var e=c(d.value);return a.isEmpty(b)||e.test(b)}}}]),angular.module("valdr").factory("valdrMinLengthValidator",["valdrUtil",function(a){return{name:"minLength",validate:function(b,c){var d=c.number;return a.isEmpty(b)?0===d:"string"==typeof b?b.length>=d:!1}}}]),angular.module("valdr").factory("valdrMaxLengthValidator",["valdrUtil",function(a){return{name:"maxLength",validate:function(b,c){var d=c.number;return a.isEmpty(b)?!0:"string"==typeof b?b.length<=d:!1}}}]),angular.module("valdr").factory("valdrHibernateEmailValidator",["valdrUtil",function(a){var b="[a-z0-9!#$%&'*+/=?^_`{|}~-]",c="^"+b+"+(\\."+b+"+)*$",d="^\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\]$",e=new RegExp("^"+b+"+(\\."+b+"+)*$","i"),f=new RegExp(c+"|"+d,"i");return{name:"hibernateEmail",validate:function(b){if(a.isEmpty(b))return!0;var c=b.split("@");return 2!==c.length?!1:e.test(c[0])?f.test(c[1]):!1}}}]),angular.module("valdr").provider("valdr",function(){var a,b,c={},d={},e={},f=["valdrRequiredValidator","valdrSizeValidator","valdrMinLengthValidator","valdrMaxLengthValidator","valdrMinValidator","valdrMaxValidator","valdrEmailValidator","valdrUrlValidator","valdrDigitsValidator","valdrFutureValidator","valdrPastValidator","valdrPatternValidator","valdrHibernateEmailValidator"],g=function(a){angular.extend(c,a)};this.addConstraints=g;var h=function(a){angular.isArray(a)?angular.forEach(a,function(a){delete c[a]}):angular.isString(a)&&delete c[a]};this.removeConstraints=h,this.setConstraintUrl=function(b){a=b},this.addValidator=function(a){f.push(a)},this.addConstraintAlias=function(a,b){angular.isArray(e[a])||(e[a]=[]),e[a].push(b)},this.$get=["$log","$injector","$rootScope","$http","valdrEvents","valdrUtil","valdrClasses",function(i,j,k,l,m,n,o){angular.forEach(f,function(a){var b=j.get(a);d[b.name]=b,angular.isArray(e[b.name])&&angular.forEach(e[b.name],function(a){d[a]=b})}),a&&(b=!0,l.get(a).then(function(a){b=!1,g(a.data),k.$broadcast(m.revalidate)})["finally"](function(){b=!1}));var p=function(a){return n.has(c,a)?c[a]:void(b||i.warn("No constraints for type '"+a+"' available."))};return{validate:function(a,b,c){var e={valid:!0},f=p(a);if(n.has(f,b)){var g=f[b],h=!0,j=[],k=[];return angular.forEach(g,function(f,g){var l=d[g];if(angular.isUndefined(l))return i.warn("No validator defined for '"+g+"'. Can not validate field '"+b+"'"),e;var m=l.validate(c,f),n={valid:m,value:c,field:b,type:a,validator:g};angular.extend(n,f),j.push(n),m||k.push(n),h=h&&m}),{valid:h,violations:0===k.length?void 0:k,validationResults:0===j.length?void 0:j}}return e},addConstraints:function(a){g(a),k.$broadcast(m.revalidate)},removeConstraints:function(a){h(a),k.$broadcast(m.revalidate)},getConstraints:function(){return c},setClasses:function(a){angular.extend(o,a),k.$broadcast(m.revalidate)}}}]});var c=["valdrClasses","valdrConfig",function(a,b){return{restrict:"EA",link:function(c,d){b.addFormGroupClass&&d.addClass(a.formGroup)},controller:["$scope","$element",function(b,c){var d=[],e={},f=function(){var a={invalidDirtyTouchedGroup:!1,valid:!0,itemStates:[]};return angular.forEach(d,function(b){b.$touched&&b.$dirty&&b.$invalid&&(a.invalidDirtyTouchedGroup=!0),b.$invalid&&(a.valid=!1);var c={name:b.$name,touched:b.$touched,dirty:b.$dirty,valid:b.$valid};a.itemStates.push(c)}),a},g=function(b){c.toggleClass(a.invalidDirtyTouchedGroup,b.invalidDirtyTouchedGroup),c.toggleClass(a.valid,b.valid),c.toggleClass(a.invalid,!b.valid),angular.forEach(b.itemStates,function(b){var c=e[b.name];c&&(c.toggleClass(a.valid,b.valid),c.toggleClass(a.invalid,!b.valid),c.toggleClass(a.dirty,b.dirty),c.toggleClass(a.pristine,!b.dirty),c.toggleClass(a.touched,b.touched),c.toggleClass(a.untouched,!b.touched))})};b.$watch(f,g,!0),this.addFormItem=function(a){d.push(a)},this.removeFormItem=function(a){var b=d.indexOf(a);b>=0&&d.splice(b,1)},this.addMessageElement=function(a,b){c.append(b),e[a.$name]=b},this.removeMessageElement=function(a){e[a.$name].remove()}}]}}];angular.module("valdr").directive("valdrFormGroup",c),angular.module("valdr").directive("valdrType",function(){return{priority:1,controller:["$attrs",function(a){this.getType=function(){return a.valdrType}}]}});var d={isEnabled:function(){return!0}},e={addFormItem:angular.noop,removeFormItem:angular.noop},f=function(a){return["valdrEvents","valdr","valdrUtil",function(b,c,f){return{restrict:a,require:["?^valdrType","?^ngModel","?^valdrFormGroup","?^valdrEnabled"],link:function(a,g,h,i){var j=i[0],k=i[1],l=i[2]||e,m=i[3]||d,n=h.valdrNoValidate,o=h.name;if(j&&k&&!angular.isDefined(n)){l.addFormItem(k),f.isEmpty(o)&&m.isEnabled()&&console.warn('Form element with ID "'+h.id+'" is not bound to a field name.');var p=function(a){if(m.isEnabled()){var b=["valdr"];angular.forEach(a.validationResults,function(a){var c=f.validatorNameToToken(a.validator);k.$setValidity(c,a.valid),b.push(c)}),k.$setValidity("valdr",a.valid),k.valdrViolations=a.violations,angular.forEach(k.$error,function(a,c){-1===b.indexOf(c)&&f.startsWith(c,"valdr")&&k.$setValidity(c,!0)})}else angular.forEach(k.$error,function(a,b){f.startsWith(b,"valdr")&&k.$setValidity(b,!0)}),k.valdrViolations=void 0},q=function(a){var b=c.validate(j.getType(),o,a);return p(b),m.isEnabled()?b.valid:!0};k.$validators.valdr=q,a.$on(b.revalidate,function(){q(k.$modelValue)}),a.$on("$destroy",function(){l.removeFormItem(k)})}}}}]},g=f("E"),h=f("A");angular.module("valdr").directive("input",g).directive("select",g).directive("textarea",g).directive("enableValdrValidation",h),angular.module("valdr").directive("valdrEnabled",["valdrEvents",function(a){return{controller:["$scope","$attrs",function(b,c){b.$watch(c.valdrEnabled,function(){b.$broadcast(a.revalidate)}),this.isEnabled=function(){var a=b.$eval(c.valdrEnabled);return void 0===a?!0:a}}]}}])}(window,document);
!function(a,b){"use strict";angular.module("valdr",["ng"]).constant("valdrEvents",{revalidate:"valdr-revalidate"}).value("valdrConfig",{addFormGroupClass:!0}).value("valdrClasses",{formGroup:"form-group",valid:"ng-valid",invalid:"ng-invalid",dirty:"ng-dirty",pristine:"ng-pristine",touched:"ng-touched",untouched:"ng-untouched",invalidDirtyTouchedGroup:"valdr-invalid-dirty-touched-group"}),angular.module("valdr").factory("valdrUtil",[function(){var a=function(a){return-1===a.lastIndexOf(".")?a:a.substring(a.lastIndexOf(".")+1,a.length)},b=/[A-Z]/g,c=function(a){return a.replace(b,function(a,b){return(b?"-":"")+a.toLowerCase()})},d=function(b){if(angular.isString(b)){var d=a(b);return d=c(d),"valdr-"+d}return b};return{validatorNameToToken:d,isNaN:function(a){return this.isNumber(a)&&a!==+a},isNumber:function(a){var b=typeof a;return"number"===b||a&&"object"===b&&"[object Number]"===Object.prototype.toString.call(a)||!1},has:function(a,b){return a?Object.prototype.hasOwnProperty.call(a,b):!1},notEmpty:function(a){return this.isNaN(a)?!1:angular.isDefined(a)&&""!==a&&null!==a},isEmpty:function(a){return this.isNaN(a)?!1:!this.notEmpty(a)},startsWith:function(a,b){return angular.isString(a)&&angular.isString(b)&&0===a.lastIndexOf(b,0)}}}]),angular.module("valdr").factory("valdrRequiredValidator",["valdrUtil",function(a){return{name:"required",validate:function(b){return a.notEmpty(b)}}}]),angular.module("valdr").factory("valdrMinValidator",["valdrUtil",function(a){return{name:"min",validate:function(b,c){var d=Number(c.value),e=Number(b);return a.isNaN(b)?!1:a.isEmpty(b)||e>=d}}}]),angular.module("valdr").factory("valdrMaxValidator",["valdrUtil",function(a){return{name:"max",validate:function(b,c){var d=Number(c.value),e=Number(b);return a.isNaN(b)?!1:a.isEmpty(b)||d>=e}}}]),angular.module("valdr").factory("valdrSizeValidator",function(){return{name:"size",validate:function(a,b){var c=b.min||0,d=b.max;return a=a||"",a.length>=c&&(void 0===d||a.length<=d)}}}),angular.module("valdr").factory("valdrEmailValidator",["valdrUtil",function(a){var b=/^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;return{name:"email",validate:function(c){return a.isEmpty(c)||b.test(c)}}}]),angular.module("valdr").factory("valdrUrlValidator",["valdrUtil",function(a){var b=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;return{name:"url",validate:function(c){return a.isEmpty(c)||b.test(c)}}}]),angular.module("valdr").factory("valdrDigitsValidator",["valdrUtil",function(a){var b=new RegExp("[^.\\d]","g"),c=function(a){return Number(a).toString().replace(b,"")},d=function(a,b){return a?a.length<=b:!0},e=function(a,b){var e,f,g=b.integer,h=b.fraction;return e=c(a),f=e.split("."),d(f[0],g)&&d(f[1],h)};return{name:"digits",validate:function(b,c){return a.isEmpty(b)?!0:a.isNaN(Number(b))?!1:e(b,c)}}}]),angular.module("valdr").factory("futureAndPastSharedValidator",["valdrUtil",function(a){var b=["D-M-YYYY","D.M.YYYY","D/M/YYYY","D. M. YYYY","YYYY.M.D"];return{validate:function(c,d){var e,f=moment();if(a.isEmpty(c))return!0;e=moment(c);for(var g=0;g<b.length&&!e.isValid();g++)e=moment(c,b[g],!0);return e.isValid()&&d(e,f)}}}]),angular.module("valdr").factory("valdrPastValidator",["futureAndPastSharedValidator",function(a){return{name:"past",validate:function(b){return a.validate(b,function(a,b){return a.isBefore(b)})}}}]),angular.module("valdr").factory("valdrFutureValidator",["futureAndPastSharedValidator",function(a){return{name:"future",validate:function(b){return a.validate(b,function(a,b){return a.isAfter(b)})}}}]),angular.module("valdr").factory("valdrPatternValidator",["valdrUtil",function(a){var b=/^\/(.*)\/([gim]*)$/,c=function(a){var c;if(a.test)return a;if(c=a.match(b))return new RegExp(c[1],c[2]);throw"Expected "+a+" to be a RegExp"};return{name:"pattern",validate:function(b,d){var e=c(d.value);return a.isEmpty(b)||e.test(b)}}}]),angular.module("valdr").factory("valdrMinLengthValidator",["valdrUtil",function(a){return{name:"minLength",validate:function(b,c){var d=c.number;return a.isEmpty(b)?0===d:"string"==typeof b?b.length>=d:!1}}}]),angular.module("valdr").factory("valdrMaxLengthValidator",["valdrUtil",function(a){return{name:"maxLength",validate:function(b,c){var d=c.number;return a.isEmpty(b)?!0:"string"==typeof b?b.length<=d:!1}}}]),angular.module("valdr").factory("valdrHibernateEmailValidator",["valdrUtil",function(a){var b="[a-z0-9!#$%&'*+/=?^_`{|}~-]",c="^"+b+"+(\\."+b+"+)*$",d="^\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\]$",e=new RegExp("^"+b+"+(\\."+b+"+)*$","i"),f=new RegExp(c+"|"+d,"i");return{name:"hibernateEmail",validate:function(b){if(a.isEmpty(b))return!0;var c=b.split("@");return 2!==c.length?!1:e.test(c[0])?f.test(c[1]):!1}}}]),angular.module("valdr").provider("valdr",function(){var a,b,c={},d={},e={},f=["valdrRequiredValidator","valdrSizeValidator","valdrMinLengthValidator","valdrMaxLengthValidator","valdrMinValidator","valdrMaxValidator","valdrEmailValidator","valdrUrlValidator","valdrDigitsValidator","valdrFutureValidator","valdrPastValidator","valdrPatternValidator","valdrHibernateEmailValidator"],g=function(a){angular.extend(c,a)};this.addConstraints=g;var h=function(a){angular.isArray(a)?angular.forEach(a,function(a){delete c[a]}):angular.isString(a)&&delete c[a]};this.removeConstraints=h,this.setConstraintUrl=function(b){a=b},this.addValidator=function(a){f.push(a)},this.addConstraintAlias=function(a,b){angular.isArray(e[a])||(e[a]=[]),e[a].push(b)},this.$get=["$log","$injector","$rootScope","$http","valdrEvents","valdrUtil","valdrClasses",function(i,j,k,l,m,n,o){angular.forEach(f,function(a){var b=j.get(a);d[b.name]=b,angular.isArray(e[b.name])&&angular.forEach(e[b.name],function(a){d[a]=b})}),a&&(b=!0,l.get(a).then(function(a){b=!1,g(a.data),k.$broadcast(m.revalidate)})["finally"](function(){b=!1}));var p=function(a){return n.has(c,a)?c[a]:void(b||i.warn("No constraints for type '"+a+"' available."))};return{validate:function(a,b,c){var e={valid:!0},f=p(a);if(n.has(f,b)){var g=f[b],h=!0,j=[],k=[];return angular.forEach(g,function(f,g){var l=d[g];if(angular.isUndefined(l))return i.warn("No validator defined for '"+g+"'. Can not validate field '"+b+"'"),e;var m=l.validate(c,f),n={valid:m,value:c,field:b,type:a,validator:g};angular.extend(n,f),j.push(n),m||k.push(n),h=h&&m}),{valid:h,violations:0===k.length?void 0:k,validationResults:0===j.length?void 0:j}}return e},addConstraints:function(a){g(a),k.$broadcast(m.revalidate)},removeConstraints:function(a){h(a),k.$broadcast(m.revalidate)},getConstraints:function(){return c},setClasses:function(a){angular.extend(o,a),k.$broadcast(m.revalidate)}}}]});var c=["valdrClasses","valdrConfig",function(a,b){return{restrict:"EA",link:function(c,d){b.addFormGroupClass&&d.addClass(a.formGroup)},controller:["$scope","$element",function(b,c){var d=[],e={},f=function(){var a={invalidDirtyTouchedGroup:!1,valid:!0,itemStates:[]};return angular.forEach(d,function(b){b.$touched&&b.$dirty&&b.$invalid&&(a.invalidDirtyTouchedGroup=!0),b.$invalid&&(a.valid=!1);var c={name:b.$name,touched:b.$touched,dirty:b.$dirty,valid:b.$valid};a.itemStates.push(c)}),a},g=function(b){c.toggleClass(a.invalidDirtyTouchedGroup,b.invalidDirtyTouchedGroup),c.toggleClass(a.valid,b.valid),c.toggleClass(a.invalid,!b.valid),angular.forEach(b.itemStates,function(b){var c=e[b.name];c&&(c.toggleClass(a.valid,b.valid),c.toggleClass(a.invalid,!b.valid),c.toggleClass(a.dirty,b.dirty),c.toggleClass(a.pristine,!b.dirty),c.toggleClass(a.touched,b.touched),c.toggleClass(a.untouched,!b.touched))})};b.$watch(f,g,!0),this.addFormItem=function(a){d.push(a)},this.removeFormItem=function(a){var b=d.indexOf(a);b>=0&&d.splice(b,1)},this.addMessageElement=function(a,b){c.append(b),e[a.$name]=b},this.removeMessageElement=function(a){e[a.$name].remove()}}]}}];angular.module("valdr").directive("valdrFormGroup",c),angular.module("valdr").directive("valdrType",function(){return{priority:1,controller:["$attrs",function(a){this.getType=function(){return a.valdrType}}]}});var d={isEnabled:function(){return!0}},e={addFormItem:angular.noop,removeFormItem:angular.noop},f=function(a){return["valdrEvents","valdr","valdrUtil",function(b,c,f){return{restrict:a,require:["?^valdrType","?^ngModel","?^valdrFormGroup","?^valdrEnabled"],link:function(a,g,h,i){var j=i[0],k=i[1],l=i[2]||e,m=i[3]||d,n=h.valdrNoValidate,o=h.name;if(j&&k&&!angular.isDefined(n)){l.addFormItem(k),f.isEmpty(o)&&m.isEnabled()&&console.warn('Form element with ID "'+h.id+'" is not bound to a field name.');var p=function(a){if(m.isEnabled()){var b=["valdr"];angular.forEach(a.validationResults,function(a){var c=f.validatorNameToToken(a.validator);k.$setValidity(c,a.valid),b.push(c)}),k.$setValidity("valdr",a.valid),k.valdrViolations=a.violations,angular.forEach(k.$error,function(a,c){-1===b.indexOf(c)&&f.startsWith(c,"valdr")&&k.$setValidity(c,!0)})}else angular.forEach(k.$error,function(a,b){f.startsWith(b,"valdr")&&k.$setValidity(b,!0)}),k.valdrViolations=void 0},q=function(a){var b=c.validate(j.getType(),o,a);return p(b),m.isEnabled()?b.valid:!0};k.$validators.valdr=q,a.$on(b.revalidate,function(){q(k.$modelValue)}),a.$on("$destroy",function(){l.removeFormItem(k)})}}}}]},g=f("E"),h=f("A");angular.module("valdr").directive("input",g).directive("select",g).directive("textarea",g).directive("enableValdrValidation",h),angular.module("valdr").directive("valdrEnabled",["valdrEvents",function(a){return{controller:["$scope","$attrs",function(b,c){b.$watch(c.valdrEnabled,function(){b.$broadcast(a.revalidate)}),this.isEnabled=function(){var a=b.$eval(c.valdrEnabled);return void 0===a?!0:a}}]}}])}(window,document);
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/DefaultPortalMetaServerProvider.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.environment; import static com.ctrip.framework.apollo.portal.environment.Env.transformToEnvMap; import com.ctrip.framework.apollo.core.utils.ResourceUtils; import com.ctrip.framework.apollo.portal.util.KeyValueUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; /** * Only use in apollo-portal * load all meta server address from * - System Property [key ends with "_meta" (case insensitive)] * - OS environment variable [key ends with "_meta" (case insensitive)] * - user's configuration file [key ends with ".meta" (case insensitive)] * when apollo-portal start up. * @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider * @author wxq */ class DefaultPortalMetaServerProvider implements PortalMetaServerProvider { private static final Logger logger = LoggerFactory.getLogger(DefaultPortalMetaServerProvider.class); /** * environments and their meta server address * properties file path */ private static final String APOLLO_ENV_PROPERTIES_FILE_PATH = "apollo-env.properties"; private volatile Map<Env, String> domains; DefaultPortalMetaServerProvider() { reload(); } @Override public String getMetaServerAddress(Env targetEnv) { String metaServerAddress = domains.get(targetEnv); return metaServerAddress == null ? null : metaServerAddress.trim(); } @Override public boolean exists(Env targetEnv) { return domains.containsKey(targetEnv); } @Override public void reload() { domains = initializeDomains(); logger.info("Loaded meta server addresses from system property, os environment and properties file: {}", domains); } /** * load all environment's meta address dynamically when this class loaded by JVM */ private Map<Env, String> initializeDomains() { // add to domain Map<Env, String> map = new ConcurrentHashMap<>(); // lower priority add first map.putAll(getDomainsFromPropertiesFile()); map.putAll(getDomainsFromOSEnvironment()); map.putAll(getDomainsFromSystemProperty()); // log all return map; } private Map<Env, String> getDomainsFromSystemProperty() { // find key-value from System Property which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromSystemProperty = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getProperties(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromSystemProperty = KeyValueUtils.removeKeySuffix(metaServerAddressesFromSystemProperty, "_meta".length()); return transformToEnvMap(metaServerAddressesFromSystemProperty); } private Map<Env, String> getDomainsFromOSEnvironment() { // find key-value from OS environment variable which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromOSEnvironment = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getenv(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromOSEnvironment = KeyValueUtils.removeKeySuffix(metaServerAddressesFromOSEnvironment, "_meta".length()); return transformToEnvMap(metaServerAddressesFromOSEnvironment); } private Map<Env, String> getDomainsFromPropertiesFile() { // find key-value from properties file which key ends with ".meta" (case insensitive) Properties properties = new Properties(); properties = ResourceUtils.readConfigFile(APOLLO_ENV_PROPERTIES_FILE_PATH, properties); Map<String, String> metaServerAddressesFromPropertiesFile = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(properties, ".meta"); // remove key's suffix ".meta" (case insensitive) metaServerAddressesFromPropertiesFile = KeyValueUtils.removeKeySuffix(metaServerAddressesFromPropertiesFile, ".meta".length()); return transformToEnvMap(metaServerAddressesFromPropertiesFile); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.environment; import static com.ctrip.framework.apollo.portal.environment.Env.transformToEnvMap; import com.ctrip.framework.apollo.core.utils.ResourceUtils; import com.ctrip.framework.apollo.portal.util.KeyValueUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; /** * Only use in apollo-portal * load all meta server address from * - System Property [key ends with "_meta" (case insensitive)] * - OS environment variable [key ends with "_meta" (case insensitive)] * - user's configuration file [key ends with ".meta" (case insensitive)] * when apollo-portal start up. * @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider * @author wxq */ class DefaultPortalMetaServerProvider implements PortalMetaServerProvider { private static final Logger logger = LoggerFactory.getLogger(DefaultPortalMetaServerProvider.class); /** * environments and their meta server address * properties file path */ private static final String APOLLO_ENV_PROPERTIES_FILE_PATH = "apollo-env.properties"; private volatile Map<Env, String> domains; DefaultPortalMetaServerProvider() { reload(); } @Override public String getMetaServerAddress(Env targetEnv) { String metaServerAddress = domains.get(targetEnv); return metaServerAddress == null ? null : metaServerAddress.trim(); } @Override public boolean exists(Env targetEnv) { return domains.containsKey(targetEnv); } @Override public void reload() { domains = initializeDomains(); logger.info("Loaded meta server addresses from system property, os environment and properties file: {}", domains); } /** * load all environment's meta address dynamically when this class loaded by JVM */ private Map<Env, String> initializeDomains() { // add to domain Map<Env, String> map = new ConcurrentHashMap<>(); // lower priority add first map.putAll(getDomainsFromPropertiesFile()); map.putAll(getDomainsFromOSEnvironment()); map.putAll(getDomainsFromSystemProperty()); // log all return map; } private Map<Env, String> getDomainsFromSystemProperty() { // find key-value from System Property which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromSystemProperty = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getProperties(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromSystemProperty = KeyValueUtils.removeKeySuffix(metaServerAddressesFromSystemProperty, "_meta".length()); return transformToEnvMap(metaServerAddressesFromSystemProperty); } private Map<Env, String> getDomainsFromOSEnvironment() { // find key-value from OS environment variable which key ends with "_meta" (case insensitive) Map<String, String> metaServerAddressesFromOSEnvironment = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(System.getenv(), "_meta"); // remove key's suffix "_meta" (case insensitive) metaServerAddressesFromOSEnvironment = KeyValueUtils.removeKeySuffix(metaServerAddressesFromOSEnvironment, "_meta".length()); return transformToEnvMap(metaServerAddressesFromOSEnvironment); } private Map<Env, String> getDomainsFromPropertiesFile() { // find key-value from properties file which key ends with ".meta" (case insensitive) Properties properties = new Properties(); properties = ResourceUtils.readConfigFile(APOLLO_ENV_PROPERTIES_FILE_PATH, properties); Map<String, String> metaServerAddressesFromPropertiesFile = KeyValueUtils.filterWithKeyIgnoreCaseEndsWith(properties, ".meta"); // remove key's suffix ".meta" (case insensitive) metaServerAddressesFromPropertiesFile = KeyValueUtils.removeKeySuffix(metaServerAddressesFromPropertiesFile, ".meta".length()); return transformToEnvMap(metaServerAddressesFromPropertiesFile); } }
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/zh/_navbar.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) - Translations - [:uk: English](/en/) - [:cn: 中文](/zh/)
- 社区 - [团队](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) - Translations - [:uk: English](/en/) - [:cn: 中文](/zh/)
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AdditionalUserInfoEnrichService.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.portal.enricher.adapter.UserInfoEnrichedAdapter; import java.util.List; import java.util.function.Function; /** * @author vdisk <vdisk@foxmail.com> */ public interface AdditionalUserInfoEnrichService { /** * enrich the additional user info for the object list * * @param list object with user id * @param mapper map the object in the list to {@link UserInfoEnrichedAdapter} */ <T> void enrichAdditionalUserInfo(List<? extends T> list, Function<? super T, ? extends UserInfoEnrichedAdapter> mapper); }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.service; import com.ctrip.framework.apollo.portal.enricher.adapter.UserInfoEnrichedAdapter; import java.util.List; import java.util.function.Function; /** * @author vdisk <vdisk@foxmail.com> */ public interface AdditionalUserInfoEnrichService { /** * enrich the additional user info for the object list * * @param list object with user id * @param mapper map the object in the list to {@link UserInfoEnrichedAdapter} */ <T> void enrichAdditionalUserInfo(List<? extends T> list, Function<? super T, ? extends UserInfoEnrichedAdapter> mapper); }
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/usage/java-sdk-user-guide.md
TODO
TODO
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest11.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"> <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"> <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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCacheTest.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.service; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository; import com.ctrip.framework.apollo.common.entity.AppNamespace; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import java.util.Calendar; import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; import static org.awaitility.Awaitility.await; import static org.junit.Assert.*; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ @RunWith(MockitoJUnitRunner.Silent.class) public class AppNamespaceServiceWithCacheTest { private AppNamespaceServiceWithCache appNamespaceServiceWithCache; @Mock private AppNamespaceRepository appNamespaceRepository; @Mock private BizConfig bizConfig; private int scanInterval; private TimeUnit scanIntervalTimeUnit; private Comparator<AppNamespace> appNamespaceComparator = (o1, o2) -> (int) (o1.getId() - o2.getId()); @Before public void setUp() throws Exception { appNamespaceServiceWithCache = new AppNamespaceServiceWithCache(appNamespaceRepository, bizConfig); scanInterval = 50; scanIntervalTimeUnit = TimeUnit.MILLISECONDS; when(bizConfig.appNamespaceCacheRebuildInterval()).thenReturn(scanInterval); when(bizConfig.appNamespaceCacheRebuildIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit); when(bizConfig.appNamespaceCacheScanInterval()).thenReturn(scanInterval); when(bizConfig.appNamespaceCacheScanIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit); Awaitility.reset(); Awaitility.setDefaultTimeout(scanInterval * 100, scanIntervalTimeUnit); Awaitility.setDefaultPollInterval(scanInterval, scanIntervalTimeUnit); } @Test public void testAppNamespace() throws Exception { String someAppId = "someAppId"; String somePrivateNamespace = "somePrivateNamespace"; String somePrivateNamespaceWithIncorrectCase = somePrivateNamespace.toUpperCase(); long somePrivateNamespaceId = 1; String yetAnotherPrivateNamespace = "anotherPrivateNamespace"; long yetAnotherPrivateNamespaceId = 4; String anotherPublicNamespace = "anotherPublicNamespace"; long anotherPublicNamespaceId = 5; String somePublicAppId = "somePublicAppId"; String somePublicNamespace = "somePublicNamespace"; String somePublicNamespaceWithIncorrectCase = somePublicNamespace.toUpperCase(); long somePublicNamespaceId = 2; String anotherPrivateNamespace = "anotherPrivateNamespace"; long anotherPrivateNamespaceId = 3; AppNamespace somePrivateAppNamespace = assembleAppNamespace(somePrivateNamespaceId, someAppId, somePrivateNamespace, false); AppNamespace somePublicAppNamespace = assembleAppNamespace(somePublicNamespaceId, somePublicAppId, somePublicNamespace, true); AppNamespace anotherPrivateAppNamespace = assembleAppNamespace(anotherPrivateNamespaceId, somePublicAppId, anotherPrivateNamespace, false); AppNamespace yetAnotherPrivateAppNamespace = assembleAppNamespace (yetAnotherPrivateNamespaceId, someAppId, yetAnotherPrivateNamespace, false); AppNamespace anotherPublicAppNamespace = assembleAppNamespace(anotherPublicNamespaceId, someAppId, anotherPublicNamespace, true); Set<String> someAppIdNamespaces = Sets.newHashSet (somePrivateNamespace, yetAnotherPrivateNamespace, anotherPublicNamespace); Set<String> someAppIdNamespacesWithIncorrectCase = Sets.newHashSet (somePrivateNamespaceWithIncorrectCase, yetAnotherPrivateNamespace, anotherPublicNamespace); Set<String> somePublicAppIdNamespaces = Sets.newHashSet(somePublicNamespace, anotherPrivateNamespace); Set<String> publicNamespaces = Sets.newHashSet(somePublicNamespace, anotherPublicNamespace); Set<String> publicNamespacesWithIncorrectCase = Sets.newHashSet(somePublicNamespaceWithIncorrectCase, anotherPublicNamespace); List<Long> appNamespaceIds = Lists.newArrayList(somePrivateNamespaceId, somePublicNamespaceId, anotherPrivateNamespaceId, yetAnotherPrivateNamespaceId, anotherPublicNamespaceId); List<AppNamespace> allAppNamespaces = Lists.newArrayList(somePrivateAppNamespace, somePublicAppNamespace, anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace); // Test init appNamespaceServiceWithCache.afterPropertiesSet(); // Should have no record now assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace)); assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces).isEmpty()); assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase) .isEmpty()); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespaceWithIncorrectCase)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace)); assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces).isEmpty()); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespaceWithIncorrectCase)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace)); assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces).isEmpty()); assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespacesWithIncorrectCase).isEmpty()); // Add 1 private namespace and 1 public namespace when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0)).thenReturn(Lists .newArrayList(somePrivateAppNamespace, somePublicAppNamespace)); when(appNamespaceRepository.findAllById(Lists.newArrayList(somePrivateNamespaceId, somePublicNamespaceId))).thenReturn(Lists.newArrayList(somePrivateAppNamespace, somePublicAppNamespace)); await().untilAsserted(() -> { assertEquals(somePrivateAppNamespace, appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace)); assertEquals(somePrivateAppNamespace, appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase)); check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, someAppIdNamespaces)); check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespaceWithIncorrectCase)); check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findPublicNamespaceByName (somePublicNamespaceWithIncorrectCase)); check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache.findPublicNamespacesByNames (publicNamespaces)); check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache.findPublicNamespacesByNames (publicNamespacesWithIncorrectCase)); }); // Add 2 private namespaces and 1 public namespace when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(somePublicNamespaceId)) .thenReturn(Lists.newArrayList(anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace)); when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(allAppNamespaces); await().untilAsserted(() -> { check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace), Lists .newArrayList( appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, anotherPublicNamespace))); check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces (someAppId, someAppIdNamespaces)); check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace), Lists.newArrayList(appNamespaceServiceWithCache .findByAppIdAndNamespace(somePublicAppId, somePublicNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace))); check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces)); check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace), Lists.newArrayList( appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace), appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace))); check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace), appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces)); }); // Update name String somePrivateNamespaceNew = "somePrivateNamespaceNew"; AppNamespace somePrivateAppNamespaceNew = assembleAppNamespace(somePrivateAppNamespace.getId (), somePrivateAppNamespace.getAppId(), somePrivateNamespaceNew, somePrivateAppNamespace .isPublic()); somePrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta (somePrivateAppNamespace.getDataChangeLastModifiedTime(), 1)); // Update appId String someAppIdNew = "someAppIdNew"; AppNamespace yetAnotherPrivateAppNamespaceNew = assembleAppNamespace (yetAnotherPrivateAppNamespace.getId(), someAppIdNew, yetAnotherPrivateAppNamespace .getName(), false); yetAnotherPrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta (yetAnotherPrivateAppNamespace.getDataChangeLastModifiedTime(), 1)); // Update isPublic AppNamespace somePublicAppNamespaceNew = assembleAppNamespace(somePublicAppNamespace .getId(), somePublicAppNamespace.getAppId(), somePublicAppNamespace.getName(), !somePublicAppNamespace.isPublic()); somePublicAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta (somePublicAppNamespace.getDataChangeLastModifiedTime(), 1)); // Delete 1 private and 1 public // should prepare for the case after deleted first, or in 2 rebuild intervals, all will be deleted List<Long> appNamespaceIdsAfterDelete = Lists .newArrayList(somePrivateNamespaceId, somePublicNamespaceId, yetAnotherPrivateNamespaceId); when(appNamespaceRepository.findAllById(appNamespaceIdsAfterDelete)).thenReturn(Lists.newArrayList (somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew)); // do delete when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(Lists.newArrayList (somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew)); await().untilAsserted(() -> { assertNull( appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace)); assertNull(appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace)); assertNull( appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace)); check(Collections.emptyList(), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, someAppIdNamespaces)); assertEquals(somePublicAppNamespaceNew, appNamespaceServiceWithCache .findByAppIdAndNamespace(somePublicAppId, somePublicNamespace)); check(Lists.newArrayList(somePublicAppNamespaceNew), appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace)); check(Collections.emptyList(), appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces)); assertEquals(somePrivateAppNamespaceNew, appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceNew)); check(Lists.newArrayList(somePrivateAppNamespaceNew), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, Sets.newHashSet(somePrivateNamespaceNew))); assertEquals(yetAnotherPrivateAppNamespaceNew, appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppIdNew, yetAnotherPrivateNamespace)); check(Lists.newArrayList(yetAnotherPrivateAppNamespaceNew), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppIdNew, Sets.newHashSet(yetAnotherPrivateNamespace))); }); } private void check(List<AppNamespace> someList, List<AppNamespace> anotherList) { someList.sort(appNamespaceComparator); anotherList.sort(appNamespaceComparator); assertEquals(someList, anotherList); } private Date newDateWithDelta(Date date, int deltaInSeconds) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.SECOND, deltaInSeconds); return calendar.getTime(); } private AppNamespace assembleAppNamespace(long id, String appId, String name, boolean isPublic) { AppNamespace appNamespace = new AppNamespace(); appNamespace.setId(id); appNamespace.setAppId(appId); appNamespace.setName(name); appNamespace.setPublic(isPublic); appNamespace.setDataChangeLastModifiedTime(new Date()); return appNamespace; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.configservice.service; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository; import com.ctrip.framework.apollo.common.entity.AppNamespace; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import java.util.Calendar; import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; import static org.awaitility.Awaitility.await; import static org.junit.Assert.*; import static org.mockito.Mockito.when; /** * @author Jason Song(song_s@ctrip.com) */ @RunWith(MockitoJUnitRunner.Silent.class) public class AppNamespaceServiceWithCacheTest { private AppNamespaceServiceWithCache appNamespaceServiceWithCache; @Mock private AppNamespaceRepository appNamespaceRepository; @Mock private BizConfig bizConfig; private int scanInterval; private TimeUnit scanIntervalTimeUnit; private Comparator<AppNamespace> appNamespaceComparator = (o1, o2) -> (int) (o1.getId() - o2.getId()); @Before public void setUp() throws Exception { appNamespaceServiceWithCache = new AppNamespaceServiceWithCache(appNamespaceRepository, bizConfig); scanInterval = 50; scanIntervalTimeUnit = TimeUnit.MILLISECONDS; when(bizConfig.appNamespaceCacheRebuildInterval()).thenReturn(scanInterval); when(bizConfig.appNamespaceCacheRebuildIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit); when(bizConfig.appNamespaceCacheScanInterval()).thenReturn(scanInterval); when(bizConfig.appNamespaceCacheScanIntervalTimeUnit()).thenReturn(scanIntervalTimeUnit); Awaitility.reset(); Awaitility.setDefaultTimeout(scanInterval * 100, scanIntervalTimeUnit); Awaitility.setDefaultPollInterval(scanInterval, scanIntervalTimeUnit); } @Test public void testAppNamespace() throws Exception { String someAppId = "someAppId"; String somePrivateNamespace = "somePrivateNamespace"; String somePrivateNamespaceWithIncorrectCase = somePrivateNamespace.toUpperCase(); long somePrivateNamespaceId = 1; String yetAnotherPrivateNamespace = "anotherPrivateNamespace"; long yetAnotherPrivateNamespaceId = 4; String anotherPublicNamespace = "anotherPublicNamespace"; long anotherPublicNamespaceId = 5; String somePublicAppId = "somePublicAppId"; String somePublicNamespace = "somePublicNamespace"; String somePublicNamespaceWithIncorrectCase = somePublicNamespace.toUpperCase(); long somePublicNamespaceId = 2; String anotherPrivateNamespace = "anotherPrivateNamespace"; long anotherPrivateNamespaceId = 3; AppNamespace somePrivateAppNamespace = assembleAppNamespace(somePrivateNamespaceId, someAppId, somePrivateNamespace, false); AppNamespace somePublicAppNamespace = assembleAppNamespace(somePublicNamespaceId, somePublicAppId, somePublicNamespace, true); AppNamespace anotherPrivateAppNamespace = assembleAppNamespace(anotherPrivateNamespaceId, somePublicAppId, anotherPrivateNamespace, false); AppNamespace yetAnotherPrivateAppNamespace = assembleAppNamespace (yetAnotherPrivateNamespaceId, someAppId, yetAnotherPrivateNamespace, false); AppNamespace anotherPublicAppNamespace = assembleAppNamespace(anotherPublicNamespaceId, someAppId, anotherPublicNamespace, true); Set<String> someAppIdNamespaces = Sets.newHashSet (somePrivateNamespace, yetAnotherPrivateNamespace, anotherPublicNamespace); Set<String> someAppIdNamespacesWithIncorrectCase = Sets.newHashSet (somePrivateNamespaceWithIncorrectCase, yetAnotherPrivateNamespace, anotherPublicNamespace); Set<String> somePublicAppIdNamespaces = Sets.newHashSet(somePublicNamespace, anotherPrivateNamespace); Set<String> publicNamespaces = Sets.newHashSet(somePublicNamespace, anotherPublicNamespace); Set<String> publicNamespacesWithIncorrectCase = Sets.newHashSet(somePublicNamespaceWithIncorrectCase, anotherPublicNamespace); List<Long> appNamespaceIds = Lists.newArrayList(somePrivateNamespaceId, somePublicNamespaceId, anotherPrivateNamespaceId, yetAnotherPrivateNamespaceId, anotherPublicNamespaceId); List<AppNamespace> allAppNamespaces = Lists.newArrayList(somePrivateAppNamespace, somePublicAppNamespace, anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace); // Test init appNamespaceServiceWithCache.afterPropertiesSet(); // Should have no record now assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace)); assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespaces).isEmpty()); assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase) .isEmpty()); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespaceWithIncorrectCase)); assertNull(appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace)); assertTrue(appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces).isEmpty()); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespaceWithIncorrectCase)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace)); assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces).isEmpty()); assertTrue(appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespacesWithIncorrectCase).isEmpty()); // Add 1 private namespace and 1 public namespace when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(0)).thenReturn(Lists .newArrayList(somePrivateAppNamespace, somePublicAppNamespace)); when(appNamespaceRepository.findAllById(Lists.newArrayList(somePrivateNamespaceId, somePublicNamespaceId))).thenReturn(Lists.newArrayList(somePrivateAppNamespace, somePublicAppNamespace)); await().untilAsserted(() -> { assertEquals(somePrivateAppNamespace, appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace)); assertEquals(somePrivateAppNamespace, appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, somePrivateNamespaceWithIncorrectCase)); check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, someAppIdNamespaces)); check(Lists.newArrayList(somePrivateAppNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, someAppIdNamespacesWithIncorrectCase)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespace)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findByAppIdAndNamespace(somePublicAppId, somePublicNamespaceWithIncorrectCase)); check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace)); assertEquals(somePublicAppNamespace, appNamespaceServiceWithCache.findPublicNamespaceByName (somePublicNamespaceWithIncorrectCase)); check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache.findPublicNamespacesByNames (publicNamespaces)); check(Lists.newArrayList(somePublicAppNamespace), appNamespaceServiceWithCache.findPublicNamespacesByNames (publicNamespacesWithIncorrectCase)); }); // Add 2 private namespaces and 1 public namespace when(appNamespaceRepository.findFirst500ByIdGreaterThanOrderByIdAsc(somePublicNamespaceId)) .thenReturn(Lists.newArrayList(anotherPrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace)); when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(allAppNamespaces); await().untilAsserted(() -> { check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace), Lists .newArrayList( appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, anotherPublicNamespace))); check(Lists.newArrayList(somePrivateAppNamespace, yetAnotherPrivateAppNamespace, anotherPublicAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces (someAppId, someAppIdNamespaces)); check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace), Lists.newArrayList(appNamespaceServiceWithCache .findByAppIdAndNamespace(somePublicAppId, somePublicNamespace), appNamespaceServiceWithCache .findByAppIdAndNamespace(somePublicAppId, anotherPrivateNamespace))); check(Lists.newArrayList(somePublicAppNamespace, anotherPrivateAppNamespace), appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces)); check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace), Lists.newArrayList( appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace), appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace))); check(Lists.newArrayList(somePublicAppNamespace, anotherPublicAppNamespace), appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces)); }); // Update name String somePrivateNamespaceNew = "somePrivateNamespaceNew"; AppNamespace somePrivateAppNamespaceNew = assembleAppNamespace(somePrivateAppNamespace.getId (), somePrivateAppNamespace.getAppId(), somePrivateNamespaceNew, somePrivateAppNamespace .isPublic()); somePrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta (somePrivateAppNamespace.getDataChangeLastModifiedTime(), 1)); // Update appId String someAppIdNew = "someAppIdNew"; AppNamespace yetAnotherPrivateAppNamespaceNew = assembleAppNamespace (yetAnotherPrivateAppNamespace.getId(), someAppIdNew, yetAnotherPrivateAppNamespace .getName(), false); yetAnotherPrivateAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta (yetAnotherPrivateAppNamespace.getDataChangeLastModifiedTime(), 1)); // Update isPublic AppNamespace somePublicAppNamespaceNew = assembleAppNamespace(somePublicAppNamespace .getId(), somePublicAppNamespace.getAppId(), somePublicAppNamespace.getName(), !somePublicAppNamespace.isPublic()); somePublicAppNamespaceNew.setDataChangeLastModifiedTime(newDateWithDelta (somePublicAppNamespace.getDataChangeLastModifiedTime(), 1)); // Delete 1 private and 1 public // should prepare for the case after deleted first, or in 2 rebuild intervals, all will be deleted List<Long> appNamespaceIdsAfterDelete = Lists .newArrayList(somePrivateNamespaceId, somePublicNamespaceId, yetAnotherPrivateNamespaceId); when(appNamespaceRepository.findAllById(appNamespaceIdsAfterDelete)).thenReturn(Lists.newArrayList (somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew)); // do delete when(appNamespaceRepository.findAllById(appNamespaceIds)).thenReturn(Lists.newArrayList (somePrivateAppNamespaceNew, yetAnotherPrivateAppNamespaceNew, somePublicAppNamespaceNew)); await().untilAsserted(() -> { assertNull( appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespace)); assertNull(appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppId, yetAnotherPrivateNamespace)); assertNull( appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, anotherPublicNamespace)); check(Collections.emptyList(), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, someAppIdNamespaces)); assertEquals(somePublicAppNamespaceNew, appNamespaceServiceWithCache .findByAppIdAndNamespace(somePublicAppId, somePublicNamespace)); check(Lists.newArrayList(somePublicAppNamespaceNew), appNamespaceServiceWithCache.findByAppIdAndNamespaces(somePublicAppId, somePublicAppIdNamespaces)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(somePublicNamespace)); assertNull(appNamespaceServiceWithCache.findPublicNamespaceByName(anotherPublicNamespace)); check(Collections.emptyList(), appNamespaceServiceWithCache.findPublicNamespacesByNames(publicNamespaces)); assertEquals(somePrivateAppNamespaceNew, appNamespaceServiceWithCache.findByAppIdAndNamespace(someAppId, somePrivateNamespaceNew)); check(Lists.newArrayList(somePrivateAppNamespaceNew), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppId, Sets.newHashSet(somePrivateNamespaceNew))); assertEquals(yetAnotherPrivateAppNamespaceNew, appNamespaceServiceWithCache .findByAppIdAndNamespace(someAppIdNew, yetAnotherPrivateNamespace)); check(Lists.newArrayList(yetAnotherPrivateAppNamespaceNew), appNamespaceServiceWithCache .findByAppIdAndNamespaces(someAppIdNew, Sets.newHashSet(yetAnotherPrivateNamespace))); }); } private void check(List<AppNamespace> someList, List<AppNamespace> anotherList) { someList.sort(appNamespaceComparator); anotherList.sort(appNamespaceComparator); assertEquals(someList, anotherList); } private Date newDateWithDelta(Date date, int deltaInSeconds) { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.SECOND, deltaInSeconds); return calendar.getTime(); } private AppNamespace assembleAppNamespace(long id, String appId, String name, boolean isPublic) { AppNamespace appNamespace = new AppNamespace(); appNamespace.setId(id); appNamespace.setAppId(appId); appNamespace.setName(name); appNamespace.setPublic(isPublic); appNamespace.setDataChangeLastModifiedTime(new Date()); return appNamespace; } }
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceLockTest.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.aop; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.NamespaceLock; import com.ctrip.framework.apollo.biz.service.ItemService; import com.ctrip.framework.apollo.biz.service.NamespaceLockService; import com.ctrip.framework.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.exception.ServiceException; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.DataIntegrityViolationException; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class NamespaceLockTest { private static final String APP = "app-test"; private static final String CLUSTER = "cluster-test"; private static final String NAMESPACE = "namespace-test"; private static final String CURRENT_USER = "user-test"; private static final String ANOTHER_USER = "user-test2"; private static final long NAMESPACE_ID = 100; @Mock private NamespaceLockService namespaceLockService; @Mock private NamespaceService namespaceService; @Mock private ItemService itemService; @Mock private BizConfig bizConfig; @InjectMocks NamespaceAcquireLockAspect namespaceLockAspect; @Test public void acquireLockWithNotLockedAndSwitchON() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(true); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(namespaceService, times(0)).findOne(APP, CLUSTER, NAMESPACE); } @Test public void acquireLockWithNotLockedAndSwitchOFF() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(anyLong())).thenReturn(null); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE); verify(namespaceLockService).findLock(anyLong()); verify(namespaceLockService).tryLock(any()); } @Test(expected = BadRequestException.class) public void acquireLockWithAlreadyLockedByOtherGuy() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(ANOTHER_USER)); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE); verify(namespaceLockService).findLock(NAMESPACE_ID); } @Test public void acquireLockWithAlreadyLockedBySelf() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(CURRENT_USER)); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE); verify(namespaceLockService).findLock(NAMESPACE_ID); } @Test public void acquireLockWithNamespaceIdSwitchOn(){ when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null); namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(NAMESPACE_ID); verify(namespaceLockService).findLock(NAMESPACE_ID); verify(namespaceLockService).tryLock(any()); } @Test(expected = ServiceException.class) public void testDuplicateLock(){ when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null); when(namespaceLockService.tryLock(any())).thenThrow(DataIntegrityViolationException.class); namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(NAMESPACE_ID); verify(namespaceLockService, times(2)).findLock(NAMESPACE_ID); verify(namespaceLockService).tryLock(any()); } private Namespace mockNamespace() { Namespace namespace = new Namespace(); namespace.setId(NAMESPACE_ID); namespace.setAppId(APP); namespace.setClusterName(CLUSTER); namespace.setNamespaceName(NAMESPACE); return namespace; } private NamespaceLock mockNamespaceLock(String locedUser) { NamespaceLock lock = new NamespaceLock(); lock.setNamespaceId(NAMESPACE_ID); lock.setDataChangeCreatedBy(locedUser); return lock; } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.aop; import com.ctrip.framework.apollo.biz.config.BizConfig; import com.ctrip.framework.apollo.biz.entity.Namespace; import com.ctrip.framework.apollo.biz.entity.NamespaceLock; import com.ctrip.framework.apollo.biz.service.ItemService; import com.ctrip.framework.apollo.biz.service.NamespaceLockService; import com.ctrip.framework.apollo.biz.service.NamespaceService; import com.ctrip.framework.apollo.common.exception.BadRequestException; import com.ctrip.framework.apollo.common.exception.ServiceException; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.dao.DataIntegrityViolationException; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class NamespaceLockTest { private static final String APP = "app-test"; private static final String CLUSTER = "cluster-test"; private static final String NAMESPACE = "namespace-test"; private static final String CURRENT_USER = "user-test"; private static final String ANOTHER_USER = "user-test2"; private static final long NAMESPACE_ID = 100; @Mock private NamespaceLockService namespaceLockService; @Mock private NamespaceService namespaceService; @Mock private ItemService itemService; @Mock private BizConfig bizConfig; @InjectMocks NamespaceAcquireLockAspect namespaceLockAspect; @Test public void acquireLockWithNotLockedAndSwitchON() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(true); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(namespaceService, times(0)).findOne(APP, CLUSTER, NAMESPACE); } @Test public void acquireLockWithNotLockedAndSwitchOFF() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(anyLong())).thenReturn(null); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE); verify(namespaceLockService).findLock(anyLong()); verify(namespaceLockService).tryLock(any()); } @Test(expected = BadRequestException.class) public void acquireLockWithAlreadyLockedByOtherGuy() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(ANOTHER_USER)); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE); verify(namespaceLockService).findLock(NAMESPACE_ID); } @Test public void acquireLockWithAlreadyLockedBySelf() { when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(APP, CLUSTER, NAMESPACE)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(mockNamespaceLock(CURRENT_USER)); namespaceLockAspect.acquireLock(APP, CLUSTER, NAMESPACE, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(APP, CLUSTER, NAMESPACE); verify(namespaceLockService).findLock(NAMESPACE_ID); } @Test public void acquireLockWithNamespaceIdSwitchOn(){ when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null); namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(NAMESPACE_ID); verify(namespaceLockService).findLock(NAMESPACE_ID); verify(namespaceLockService).tryLock(any()); } @Test(expected = ServiceException.class) public void testDuplicateLock(){ when(bizConfig.isNamespaceLockSwitchOff()).thenReturn(false); when(namespaceService.findOne(NAMESPACE_ID)).thenReturn(mockNamespace()); when(namespaceLockService.findLock(NAMESPACE_ID)).thenReturn(null); when(namespaceLockService.tryLock(any())).thenThrow(DataIntegrityViolationException.class); namespaceLockAspect.acquireLock(NAMESPACE_ID, CURRENT_USER); verify(bizConfig).isNamespaceLockSwitchOff(); verify(namespaceService).findOne(NAMESPACE_ID); verify(namespaceLockService, times(2)).findLock(NAMESPACE_ID); verify(namespaceLockService).tryLock(any()); } private Namespace mockNamespace() { Namespace namespace = new Namespace(); namespace.setId(NAMESPACE_ID); namespace.setAppId(APP); namespace.setClusterName(CLUSTER); namespace.setNamespaceName(NAMESPACE); return namespace; } private NamespaceLock mockNamespaceLock(String locedUser) { NamespaceLock lock = new NamespaceLock(); lock.setNamespaceId(NAMESPACE_ID); lock.setDataChangeCreatedBy(locedUser); return lock; } }
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripSsoHeartbeatHandler.java
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.ctrip; import com.ctrip.framework.apollo.portal.spi.SsoHeartbeatHandler; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** * @author Jason Song(song_s@ctrip.com) */ public class CtripSsoHeartbeatHandler implements SsoHeartbeatHandler { @Override public void doHeartbeat(HttpServletRequest request, HttpServletResponse response) { try { response.sendRedirect("ctrip_sso_heartbeat.html"); } catch (IOException e) { } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package com.ctrip.framework.apollo.portal.spi.ctrip; import com.ctrip.framework.apollo.portal.spi.SsoHeartbeatHandler; import java.io.IOException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** * @author Jason Song(song_s@ctrip.com) */ public class CtripSsoHeartbeatHandler implements SsoHeartbeatHandler { @Override public void doHeartbeat(HttpServletRequest request, HttpServletResponse response) { try { response.sendRedirect("ctrip_sso_heartbeat.html"); } catch (IOException e) { } } }
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./docs/en/usage/dotnet-sdk-user-guide.md
TODO
TODO
-1
apolloconfig/apollo
3,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-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-config-server-fat kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-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-meta-server-fat labels: app: service-apollo-meta-server-fat spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-fat type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-fat labels: app: service-apollo-config-server-fat spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30003 selector: app: pod-apollo-config-server-fat type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-fat labels: app: statefulset-apollo-config-server-fat spec: serviceName: service-apollo-meta-server-fat replicas: 2 selector: matchLabels: app: pod-apollo-config-server-fat updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-fat spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-fat topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-fat configMap: name: configmap-apollo-config-server-fat 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-fat ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-fat mountPath: /apollo-configservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-fat.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-fat kind: ConfigMap apiVersion: v1 metadata: namespace: sre name: configmap-apollo-config-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-meta-server-fat labels: app: service-apollo-meta-server-fat spec: ports: - protocol: TCP port: 8080 targetPort: 8080 selector: app: pod-apollo-config-server-fat type: ClusterIP clusterIP: None sessionAffinity: ClientIP --- kind: Service apiVersion: v1 metadata: namespace: sre name: service-apollo-config-server-fat labels: app: service-apollo-config-server-fat spec: ports: - protocol: TCP port: 8080 targetPort: 8080 nodePort: 30003 selector: app: pod-apollo-config-server-fat type: NodePort sessionAffinity: ClientIP --- kind: StatefulSet apiVersion: apps/v1 metadata: namespace: sre name: statefulset-apollo-config-server-fat labels: app: statefulset-apollo-config-server-fat spec: serviceName: service-apollo-meta-server-fat replicas: 2 selector: matchLabels: app: pod-apollo-config-server-fat updateStrategy: type: RollingUpdate template: metadata: labels: app: pod-apollo-config-server-fat spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 100 podAffinityTerm: labelSelector: matchExpressions: - key: app operator: In values: - pod-apollo-config-server-fat topologyKey: kubernetes.io/hostname volumes: - name: volume-configmap-apollo-config-server-fat configMap: name: configmap-apollo-config-server-fat 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-fat ports: - protocol: TCP containerPort: 8080 volumeMounts: - name: volume-configmap-apollo-config-server-fat mountPath: /apollo-configservice/config/application-github.properties subPath: application-github.properties env: - name: APOLLO_CONFIG_SERVICE_NAME value: "service-apollo-config-server-fat.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,851
fix show-text-modal.html number display(#3821)
## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
CalebZYC
2021-07-26T16:40:03Z
2021-07-28T05:54:28Z
8ccbbe4fb61df3c8cc733f76d4cdef2022203bc4
02c43dd547db3d44253d0b08659b8b0e8e3a8374
fix show-text-modal.html number display(#3821). ## What's the purpose of this PR 修复整数精度展示问题 ## Which issue(s) this PR fixes: Fixes #3821 ## Brief changelog XXXXX Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Write necessary unit tests to verify the code. - [ ] Run `mvn clean test` to make sure this pull request doesn't break anything. - [ ] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
./apollo-mockserver/src/test/resources/mockdata-anotherNamespace.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=otherValue1 key2=otherValue2 key3=otherValue3 key4=otherValue4 key5=otherValue5 key6=otherValue6
# # Copyright 2021 Apollo Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT 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=otherValue1 key2=otherValue2 key3=otherValue3 key4=otherValue4 key5=otherValue5 key6=otherValue6
-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.md
Changes by Version ================== Release Notes. Apollo 1.10.0 ------------------ * [Bump version to 1.10.0](https://github.com/ctripcorp/apollo/pull/3917) * [Fix issue that the $ symbol is not used when reading shell variables](https://github.com/ctripcorp/apollo/pull/3890) * [Bump xstream from 1.4.17 to 1.4.18](https://github.com/apolloconfig/apollo/pull/3916) * [switch apollo.config-service log from warning to info level](https://github.com/ctripcorp/apollo/pull/3884) * [Make Access Key Timestamp check configurable](https://github.com/ctripcorp/apollo/pull/3908) * [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920) * [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937) * [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933) * [refactor: let open api more easier to use and development](https://github.com/apolloconfig/apollo/pull/3943) * [feat(scripts): use bash to call openapi](https://github.com/apolloconfig/apollo/pull/3980) * [Support search by item](https://github.com/apolloconfig/apollo/pull/3977) * [Implement password policies to avoid weak passwords](https://github.com/apolloconfig/apollo/pull/4008) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
Changes by Version ================== Release Notes. Apollo 1.10.0 ------------------ * [Bump version to 1.10.0](https://github.com/ctripcorp/apollo/pull/3917) * [Fix issue that the $ symbol is not used when reading shell variables](https://github.com/ctripcorp/apollo/pull/3890) * [Bump xstream from 1.4.17 to 1.4.18](https://github.com/apolloconfig/apollo/pull/3916) * [switch apollo.config-service log from warning to info level](https://github.com/ctripcorp/apollo/pull/3884) * [Make Access Key Timestamp check configurable](https://github.com/ctripcorp/apollo/pull/3908) * [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920) * [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937) * [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933) * [refactor: let open api more easier to use and development](https://github.com/apolloconfig/apollo/pull/3943) * [feat(scripts): use bash to call openapi](https://github.com/apolloconfig/apollo/pull/3980) * [Support search by item](https://github.com/apolloconfig/apollo/pull/3977) * [Implement password policies to avoid weak passwords](https://github.com/apolloconfig/apollo/pull/4008) * [public namespace basic function](https://github.com/apolloconfig/apollo/pull/3850) ------------------ All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?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/i18n/en.json
{ "Common.Title": "Apollo Configuration Center", "Common.Nav.ShowNavBar": "Display navigation bar", "Common.Nav.HideNavBar": "Hide navigation bar", "Common.Nav.Help": "Help", "Common.Nav.AdminTools": "Admin Tools", "Common.Nav.NonAdminTools": "Tools", "Common.Nav.UserManage": "User Management", "Common.Nav.SystemRoleManage": "System Permission Management", "Common.Nav.OpenMange": "Open Platform Authorization Management", "Common.Nav.SystemConfig": "System Configuration", "Common.Nav.DeleteApp-Cluster-Namespace": "Delete Apps, Clusters, AppNamespace", "Common.Nav.SystemInfo": "System Information", "Common.Nav.ConfigExport": "Config Export", "Common.Nav.Logout": "Logout", "Common.Department": "Department", "Common.Cluster": "Cluster", "Common.Environment": "Environment", "Common.Email": "Email", "Common.AppId": "App Id", "Common.Namespace": "Namespace", "Common.AppName": "App Name", "Common.AppOwner": "App Owner", "Common.AppOwnerLong": "App Owner", "Common.AppAdmin": "App Administrators", "Common.ClusterName": "Cluster Name", "Common.Submit": "Submit", "Common.Save": "Save", "Common.Created": "Create Successfully", "Common.CreateFailed": "Fail to Create", "Common.Deleted": "Delete Successfully", "Common.DeleteFailed": "Fail to Delete", "Common.ReturnToIndex": "Return to project page", "Common.Cancel": "Cancel", "Common.Ok": "OK", "Common.Search": "Query", "Common.IsRootUser": "Current page is only accessible to Apollo administrator.", "Common.PleaseChooseDepartment": "Please select department", "Common.PleaseChooseOwner": "Please select app owner", "Common.LoginExpiredTips": "Your login is expired. Please refresh the page and try again.", "Component.DeleteNamespace.Title": "Delete Namespace", "Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?", "Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?", "Component.GrayscalePublishRule.Title": "Edit Grayscale Rule", "Component.GrayscalePublishRule.AppId": "Grayscale AppId", "Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule", "Component.GrayscalePublishRule.AcceptPartInstance": "Apply to some instances", "Component.GrayscalePublishRule.AcceptAllInstance": "Apply to all instances", "Component.GrayscalePublishRule.IP": "Grayscale IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(The list of instances are filtered by the typed AppId automatically)", "Component.GrayscalePublishRule.IpTips": "Can't find the IP you want? You may ", "Component.GrayscalePublishRule.EnterIp": "enter IP manually", "Component.GrayscalePublishRule.EnterIpTips": "Enter the list of IP, using ',' as the separator, and then click the Add button.", "Component.GrayscalePublishRule.Add": "Add", "Component.ConfigItem.Title": "Add Configuration", "Component.ConfigItem.TitleTips": "(Reminder: Configuration can be added in batch via text mode)", "Component.ConfigItem.AddGrayscaleItem": "Add Grayscale Configuration", "Component.ConfigItem.ModifyItem": "Modify Configuration", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "Note: Hidden characters (Spaces, Newline, Tab) easily cause configuration errors. If you want to check hidden characters in Value, please click", "Component.ConfigItem.ItemValueShowDetection": "Check Hidden Characters", "Component.ConfigItem.ItemValueNotHiddenChars": "No Hidden Characters", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "Select Cluster", "Component.MergePublish.Title": "Full Release", "Component.MergePublish.Tips": "Full release will merge the configurations of grayscale version into the main version and release them.", "Component.MergePublish.NextStep": "After full release, choose which behavior you want", "Component.MergePublish.DeleteGrayscale": "Delete grayscale version", "Component.MergePublish.ReservedGrayscale": "Keep grayscale version", "Component.Namespace.Branch.IsChanged": "Modified", "Component.Namespace.Branch.ChangeUser": "Current Modifier", "Component.Namespace.Branch.ContinueGrayscalePublish": "Continue to Grayscale Release", "Component.Namespace.Branch.GrayscalePublish": "Grayscale Release", "Component.Namespace.Branch.MergeToMasterAndPublish": "Merge to the main version and release the main version's configurations ", "Component.Namespace.Branch.AllPublish": "Full Release", "Component.Namespace.Branch.DiscardGrayscaleVersion": "Abandon Grayscale Version", "Component.Namespace.Branch.DiscardGrayscale": "Abandon Grayscale", "Component.Namespace.Branch.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Branch.Tab.Configuration": "Configuration", "Component.Namespace.Branch.Tab.GrayscaleRule": "Grayscale Rule", "Component.Namespace.Branch.Tab.GrayscaleInstance": "Grayscale Instance List", "Component.Namespace.Branch.Tab.ChangeHistory": "Change History", "Component.Namespace.Branch.Body.Item": "Grayscale Configuration", "Component.Namespace.Branch.Body.AddedItem": "Add Grayscale Configuration", "Component.Namespace.Branch.Body.PublishState": "Release Status", "Component.Namespace.Branch.Body.ItemSort": "Sort", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "Value of Main Version", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "Grayscale value", "Component.Namespace.Branch.Body.ItemComment": "Comment", "Component.Namespace.Branch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Branch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Branch.Body.ItemOperator": "Operation", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "Click to view released values", "Component.Namespace.Branch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.Branch.Body.ItemPublished": "Released", "Component.Namespace.Branch.Body.ItemEffective": "Effective configuration", "Component.Namespace.Branch.Body.ClickToSee": "Click to view", "Component.Namespace.Branch.Body.DeletedItem": "Deleted configuration", "Component.Namespace.Branch.Body.Delete": "Deleted", "Component.Namespace.Branch.Body.ChangedFromMaster": "Configuration modified from the main version", "Component.Namespace.Branch.Body.ModifiedItem": "Modified configuration", "Component.Namespace.Branch.Body.Modify": "Modified", "Component.Namespace.Branch.Body.AddedByGrayscale": "Specific configuration for grayscale version", "Component.Namespace.Branch.Body.Added": "New", "Component.Namespace.Branch.Body.Op.Modify": "Modify", "Component.Namespace.Branch.Body.Op.Delete": "Delete", "Component.Namespace.MasterBranch.Body.Title": "Configuration of the main version", "Component.Namespace.MasterBranch.Body.PublishState": "Release Status", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "Comment", "Component.Namespace.MasterBranch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.MasterBranch.Body.ItemOperator": "Operation", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "Click to check released values", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.MasterBranch.Body.ItemEffective": "Effective configuration", "Component.Namespace.MasterBranch.Body.ItemPublished": "Released", "Component.Namespace.MasterBranch.Body.AddedItem": "New configuration", "Component.Namespace.MasterBranch.Body.ModifyItem": "Modify the grayscale configuration", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "You do not have the permission to edit grayscale rule. Only those who have the permission to edit or release the namespace can edit grayscale rule. If you need to edit grayscale rule, please contact the project administrator to apply for the permission.", "Component.Namespace.Branch.GrayScaleRule.AppId": "Grayscale AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "Grayscale IP List", "Component.Namespace.Branch.GrayScaleRule.Operator": "Operation", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "Modify", "Component.Namespace.Branch.GrayScaleRule.Delete": "Delete", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "Create Rule", "Component.Namespace.Branch.Instance.RefreshList": "Refresh List", "Component.Namespace.Branch.Instance.ItemToSee": "View configuration", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "Configuration Fetched Time", "Component.Namespace.Branch.Instance.LoadMore": "Refresh list", "Component.Namespace.Branch.Instance.NoInstance": "No instance information", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "Add", "Component.Namespace.Branch.History.Modified": "Update", "Component.Namespace.Branch.History.Deleted": "Delete", "Component.Namespace.Branch.History.LoadMore": "Load more", "Component.Namespace.Branch.History.NoHistory": "No Change History", "Component.Namespace.Header.Title.Private": "Private", "Component.Namespace.Header.Title.PrivateTips": "The configuration of private namespace ({{namespace.baseInfo.namespaceName}}) can be only fetched by clients whose AppId is {{appId}}", "Component.Namespace.Header.Title.Public": "Public", "Component.Namespace.Header.Title.PublicTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) can be fetched by any client.", "Component.Namespace.Header.Title.Extend": "Association", "Component.Namespace.Header.Title.ExtendTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) will override the configuration of the public namespace, and the combined configuration can only be fetched by clients whose AppId is {{appId}}.", "Component.Namespace.Header.Title.ExpandAndCollapse": "[Expand/Collapse]", "Component.Namespace.Header.Title.Master": "Main Version", "Component.Namespace.Header.Title.Grayscale": "Grayscale Version", "Component.Namespace.Master.LoadNamespace": "Load Namespace", "Component.Namespace.Master.LoadNamespaceTips": "Load Namespace", "Component.Namespace.Master.Items.Changed": "Modified", "Component.Namespace.Master.Items.ChangedUser": "Current modifier", "Component.Namespace.Master.Items.Publish": "Release", "Component.Namespace.Master.Items.PublishTips": "Release configuration", "Component.Namespace.Master.Items.Rollback": "Rollback", "Component.Namespace.Master.Items.RollbackTips": "Rollback released configuration", "Component.Namespace.Master.Items.PublishHistory": "Release History", "Component.Namespace.Master.Items.PublishHistoryTips": "View the release history", "Component.Namespace.Master.Items.Grant": "Authorize", "Component.Namespace.Master.Items.GrantTips": "Manage the configuration edit and release permission", "Component.Namespace.Master.Items.Grayscale": "Grayscale", "Component.Namespace.Master.Items.GrayscaleTips": "Create a test version", "Component.Namespace.Master.Items.RequestPermission": "Apply for configuration permission", "Component.Namespace.Master.Items.RequestPermissionTips": "You do not have any configuration permission. Please apply.", "Component.Namespace.Master.Items.DeleteNamespace": "Delete Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Master.Items.ItemList": "Table", "Component.Namespace.Master.Items.ItemListByText": "Text", "Component.Namespace.Master.Items.ItemHistory": "Change History", "Component.Namespace.Master.Items.ItemInstance": "Instance List", "Component.Namespace.Master.Items.CopyText": "Copy", "Component.Namespace.Master.Items.GrammarCheck": "Syntax Check", "Component.Namespace.Master.Items.CancelChanged": "Cancel", "Component.Namespace.Master.Items.Change": "Modify", "Component.Namespace.Master.Items.SummitChanged": "Submit", "Component.Namespace.Master.Items.SortByKey": "Filter the configurations by key", "Component.Namespace.Master.Items.FilterItem": "Filter", "Component.Namespace.Master.Items.RevokeItemTips": "Revoke configuration changes", "Component.Namespace.Master.Items.RevokeItem" :"Revoke", "Component.Namespace.Master.Items.SyncItemTips": "Synchronize configurations among environments", "Component.Namespace.Master.Items.SyncItem": "Synchronize", "Component.Namespace.Master.Items.DiffItemTips": "Compare the configurations among environments", "Component.Namespace.Master.Items.DiffItem": "Compare", "Component.Namespace.Master.Items.AddItem": "Add Configuration", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: This namespace has never been released. Apollo client will not be able to fetch the configuration and will record 404 log information. Please release it in time.", "Component.Namespace.Master.Items.Body.FilterByKey": "Input key to filter", "Component.Namespace.Master.Items.Body.PublishState": "Release Status", "Component.Namespace.Master.Items.Body.Sort": "Sort", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Master.Items.Body.ItemOperator": "Operation", "Component.Namespace.Master.Items.Body.NoPublish": "Unreleased", "Component.Namespace.Master.Items.Body.NoPublishTitle": "Click to view released values", "Component.Namespace.Master.Items.Body.NoPublishTips": "New configuration, no released value", "Component.Namespace.Master.Items.Body.Published": "Released", "Component.Namespace.Master.Items.Body.PublishedTitle": "Effective configuration", "Component.Namespace.Master.Items.Body.ClickToSee": "Click to view", "Component.Namespace.Master.Items.Body.Grayscale": "Gray", "Component.Namespace.Master.Items.Body.HaveGrayscale": "This configuration has grayscale configuration. Click to view the value of grayscale.", "Component.Namespace.Master.Items.Body.NewAdded": "New", "Component.Namespace.Master.Items.Body.NewAddedTips": "New Configuration", "Component.Namespace.Master.Items.Body.Modified": "Modified", "Component.Namespace.Master.Items.Body.ModifiedTips": "Modified Configuration", "Component.Namespace.Master.Items.Body.Deleted": "Deleted", "Component.Namespace.Master.Items.Body.DeletedTips": "Deleted Configuration", "Component.Namespace.Master.Items.Body.ModifyTips": "Modify", "Component.Namespace.Master.Items.Body.DeleteTips": "Delete", "Component.Namespace.Master.Items.Body.Link.Title": "Overridden Configuration", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "No Overridden Configuration", "Component.Namespace.Master.Items.Body.Public.Title": "Public Configuration", "Component.Namespace.Master.Items.Body.Public.Published": "Released Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublish": "Unreleased Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "Owner of the current public namespace", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "hasn't associated this namespace, please contact the owner of {{namespace.parentAppId}} to associate this namespace in the {{namespace.parentAppId}} project.", "Component.Namespace.Master.Items.Body.Public.NoPublished": "No Released Configuration", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "Override this configuration", "Component.Namespace.Master.Items.Body.NoPublished.Title": "No public configuration", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "Released Value", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "Unreleased Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "Add", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "Update", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "Delete", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "No Change History", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory": "Filter History", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey": "Filter the history by key", "Component.Namespace.Master.Items.Body.Instance.Tips": "Tips: Only show instances who have fetched configurations in the last 24 hrs ", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "Instances using the latest configuration", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "Instances using outdated configuration", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "All Instances", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "Refresh List", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "View Configuration", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "Configuration fetched time", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "No Instance Information", "Component.PublishDeny.Title": "Release Restriction", "Component.PublishDeny.Tips1": "You can't release! The operators to edit and release the configurations in {{env}} environment must be different, please find someone else who has the release permission of this namespace to do the release operation.", "Component.PublishDeny.Tips2": "(If it is non working time or a special situation, you may release by clicking the 'Emergency Release' button.)", "Component.PublishDeny.EmergencyPublish": "Emergency Release", "Component.PublishDeny.Close": "Close", "Component.Publish.Title": "Release", "Component.Publish.Tips": "(Only the released configurations can be fetched by clients, and this release will only be applied to the current environment: {{env}})", "Component.Publish.Grayscale": "Grayscale Release", "Component.Publish.GrayscaleTips": "(The grayscale configurations are only applied to the instances specified in grayscale rules)", "Component.Publish.AllPublish": "Full Release", "Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)", "Component.Publish.ToSeeChange": "View changes", "Component.Publish.PublishedValue": "Released values", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "Unreleased values", "Component.Publish.ModifyUser": "Modifier", "Component.Publish.ModifyTime": "Modified Time", "Component.Publish.NewAdded": "New", "Component.Publish.NewAddedTips": "New Configuration", "Component.Publish.Modified": "Modified", "Component.Publish.ModifiedTips": "Modified Configuration", "Component.Publish.Deleted": "Deleted", "Component.Publish.DeletedTips": "Deleted Configuration", "Component.Publish.MasterValue": "Main version value", "Component.Publish.GrayValue": "Grayscale version value", "Component.Publish.GrayPublishedValue": "Released grayscale version value", "Component.Publish.GrayNoPublishedValue": "Unreleased grayscale version value", "Component.Publish.ItemNoChange": "No configuration changes", "Component.Publish.GrayItemNoChange": "No configuration changes", "Component.Publish.NoGrayItems": "No grayscale changes", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "Release", "Component.Rollback.To": "roll back to", "Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page", "Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations", "Component.Rollback.ClickToView": "Click to view", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "Before Rollback", "Component.Rollback.RollbackAfterValue": "After Rollback", "Component.Rollback.Added": "Add", "Component.Rollback.Modified": "Update", "Component.Rollback.Deleted": "Delete", "Component.Rollback.NoChange": "No configuration changes", "Component.Rollback.OpRollback": "Rollback", "Component.ShowText.Title": "View", "Login.Login": "Login", "Login.UserNameOrPasswordIncorrect": "Incorrect username or password", "Login.LogoutSuccessfully": "Logout Successfully", "Index.MyProject": "My projects", "Index.CreateProject": "Create project", "Index.LoadMore": "Load more", "Index.FavoriteItems": "Favorite projects", "Index.Topping": "Top", "Index.FavoriteTip": "You haven't favorited any items yet. You can favorite items on the project homepage.", "Index.RecentlyViewedItems": "Recent projects", "Index.GetCreateAppRoleFailed": "Failed to get the information of create project permission", "Index.Topped": "Top Successfully", "Index.CancelledFavorite": "Remove favorite successfully", "Cluster.CreateCluster": "Create Cluster", "Cluster.Tips.1": "By adding clusters, the same program can use different configuration in different clusters (such as different data centers)", "Cluster.Tips.2": "If the different clusters use the same configuration, there is no need to create clusters", "Cluster.Tips.3": "By default, Apollo reads IDC attributes in /opt/settings/server.properties(Linux) or C:\\opt\\settings\\server.properties(Windows) files on the machine as cluster names, such as SHAJQ (Jinqiao Data Center), SHAOY (Ouyang Data Center)", "Cluster.Tips.4": "The cluster name created here should be consistent with the IDC attribute in server.properties on the machine", "Cluster.CreateNameTips": "(Cluster names such as SHAJQ, SHAOY or customized clusters such as SHAJQ-xx, SHAJQ-yy)", "Cluster.ChooseEnvironment": "Environment", "Cluster.LoadingEnvironmentError": "Error in loading environment information", "Cluster.ClusterCreated": "Create cluster successfully", "Cluster.ClusterCreateFailed": "Failed to create cluster", "Cluster.PleaseChooseEnvironment": "Please select the environment", "Config.Title": "Apollo Configuration Center", "Config.AppIdNotFound": "doesn't exist, ", "Config.ClickByCreate": "click to create", "Config.EnvList": "Environments", "Config.EnvListTips": "Manage the configuration of different environments and clusters by switching environments and clusters", "Config.ProjectInfo": "Project Info", "Config.ModifyBasicProjectInfo": "Modify project's basic information", "Config.Favorite": "Favorite", "Config.CancelFavorite": "Cancel Favorite", "Config.MissEnv": "Missing environment", "Config.MissNamespace": "Missing Namespace", "Config.ProjectManage": "Manage Project", "Config.AccessKeyManage": "Manage AccessKey", "Config.CreateAppMissEnv": "Recover Environments", "Config.CreateAppMissNamespace": "Recover Namespaces", "Config.AddCluster": "Add Cluster", "Config.AddNamespace": "Add Namespace", "Config.CurrentlyOperatorEnv": "Current environment", "Config.DoNotRemindAgain": "No longer prompt", "Config.Note": "Note", "Config.ClusterIsDefaultTipContent": "All instances that do not belong to the '{{name}}' cluster will fetch the default cluster (current page) configuration, and those that belong to the '{{name}}' cluster will use the corresponding cluster configuration!", "Config.ClusterIsCustomTipContent": "Instances belonging to the '{{name}}' cluster will only fetch the configuration of the '{{name}}' cluster (the current page), and the default cluster configuration will only be fetched when the corresponding namespace has not been released in the current cluster.", "Config.HasNotPublishNamespace": "The following environment/cluster has unreleased configurations, the client will not fetch the unreleased configurations, please release them in time.", "Config.RevokeItem.DialogTitle": "Revoke configuration changes", "Config.RevokeItem.DialogContent": "Modified but unpublished configurations in the current namespace will be revoked. Are you sure to revoke the configuration changes?", "Config.DeleteItem.DialogTitle": "Delete configuration", "Config.DeleteItem.DialogContent": "You are deleting the configuration whose Key is <b>'{{config.key}}'</b> Value is <b>'{{config.value}}'</b>. <br> Are you sure to delete the configuration?", "Config.PublishNoPermission.DialogTitle": "Release", "Config.PublishNoPermission.DialogContent": "You do not have release permission. Please ask the project administrators '{{masterUsers}}' to authorize release permission.", "Config.ModifyNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.ModifyNoPermission.DialogContent": "Please ask the project administrators '{{masterUsers}}' to authorize release or edit permission.", "Config.MasterNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.MasterNoPermission.DialogContent": "You are not this project's administrator. Only project administrators have the permission to add clusters and namespaces. Please ask the project administrators '{{masterUsers}}' to assign administrator permission", "Config.NamespaceLocked.DialogTitle": "Edit not allowed", "Config.NamespaceLocked.DialogContent": "Current namespace is being edited by '{{lockOwner}}', and a release phase can only be edited by one person.", "Config.RollbackAlert.DialogTitle": "Rollback", "Config.RollbackAlert.DialogContent": "Are you sure to roll back?", "Config.EmergencyPublishAlert.DialogTitle": "Emergency release", "Config.EmergencyPublishAlert.DialogContent": "Are you sure to perform the emergency release?", "Config.DeleteBranch.DialogTitle": "Delete grayscale", "Config.DeleteBranch.DialogContent": "Deleting grayscale will lose the grayscale configurations. Are you sure to delete it?", "Config.UpdateRuleTips.DialogTitle": "Update gray rule prompt", "Config.UpdateRuleTips.DialogContent": "Grayscale rules are in effect. However there are unreleased configurations in grayscale version, they won't be effective until a manual grayscale release is performed.", "Config.MergeAndReleaseDeny.DialogTitle": "Full release", "Config.MergeAndReleaseDeny.DialogContent": "The main version has unreleased configuration. Please release the main version first.", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "Missing gray rule prompt", "Config.GrayReleaseWithoutRulesTips.DialogContent": "The grayscale version has not configured any grayscale rule. Please configure the grayscale rules.", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "Delete namespace warning", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> instances using namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'), and deleting namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Instance List\"</ins> to confirm the instance information. If you confirm that the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "Delete namespace warning information", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> instances using the grayscale version of namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}') configuration, and deleting Namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Grayscale Version\"=> \"Instance List\"</ins> to confirm the instance information. If you confirm the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "Please enter appId", "Config.SyntaxCheckFailed.DialogTitle": "Syntax Check Error", "Config.SyntaxCheckFailed.DialogContent": "Delete Namespace Failure Tip", "Config.CreateBranchTips.DialogTitle": "Create Grayscale Notice", "Config.CreateBranchTips.DialogContent": "By creating grayscale version, you can do grayscale test for some configurations. <br> Grayscale process is as follows: <br> &nbsp; &nbsp; 1. Create grayscale version <br> &nbsp; &nbsp; 2. Configure grayscale configuration items <br> &nbsp; &nbsp; 3. Configure grayscale rules. If it is a private namespace, it can be grayed according to the IP of client. If it is a public namespace, it can be grayed according to both appId and the IP. <br> &nbsp; &nbsp; 4. Grayscale release <br> Grayscale version has two final results: <b> Full release and Abandon grayscale</b> <br> <b>Full release</b>: grayscale configurations are merged with the main version and released, all clients will use the merged configurations <br> <b> Abandon grayscale</b>: Delete grayscale version. All clients will use the configurations of the main version<br> Notice: <br> &nbsp; &nbsp; 1. If the grayscale version has been released, then the grayscale rules will be effective immediately without the need to release grayscale configuration again.", "Config.ProjectMissEnvInfos": "There are missing environments in the current project, please click \"Recover Environments\" on the left side of the page to do the recovery.", "Config.ProjectMissNamespaceInfos": "There are missing namespaces in the current environment. Please click \"Recover Namespaces\" on the left side of the page to do the recovery.", "Config.SystemError": "System error, please try again or contact the system administrator", "Config.FavoriteSuccessfully": "Favorite Successfully", "Config.FavoriteFailed": "Failed to favorite", "Config.CancelledFavorite": "Cancel favorite successfully", "Config.CancelFavoriteFailed": "Failed to cancel the favorite", "Config.GetUserInfoFailed": "Failed to obtain user login information", "Config.LoadingAllNamespaceError": "Failed to load configuration", "Config.CancelFavoriteError": "Failure to Cancel Collection", "Config.Deleted": "Delete Successfully", "Config.DeleteFailed": "Failed to delete", "Config.GrayscaleCreated": "Create Grayscale Successfully", "Config.GrayscaleCreateFailed": "Failed to create grayscale", "Config.BranchDeleted": "Delete branch successfully", "Config.BranchDeleteFailed": "Failed to delete branch", "Config.DeleteNamespaceFailedTips": "The following projects are associated with this public namespace and they must all be deleted deleting the public Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "Failed to delete", "Config.DeleteNamespaceNoPermissionFailedTips": "You do not have Project Administrator permission. Only Administrators can delete namespace. Please ask Project Administrators [{{users}}] to delete namespace.", "Delete.Title": "Delete applications, clusters, AppNamespace", "Delete.DeleteApp": "Delete application", "Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)", "Delete.AppIdTips": "(Please query application information before deleting)", "Delete.AppInfo": "Application information", "Delete.DeleteCluster": "Delete clusters", "Delete.DeleteClusterTips": "(Because deleting clusters has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the cluster before deleting it.)", "Delete.EnvName": "Environment Name", "Delete.ClusterNameTips": "(Please query cluster information before deletion)", "Delete.ClusterInfo": "Cluster information", "Delete.DeleteNamespace": "Delete AppNamespace", "Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!", "Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace", "Delete.AppNamespaceName": "AppNamespace name", "Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace Information", "Delete.IsRootUserTips": "The current page is only accessible to Apollo administrators", "Delete.PleaseEnterAppId": "Please enter appId", "Delete.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "Delete.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "Delete.ConfirmDeleteAppId": "Are you sure to delete AppId: '{{appId}}'?", "Delete.Deleted": "Delete Successfully", "Delete.PleaseEnterAppIdAndEnvAndCluster": "Please enter appId, environment, and cluster name", "Delete.ClusterInfoContent": "AppId: '{{appId}}' environment: '{{env}}' cluster name: '{{clusterName}}'", "Delete.ConfirmDeleteCluster": "Are you sure to delete the cluster? AppId: '{{appId}}' environment: '{{env}}' cluster name:'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "Please enter appId and AppNamespace names", "Delete.AppNamespaceInfoContent": "AppId: '{{appId}}' AppNamespace name: '{{namespace}}' isPublic: '{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "Are you sure to delete AppNamespace and Namespace for all environments? AppId: '{{appId}}' environment: 'All environments' AppNamespace name: '{{namespace}}'", "Namespace.Title": "New Namespace", "Namespace.UnderstandMore": "(Click to learn more about Namespace)", "Namespace.Link.Tips1": "Applications can override the configuration of a public namespace by associating a public namespace", "Namespace.Link.Tips2": "If the application does not need to override the configuration of the public namespace, then there is no need to associate the public namespace", "Namespace.CreatePublic.Tips1": "The configuration of the public Namespace can be fetched by any application", "Namespace.CreatePublic.Tips2": "Configuration of public components or the need for multiple applications to share the same configuration can be achieved by creating a public namespace.", "Namespace.CreatePublic.Tips3": "If other applications need to override the configuration of the public namespace, you can associate the public namespace in other applications, and then configure the configuration that needs to be overridden in the associated namespace.", "Namespace.CreatePublic.Tips4": "If other applications do not need to override the configuration of public namespace, then there is no need to associate public namespace in other applications.", "Namespace.CreatePrivate.Tips1": "The configuration of a private Namespace can only be fetched by the application to which it belongs.", "Namespace.CreatePrivate.Tips2": "Group management configuration can be achieved by creating a private namespace", "Namespace.CreatePrivate.Tips3": "The format of private namespaces can be xml, yml, yaml, json, txt. You can get the content of namespace in non-property format through the ConfigFile interface in apollo-client.", "Namespace.CreatePrivate.Tips4": "The 1.3.0 and above versions of apollo-client provide better support for yaml/yml. Config objects can be obtained directly through ConfigService.getConfig(\"someNamespace.yml\"), or through @EnableApolloConfig(\"someNamespace.yml\") or apollo.bootstrap.namespaces=someNamespace.yml to inject YML configuration into Spring/Spring Boot", "Namespace.CreateNamespace": "Create Namespace", "Namespace.AssociationPublicNamespace": "Associate Public Namespace", "Namespace.ChooseCluster": "Select Cluster", "Namespace.NamespaceName": "Name", "Namespace.AutoAddDepartmentPrefix": "Add department prefix", "Namespace.AutoAddDepartmentPrefixTips": "(The name of a public namespace needs to be globally unique, and adding a department prefix helps ensure global uniqueness)", "Namespace.NamespaceType": "Type", "Namespace.NamespaceType.Public": "Public", "Namespace.NamespaceType.Private": "Private", "Namespace.Remark": "Remarks", "Namespace.Namespace": "Namespace", "Namespace.PleaseChooseNamespace": "Please select namespace", "Namespace.LoadingPublicNamespaceError": "Failed to load public namespace", "Namespace.LoadingAppInfoError": "Failed to load App information", "Namespace.PleaseChooseCluster": "Select Cluster", "Namespace.CheckNamespaceNameLengthTip": "The namespace name should not be longer than 32 characters. Department prefix:'{{departmentLength}}' characters, name {{namespaceLength}} characters", "ServiceConfig.Title": "System Configuration", "ServiceConfig.Tips": "(Maintain Apollo PortalDB.ServerConfig table data, will override configuration items if they already exist, or create configuration items. Configuration updates take effect automatically in a minute)", "ServiceConfig.Key": "Key", "ServiceConfig.KeyTips": "(Please query the configuration information before modifying the configuration)", "ServiceConfig.Value": "Value", "ServiceConfig.Comment": "Comment", "ServiceConfig.Saved": "Save Successfully", "ServiceConfig.SaveFailed": "Failed to Save", "ServiceConfig.PleaseEnterKey": "Please enter key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' does not exist. Click Save to create the configuration item.", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' already exists. Click Save will override the configuration item.", "AccessKey.Tips.1": "Add up to 5 access keys per environment.", "AccessKey.Tips.2": "Once the environment has any enabled access key, the client will be required to configure access key, or the configurations cannot be obtained.", "AccessKey.Tips.3": "Configure the access key to prevent unauthorized clients from obtaining the application configuration. The configuration method is as follows(requires apollo-client version 1.6.0+):", "AccessKey.Tips.3.1": "Via jvm parameter -Dapollo.access-key.secret", "AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "Configure apollo.access-key.secret via META-INF/app.properties or application.properties (note that the multi-environment secret is different)", "AccessKey.NoAccessKeyServiceTips": "There are no access keys in this environment.", "AccessKey.ConfigAccessKeys.Secret": "Access Key Secret", "AccessKey.ConfigAccessKeys.Status": "Status", "AccessKey.ConfigAccessKeys.LastModify": "Last Modifier", "AccessKey.ConfigAccessKeys.LastModifyTime": "Last Modified Time", "AccessKey.ConfigAccessKeys.Operator": "Operation", "AccessKey.Operator.Disable": "Disable", "AccessKey.Operator.Enable": "Enable", "AccessKey.Operator.Disabled": "Disabled", "AccessKey.Operator.Enabled": "Enabled", "AccessKey.Operator.Remove": "Remove", "AccessKey.Operator.CreateSuccess": "Access key created successfully", "AccessKey.Operator.DisabledSuccess": "Access key disabled successfully", "AccessKey.Operator.EnabledSuccess": "Access key enabled successfully", "AccessKey.Operator.RemoveSuccess": "Access key removed successfully", "AccessKey.Operator.CreateError": "Access key created failed", "AccessKey.Operator.DisabledError": "Access key disabled failed", "AccessKey.Operator.EnabledError": "Access key enabled failed", "AccessKey.Operator.RemoveError": "Access key removed failed", "AccessKey.Operator.DisabledTips": "Are you sure you want to disable the access key?", "AccessKey.Operator.EnabledTips": "Are you sure you want to enable the access key?", "AccessKey.Operator.RemoveTips": "Are you sure you want to remove the access key?", "AccessKey.LoadError": "Error Loading access keys", "SystemInfo.Title": "System Information", "SystemInfo.SystemVersion": "System version", "SystemInfo.Tips1": "The environment list comes from the <strong>apollo.portal.envs</strong> configuration in Apollo PortalDB.ServerConfig, and can be configured in <a href=\"{{serverConfigUrl}}\">System Configuration</a> page. For more information, please refer the <strong>apollo.portal.envs - supportable environment list</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Tips2": "The meta server address shows the meta server information for this environment configuration. For more information, please refer the <strong>Configuring meta service information for apollo-portal</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "(Current environment status is abnormal, please diagnose with the system information below and Check Health results of AdminService)", "SystemInfo.MetaServerAddress": "Meta server address", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "Check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.Title": "System Permission Management", "SystemRole.AddCreateAppRoleToUser": "Create application permission for users", "SystemRole.AddCreateAppRoleToUserTips": "(When role.create-application.enabled=true is set in system configurations, only super admin and those accounts with Create application permission can create application)", "SystemRole.ChooseUser": "Select User", "SystemRole.Add": "Add", "SystemRole.AuthorizedUser": "Users with permission", "SystemRole.ModifyAppAdminUser": "Modify Application Administrator Allocation Permissions", "SystemRole.ModifyAppAdminUserTips": "(When role.manage-app-master.enabled=true is set in system configurations, only super admin and those accounts with application administrator allocation permissions can modify the application's administrators)", "SystemRole.AppIdTips": "(Please query the application information first)", "SystemRole.AppInfo": "Application information", "SystemRole.AllowAppMasterAssignRole": "Allow this user to add Master as an administrator", "SystemRole.DeleteAppMasterAssignRole": "Disallow this user to add Master as an administrator", "SystemRole.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.PleaseChooseUser": "Please select a user", "SystemRole.Added": "Add Successfully", "SystemRole.AddFailed": "Failed to add", "SystemRole.Deleted": "Delete Successfully", "SystemRole.DeleteFailed": "Failed to Delete", "SystemRole.GetCanCreateProjectUsersError": "Error getting user list with create project permission", "SystemRole.PleaseEnterAppId": "Please enter appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "SystemRole.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "SystemRole.DeleteMasterAssignRoleTips": "Are you sure to disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.DeletedMasterAssignRoleTips": "Disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "SystemRole.AllowAppMasterAssignRoleTips": "Are you sure to allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.AllowedAppMasterAssignRoleTips": "Allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "UserMange.Title": "User Management", "UserMange.TitleTips": "(Only valid for the default Spring Security simple authentication method: - Dapollo_profile = github,auth)", "UserMange.UserName": "User Login Name", "UserMange.UserDisplayName": "User Display Name", "UserMange.UserNameTips": "If the user name entered does not exist, will create a new one. If it already exists, then it will be updated.", "UserMange.Pwd": "Password", "UserMange.Email": "Email", "UserMange.Created": "Create user successfully", "UserMange.CreateFailed": "Failed to create user", "Open.Manage.Title": "Open Platform", "Open.Manage.CreateThirdApp": "Create third-party applications", "Open.Manage.CreateThirdAppTips": "(Note: Third-party applications can manage configuration through Apollo Open Platform)", "Open.Manage.ThirdAppId": "Third party appId", "Open.Manage.ThirdAppIdTips": "(Please check if the third-party application has already exists first)", "Open.Manage.ThirdAppName": "Third party application name", "Open.Manage.ThirdAppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "Open.Manage.ProjectOwner": "Owner", "Open.Manage.Create": "Create", "Open.Manage.GrantPermission": "Authorization", "Open.Manage.GrantPermissionTips": "(Namespace level permissions include edit and release namespace. Application level permissions include creating namespace, edit or release any namespace in the application.)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "Managed AppId", "Open.Manage.ManagedNamespace": "Managed Namespace", "Open.Manage.ManagedNamespaceTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Open.Manage.GrantType": "Authorization type", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "Environments", "Open.Manage.GrantEnvTips": "(If you don't select any environment, then will have permissions to all environments.)", "Open.Manage.PleaseEnterAppId": "Please enter appId", "Open.Manage.AppNotCreated": "App('{{appId}}') does not exist, please create it first", "Open.Manage.GrantSuccessfully": "Authorize Successfully", "Open.Manage.GrantFailed": "Failed to authorize", "Namespace.Role.Title": "Permission Management", "Namespace.Role.GrantModifyTo": "Permission to edit", "Namespace.Role.GrantModifyTo2": "(Can edit the configuration)", "Namespace.Role.AllEnv": "All environments", "Namespace.Role.GrantPublishTo": "Permission to release", "Namespace.Role.GrantPublishTo2": "(Can release the configuration)", "Namespace.Role.Add": "Add", "Namespace.Role.NoPermission": "You do not have permission!", "Namespace.Role.InitNamespacePermissionError": "Error initializing authorization", "Namespace.Role.GetEnvGrantUserError": "Failed to load authorized users for '{{env}}'", "Namespace.Role.GetGrantUserError": "Failed to load authorized users", "Namespace.Role.PleaseChooseUser": "Please select the user", "Namespace.Role.Added": "Add Successfully", "Namespace.Role.AddFailed": "Failed to add", "Namespace.Role.Deleted": "Delete Successfully", "Namespace.Role.DeleteFailed": "Failed to Delete", "Config.Sync.Title": "Synchronize Configuration", "Config.Sync.FistStep": "(Step 1: Select Synchronization Information)", "Config.Sync.SecondStep": "(Step 2: Check Diff)", "Config.Sync.PreviousStep": "Previous step", "Config.Sync.NextStep": "Next step", "Config.Sync.Sync": "Synchronize", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "Configurations between multiple environments and clusters can be maintained by synchronize configuration", "Config.Sync.Tips2": "It should be noted that the configurations will not take effect until they are released after synchronization.", "Config.Sync.SyncNamespace": "Synchronized Namespace", "Config.Sync.SyncToCluster": "Synchronize to which cluster", "Config.Sync.NeedToSyncItem": "Configuration to synchronize", "Config.Sync.SortByLastModifyTime": "Filter by last update time", "Config.Sync.BeginTime": "Start time", "Config.Sync.EndTime": "End time", "Config.Sync.Filter": "Filter", "Config.Sync.Rest": "Reset", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "No updated configuration", "Config.Sync.IgnoreSync": "Ignore synchronization", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "Before Sync", "Config.Sync.Step2SyncAfter": "After Sync", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "Operation", "Config.Sync.NewAdd": "Add", "Config.Sync.NoSyncItem": "Do not synchronize the configuration", "Config.Sync.Delete": "Delete", "Config.Sync.Update": "Update", "Config.Sync.SyncSuccessfully": "Synchronize Successfully!", "Config.Sync.SyncFailed": "Failed to Synchronize!", "Config.Sync.LoadingItemsError": "Error loading configuration", "Config.Sync.PleaseChooseNeedSyncItems": "Please select the configuration that needs synchronization", "Config.Sync.PleaseChooseCluster": "Select Cluster", "Config.History.Title": "Release History", "Config.History.MasterVersionPublish": "Main version release", "Config.History.MasterVersionRollback": "Main version rollback", "Config.History.GrayscaleOperator": "Grayscale operation", "Config.History.PublishHistory": "Release History", "Config.History.OperationType0": "Normal release", "Config.History.OperationType1": "Rollback", "Config.History.OperationType2": "Grayscale Release", "Config.History.OperationType3": "Update Gray Rules", "Config.History.OperationType4": "Full Grayscale Release", "Config.History.OperationType5": "Grayscale Release(Main Version Release)", "Config.History.OperationType6": "Grayscale Release(Main Version Rollback)", "Config.History.OperationType7": "Abandon Grayscale", "Config.History.OperationType8": "Delete Grayscale(Full Release)", "Config.History.UrgentPublish": "Emergency Release", "Config.History.LoadMore": "Load more", "Config.History.Abandoned": "Abandoned", "Config.History.RollbackTo": "Rollback To This Release", "Config.History.RollbackToTips": "Rollback released configuration to this release", "Config.History.ChangedItem": "Changed Configuration", "Config.History.ChangedItemTips": "View changes between this release and the previous release", "Config.History.AllItem": "Full Configuration", "Config.History.AllItemTips": "View all configurations for this release", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "Add", "Config.History.ChangeTypeModify": "Update", "Config.History.ChangeTypeDelete": "Delete", "Config.History.NoChange": "No configuration changes", "Config.History.NoItem": "No configuration", "Config.History.GrayscaleRule": "Grayscale Rule", "Config.History.GrayscaleAppId": "Grayscale AppId", "Config.History.GrayscaleIp": "Grayscale IP", "Config.History.NoGrayscaleRule": "No Grayscale Rule", "Config.History.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the release history.", "Config.History.NoPublishHistory": "No release history", "Config.History.LoadingHistoryError": "No release history", "Config.Diff.Title": "Compare Configuration", "Config.Diff.FirstStep": "(Step 1: Select what to compare)", "Config.Diff.SecondStep": "(Step 2: View the differences)", "Config.Diff.PreviousStep": "Previous step", "Config.Diff.NextStep": "Next step", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters", "Config.Diff.DiffCluster": "Clusters to be compared", "Config.Diff.HasDiffComment": "Whether to compare comments or not", "Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters", "ConfigExport.Title": "Config Export", "ConfigExport.TitleTips" : "Super administrators will download the configuration of all projects, normal users will only download the configuration of their own projects", "ConfigExport.Download": "Download", "App.CreateProject": "Create Project", "App.AppIdTips": "(Application's unique identifiers)", "App.AppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.AppOwnerTips": "(After enabling the application administrator allocation restrictions, the application owner and project administrator are default to current account, not subject to change)", "App.AppAdminTips1": "(The application owner has project administrator permission by default.", "App.AppAdminTips2": "Project administrators can create namespace, cluster, and assign user permissions)", "App.AccessKey.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.Title": "Manage Project", "App.Setting.Admin": "Administrators", "App.Setting.AdminTips": "(Project administrators have the following permissions: 1. Create namespace 2. Create clusters 3. Manage project and namespace permissions)", "App.Setting.Add": "Add", "App.Setting.BasicInfo": "Basic information", "App.Setting.ProjectName": "App Name", "App.Setting.ProjectNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.Setting.ProjectOwner": "Owner", "App.Setting.Modify": "Modify project information", "App.Setting.Cancel": "Cancel", "App.Setting.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.DeleteAdmin": "Delete Administrator", "App.Setting.CanNotDeleteAllAdmin": "Cannot delete all administrators", "App.Setting.PleaseChooseUser": "Please select a user", "App.Setting.Added": "Add Successfully", "App.Setting.AddFailed": "Failed to Add", "App.Setting.Deleted": "Delete Successfully", "App.Setting.DeleteFailed": "Failed to Delete", "App.Setting.Modified": "Update Successfully", "Valdr.App.AppId.Size": "AppId cannot be longer than 64 characters", "Valdr.App.AppId.Required": "AppId cannot be empty", "Valdr.App.appName.Size": "The app name cannot be longer than 128 characters", "Valdr.App.appName.Required": "App name cannot be empty", "Valdr.Cluster.ClusterName.Size": "Cluster names cannot be longer than 32 characters", "Valdr.Cluster.ClusterName.Required": "Cluster name cannot be empty", "Valdr.AppNamespace.NamespaceName.Size": "Namespace name cannot be longer than 32 characters", "Valdr.AppNamespace.NamespaceName.Required": "Namespace name cannot be empty", "Valdr.AppNamespace.Comment.Size": "Comment length should not exceed 64 characters", "Valdr.Item.Key.Size": "Key cannot be longer than 128 characters", "Valdr.Item.Key.Required": "Key can't be empty", "Valdr.Item.Comment.Size": "Comment length should not exceed 256 characters", "Valdr.Release.ReleaseName.Size": "Release Name cannot be longer than 64 characters", "Valdr.Release.ReleaseName.Required": "Release Name cannot be empty", "Valdr.Release.Comment.Size": "Comment length should not exceed 256 characters", "ApolloConfirmDialog.DefaultConfirmBtnName": "OK", "ApolloConfirmDialog.SearchPlaceHolder": "Search Apps by appId, appName, configuration key", "RulesModal.ChooseInstances": "Select from the list of instances", "RulesModal.InvalidIp": "Illegal IP Address: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "Grayscale AppId cannot be empty", "RulesModal.AppIdExistsRule": "Rules already exist for AppId='{{appId}}'", "RulesModal.IpListCanNotBeNull": "IP list cannot be empty", "ItemModal.KeyExists": "Key='{{key}}' already exists", "ItemModal.AddedTips": "Add Successfully. need to release configuration to take effect", "ItemModal.AddFailed": "Failed to Add", "ItemModal.PleaseChooseCluster": "Please Select Cluster", "ItemModal.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ItemModal.ModifyFailed": "Failed to Update", "ItemModal.Tabs": "Tab-character", "ItemModal.NewLine": "Newline-character", "ItemModal.Space": "Blank-space", "ApolloNsPanel.LoadingHistoryError": "Failed to load change history", "ApolloNsPanel.LoadingGrayscaleError": "Failed to load change history", "ApolloNsPanel.Deleted": "Delete Successfully", "ApolloNsPanel.GrayscaleModified": "Update grayscale rules successfully", "ApolloNsPanel.GrayscaleModifyFailed": "Failed to update grayscale rules", "ApolloNsPanel.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ApolloNsPanel.ModifyFailed": "Failed to Update", "ApolloNsPanel.GrammarIsRight": "Syntax is correct", "ReleaseModal.Published": "Release Successfully", "ReleaseModal.PublishFailed": "Failed to Release", "ReleaseModal.GrayscalePublished": "Grayscale Release Successfully", "ReleaseModal.GrayscalePublishFailed": "Failed to Grayscale Release", "ReleaseModal.AllPublished": "Full Release Successfully", "ReleaseModal.AllPublishFailed": "Failed to Full Release", "Rollback.NoRollbackList": "No released history to rollback", "Rollback.SameAsCurrentRelease": "This release is the same as current release", "Rollback.RollbackSuccessfully": "Rollback Successfully", "Rollback.RollbackFailed": "Failed to Rollback", "Revoke.RevokeFailed": "Failed to Revoke", "Revoke.RevokeSuccessfully": "Revoke Successfully" }
{ "Common.Title": "Apollo Configuration Center", "Common.Nav.ShowNavBar": "Display navigation bar", "Common.Nav.HideNavBar": "Hide navigation bar", "Common.Nav.Help": "Help", "Common.Nav.AdminTools": "Admin Tools", "Common.Nav.NonAdminTools": "Tools", "Common.Nav.UserManage": "User Management", "Common.Nav.SystemRoleManage": "System Permission Management", "Common.Nav.OpenMange": "Open Platform Authorization Management", "Common.Nav.SystemConfig": "System Configuration", "Common.Nav.DeleteApp-Cluster-Namespace": "Delete Apps, Clusters, AppNamespace", "Common.Nav.SystemInfo": "System Information", "Common.Nav.ConfigExport": "Config Export", "Common.Nav.Logout": "Logout", "Common.Department": "Department", "Common.Cluster": "Cluster", "Common.Environment": "Environment", "Common.Email": "Email", "Common.AppId": "App Id", "Common.Namespace": "Namespace", "Common.AppName": "App Name", "Common.AppOwner": "App Owner", "Common.AppOwnerLong": "App Owner", "Common.AppAdmin": "App Administrators", "Common.ClusterName": "Cluster Name", "Common.Submit": "Submit", "Common.Save": "Save", "Common.Created": "Create Successfully", "Common.CreateFailed": "Fail to Create", "Common.Deleted": "Delete Successfully", "Common.DeleteFailed": "Fail to Delete", "Common.ReturnToIndex": "Return to project page", "Common.Cancel": "Cancel", "Common.Ok": "OK", "Common.Search": "Query", "Common.IsRootUser": "Current page is only accessible to Apollo administrator.", "Common.PleaseChooseDepartment": "Please select department", "Common.PleaseChooseOwner": "Please select app owner", "Common.LoginExpiredTips": "Your login is expired. Please refresh the page and try again.", "Component.DeleteNamespace.Title": "Delete Namespace", "Component.DeleteNamespace.PublicContent": "Deleting namespace will cause the instances unable to get the configuration of this namespace. Are you sure to delete it?", "Component.DeleteNamespace.PrivateContent": "Deleting a private Namespace will cause the instances unable to get the configuration of this namespace, and the page will prompt 'missing namespace' (unless the AppNamespace is deleted by admin tool). Are you sure to delete it?", "Component.GrayscalePublishRule.Title": "Edit Grayscale Rule", "Component.GrayscalePublishRule.AppId": "Grayscale AppId", "Component.GrayscalePublishRule.AcceptRule": "Grayscale Application Rule", "Component.GrayscalePublishRule.AcceptPartInstance": "Apply to some instances", "Component.GrayscalePublishRule.AcceptAllInstance": "Apply to all instances", "Component.GrayscalePublishRule.IP": "Grayscale IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(The list of instances are filtered by the typed AppId automatically)", "Component.GrayscalePublishRule.IpTips": "Can't find the IP you want? You may ", "Component.GrayscalePublishRule.EnterIp": "enter IP manually", "Component.GrayscalePublishRule.EnterIpTips": "Enter the list of IP, using ',' as the separator, and then click the Add button.", "Component.GrayscalePublishRule.Add": "Add", "Component.ConfigItem.Title": "Add Configuration", "Component.ConfigItem.TitleTips": "(Reminder: Configuration can be added in batch via text mode)", "Component.ConfigItem.AddGrayscaleItem": "Add Grayscale Configuration", "Component.ConfigItem.ModifyItem": "Modify Configuration", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "Note: Hidden characters (Spaces, Newline, Tab) easily cause configuration errors. If you want to check hidden characters in Value, please click", "Component.ConfigItem.ItemValueShowDetection": "Check Hidden Characters", "Component.ConfigItem.ItemValueNotHiddenChars": "No Hidden Characters", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "Select Cluster", "Component.MergePublish.Title": "Full Release", "Component.MergePublish.Tips": "Full release will merge the configurations of grayscale version into the main version and release them.", "Component.MergePublish.NextStep": "After full release, choose which behavior you want", "Component.MergePublish.DeleteGrayscale": "Delete grayscale version", "Component.MergePublish.ReservedGrayscale": "Keep grayscale version", "Component.Namespace.Branch.IsChanged": "Modified", "Component.Namespace.Branch.ChangeUser": "Current Modifier", "Component.Namespace.Branch.ContinueGrayscalePublish": "Continue to Grayscale Release", "Component.Namespace.Branch.GrayscalePublish": "Grayscale Release", "Component.Namespace.Branch.MergeToMasterAndPublish": "Merge to the main version and release the main version's configurations ", "Component.Namespace.Branch.AllPublish": "Full Release", "Component.Namespace.Branch.DiscardGrayscaleVersion": "Abandon Grayscale Version", "Component.Namespace.Branch.DiscardGrayscale": "Abandon Grayscale", "Component.Namespace.Branch.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Branch.Tab.Configuration": "Configuration", "Component.Namespace.Branch.Tab.GrayscaleRule": "Grayscale Rule", "Component.Namespace.Branch.Tab.GrayscaleInstance": "Grayscale Instance List", "Component.Namespace.Branch.Tab.ChangeHistory": "Change History", "Component.Namespace.Branch.Body.Item": "Grayscale Configuration", "Component.Namespace.Branch.Body.AddedItem": "Add Grayscale Configuration", "Component.Namespace.Branch.Body.PublishState": "Release Status", "Component.Namespace.Branch.Body.ItemSort": "Sort", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "Value of Main Version", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "Grayscale value", "Component.Namespace.Branch.Body.ItemComment": "Comment", "Component.Namespace.Branch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Branch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Branch.Body.ItemOperator": "Operation", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "Click to view released values", "Component.Namespace.Branch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.Branch.Body.ItemPublished": "Released", "Component.Namespace.Branch.Body.ItemEffective": "Effective configuration", "Component.Namespace.Branch.Body.ClickToSee": "Click to view", "Component.Namespace.Branch.Body.DeletedItem": "Deleted configuration", "Component.Namespace.Branch.Body.Delete": "Deleted", "Component.Namespace.Branch.Body.ChangedFromMaster": "Configuration modified from the main version", "Component.Namespace.Branch.Body.ModifiedItem": "Modified configuration", "Component.Namespace.Branch.Body.Modify": "Modified", "Component.Namespace.Branch.Body.AddedByGrayscale": "Specific configuration for grayscale version", "Component.Namespace.Branch.Body.Added": "New", "Component.Namespace.Branch.Body.Op.Modify": "Modify", "Component.Namespace.Branch.Body.Op.Delete": "Delete", "Component.Namespace.MasterBranch.Body.Title": "Configuration of the main version", "Component.Namespace.MasterBranch.Body.PublishState": "Release Status", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "Comment", "Component.Namespace.MasterBranch.Body.ItemLastModify": "Last Modifier", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.MasterBranch.Body.ItemOperator": "Operation", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "Click to check released values", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "Unreleased", "Component.Namespace.MasterBranch.Body.ItemEffective": "Effective configuration", "Component.Namespace.MasterBranch.Body.ItemPublished": "Released", "Component.Namespace.MasterBranch.Body.AddedItem": "New configuration", "Component.Namespace.MasterBranch.Body.ModifyItem": "Modify the grayscale configuration", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "You do not have the permission to edit grayscale rule. Only those who have the permission to edit or release the namespace can edit grayscale rule. If you need to edit grayscale rule, please contact the project administrator to apply for the permission.", "Component.Namespace.Branch.GrayScaleRule.AppId": "Grayscale AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "Grayscale IP List", "Component.Namespace.Branch.GrayScaleRule.Operator": "Operation", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "Modify", "Component.Namespace.Branch.GrayScaleRule.Delete": "Delete", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "Create Rule", "Component.Namespace.Branch.Instance.RefreshList": "Refresh List", "Component.Namespace.Branch.Instance.ItemToSee": "View configuration", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "Configuration Fetched Time", "Component.Namespace.Branch.Instance.LoadMore": "Refresh list", "Component.Namespace.Branch.Instance.NoInstance": "No instance information", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "Add", "Component.Namespace.Branch.History.Modified": "Update", "Component.Namespace.Branch.History.Deleted": "Delete", "Component.Namespace.Branch.History.LoadMore": "Load more", "Component.Namespace.Branch.History.NoHistory": "No Change History", "Component.Namespace.Header.Title.Private": "Private", "Component.Namespace.Header.Title.PrivateTips": "The configuration of private namespace ({{namespace.baseInfo.namespaceName}}) can be only fetched by clients whose AppId is {{appId}}", "Component.Namespace.Header.Title.Public": "Public", "Component.Namespace.Header.Title.PublicTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) can be fetched by any client.", "Component.Namespace.Header.Title.Extend": "Association", "Component.Namespace.Header.Title.ExtendTips": "The configuration of namespace ({{namespace.baseInfo.namespaceName}}) will override the configuration of the public namespace, and the combined configuration can only be fetched by clients whose AppId is {{appId}}.", "Component.Namespace.Header.Title.ExpandAndCollapse": "[Expand/Collapse]", "Component.Namespace.Header.Title.Master": "Main Version", "Component.Namespace.Header.Title.Grayscale": "Grayscale Version", "Component.Namespace.Master.LoadNamespace": "Load Namespace", "Component.Namespace.Master.LoadNamespaceTips": "Load Namespace", "Component.Namespace.Master.Items.Changed": "Modified", "Component.Namespace.Master.Items.ChangedUser": "Current modifier", "Component.Namespace.Master.Items.Publish": "Release", "Component.Namespace.Master.Items.PublishTips": "Release configuration", "Component.Namespace.Master.Items.Rollback": "Rollback", "Component.Namespace.Master.Items.RollbackTips": "Rollback released configuration", "Component.Namespace.Master.Items.PublishHistory": "Release History", "Component.Namespace.Master.Items.PublishHistoryTips": "View the release history", "Component.Namespace.Master.Items.Grant": "Authorize", "Component.Namespace.Master.Items.GrantTips": "Manage the configuration edit and release permission", "Component.Namespace.Master.Items.Grayscale": "Grayscale", "Component.Namespace.Master.Items.GrayscaleTips": "Create a test version", "Component.Namespace.Master.Items.RequestPermission": "Apply for configuration permission", "Component.Namespace.Master.Items.RequestPermissionTips": "You do not have any configuration permission. Please apply.", "Component.Namespace.Master.Items.DeleteNamespace": "Delete Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the configuration.", "Component.Namespace.Master.Items.ItemList": "Table", "Component.Namespace.Master.Items.ItemListByText": "Text", "Component.Namespace.Master.Items.ItemHistory": "Change History", "Component.Namespace.Master.Items.ItemInstance": "Instance List", "Component.Namespace.Master.Items.CopyText": "Copy", "Component.Namespace.Master.Items.GrammarCheck": "Syntax Check", "Component.Namespace.Master.Items.CancelChanged": "Cancel", "Component.Namespace.Master.Items.Change": "Modify", "Component.Namespace.Master.Items.SummitChanged": "Submit", "Component.Namespace.Master.Items.SortByKey": "Filter the configurations by key", "Component.Namespace.Master.Items.FilterItem": "Filter", "Component.Namespace.Master.Items.RevokeItemTips": "Revoke configuration changes", "Component.Namespace.Master.Items.RevokeItem" :"Revoke", "Component.Namespace.Master.Items.SyncItemTips": "Synchronize configurations among environments", "Component.Namespace.Master.Items.SyncItem": "Synchronize", "Component.Namespace.Master.Items.DiffItemTips": "Compare the configurations among environments", "Component.Namespace.Master.Items.DiffItem": "Compare", "Component.Namespace.Master.Items.AddItem": "Add Configuration", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: This namespace has never been released. Apollo client will not be able to fetch the configuration and will record 404 log information. Please release it in time.", "Component.Namespace.Master.Items.Body.FilterByKey": "Input key to filter", "Component.Namespace.Master.Items.Body.PublishState": "Release Status", "Component.Namespace.Master.Items.Body.Sort": "Sort", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.ItemLastModify": "Last Modifier", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "Last Modified Time", "Component.Namespace.Master.Items.Body.ItemOperator": "Operation", "Component.Namespace.Master.Items.Body.NoPublish": "Unreleased", "Component.Namespace.Master.Items.Body.NoPublishTitle": "Click to view released values", "Component.Namespace.Master.Items.Body.NoPublishTips": "New configuration, no released value", "Component.Namespace.Master.Items.Body.Published": "Released", "Component.Namespace.Master.Items.Body.PublishedTitle": "Effective configuration", "Component.Namespace.Master.Items.Body.ClickToSee": "Click to view", "Component.Namespace.Master.Items.Body.Grayscale": "Gray", "Component.Namespace.Master.Items.Body.HaveGrayscale": "This configuration has grayscale configuration. Click to view the value of grayscale.", "Component.Namespace.Master.Items.Body.NewAdded": "New", "Component.Namespace.Master.Items.Body.NewAddedTips": "New Configuration", "Component.Namespace.Master.Items.Body.Modified": "Modified", "Component.Namespace.Master.Items.Body.ModifiedTips": "Modified Configuration", "Component.Namespace.Master.Items.Body.Deleted": "Deleted", "Component.Namespace.Master.Items.Body.DeletedTips": "Deleted Configuration", "Component.Namespace.Master.Items.Body.ModifyTips": "Modify", "Component.Namespace.Master.Items.Body.DeleteTips": "Delete", "Component.Namespace.Master.Items.Body.Link.Title": "Overridden Configuration", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "No Overridden Configuration", "Component.Namespace.Master.Items.Body.Public.Title": "Public Configuration", "Component.Namespace.Master.Items.Body.Public.Published": "Released Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublish": "Unreleased Configuration", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "Owner of the current public namespace", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "hasn't associated this namespace, please contact the owner of {{namespace.parentAppId}} to associate this namespace in the {{namespace.parentAppId}} project.", "Component.Namespace.Master.Items.Body.Public.NoPublished": "No Released Configuration", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "Override this configuration", "Component.Namespace.Master.Items.Body.NoPublished.Title": "No public configuration", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "Released Value", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "Unreleased Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "Add", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "Update", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "Delete", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "No Change History", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory": "Filter History", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey": "Filter the history by key", "Component.Namespace.Master.Items.Body.Instance.Tips": "Tips: Only show instances who have fetched configurations in the last 24 hrs ", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "Instances using the latest configuration", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "Instances using outdated configuration", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "All Instances", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "Refresh List", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "View Configuration", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "Load more", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "Configuration fetched time", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "No Instance Information", "Component.PublishDeny.Title": "Release Restriction", "Component.PublishDeny.Tips1": "You can't release! The operators to edit and release the configurations in {{env}} environment must be different, please find someone else who has the release permission of this namespace to do the release operation.", "Component.PublishDeny.Tips2": "(If it is non working time or a special situation, you may release by clicking the 'Emergency Release' button.)", "Component.PublishDeny.EmergencyPublish": "Emergency Release", "Component.PublishDeny.Close": "Close", "Component.Publish.Title": "Release", "Component.Publish.Tips": "(Only the released configurations can be fetched by clients, and this release will only be applied to the current environment: {{env}})", "Component.Publish.Grayscale": "Grayscale Release", "Component.Publish.GrayscaleTips": "(The grayscale configurations are only applied to the instances specified in grayscale rules)", "Component.Publish.AllPublish": "Full Release", "Component.Publish.AllPublishTips": "(Full release configurations are applied to all instances)", "Component.Publish.ToSeeChange": "View changes", "Component.Publish.PublishedValue": "Released values", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "Unreleased values", "Component.Publish.ModifyUser": "Modifier", "Component.Publish.ModifyTime": "Modified Time", "Component.Publish.NewAdded": "New", "Component.Publish.NewAddedTips": "New Configuration", "Component.Publish.Modified": "Modified", "Component.Publish.ModifiedTips": "Modified Configuration", "Component.Publish.Deleted": "Deleted", "Component.Publish.DeletedTips": "Deleted Configuration", "Component.Publish.MasterValue": "Main version value", "Component.Publish.GrayValue": "Grayscale version value", "Component.Publish.GrayPublishedValue": "Released grayscale version value", "Component.Publish.GrayNoPublishedValue": "Unreleased grayscale version value", "Component.Publish.ItemNoChange": "No configuration changes", "Component.Publish.GrayItemNoChange": "No configuration changes", "Component.Publish.NoGrayItems": "No grayscale changes", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "Release", "Component.Rollback.To": "roll back to", "Component.Rollback.Tips": "This operation will roll back to the last released version, and the current version is abandoned, but there is no impact to the currently editing configurations. You may view the currently effective version in the release history page", "Component.RollbackTo.Tips": "This operation will roll back to this released version, and the current version is abandoned, but there is no impact to the currently editing configurations", "Component.Rollback.ClickToView": "Click to view", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "Before Rollback", "Component.Rollback.RollbackAfterValue": "After Rollback", "Component.Rollback.Added": "Add", "Component.Rollback.Modified": "Update", "Component.Rollback.Deleted": "Delete", "Component.Rollback.NoChange": "No configuration changes", "Component.Rollback.OpRollback": "Rollback", "Component.ShowText.Title": "View", "Login.Login": "Login", "Login.UserNameOrPasswordIncorrect": "Incorrect username or password", "Login.LogoutSuccessfully": "Logout Successfully", "Index.MyProject": "My projects", "Index.CreateProject": "Create project", "Index.LoadMore": "Load more", "Index.FavoriteItems": "Favorite projects", "Index.Topping": "Top", "Index.FavoriteCancel": "Remove favorite", "Index.FavoriteTip": "You haven't favorited any items yet. You can favorite items on the project homepage.", "Index.RecentlyViewedItems": "Recent projects", "Index.GetCreateAppRoleFailed": "Failed to get the information of create project permission", "Index.Topped": "Top Successfully", "Index.CancelledFavorite": "Remove favorite successfully", "Index.PublicNamespace": "Public namespaces", "Index.SearchNamespace": "Search Public Namespace(AppId or Namespace)", "Index.PublicNamespaceTip": "You haven't created any public namespaces yet. You can create them in your projects.", "Index.appTable.operation": "Operation", "Index.appTable.Format": "Format", "Index.appTable.Comment": "Comment", "Cluster.CreateCluster": "Create Cluster", "Cluster.Tips.1": "By adding clusters, the same program can use different configuration in different clusters (such as different data centers)", "Cluster.Tips.2": "If the different clusters use the same configuration, there is no need to create clusters", "Cluster.Tips.3": "By default, Apollo reads IDC attributes in /opt/settings/server.properties(Linux) or C:\\opt\\settings\\server.properties(Windows) files on the machine as cluster names, such as SHAJQ (Jinqiao Data Center), SHAOY (Ouyang Data Center)", "Cluster.Tips.4": "The cluster name created here should be consistent with the IDC attribute in server.properties on the machine", "Cluster.CreateNameTips": "(Cluster names such as SHAJQ, SHAOY or customized clusters such as SHAJQ-xx, SHAJQ-yy)", "Cluster.ChooseEnvironment": "Environment", "Cluster.LoadingEnvironmentError": "Error in loading environment information", "Cluster.ClusterCreated": "Create cluster successfully", "Cluster.ClusterCreateFailed": "Failed to create cluster", "Cluster.PleaseChooseEnvironment": "Please select the environment", "Config.Title": "Apollo Configuration Center", "Config.AppIdNotFound": "doesn't exist, ", "Config.ClickByCreate": "click to create", "Config.EnvList": "Environments", "Config.EnvListTips": "Manage the configuration of different environments and clusters by switching environments and clusters", "Config.ProjectInfo": "Project Info", "Config.ModifyBasicProjectInfo": "Modify project's basic information", "Config.Favorite": "Favorite", "Config.CancelFavorite": "Cancel Favorite", "Config.MissEnv": "Missing environment", "Config.MissNamespace": "Missing Namespace", "Config.ProjectManage": "Manage Project", "Config.AccessKeyManage": "Manage AccessKey", "Config.CreateAppMissEnv": "Recover Environments", "Config.CreateAppMissNamespace": "Recover Namespaces", "Config.AddCluster": "Add Cluster", "Config.AddNamespace": "Add Namespace", "Config.CurrentlyOperatorEnv": "Current environment", "Config.DoNotRemindAgain": "No longer prompt", "Config.Note": "Note", "Config.ClusterIsDefaultTipContent": "All instances that do not belong to the '{{name}}' cluster will fetch the default cluster (current page) configuration, and those that belong to the '{{name}}' cluster will use the corresponding cluster configuration!", "Config.ClusterIsCustomTipContent": "Instances belonging to the '{{name}}' cluster will only fetch the configuration of the '{{name}}' cluster (the current page), and the default cluster configuration will only be fetched when the corresponding namespace has not been released in the current cluster.", "Config.HasNotPublishNamespace": "The following environment/cluster has unreleased configurations, the client will not fetch the unreleased configurations, please release them in time.", "Config.RevokeItem.DialogTitle": "Revoke configuration changes", "Config.RevokeItem.DialogContent": "Modified but unpublished configurations in the current namespace will be revoked. Are you sure to revoke the configuration changes?", "Config.DeleteItem.DialogTitle": "Delete configuration", "Config.DeleteItem.DialogContent": "You are deleting the configuration whose Key is <b>'{{config.key}}'</b> Value is <b>'{{config.value}}'</b>. <br> Are you sure to delete the configuration?", "Config.PublishNoPermission.DialogTitle": "Release", "Config.PublishNoPermission.DialogContent": "You do not have release permission. Please ask the project administrators '{{masterUsers}}' to authorize release permission.", "Config.ModifyNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.ModifyNoPermission.DialogContent": "Please ask the project administrators '{{masterUsers}}' to authorize release or edit permission.", "Config.MasterNoPermission.DialogTitle": "Apply for Configuration Permission", "Config.MasterNoPermission.DialogContent": "You are not this project's administrator. Only project administrators have the permission to add clusters and namespaces. Please ask the project administrators '{{masterUsers}}' to assign administrator permission", "Config.NamespaceLocked.DialogTitle": "Edit not allowed", "Config.NamespaceLocked.DialogContent": "Current namespace is being edited by '{{lockOwner}}', and a release phase can only be edited by one person.", "Config.RollbackAlert.DialogTitle": "Rollback", "Config.RollbackAlert.DialogContent": "Are you sure to roll back?", "Config.EmergencyPublishAlert.DialogTitle": "Emergency release", "Config.EmergencyPublishAlert.DialogContent": "Are you sure to perform the emergency release?", "Config.DeleteBranch.DialogTitle": "Delete grayscale", "Config.DeleteBranch.DialogContent": "Deleting grayscale will lose the grayscale configurations. Are you sure to delete it?", "Config.UpdateRuleTips.DialogTitle": "Update gray rule prompt", "Config.UpdateRuleTips.DialogContent": "Grayscale rules are in effect. However there are unreleased configurations in grayscale version, they won't be effective until a manual grayscale release is performed.", "Config.MergeAndReleaseDeny.DialogTitle": "Full release", "Config.MergeAndReleaseDeny.DialogContent": "The main version has unreleased configuration. Please release the main version first.", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "Missing gray rule prompt", "Config.GrayReleaseWithoutRulesTips.DialogContent": "The grayscale version has not configured any grayscale rule. Please configure the grayscale rules.", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "Delete namespace warning", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> instances using namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'), and deleting namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Instance List\"</ins> to confirm the instance information. If you confirm that the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "Delete namespace warning information", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "There are <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> instances using the grayscale version of namespace ('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}') configuration, and deleting Namespace would cause those instances failed to fetch configuration. <br> Please go to <ins> \"Grayscale Version\"=> \"Instance List\"</ins> to confirm the instance information. If you confirm the relevant instances are no longer using the namespace configuration, you can contact the Apollo administrators to delete the instance information (Instance Config) or wait for the instance to expire automatically 24 hours before deletion.", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "Delete Namespace Failure Tip", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "Please enter appId", "Config.SyntaxCheckFailed.DialogTitle": "Syntax Check Error", "Config.SyntaxCheckFailed.DialogContent": "Delete Namespace Failure Tip", "Config.CreateBranchTips.DialogTitle": "Create Grayscale Notice", "Config.CreateBranchTips.DialogContent": "By creating grayscale version, you can do grayscale test for some configurations. <br> Grayscale process is as follows: <br> &nbsp; &nbsp; 1. Create grayscale version <br> &nbsp; &nbsp; 2. Configure grayscale configuration items <br> &nbsp; &nbsp; 3. Configure grayscale rules. If it is a private namespace, it can be grayed according to the IP of client. If it is a public namespace, it can be grayed according to both appId and the IP. <br> &nbsp; &nbsp; 4. Grayscale release <br> Grayscale version has two final results: <b> Full release and Abandon grayscale</b> <br> <b>Full release</b>: grayscale configurations are merged with the main version and released, all clients will use the merged configurations <br> <b> Abandon grayscale</b>: Delete grayscale version. All clients will use the configurations of the main version<br> Notice: <br> &nbsp; &nbsp; 1. If the grayscale version has been released, then the grayscale rules will be effective immediately without the need to release grayscale configuration again.", "Config.ProjectMissEnvInfos": "There are missing environments in the current project, please click \"Recover Environments\" on the left side of the page to do the recovery.", "Config.ProjectMissNamespaceInfos": "There are missing namespaces in the current environment. Please click \"Recover Namespaces\" on the left side of the page to do the recovery.", "Config.SystemError": "System error, please try again or contact the system administrator", "Config.FavoriteSuccessfully": "Favorite Successfully", "Config.FavoriteFailed": "Failed to favorite", "Config.CancelledFavorite": "Cancel favorite successfully", "Config.CancelFavoriteFailed": "Failed to cancel the favorite", "Config.GetUserInfoFailed": "Failed to obtain user login information", "Config.LoadingAllNamespaceError": "Failed to load configuration", "Config.CancelFavoriteError": "Failure to Cancel Collection", "Config.Deleted": "Delete Successfully", "Config.DeleteFailed": "Failed to delete", "Config.GrayscaleCreated": "Create Grayscale Successfully", "Config.GrayscaleCreateFailed": "Failed to create grayscale", "Config.BranchDeleted": "Delete branch successfully", "Config.BranchDeleteFailed": "Failed to delete branch", "Config.DeleteNamespaceFailedTips": "The following projects are associated with this public namespace and they must all be deleted deleting the public Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "Failed to delete", "Config.DeleteNamespaceNoPermissionFailedTips": "You do not have Project Administrator permission. Only Administrators can delete namespace. Please ask Project Administrators [{{users}}] to delete namespace.", "Delete.Title": "Delete applications, clusters, AppNamespace", "Delete.DeleteApp": "Delete application", "Delete.DeleteAppTips": "(Because deleting applications has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the application before deleting it.)", "Delete.AppIdTips": "(Please query application information before deleting)", "Delete.AppInfo": "Application information", "Delete.DeleteCluster": "Delete clusters", "Delete.DeleteClusterTips": "(Because deleting clusters has very large impacts, only system administrators are allowed to delete them for the time being. Make sure that no client fetches the configuration of the cluster before deleting it.)", "Delete.EnvName": "Environment Name", "Delete.ClusterNameTips": "(Please query cluster information before deletion)", "Delete.ClusterInfo": "Cluster information", "Delete.DeleteNamespace": "Delete AppNamespace", "Delete.DeleteNamespaceTips": "(Note that Namespace and AppNamespace in all environments will be deleted! If you just want to delete the namespace of some environment, let the user delete it on the project page!", "Delete.DeleteNamespaceTips2": "Currently users can delete the associated namespace and private namespace by themselves, but they can not delete the AppNamespace. Because deleting AppNamespace has very large impacts, it is only allowed to be deleted by system administrators for the time being. For public Namespace, it is necessary to ensure that no application associates the AppNamespace", "Delete.AppNamespaceName": "AppNamespace name", "Delete.AppNamespaceNameTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace Information", "Delete.IsRootUserTips": "The current page is only accessible to Apollo administrators", "Delete.PleaseEnterAppId": "Please enter appId", "Delete.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "Delete.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "Delete.ConfirmDeleteAppId": "Are you sure to delete AppId: '{{appId}}'?", "Delete.Deleted": "Delete Successfully", "Delete.PleaseEnterAppIdAndEnvAndCluster": "Please enter appId, environment, and cluster name", "Delete.ClusterInfoContent": "AppId: '{{appId}}' environment: '{{env}}' cluster name: '{{clusterName}}'", "Delete.ConfirmDeleteCluster": "Are you sure to delete the cluster? AppId: '{{appId}}' environment: '{{env}}' cluster name:'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "Please enter appId and AppNamespace names", "Delete.AppNamespaceInfoContent": "AppId: '{{appId}}' AppNamespace name: '{{namespace}}' isPublic: '{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "Are you sure to delete AppNamespace and Namespace for all environments? AppId: '{{appId}}' environment: 'All environments' AppNamespace name: '{{namespace}}'", "Namespace.Title": "New Namespace", "Namespace.UnderstandMore": "(Click to learn more about Namespace)", "Namespace.Link.Tips1": "Applications can override the configuration of a public namespace by associating a public namespace", "Namespace.Link.Tips2": "If the application does not need to override the configuration of the public namespace, then there is no need to associate the public namespace", "Namespace.CreatePublic.Tips1": "The configuration of the public Namespace can be fetched by any application", "Namespace.CreatePublic.Tips2": "Configuration of public components or the need for multiple applications to share the same configuration can be achieved by creating a public namespace.", "Namespace.CreatePublic.Tips3": "If other applications need to override the configuration of the public namespace, you can associate the public namespace in other applications, and then configure the configuration that needs to be overridden in the associated namespace.", "Namespace.CreatePublic.Tips4": "If other applications do not need to override the configuration of public namespace, then there is no need to associate public namespace in other applications.", "Namespace.CreatePrivate.Tips1": "The configuration of a private Namespace can only be fetched by the application to which it belongs.", "Namespace.CreatePrivate.Tips2": "Group management configuration can be achieved by creating a private namespace", "Namespace.CreatePrivate.Tips3": "The format of private namespaces can be xml, yml, yaml, json, txt. You can get the content of namespace in non-property format through the ConfigFile interface in apollo-client.", "Namespace.CreatePrivate.Tips4": "The 1.3.0 and above versions of apollo-client provide better support for yaml/yml. Config objects can be obtained directly through ConfigService.getConfig(\"someNamespace.yml\"), or through @EnableApolloConfig(\"someNamespace.yml\") or apollo.bootstrap.namespaces=someNamespace.yml to inject YML configuration into Spring/Spring Boot", "Namespace.CreateNamespace": "Create Namespace", "Namespace.AssociationPublicNamespace": "Associate Public Namespace", "Namespace.ChooseCluster": "Select Cluster", "Namespace.NamespaceName": "Name", "Namespace.AutoAddDepartmentPrefix": "Add department prefix", "Namespace.AutoAddDepartmentPrefixTips": "(The name of a public namespace needs to be globally unique, and adding a department prefix helps ensure global uniqueness)", "Namespace.NamespaceType": "Type", "Namespace.NamespaceType.Public": "Public", "Namespace.NamespaceType.Private": "Private", "Namespace.Remark": "Remarks", "Namespace.Namespace": "Namespace", "Namespace.PleaseChooseNamespace": "Please select namespace", "Namespace.LoadingPublicNamespaceError": "Failed to load public namespace", "Namespace.LoadingAppInfoError": "Failed to load App information", "Namespace.PleaseChooseCluster": "Select Cluster", "Namespace.CheckNamespaceNameLengthTip": "The namespace name should not be longer than 32 characters. Department prefix:'{{departmentLength}}' characters, name {{namespaceLength}} characters", "ServiceConfig.Title": "System Configuration", "ServiceConfig.Tips": "(Maintain Apollo PortalDB.ServerConfig table data, will override configuration items if they already exist, or create configuration items. Configuration updates take effect automatically in a minute)", "ServiceConfig.Key": "Key", "ServiceConfig.KeyTips": "(Please query the configuration information before modifying the configuration)", "ServiceConfig.Value": "Value", "ServiceConfig.Comment": "Comment", "ServiceConfig.Saved": "Save Successfully", "ServiceConfig.SaveFailed": "Failed to Save", "ServiceConfig.PleaseEnterKey": "Please enter key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' does not exist. Click Save to create the configuration item.", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' already exists. Click Save will override the configuration item.", "AccessKey.Tips.1": "Add up to 5 access keys per environment.", "AccessKey.Tips.2": "Once the environment has any enabled access key, the client will be required to configure access key, or the configurations cannot be obtained.", "AccessKey.Tips.3": "Configure the access key to prevent unauthorized clients from obtaining the application configuration. The configuration method is as follows(requires apollo-client version 1.6.0+):", "AccessKey.Tips.3.1": "Via jvm parameter -Dapollo.access-key.secret", "AccessKey.Tips.3.2": "Through the os environment variable APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "Configure apollo.access-key.secret via META-INF/app.properties or application.properties (note that the multi-environment secret is different)", "AccessKey.NoAccessKeyServiceTips": "There are no access keys in this environment.", "AccessKey.ConfigAccessKeys.Secret": "Access Key Secret", "AccessKey.ConfigAccessKeys.Status": "Status", "AccessKey.ConfigAccessKeys.LastModify": "Last Modifier", "AccessKey.ConfigAccessKeys.LastModifyTime": "Last Modified Time", "AccessKey.ConfigAccessKeys.Operator": "Operation", "AccessKey.Operator.Disable": "Disable", "AccessKey.Operator.Enable": "Enable", "AccessKey.Operator.Disabled": "Disabled", "AccessKey.Operator.Enabled": "Enabled", "AccessKey.Operator.Remove": "Remove", "AccessKey.Operator.CreateSuccess": "Access key created successfully", "AccessKey.Operator.DisabledSuccess": "Access key disabled successfully", "AccessKey.Operator.EnabledSuccess": "Access key enabled successfully", "AccessKey.Operator.RemoveSuccess": "Access key removed successfully", "AccessKey.Operator.CreateError": "Access key created failed", "AccessKey.Operator.DisabledError": "Access key disabled failed", "AccessKey.Operator.EnabledError": "Access key enabled failed", "AccessKey.Operator.RemoveError": "Access key removed failed", "AccessKey.Operator.DisabledTips": "Are you sure you want to disable the access key?", "AccessKey.Operator.EnabledTips": "Are you sure you want to enable the access key?", "AccessKey.Operator.RemoveTips": "Are you sure you want to remove the access key?", "AccessKey.LoadError": "Error Loading access keys", "SystemInfo.Title": "System Information", "SystemInfo.SystemVersion": "System version", "SystemInfo.Tips1": "The environment list comes from the <strong>apollo.portal.envs</strong> configuration in Apollo PortalDB.ServerConfig, and can be configured in <a href=\"{{serverConfigUrl}}\">System Configuration</a> page. For more information, please refer the <strong>apollo.portal.envs - supportable environment list</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Tips2": "The meta server address shows the meta server information for this environment configuration. For more information, please refer the <strong>Configuring meta service information for apollo-portal</strong> section in <a href=\"{{wikiUrl}}\">Distributed Deployment Guide</a>.", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "(Current environment status is abnormal, please diagnose with the system information below and Check Health results of AdminService)", "SystemInfo.MetaServerAddress": "Meta server address", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "Check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.Title": "System Permission Management", "SystemRole.AddCreateAppRoleToUser": "Create application permission for users", "SystemRole.AddCreateAppRoleToUserTips": "(When role.create-application.enabled=true is set in system configurations, only super admin and those accounts with Create application permission can create application)", "SystemRole.ChooseUser": "Select User", "SystemRole.Add": "Add", "SystemRole.AuthorizedUser": "Users with permission", "SystemRole.ModifyAppAdminUser": "Modify Application Administrator Allocation Permissions", "SystemRole.ModifyAppAdminUserTips": "(When role.manage-app-master.enabled=true is set in system configurations, only super admin and those accounts with application administrator allocation permissions can modify the application's administrators)", "SystemRole.AppIdTips": "(Please query the application information first)", "SystemRole.AppInfo": "Application information", "SystemRole.AllowAppMasterAssignRole": "Allow this user to add Master as an administrator", "SystemRole.DeleteAppMasterAssignRole": "Disallow this user to add Master as an administrator", "SystemRole.IsRootUser": "The current page is only accessible to Apollo administrators", "SystemRole.PleaseChooseUser": "Please select a user", "SystemRole.Added": "Add Successfully", "SystemRole.AddFailed": "Failed to add", "SystemRole.Deleted": "Delete Successfully", "SystemRole.DeleteFailed": "Failed to Delete", "SystemRole.GetCanCreateProjectUsersError": "Error getting user list with create project permission", "SystemRole.PleaseEnterAppId": "Please enter appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' does not exist!", "SystemRole.AppInfoContent": "Application name: '{{appName}}' department: '{{departmentName}}({{departmentId}})' owner: '{{ownerName}}'", "SystemRole.DeleteMasterAssignRoleTips": "Are you sure to disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.DeletedMasterAssignRoleTips": "Disallow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "SystemRole.AllowAppMasterAssignRoleTips": "Are you sure to allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}'?", "SystemRole.AllowedAppMasterAssignRoleTips": "Allow the user '{{userId}}' to add Master as an administrator for AppId:'{{appId}}' Successfully", "UserMange.Title": "User Management", "UserMange.TitleTips": "(Only valid for the default Spring Security simple authentication method: - Dapollo_profile = github,auth)", "UserMange.UserName": "User Login Name", "UserMange.UserDisplayName": "User Display Name", "UserMange.UserNameTips": "If the user name entered does not exist, will create a new one. If it already exists, then it will be updated.", "UserMange.Pwd": "Password", "UserMange.Email": "Email", "UserMange.Created": "Create user successfully", "UserMange.CreateFailed": "Failed to create user", "Open.Manage.Title": "Open Platform", "Open.Manage.CreateThirdApp": "Create third-party applications", "Open.Manage.CreateThirdAppTips": "(Note: Third-party applications can manage configuration through Apollo Open Platform)", "Open.Manage.ThirdAppId": "Third party appId", "Open.Manage.ThirdAppIdTips": "(Please check if the third-party application has already exists first)", "Open.Manage.ThirdAppName": "Third party application name", "Open.Manage.ThirdAppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "Open.Manage.ProjectOwner": "Owner", "Open.Manage.Create": "Create", "Open.Manage.GrantPermission": "Authorization", "Open.Manage.GrantPermissionTips": "(Namespace level permissions include edit and release namespace. Application level permissions include creating namespace, edit or release any namespace in the application.)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "Managed AppId", "Open.Manage.ManagedNamespace": "Managed Namespace", "Open.Manage.ManagedNamespaceTips": "(For non-properties namespaces, please add the suffix, such as apollo.xml)", "Open.Manage.GrantType": "Authorization type", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "Environments", "Open.Manage.GrantEnvTips": "(If you don't select any environment, then will have permissions to all environments.)", "Open.Manage.PleaseEnterAppId": "Please enter appId", "Open.Manage.AppNotCreated": "App('{{appId}}') does not exist, please create it first", "Open.Manage.GrantSuccessfully": "Authorize Successfully", "Open.Manage.GrantFailed": "Failed to authorize", "Namespace.Role.Title": "Permission Management", "Namespace.Role.GrantModifyTo": "Permission to edit", "Namespace.Role.GrantModifyTo2": "(Can edit the configuration)", "Namespace.Role.AllEnv": "All environments", "Namespace.Role.GrantPublishTo": "Permission to release", "Namespace.Role.GrantPublishTo2": "(Can release the configuration)", "Namespace.Role.Add": "Add", "Namespace.Role.NoPermission": "You do not have permission!", "Namespace.Role.InitNamespacePermissionError": "Error initializing authorization", "Namespace.Role.GetEnvGrantUserError": "Failed to load authorized users for '{{env}}'", "Namespace.Role.GetGrantUserError": "Failed to load authorized users", "Namespace.Role.PleaseChooseUser": "Please select the user", "Namespace.Role.Added": "Add Successfully", "Namespace.Role.AddFailed": "Failed to add", "Namespace.Role.Deleted": "Delete Successfully", "Namespace.Role.DeleteFailed": "Failed to Delete", "Config.Sync.Title": "Synchronize Configuration", "Config.Sync.FistStep": "(Step 1: Select Synchronization Information)", "Config.Sync.SecondStep": "(Step 2: Check Diff)", "Config.Sync.PreviousStep": "Previous step", "Config.Sync.NextStep": "Next step", "Config.Sync.Sync": "Synchronize", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "Configurations between multiple environments and clusters can be maintained by synchronize configuration", "Config.Sync.Tips2": "It should be noted that the configurations will not take effect until they are released after synchronization.", "Config.Sync.SyncNamespace": "Synchronized Namespace", "Config.Sync.SyncToCluster": "Synchronize to which cluster", "Config.Sync.NeedToSyncItem": "Configuration to synchronize", "Config.Sync.SortByLastModifyTime": "Filter by last update time", "Config.Sync.BeginTime": "Start time", "Config.Sync.EndTime": "End time", "Config.Sync.Filter": "Filter", "Config.Sync.Rest": "Reset", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "No updated configuration", "Config.Sync.IgnoreSync": "Ignore synchronization", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "Before Sync", "Config.Sync.Step2SyncAfter": "After Sync", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "Operation", "Config.Sync.NewAdd": "Add", "Config.Sync.NoSyncItem": "Do not synchronize the configuration", "Config.Sync.Delete": "Delete", "Config.Sync.Update": "Update", "Config.Sync.SyncSuccessfully": "Synchronize Successfully!", "Config.Sync.SyncFailed": "Failed to Synchronize!", "Config.Sync.LoadingItemsError": "Error loading configuration", "Config.Sync.PleaseChooseNeedSyncItems": "Please select the configuration that needs synchronization", "Config.Sync.PleaseChooseCluster": "Select Cluster", "Config.History.Title": "Release History", "Config.History.MasterVersionPublish": "Main version release", "Config.History.MasterVersionRollback": "Main version rollback", "Config.History.GrayscaleOperator": "Grayscale operation", "Config.History.PublishHistory": "Release History", "Config.History.OperationType0": "Normal release", "Config.History.OperationType1": "Rollback", "Config.History.OperationType2": "Grayscale Release", "Config.History.OperationType3": "Update Gray Rules", "Config.History.OperationType4": "Full Grayscale Release", "Config.History.OperationType5": "Grayscale Release(Main Version Release)", "Config.History.OperationType6": "Grayscale Release(Main Version Rollback)", "Config.History.OperationType7": "Abandon Grayscale", "Config.History.OperationType8": "Delete Grayscale(Full Release)", "Config.History.UrgentPublish": "Emergency Release", "Config.History.LoadMore": "Load more", "Config.History.Abandoned": "Abandoned", "Config.History.RollbackTo": "Rollback To This Release", "Config.History.RollbackToTips": "Rollback released configuration to this release", "Config.History.ChangedItem": "Changed Configuration", "Config.History.ChangedItemTips": "View changes between this release and the previous release", "Config.History.AllItem": "Full Configuration", "Config.History.AllItemTips": "View all configurations for this release", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "Add", "Config.History.ChangeTypeModify": "Update", "Config.History.ChangeTypeDelete": "Delete", "Config.History.NoChange": "No configuration changes", "Config.History.NoItem": "No configuration", "Config.History.GrayscaleRule": "Grayscale Rule", "Config.History.GrayscaleAppId": "Grayscale AppId", "Config.History.GrayscaleIp": "Grayscale IP", "Config.History.NoGrayscaleRule": "No Grayscale Rule", "Config.History.NoPermissionTips": "You are not this project's administrator, nor you have edit or release permission for the namespace. Thus you cannot view the release history.", "Config.History.NoPublishHistory": "No release history", "Config.History.LoadingHistoryError": "No release history", "Config.Diff.Title": "Compare Configuration", "Config.Diff.FirstStep": "(Step 1: Select what to compare)", "Config.Diff.SecondStep": "(Step 2: View the differences)", "Config.Diff.PreviousStep": "Previous step", "Config.Diff.NextStep": "Next step", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "By comparing configuration, you can see configuration differences between multiple environments and clusters", "Config.Diff.DiffCluster": "Clusters to be compared", "Config.Diff.HasDiffComment": "Whether to compare comments or not", "Config.Diff.PleaseChooseTwoCluster": "Please select at least two clusters", "ConfigExport.Title": "Config Export", "ConfigExport.TitleTips" : "Super administrators will download the configuration of all projects, normal users will only download the configuration of their own projects", "ConfigExport.Download": "Download", "App.CreateProject": "Create Project", "App.AppIdTips": "(Application's unique identifiers)", "App.AppNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.AppOwnerTips": "(After enabling the application administrator allocation restrictions, the application owner and project administrator are default to current account, not subject to change)", "App.AppAdminTips1": "(The application owner has project administrator permission by default.", "App.AppAdminTips2": "Project administrators can create namespace, cluster, and assign user permissions)", "App.AccessKey.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.Title": "Manage Project", "App.Setting.Admin": "Administrators", "App.Setting.AdminTips": "(Project administrators have the following permissions: 1. Create namespace 2. Create clusters 3. Manage project and namespace permissions)", "App.Setting.Add": "Add", "App.Setting.BasicInfo": "Basic information", "App.Setting.ProjectName": "App Name", "App.Setting.ProjectNameTips": "(Suggested format xx-yy-zz e.g. apollo-server)", "App.Setting.ProjectOwner": "Owner", "App.Setting.Modify": "Modify project information", "App.Setting.Cancel": "Cancel", "App.Setting.NoPermissionTips": "You do not have permission to operate, please ask [{{users}}] to authorize", "App.Setting.DeleteAdmin": "Delete Administrator", "App.Setting.CanNotDeleteAllAdmin": "Cannot delete all administrators", "App.Setting.PleaseChooseUser": "Please select a user", "App.Setting.Added": "Add Successfully", "App.Setting.AddFailed": "Failed to Add", "App.Setting.Deleted": "Delete Successfully", "App.Setting.DeleteFailed": "Failed to Delete", "App.Setting.Modified": "Update Successfully", "Valdr.App.AppId.Size": "AppId cannot be longer than 64 characters", "Valdr.App.AppId.Required": "AppId cannot be empty", "Valdr.App.appName.Size": "The app name cannot be longer than 128 characters", "Valdr.App.appName.Required": "App name cannot be empty", "Valdr.Cluster.ClusterName.Size": "Cluster names cannot be longer than 32 characters", "Valdr.Cluster.ClusterName.Required": "Cluster name cannot be empty", "Valdr.AppNamespace.NamespaceName.Size": "Namespace name cannot be longer than 32 characters", "Valdr.AppNamespace.NamespaceName.Required": "Namespace name cannot be empty", "Valdr.AppNamespace.Comment.Size": "Comment length should not exceed 64 characters", "Valdr.Item.Key.Size": "Key cannot be longer than 128 characters", "Valdr.Item.Key.Required": "Key can't be empty", "Valdr.Item.Comment.Size": "Comment length should not exceed 256 characters", "Valdr.Release.ReleaseName.Size": "Release Name cannot be longer than 64 characters", "Valdr.Release.ReleaseName.Required": "Release Name cannot be empty", "Valdr.Release.Comment.Size": "Comment length should not exceed 256 characters", "ApolloConfirmDialog.DefaultConfirmBtnName": "OK", "ApolloConfirmDialog.SearchPlaceHolder": "Search Apps by appId, appName, configuration key", "RulesModal.ChooseInstances": "Select from the list of instances", "RulesModal.InvalidIp": "Illegal IP Address: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "Grayscale AppId cannot be empty", "RulesModal.AppIdExistsRule": "Rules already exist for AppId='{{appId}}'", "RulesModal.IpListCanNotBeNull": "IP list cannot be empty", "ItemModal.KeyExists": "Key='{{key}}' already exists", "ItemModal.AddedTips": "Add Successfully. need to release configuration to take effect", "ItemModal.AddFailed": "Failed to Add", "ItemModal.PleaseChooseCluster": "Please Select Cluster", "ItemModal.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ItemModal.ModifyFailed": "Failed to Update", "ItemModal.Tabs": "Tab-character", "ItemModal.NewLine": "Newline-character", "ItemModal.Space": "Blank-space", "ApolloNsPanel.LoadingHistoryError": "Failed to load change history", "ApolloNsPanel.LoadingGrayscaleError": "Failed to load change history", "ApolloNsPanel.Deleted": "Delete Successfully", "ApolloNsPanel.GrayscaleModified": "Update grayscale rules successfully", "ApolloNsPanel.GrayscaleModifyFailed": "Failed to update grayscale rules", "ApolloNsPanel.ModifiedTips": "Update Successfully. need to release configuration to take effect", "ApolloNsPanel.ModifyFailed": "Failed to Update", "ApolloNsPanel.GrammarIsRight": "Syntax is correct", "ReleaseModal.Published": "Release Successfully", "ReleaseModal.PublishFailed": "Failed to Release", "ReleaseModal.GrayscalePublished": "Grayscale Release Successfully", "ReleaseModal.GrayscalePublishFailed": "Failed to Grayscale Release", "ReleaseModal.AllPublished": "Full Release Successfully", "ReleaseModal.AllPublishFailed": "Failed to Full Release", "Rollback.NoRollbackList": "No released history to rollback", "Rollback.SameAsCurrentRelease": "This release is the same as current release", "Rollback.RollbackSuccessfully": "Rollback Successfully", "Rollback.RollbackFailed": "Failed to Rollback", "Revoke.RevokeFailed": "Failed to Revoke", "Revoke.RevokeSuccessfully": "Revoke Successfully" }
1
apolloconfig/apollo
3,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/i18n/zh-CN.json
{ "Common.Title": "Apollo配置中心", "Common.Nav.ShowNavBar": "显示导航栏", "Common.Nav.HideNavBar": "隐藏导航栏", "Common.Nav.Help": "帮助", "Common.Nav.AdminTools": "管理员工具", "Common.Nav.NonAdminTools": "工具", "Common.Nav.UserManage": "用户管理", "Common.Nav.SystemRoleManage": "系统权限管理", "Common.Nav.OpenMange": "开放平台授权管理", "Common.Nav.SystemConfig": "系统参数", "Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace", "Common.Nav.SystemInfo": "系统信息", "Common.Nav.ConfigExport": "配置导出", "Common.Nav.Logout": "退出", "Common.Department": "部门", "Common.Cluster": "集群", "Common.Environment": "环境", "Common.Email": "邮箱", "Common.AppId": "AppId", "Common.Namespace": "Namespace", "Common.AppName": "应用名称", "Common.AppOwner": "负责人", "Common.AppOwnerLong": "应用负责人", "Common.AppAdmin": "应用管理员", "Common.ClusterName": "集群名称", "Common.Submit": "提交", "Common.Save": "保存", "Common.Created": "创建成功", "Common.CreateFailed": "创建失败", "Common.Deleted": "删除成功", "Common.DeleteFailed": "删除失败", "Common.ReturnToIndex": "返回到应用首页", "Common.Cancel": "取消", "Common.Ok": "确定", "Common.Search": "查询", "Common.IsRootUser": "当前页面只对Apollo管理员开放", "Common.PleaseChooseDepartment": "请选择部门", "Common.PleaseChooseOwner": "请选择应用负责人", "Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试", "Component.DeleteNamespace.Title": "删除Namespace", "Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置,确定要删除吗?", "Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置,且页面会提示缺失Namespace(除非使用管理员工具删除AppNamespace),确定要删除吗?", "Component.GrayscalePublishRule.Title": "编辑灰度规则", "Component.GrayscalePublishRule.AppId": "灰度的AppId", "Component.GrayscalePublishRule.AcceptRule": "灰度应用规则", "Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例", "Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例", "Component.GrayscalePublishRule.IP": "灰度的IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)", "Component.GrayscalePublishRule.IpTips": "没找到你想要的IP?可以", "Component.GrayscalePublishRule.EnterIp": "手动输入IP", "Component.GrayscalePublishRule.EnterIpTips": "输入IP列表,英文逗号隔开,输入完后点击添加按钮", "Component.GrayscalePublishRule.Add": "添加", "Component.ConfigItem.Title": "添加配置项", "Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)", "Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项", "Component.ConfigItem.ModifyItem": "修改配置项", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错,如果需要检测Value中隐藏字符,请点击", "Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符", "Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "选择集群", "Component.MergePublish.Title": "全量发布", "Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支,并发布。", "Component.MergePublish.NextStep": "全量发布后,您希望", "Component.MergePublish.DeleteGrayscale": "删除灰度版本", "Component.MergePublish.ReservedGrayscale": "保留灰度版本", "Component.Namespace.Branch.IsChanged": "有修改", "Component.Namespace.Branch.ChangeUser": "当前修改者", "Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布", "Component.Namespace.Branch.GrayscalePublish": "灰度发布", "Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置", "Component.Namespace.Branch.AllPublish": "全量发布", "Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本", "Component.Namespace.Branch.DiscardGrayscale": "放弃灰度", "Component.Namespace.Branch.NoPermissionTips": "您不是该应用的管理员,也没有该Namespace的编辑或发布权限,无法查看配置信息。", "Component.Namespace.Branch.Tab.Configuration": "配置", "Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则", "Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表", "Component.Namespace.Branch.Tab.ChangeHistory": "更改历史", "Component.Namespace.Branch.Body.Item": "灰度的配置", "Component.Namespace.Branch.Body.AddedItem": "新增灰度配置", "Component.Namespace.Branch.Body.PublishState": "发布状态", "Component.Namespace.Branch.Body.ItemSort": "排序", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值", "Component.Namespace.Branch.Body.ItemComment": "备注", "Component.Namespace.Branch.Body.ItemLastModify": "最后修改人", "Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Branch.Body.ItemOperator": "操作", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.Branch.Body.ItemNoPublish": "未发布", "Component.Namespace.Branch.Body.ItemPublished": "已发布", "Component.Namespace.Branch.Body.ItemEffective": "已生效的配置", "Component.Namespace.Branch.Body.ClickToSee": "点击查看", "Component.Namespace.Branch.Body.DeletedItem": "删除的配置", "Component.Namespace.Branch.Body.Delete": "删", "Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置", "Component.Namespace.Branch.Body.ModifiedItem": "修改的配置", "Component.Namespace.Branch.Body.Modify": "改", "Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置", "Component.Namespace.Branch.Body.Added": "新", "Component.Namespace.Branch.Body.Op.Modify": "修改", "Component.Namespace.Branch.Body.Op.Delete": "删除", "Component.Namespace.MasterBranch.Body.Title": "主版本的配置", "Component.Namespace.MasterBranch.Body.PublishState": "发布状态", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "备注", "Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.MasterBranch.Body.ItemOperator": "操作", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布", "Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置", "Component.Namespace.MasterBranch.Body.ItemPublished": "已发布", "Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置", "Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找应用管理员申请权限.", "Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表", "Component.Namespace.Branch.GrayScaleRule.Operator": "操作", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "修改", "Component.Namespace.Branch.GrayScaleRule.Delete": "删除", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则", "Component.Namespace.Branch.Instance.RefreshList": "刷新列表", "Component.Namespace.Branch.Instance.ItemToSee": "查看配置", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间", "Component.Namespace.Branch.Instance.LoadMore": "刷新列表", "Component.Namespace.Branch.Instance.NoInstance": "无实例信息", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "新增", "Component.Namespace.Branch.History.Modified": "更新", "Component.Namespace.Branch.History.Deleted": "删除", "Component.Namespace.Branch.History.LoadMore": "加载更多", "Component.Namespace.Branch.History.NoHistory": "无更改历史", "Component.Namespace.Header.Title.Private": "私有", "Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.Public": "公共", "Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到", "Component.Namespace.Header.Title.Extend": "关联", "Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]", "Component.Namespace.Header.Title.Master": "主版本", "Component.Namespace.Header.Title.Grayscale": "灰度版本", "Component.Namespace.Master.LoadNamespace": "加载Namespace", "Component.Namespace.Master.LoadNamespaceTips": "加载Namespace", "Component.Namespace.Master.Items.Changed": "有修改", "Component.Namespace.Master.Items.ChangedUser": "当前修改者", "Component.Namespace.Master.Items.Publish": "发布", "Component.Namespace.Master.Items.PublishTips": "发布配置", "Component.Namespace.Master.Items.Rollback": "回滚", "Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置", "Component.Namespace.Master.Items.PublishHistory": "发布历史", "Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史", "Component.Namespace.Master.Items.Grant": "授权", "Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限", "Component.Namespace.Master.Items.Grayscale": "灰度", "Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本", "Component.Namespace.Master.Items.RequestPermission": "申请配置权限", "Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请", "Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "您不是该应用的管理员,也没有该Namespace的编辑或发布权限,无法查看配置信息。", "Component.Namespace.Master.Items.ItemList": "表格", "Component.Namespace.Master.Items.ItemListByText": "文本", "Component.Namespace.Master.Items.ItemHistory": "更改历史", "Component.Namespace.Master.Items.ItemInstance": "实例列表", "Component.Namespace.Master.Items.CopyText": "复制文本", "Component.Namespace.Master.Items.GrammarCheck": "语法检查", "Component.Namespace.Master.Items.CancelChanged": "取消修改", "Component.Namespace.Master.Items.Change": "修改配置", "Component.Namespace.Master.Items.SummitChanged": "提交修改", "Component.Namespace.Master.Items.SortByKey": "按Key过滤配置", "Component.Namespace.Master.Items.FilterItem": "过滤配置", "Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置", "Component.Namespace.Master.Items.SyncItem": "同步配置", "Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改", "Component.Namespace.Master.Items.RevokeItem": "撤销配置", "Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置", "Component.Namespace.Master.Items.DiffItem": "比较配置", "Component.Namespace.Master.Items.AddItem": "新增配置", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过,Apollo客户端将获取不到配置并记录404日志信息,请及时发布。", "Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤", "Component.Namespace.Master.Items.Body.PublishState": "发布状态", "Component.Namespace.Master.Items.Body.Sort": "排序", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "备注", "Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Master.Items.Body.ItemOperator": "操作", "Component.Namespace.Master.Items.Body.NoPublish": "未发布", "Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值", "Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值", "Component.Namespace.Master.Items.Body.Published": "已发布", "Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置", "Component.Namespace.Master.Items.Body.ClickToSee": "点击查看", "Component.Namespace.Master.Items.Body.Grayscale": "灰", "Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值", "Component.Namespace.Master.Items.Body.NewAdded": "新", "Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置", "Component.Namespace.Master.Items.Body.Modified": "改", "Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置", "Component.Namespace.Master.Items.Body.Deleted": "删", "Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置", "Component.Namespace.Master.Items.Body.ModifyTips": "修改", "Component.Namespace.Master.Items.Body.DeleteTips": "删除", "Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置", "Component.Namespace.Master.Items.Body.Public.Title": "公共的配置", "Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}应用里关联此namespace", "Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置", "Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory": "过滤更改历史", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey": "按key过滤更改历史", "Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息", "Component.PublishDeny.Title": "发布受限", "Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人,请找另一个具有当前namespace发布权的人操作发布~", "Component.PublishDeny.Tips2": "(如果是非工作时间或者特殊情况,您可以通过点击'紧急发布'按钮进行发布)", "Component.PublishDeny.EmergencyPublish": "紧急发布", "Component.PublishDeny.Close": "关闭", "Component.Publish.Title": "发布", "Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到,此次发布只会作用于当前环境:{{env}})", "Component.Publish.Grayscale": "灰度发布", "Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)", "Component.Publish.AllPublish": "全量发布", "Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)", "Component.Publish.ToSeeChange": "查看变更", "Component.Publish.PublishedValue": "发布的值", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "未发布的值", "Component.Publish.ModifyUser": "修改人", "Component.Publish.ModifyTime": "修改时间", "Component.Publish.NewAdded": "新", "Component.Publish.NewAddedTips": "新增的配置", "Component.Publish.Modified": "改", "Component.Publish.ModifiedTips": "修改的配置", "Component.Publish.Deleted": "删", "Component.Publish.DeletedTips": "删除的配置", "Component.Publish.MasterValue": "主版本值", "Component.Publish.GrayValue": "灰度版本的值", "Component.Publish.GrayPublishedValue": "灰度版本发布的值", "Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值", "Component.Publish.ItemNoChange": "配置没有变化", "Component.Publish.GrayItemNoChange": "灰度配置没有变化", "Component.Publish.NoGrayItems": "没有灰度的配置项", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "发布", "Component.Rollback.To": "回滚到", "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本,且当前版本作废,但不影响正在修改的配置。可在发布历史页面查看当前生效的版本", "Component.RollbackTo.Tips":"此操作将会回滚到此发布版本,且当前版本作废,但不影响正在修改的配置", "Component.Rollback.ClickToView": "点击查看", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "回滚前", "Component.Rollback.RollbackAfterValue": "回滚后", "Component.Rollback.Added": "新增", "Component.Rollback.Modified": "更新", "Component.Rollback.Deleted": "删除", "Component.Rollback.NoChange": "配置没有变化", "Component.Rollback.OpRollback": "回滚", "Component.ShowText.Title": "查看", "Login.Login": "登录", "Login.UserNameOrPasswordIncorrect": "用户名或密码错误", "Login.LogoutSuccessfully": "登出成功", "Index.MyProject": "我的应用", "Index.CreateProject": "创建应用", "Index.LoadMore": "加载更多", "Index.FavoriteItems": "收藏的应用", "Index.Topping": "置顶", "Index.FavoriteTip": "您还没有收藏过任何应用,在应用主页可以收藏应用哟~", "Index.RecentlyViewedItems": "最近浏览的应用", "Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败", "Index.Topped": "置顶成功", "Index.CancelledFavorite": "取消收藏成功", "Cluster.CreateCluster": "新建集群", "Cluster.Tips.1": "通过添加集群,可以使同一份程序在不同的集群(如不同的数据中心)使用不同的配置", "Cluster.Tips.2": "如果不同集群使用一样的配置,则没有必要创建集群", "Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字, 如SHAJQ(金桥数据中心)、SHAOY(欧阳数据中心)", "Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致", "Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)", "Cluster.ChooseEnvironment": "选择环境", "Cluster.LoadingEnvironmentError": "加载环境信息出错", "Cluster.ClusterCreated": "集群创建成功", "Cluster.ClusterCreateFailed": "集群创建失败", "Cluster.PleaseChooseEnvironment": "请选择环境", "Config.Title": "Apollo配置中心", "Config.AppIdNotFound": "不存在,", "Config.ClickByCreate": "点击创建", "Config.EnvList": "环境列表", "Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置", "Config.ProjectInfo": "应用信息", "Config.ModifyBasicProjectInfo": "修改应用基本信息", "Config.Favorite": "收藏", "Config.CancelFavorite": "取消收藏", "Config.MissEnv": "缺失的环境", "Config.MissNamespace": "缺失的Namespace", "Config.ProjectManage": "管理应用", "Config.AccessKeyManage": "管理密钥", "Config.CreateAppMissEnv": "补缺环境", "Config.CreateAppMissNamespace": "补缺Namespace", "Config.AddCluster": "添加集群", "Config.AddNamespace": "添加Namespace", "Config.CurrentlyOperatorEnv": "当前操作环境", "Config.DoNotRemindAgain": "不再提示", "Config.Note": "注意", "Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群(当前页面)的配置,属于 '{{name}}' 的实例会使用对应集群的配置!", "Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群(当前页面)的配置,只有当对应namespace在当前集群没有发布过配置时,才会使用default集群的配置。", "Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置,客户端获取不到未发布的配置,请及时发布。", "Config.RevokeItem.DialogTitle": "撤销配置", "Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销,确定要撤销么?", "Config.DeleteItem.DialogTitle": "删除配置", "Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?", "Config.PublishNoPermission.DialogTitle": "发布", "Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找应用管理员 '{{masterUsers}}' 分配发布权限", "Config.ModifyNoPermission.DialogTitle": "申请配置权限", "Config.ModifyNoPermission.DialogContent": "请找应用管理员 '{{masterUsers}}' 分配编辑或发布权限", "Config.MasterNoPermission.DialogTitle": "申请配置权限", "Config.MasterNoPermission.DialogContent": "您不是应用管理员, 只有应用管理员才有添加集群、namespace的权限。如需管理员权限,请找应用管理员 '{{masterUsers}}' 分配管理员权限", "Config.NamespaceLocked.DialogTitle": "编辑受限", "Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑,一次发布只能被一个人修改.", "Config.RollbackAlert.DialogTitle": "回滚", "Config.RollbackAlert.DialogContent": "确定要回滚吗?", "Config.EmergencyPublishAlert.DialogTitle": "紧急发布", "Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?", "Config.DeleteBranch.DialogTitle": "删除灰度", "Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置,确定要删除吗?", "Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示", "Config.UpdateRuleTips.DialogContent": "灰度规则已生效,但发现灰度版本有未发布的配置,这些配置需要手动灰度发布才会生效", "Config.MergeAndReleaseDeny.DialogTitle": "全量发布", "Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置,请先发布主版本配置", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示", "Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则,请配置灰度规则", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'),删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息,如确认相关实例都已经不再使用该Namespace配置,可以联系Apollo相关负责人删除实例信息(InstanceConfig)或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置,删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息,如确认相关实例都已经不再使用该Namespace配置,可以联系Apollo相关负责人删除实例信息(InstanceConfig)或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId", "Config.SyntaxCheckFailed.DialogTitle": "语法检查错误", "Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示", "Config.CreateBranchTips.DialogTitle": "创建灰度须知", "Config.CreateBranchTips.DialogContent": "通过创建灰度版本,您可以对某些配置做灰度测试<br>灰度流程为:<br>&nbsp;&nbsp;1.创建灰度版本 <br>&nbsp;&nbsp;2.配置灰度配置项<br>&nbsp;&nbsp;3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度,如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br>&nbsp;&nbsp;4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布,所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本,所有的客户端都会使用回主版本的配置<br>注意事项:<br>&nbsp;&nbsp;1.如果灰度版本已经有灰度发布过,那么修改灰度规则后,无需再次灰度发布就立即生效", "Config.ProjectMissEnvInfos": "当前应用有环境缺失,请点击页面左侧『补缺环境』补齐数据", "Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失,请点击页面左侧『补缺Namespace』补齐数据", "Config.SystemError": "系统出错,请重试或联系系统负责人", "Config.FavoriteSuccessfully": "收藏成功", "Config.FavoriteFailed": "收藏失败", "Config.CancelledFavorite": "取消收藏成功", "Config.CancelFavoriteFailed": "取消收藏失败", "Config.GetUserInfoFailed": "获取用户登录信息失败", "Config.LoadingAllNamespaceError": "加载配置信息出错", "Config.CancelFavoriteError": "取消收藏失败", "Config.Deleted": "删除成功", "Config.DeleteFailed": "删除失败", "Config.GrayscaleCreated": "创建灰度成功", "Config.GrayscaleCreateFailed": "创建灰度失败", "Config.BranchDeleted": "分支删除成功", "Config.BranchDeleteFailed": "分支删除失败", "Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace,必须先删除全部已关联的Namespace才能删除公共Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败", "Config.DeleteNamespaceNoPermissionFailedTips": "您没有应用管理员权限,只有管理员才能删除Namespace,请找应用管理员 [{{users}}] 删除Namespace", "Delete.Title": "删除应用、集群、AppNamespace", "Delete.DeleteApp": "删除应用", "Delete.DeleteAppTips": "(由于删除应用影响面较大,所以现在暂时只允许系统管理员删除,请确保没有客户端读取该应用的配置后再做删除动作)", "Delete.AppIdTips": "(删除前请先查询应用信息)", "Delete.AppInfo": "应用信息", "Delete.DeleteCluster": "删除集群", "Delete.DeleteClusterTips": "(由于删除集群影响面较大,所以现在暂时只允许系统管理员删除,请确保没有客户端读取该集群的配置后再做删除动作)", "Delete.EnvName": "环境名称", "Delete.ClusterNameTips": "(删除前请先查询应用集群信息)", "Delete.ClusterInfo": "集群信息", "Delete.DeleteNamespace": "删除AppNamespace", "Delete.DeleteNamespaceTips": "(注意,所有环境的Namespace和AppNamespace都会被删除!如果只是要删除某个环境的Namespace,让用户到应用页面中自行删除!)", "Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace,不过无法删除AppNamespace元信息,因为删除AppNamespace影响面较大,所以现在暂时只允许系统管理员删除,对于公共Namespace需要确保没有应用关联了该AppNamespace。", "Delete.AppNamespaceName": "AppNamespace名称", "Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀,例如apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace信息", "Delete.IsRootUserTips": "当前页面只对Apollo管理员开放", "Delete.PleaseEnterAppId": "请输入appId", "Delete.AppIdNotFound": "AppId: '{{appId}}'不存在!", "Delete.AppInfoContent": "应用名:'{{appName}}' 部门:'{{departmentName}}({{departmentId}})' 负责人:'{{ownerName}}'", "Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'?", "Delete.Deleted": "删除成功", "Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称", "Delete.ClusterInfoContent": "AppId:'{{appId}}' 环境:'{{env}}' 集群名称:'{{clusterName}}'", "Delete.ConfirmDeleteCluster": "确认删除集群?AppId:'{{appId}}' 环境:'{{env}}' 集群名称:'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称", "Delete.AppNamespaceInfoContent": "AppId:'{{appId}}' AppNamespace名称:'{{namespace}}' isPublic:'{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace?appId: '{{appId}}' 环境:'所有环境' AppNamespace名称:'{{namespace}}'", "Namespace.Title": "新建Namespace", "Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)", "Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置", "Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置,那么无需关联公共Namespace", "Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何应用读取", "Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置,或多个应用共享同一份配置的需求", "Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置,可以在其它应用那里关联公共Namespace,然后在关联的Namespace里面配置需要覆盖的配置即可", "Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置,那么就不需要在其它应用那里关联公共Namespace", "Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到", "Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置", "Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容", "Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持,可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象,也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去", "Namespace.CreateNamespace": "创建Namespace", "Namespace.AssociationPublicNamespace": "关联公共Namespace", "Namespace.ChooseCluster": "选择集群", "Namespace.NamespaceName": "名称", "Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀", "Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一,添加部门前缀有助于保证全局唯一性)", "Namespace.NamespaceType": "类型", "Namespace.NamespaceType.Public": "public", "Namespace.NamespaceType.Private": "private", "Namespace.Remark": "备注", "Namespace.Namespace": "namespace", "Namespace.PleaseChooseNamespace": "请选择Namespace", "Namespace.LoadingPublicNamespaceError": "加载公共namespace错误", "Namespace.LoadingAppInfoError": "加载App信息出错", "Namespace.PleaseChooseCluster": "请选择集群", "Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀:'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符", "ServiceConfig.Title": "应用配置", "ServiceConfig.Tips": "(维护ApolloPortalDB.ServerConfig表数据,如果已存在配置项则会覆盖,否则会创建配置项。配置更新后,一分钟后自动生效)", "ServiceConfig.Key": "key", "ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)", "ServiceConfig.Value": "value", "ServiceConfig.Comment": "comment", "ServiceConfig.Saved": "保存成功", "ServiceConfig.SaveFailed": "保存失败", "ServiceConfig.PleaseEnterKey": "请输入key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在,点击保存后会创建该配置项", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在,点击保存后会覆盖该配置项", "AccessKey.Tips.1": "每个环境最多可添加5个访问密钥", "AccessKey.Tips.2": "一旦该环境有启用的访问密钥,客户端将被要求配置密钥,否则无法获取配置", "AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置,配置方式如下(需要apollo-client 1.6.0+版本):", "AccessKey.Tips.3.1": "通过jvm参数-Dapollo.access-key.secret", "AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.access-key.secret(注意多环境secret不一样)", "AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥", "AccessKey.ConfigAccessKeys.Secret": "访问密钥", "AccessKey.ConfigAccessKeys.Status": "状态", "AccessKey.ConfigAccessKeys.LastModify": "最后修改人", "AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间", "AccessKey.ConfigAccessKeys.Operator": "操作", "AccessKey.Operator.Disable": "禁用", "AccessKey.Operator.Enable": "启用", "AccessKey.Operator.Disabled": "已禁用", "AccessKey.Operator.Enabled": "已启用", "AccessKey.Operator.Remove": "删除", "AccessKey.Operator.CreateSuccess": "访问密钥创建成功", "AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功", "AccessKey.Operator.EnabledSuccess": "访问密钥启用成功", "AccessKey.Operator.RemoveSuccess": "访问密钥删除成功", "AccessKey.Operator.CreateError": "访问密钥创建失败", "AccessKey.Operator.DisabledError": "访问密钥禁用失败", "AccessKey.Operator.EnabledError": "访问密钥启用失败", "AccessKey.Operator.RemoveError": "访问密钥删除失败", "AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?", "AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?", "AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?", "AccessKey.LoadError": "加载访问密钥出错", "SystemInfo.Title": "系统信息", "SystemInfo.SystemVersion": "系统版本", "SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置,可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置,更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。", "SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息,更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "(当前环境状态异常,请结合下方系统信息和AdminService的Check Health结果排查)", "SystemInfo.MetaServerAddress": "Meta server地址", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.Title": "系统权限管理", "SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限", "SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建应用)", "SystemRole.ChooseUser": "用户选择", "SystemRole.Add": "添加", "SystemRole.AuthorizedUser": "已拥有权限用户", "SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限", "SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改应用管理员)", "SystemRole.AppIdTips": "(请先查询应用信息)", "SystemRole.AppInfo": "应用信息", "SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master", "SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master", "SystemRole.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.PleaseChooseUser": "请选择用户名", "SystemRole.Added": "添加成功", "SystemRole.AddFailed": "添加失败", "SystemRole.Deleted": "删除成功", "SystemRole.DeleteFailed": "删除失败", "SystemRole.GetCanCreateProjectUsersError": "获取拥有创建应用权限的用户列表出错", "SystemRole.PleaseEnterAppId": "请输入appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在!", "SystemRole.AppInfoContent": "应用名:'{{appName}}' 部门:'{{departmentName}}({{departmentId}})' 负责人:'{{ownerName}}", "SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限?", "SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限?", "SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "UserMange.Title": "用户管理", "UserMange.TitleTips": "(仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth)", "UserMange.UserName": "用户登录账户", "UserMange.UserDisplayName": "用户名称", "UserMange.UserNameTips": "输入的用户名如果不存在,则新建。若已存在,则更新。", "UserMange.Pwd": "密码", "UserMange.Email": "邮箱", "UserMange.Created": "创建用户成功", "UserMange.CreateFailed": "创建用户失败", "Open.Manage.Title": "开放平台", "Open.Manage.CreateThirdApp": "创建第三方应用", "Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)", "Open.Manage.ThirdAppId": "第三方应用ID", "Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)", "Open.Manage.ThirdAppName": "第三方应用名称", "Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "Open.Manage.ProjectOwner": "应用负责人", "Open.Manage.Create": "创建", "Open.Manage.GrantPermission": "赋权", "Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "被管理的AppId", "Open.Manage.ManagedNamespace": "被管理的Namespace", "Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀,例如apollo.xml)", "Open.Manage.GrantType": "授权类型", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "环境", "Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限,如果提示Namespace's role does not exist,请先打开该Namespace的授权页面触发一下权限的初始化动作)", "Open.Manage.PleaseEnterAppId": "请输入appId", "Open.Manage.AppNotCreated": "App('{{appId}}')未创建,请先创建", "Open.Manage.GrantSuccessfully": "赋权成功", "Open.Manage.GrantFailed": "赋权失败", "Namespace.Role.Title": "权限管理", "Namespace.Role.GrantModifyTo": "修改权", "Namespace.Role.GrantModifyTo2": "(可以修改配置)", "Namespace.Role.AllEnv": "所有环境", "Namespace.Role.GrantPublishTo": "发布权", "Namespace.Role.GrantPublishTo2": "(可以发布配置)", "Namespace.Role.Add": "添加", "Namespace.Role.NoPermission": "您没有权限哟!", "Namespace.Role.InitNamespacePermissionError": "初始化授权出错", "Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错", "Namespace.Role.GetGrantUserError": "加载授权用户出错", "Namespace.Role.PleaseChooseUser": "请选择用户", "Namespace.Role.Added": "添加成功", "Namespace.Role.AddFailed": "添加失败", "Namespace.Role.Deleted": "删除成功", "Namespace.Role.DeleteFailed": "删除失败", "Config.Sync.Title": "同步配置", "Config.Sync.FistStep": "(第一步:选择同步信息)", "Config.Sync.SecondStep": "(第二步:检查Diff)", "Config.Sync.PreviousStep": "上一步", "Config.Sync.NextStep": "下一步", "Config.Sync.Sync": "同步", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "通过同步配置功能,可以使多个环境、集群间的配置保持一致", "Config.Sync.Tips2": "需要注意的是,同步完之后需要发布后才会对应用生效", "Config.Sync.SyncNamespace": "同步的Namespace", "Config.Sync.SyncToCluster": "同步到哪个集群", "Config.Sync.NeedToSyncItem": "需要同步的配置", "Config.Sync.SortByLastModifyTime": "按最后更新时间过滤", "Config.Sync.BeginTime": "开始时间", "Config.Sync.EndTime": "结束时间", "Config.Sync.Filter": "过滤", "Config.Sync.Rest": "重置", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "没有更新的配置", "Config.Sync.IgnoreSync": "忽略同步", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "同步前", "Config.Sync.Step2SyncAfter": "同步后", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "操作", "Config.Sync.NewAdd": "新增", "Config.Sync.NoSyncItem": "不同步该配置", "Config.Sync.Delete": "删除", "Config.Sync.Update": "更新", "Config.Sync.SyncSuccessfully": "同步成功!", "Config.Sync.SyncFailed": "同步失败!", "Config.Sync.LoadingItemsError": "加载配置出错", "Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置", "Config.Sync.PleaseChooseCluster": "请选择集群", "Config.History.Title": "发布历史", "Config.History.MasterVersionPublish": "主版本发布", "Config.History.MasterVersionRollback": "主版本回滚", "Config.History.GrayscaleOperator": "灰度操作", "Config.History.PublishHistory": "发布历史", "Config.History.OperationType0": "普通发布", "Config.History.OperationType1": "回滚", "Config.History.OperationType2": "灰度发布", "Config.History.OperationType3": "更新灰度规则", "Config.History.OperationType4": "灰度全量发布", "Config.History.OperationType5": "灰度发布(主版本发布)", "Config.History.OperationType6": "灰度发布(主版本回滚)", "Config.History.OperationType7": "放弃灰度", "Config.History.OperationType8": "删除灰度(全量发布)", "Config.History.UrgentPublish": "紧急发布", "Config.History.LoadMore": "加载更多", "Config.History.Abandoned": "已废弃", "Config.History.RollbackTo": "回滚到此版本", "Config.History.RollbackToTips": "回滚已发布的配置到此版本", "Config.History.ChangedItem": "变更的配置", "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更", "Config.History.AllItem": "全部配置", "Config.History.AllItemTips": "查看此次发布的所有配置信息", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "新增", "Config.History.ChangeTypeModify": "修改", "Config.History.ChangeTypeDelete": "删除", "Config.History.NoChange": "无配置更改", "Config.History.NoItem": "无配置", "Config.History.GrayscaleRule": "灰度规则", "Config.History.GrayscaleAppId": "灰度的AppId", "Config.History.GrayscaleIp": "灰度的IP", "Config.History.NoGrayscaleRule": "无灰度规则", "Config.History.NoPermissionTips": "您不是该应用的管理员,也没有该Namespace的编辑或发布权限,无法查看发布历史", "Config.History.NoPublishHistory": "无发布历史信息", "Config.History.LoadingHistoryError": "无发布历史信息", "Config.Diff.Title": "比较配置", "Config.Diff.FirstStep": "(第一步:选择比较信息)", "Config.Diff.SecondStep": "(第二步:查看差异配置)", "Config.Diff.PreviousStep": "上一步", "Config.Diff.NextStep": "下一步", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "通过比较配置功能,可以查看多个环境、集群间的配置差异", "Config.Diff.DiffCluster": "要比较的集群", "Config.Diff.HasDiffComment": "是否比较注释", "Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群", "ConfigExport.Title": "配置导出", "ConfigExport.TitleTips" : "超级管理员会下载所有应用的配置,普通用户只会下载自己应用的配置", "ConfigExport.Download": "下载", "App.CreateProject": "创建应用", "App.AppIdTips": "(应用唯一标识)", "App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.AppOwnerTips": "(开启应用管理员分配权限控制后,应用负责人和应用管理员默认为本账号,不可选择)", "App.AppAdminTips1": "(应用负责人默认具有应用管理员权限,", "App.AppAdminTips2": "应用管理员可以创建Namespace和集群、分配用户权限)", "App.AccessKey.NoPermissionTips": "您没有权限操作,请找 [{{users}}] 开通权限", "App.Setting.Title": "应用管理", "App.Setting.Admin": "管理员", "App.Setting.AdminTips": "(应用管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理应用、Namespace权限)", "App.Setting.Add": "添加", "App.Setting.BasicInfo": "基本信息", "App.Setting.ProjectName": "应用名称", "App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.Setting.ProjectOwner": "应用负责人", "App.Setting.Modify": "修改应用信息", "App.Setting.Cancel": "取消修改", "App.Setting.NoPermissionTips": "您没有权限操作,请找 [{{users}}] 开通权限", "App.Setting.DeleteAdmin": "删除管理员", "App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员", "App.Setting.PleaseChooseUser": "请选择用户", "App.Setting.Added": "添加成功", "App.Setting.AddFailed": "添加失败", "App.Setting.Deleted": "删除成功", "App.Setting.DeleteFailed": "删除失败", "App.Setting.Modified": "修改成功", "Valdr.App.AppId.Size": "AppId长度不能多于64个字符", "Valdr.App.AppId.Required": "AppId不能为空", "Valdr.App.appName.Size": "应用名称长度不能多于128个字符", "Valdr.App.appName.Required": "应用名称不能为空", "Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符", "Valdr.Cluster.ClusterName.Required": "集群名称不能为空", "Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符", "Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空", "Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符", "Valdr.Item.Key.Size": "Key长度不能多于128个字符", "Valdr.Item.Key.Required": "Key不能为空", "Valdr.Item.Comment.Size": "备注长度不能多于256个字符", "Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符", "Valdr.Release.ReleaseName.Required": "Release Name不能为空", "Valdr.Release.Comment.Size": "备注长度不能多于256个字符", "ApolloConfirmDialog.DefaultConfirmBtnName": "确认", "ApolloConfirmDialog.SearchPlaceHolder": "搜索应用Id、应用名、配置项Key", "RulesModal.ChooseInstances": "从实例列表中选择", "RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空", "RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则", "RulesModal.IpListCanNotBeNull": "IP列表不能为空", "ItemModal.KeyExists": "key='{{key}}' 已存在", "ItemModal.AddedTips": "添加成功,如需生效请发布", "ItemModal.AddFailed": "添加失败", "ItemModal.PleaseChooseCluster": "请选择集群", "ItemModal.ModifiedTips": "更新成功, 如需生效请发布", "ItemModal.ModifyFailed": "更新失败", "ItemModal.Tabs": "制表符", "ItemModal.NewLine": "换行符", "ItemModal.Space": "空格", "ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错", "ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错", "ApolloNsPanel.Deleted": "删除成功", "ApolloNsPanel.GrayscaleModified": "灰度规则更新成功", "ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败", "ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布", "ApolloNsPanel.ModifyFailed": "更新失败", "ApolloNsPanel.GrammarIsRight": "语法正确!", "ReleaseModal.Published": "发布成功", "ReleaseModal.PublishFailed": "发布失败", "ReleaseModal.GrayscalePublished": "灰度发布成功", "ReleaseModal.GrayscalePublishFailed": "灰度发布失败", "ReleaseModal.AllPublished": "全量发布成功", "ReleaseModal.AllPublishFailed": "全量发布失败", "Rollback.NoRollbackList": "没有可以回滚的发布历史", "Rollback.SameAsCurrentRelease": "该版本与当前版本相同", "Rollback.RollbackSuccessfully": "回滚成功", "Rollback.RollbackFailed": "回滚失败", "Revoke.RevokeFailed": "撤销失败", "Revoke.RevokeSuccessfully": "撤销成功" }
{ "Common.Title": "Apollo配置中心", "Common.Nav.ShowNavBar": "显示导航栏", "Common.Nav.HideNavBar": "隐藏导航栏", "Common.Nav.Help": "帮助", "Common.Nav.AdminTools": "管理员工具", "Common.Nav.NonAdminTools": "工具", "Common.Nav.UserManage": "用户管理", "Common.Nav.SystemRoleManage": "系统权限管理", "Common.Nav.OpenMange": "开放平台授权管理", "Common.Nav.SystemConfig": "系统参数", "Common.Nav.DeleteApp-Cluster-Namespace": "删除应用、集群、AppNamespace", "Common.Nav.SystemInfo": "系统信息", "Common.Nav.ConfigExport": "配置导出", "Common.Nav.Logout": "退出", "Common.Department": "部门", "Common.Cluster": "集群", "Common.Environment": "环境", "Common.Email": "邮箱", "Common.AppId": "AppId", "Common.Namespace": "Namespace", "Common.AppName": "应用名称", "Common.AppOwner": "负责人", "Common.AppOwnerLong": "应用负责人", "Common.AppAdmin": "应用管理员", "Common.ClusterName": "集群名称", "Common.Submit": "提交", "Common.Save": "保存", "Common.Created": "创建成功", "Common.CreateFailed": "创建失败", "Common.Deleted": "删除成功", "Common.DeleteFailed": "删除失败", "Common.ReturnToIndex": "返回到应用首页", "Common.Cancel": "取消", "Common.Ok": "确定", "Common.Search": "查询", "Common.IsRootUser": "当前页面只对Apollo管理员开放", "Common.PleaseChooseDepartment": "请选择部门", "Common.PleaseChooseOwner": "请选择应用负责人", "Common.LoginExpiredTips": "您的登录信息已过期,请刷新页面后重试", "Component.DeleteNamespace.Title": "删除Namespace", "Component.DeleteNamespace.PublicContent": "删除Namespace将导致实例获取不到此Namespace的配置,确定要删除吗?", "Component.DeleteNamespace.PrivateContent": "删除私有Namespace将导致实例获取不到此Namespace的配置,且页面会提示缺失Namespace(除非使用管理员工具删除AppNamespace),确定要删除吗?", "Component.GrayscalePublishRule.Title": "编辑灰度规则", "Component.GrayscalePublishRule.AppId": "灰度的AppId", "Component.GrayscalePublishRule.AcceptRule": "灰度应用规则", "Component.GrayscalePublishRule.AcceptPartInstance": "应用到部分实例", "Component.GrayscalePublishRule.AcceptAllInstance": "应用到所有的实例", "Component.GrayscalePublishRule.IP": "灰度的IP", "Component.GrayscalePublishRule.AppIdFilterTips": "(实例列表会根据输入的AppId自动过滤)", "Component.GrayscalePublishRule.IpTips": "没找到你想要的IP?可以", "Component.GrayscalePublishRule.EnterIp": "手动输入IP", "Component.GrayscalePublishRule.EnterIpTips": "输入IP列表,英文逗号隔开,输入完后点击添加按钮", "Component.GrayscalePublishRule.Add": "添加", "Component.ConfigItem.Title": "添加配置项", "Component.ConfigItem.TitleTips": "(温馨提示: 可以通过文本模式批量添加配置)", "Component.ConfigItem.AddGrayscaleItem": "添加灰度配置项", "Component.ConfigItem.ModifyItem": "修改配置项", "Component.ConfigItem.ItemKey": "Key", "Component.ConfigItem.ItemValue": "Value", "Component.ConfigItem.ItemValueTips": "注意: 隐藏字符(空格、换行符、制表符Tab)容易导致配置出错,如果需要检测Value中隐藏字符,请点击", "Component.ConfigItem.ItemValueShowDetection": "检测隐藏字符", "Component.ConfigItem.ItemValueNotHiddenChars": "无隐藏字符", "Component.ConfigItem.ItemComment": "Comment", "Component.ConfigItem.ChooseCluster": "选择集群", "Component.MergePublish.Title": "全量发布", "Component.MergePublish.Tips": "全量发布将会把灰度版本的配置合并到主分支,并发布。", "Component.MergePublish.NextStep": "全量发布后,您希望", "Component.MergePublish.DeleteGrayscale": "删除灰度版本", "Component.MergePublish.ReservedGrayscale": "保留灰度版本", "Component.Namespace.Branch.IsChanged": "有修改", "Component.Namespace.Branch.ChangeUser": "当前修改者", "Component.Namespace.Branch.ContinueGrayscalePublish": "继续灰度发布", "Component.Namespace.Branch.GrayscalePublish": "灰度发布", "Component.Namespace.Branch.MergeToMasterAndPublish": "合并到主版本并发布主版本配置", "Component.Namespace.Branch.AllPublish": "全量发布", "Component.Namespace.Branch.DiscardGrayscaleVersion": "废弃灰度版本", "Component.Namespace.Branch.DiscardGrayscale": "放弃灰度", "Component.Namespace.Branch.NoPermissionTips": "您不是该应用的管理员,也没有该Namespace的编辑或发布权限,无法查看配置信息。", "Component.Namespace.Branch.Tab.Configuration": "配置", "Component.Namespace.Branch.Tab.GrayscaleRule": "灰度规则", "Component.Namespace.Branch.Tab.GrayscaleInstance": "灰度实例列表", "Component.Namespace.Branch.Tab.ChangeHistory": "更改历史", "Component.Namespace.Branch.Body.Item": "灰度的配置", "Component.Namespace.Branch.Body.AddedItem": "新增灰度配置", "Component.Namespace.Branch.Body.PublishState": "发布状态", "Component.Namespace.Branch.Body.ItemSort": "排序", "Component.Namespace.Branch.Body.ItemKey": "Key", "Component.Namespace.Branch.Body.ItemMasterValue": "主版本的值", "Component.Namespace.Branch.Body.ItemGrayscaleValue": "灰度的值", "Component.Namespace.Branch.Body.ItemComment": "备注", "Component.Namespace.Branch.Body.ItemLastModify": "最后修改人", "Component.Namespace.Branch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Branch.Body.ItemOperator": "操作", "Component.Namespace.Branch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.Branch.Body.ItemNoPublish": "未发布", "Component.Namespace.Branch.Body.ItemPublished": "已发布", "Component.Namespace.Branch.Body.ItemEffective": "已生效的配置", "Component.Namespace.Branch.Body.ClickToSee": "点击查看", "Component.Namespace.Branch.Body.DeletedItem": "删除的配置", "Component.Namespace.Branch.Body.Delete": "删", "Component.Namespace.Branch.Body.ChangedFromMaster": "修改主版本的配置", "Component.Namespace.Branch.Body.ModifiedItem": "修改的配置", "Component.Namespace.Branch.Body.Modify": "改", "Component.Namespace.Branch.Body.AddedByGrayscale": "灰度版本特有的配置", "Component.Namespace.Branch.Body.Added": "新", "Component.Namespace.Branch.Body.Op.Modify": "修改", "Component.Namespace.Branch.Body.Op.Delete": "删除", "Component.Namespace.MasterBranch.Body.Title": "主版本的配置", "Component.Namespace.MasterBranch.Body.PublishState": "发布状态", "Component.Namespace.MasterBranch.Body.ItemKey": "Key", "Component.Namespace.MasterBranch.Body.ItemValue": "Value", "Component.Namespace.MasterBranch.Body.ItemComment": "备注", "Component.Namespace.MasterBranch.Body.ItemLastModify": "最后修改人", "Component.Namespace.MasterBranch.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.MasterBranch.Body.ItemOperator": "操作", "Component.Namespace.MasterBranch.Body.ClickToSeeItemValue": "点击查看已发布的值", "Component.Namespace.MasterBranch.Body.ItemNoPublish": "未发布", "Component.Namespace.MasterBranch.Body.ItemEffective": "已生效的配置", "Component.Namespace.MasterBranch.Body.ItemPublished": "已发布", "Component.Namespace.MasterBranch.Body.AddedItem": "新增的配置", "Component.Namespace.MasterBranch.Body.ModifyItem": "修改此灰度配置", "Component.Namespace.Branch.GrayScaleRule.NoPermissionTips": "您没有权限编辑灰度规则, 具有namespace修改权或者发布权的人员才可以编辑灰度规则. 如需要编辑灰度规则,请找应用管理员申请权限.", "Component.Namespace.Branch.GrayScaleRule.AppId": "灰度的AppId", "Component.Namespace.Branch.GrayScaleRule.IpList": "灰度的IP列表", "Component.Namespace.Branch.GrayScaleRule.Operator": "操作", "Component.Namespace.Branch.GrayScaleRule.ApplyToAllInstances": "ALL", "Component.Namespace.Branch.GrayScaleRule.Modify": "修改", "Component.Namespace.Branch.GrayScaleRule.Delete": "删除", "Component.Namespace.Branch.GrayScaleRule.AddNewRule": "新增规则", "Component.Namespace.Branch.Instance.RefreshList": "刷新列表", "Component.Namespace.Branch.Instance.ItemToSee": "查看配置", "Component.Namespace.Branch.Instance.InstanceAppId": "App ID", "Component.Namespace.Branch.Instance.InstanceClusterName": "Cluster Name", "Component.Namespace.Branch.Instance.InstanceDataCenter": "Data Center", "Component.Namespace.Branch.Instance.InstanceIp": "IP", "Component.Namespace.Branch.Instance.InstanceGetItemTime": "配置获取时间", "Component.Namespace.Branch.Instance.LoadMore": "刷新列表", "Component.Namespace.Branch.Instance.NoInstance": "无实例信息", "Component.Namespace.Branch.History.ItemType": "Type", "Component.Namespace.Branch.History.ItemKey": "Key", "Component.Namespace.Branch.History.ItemOldValue": "Old Value", "Component.Namespace.Branch.History.ItemNewValue": "New Value", "Component.Namespace.Branch.History.ItemComment": "Comment", "Component.Namespace.Branch.History.NewAdded": "新增", "Component.Namespace.Branch.History.Modified": "更新", "Component.Namespace.Branch.History.Deleted": "删除", "Component.Namespace.Branch.History.LoadMore": "加载更多", "Component.Namespace.Branch.History.NoHistory": "无更改历史", "Component.Namespace.Header.Title.Private": "私有", "Component.Namespace.Header.Title.PrivateTips": "私有namespace({{namespace.baseInfo.namespaceName}})的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.Public": "公共", "Component.Namespace.Header.Title.PublicTips": "namespace({{namespace.baseInfo.namespaceName}})的配置能被任何客户端读取到", "Component.Namespace.Header.Title.Extend": "关联", "Component.Namespace.Header.Title.ExtendTips": "namespace({{namespace.baseInfo.namespaceName}})的配置将会覆盖公共namespace的配置, 且合并之后的配置只能被AppId为{{appId}}的客户端读取到", "Component.Namespace.Header.Title.ExpandAndCollapse": "[展开/收缩]", "Component.Namespace.Header.Title.Master": "主版本", "Component.Namespace.Header.Title.Grayscale": "灰度版本", "Component.Namespace.Master.LoadNamespace": "加载Namespace", "Component.Namespace.Master.LoadNamespaceTips": "加载Namespace", "Component.Namespace.Master.Items.Changed": "有修改", "Component.Namespace.Master.Items.ChangedUser": "当前修改者", "Component.Namespace.Master.Items.Publish": "发布", "Component.Namespace.Master.Items.PublishTips": "发布配置", "Component.Namespace.Master.Items.Rollback": "回滚", "Component.Namespace.Master.Items.RollbackTips": "回滚已发布配置", "Component.Namespace.Master.Items.PublishHistory": "发布历史", "Component.Namespace.Master.Items.PublishHistoryTips": "查看发布历史", "Component.Namespace.Master.Items.Grant": "授权", "Component.Namespace.Master.Items.GrantTips": "配置修改、发布权限", "Component.Namespace.Master.Items.Grayscale": "灰度", "Component.Namespace.Master.Items.GrayscaleTips": "创建测试版本", "Component.Namespace.Master.Items.RequestPermission": "申请配置权限", "Component.Namespace.Master.Items.RequestPermissionTips": "您没有任何配置权限,请申请", "Component.Namespace.Master.Items.DeleteNamespace": "删除Namespace", "Component.Namespace.Master.Items.NoPermissionTips": "您不是该应用的管理员,也没有该Namespace的编辑或发布权限,无法查看配置信息。", "Component.Namespace.Master.Items.ItemList": "表格", "Component.Namespace.Master.Items.ItemListByText": "文本", "Component.Namespace.Master.Items.ItemHistory": "更改历史", "Component.Namespace.Master.Items.ItemInstance": "实例列表", "Component.Namespace.Master.Items.CopyText": "复制文本", "Component.Namespace.Master.Items.GrammarCheck": "语法检查", "Component.Namespace.Master.Items.CancelChanged": "取消修改", "Component.Namespace.Master.Items.Change": "修改配置", "Component.Namespace.Master.Items.SummitChanged": "提交修改", "Component.Namespace.Master.Items.SortByKey": "按Key过滤配置", "Component.Namespace.Master.Items.FilterItem": "过滤配置", "Component.Namespace.Master.Items.SyncItemTips": "同步各环境间配置", "Component.Namespace.Master.Items.SyncItem": "同步配置", "Component.Namespace.Master.Items.RevokeItemTips": "撤销配置的修改", "Component.Namespace.Master.Items.RevokeItem": "撤销配置", "Component.Namespace.Master.Items.DiffItemTips": "比较各环境间配置", "Component.Namespace.Master.Items.DiffItem": "比较配置", "Component.Namespace.Master.Items.AddItem": "新增配置", "Component.Namespace.Master.Items.Body.ItemsNoPublishedTips": "Tips: 此namespace从来没有发布过,Apollo客户端将获取不到配置并记录404日志信息,请及时发布。", "Component.Namespace.Master.Items.Body.FilterByKey": "输入key过滤", "Component.Namespace.Master.Items.Body.PublishState": "发布状态", "Component.Namespace.Master.Items.Body.Sort": "排序", "Component.Namespace.Master.Items.Body.ItemKey": "Key", "Component.Namespace.Master.Items.Body.ItemValue": "Value", "Component.Namespace.Master.Items.Body.ItemComment": "备注", "Component.Namespace.Master.Items.Body.ItemLastModify": "最后修改人", "Component.Namespace.Master.Items.Body.ItemLastModifyTime": "最后修改时间", "Component.Namespace.Master.Items.Body.ItemOperator": "操作", "Component.Namespace.Master.Items.Body.NoPublish": "未发布", "Component.Namespace.Master.Items.Body.NoPublishTitle": "点击查看已发布的值", "Component.Namespace.Master.Items.Body.NoPublishTips": "新增的配置,无发布的值", "Component.Namespace.Master.Items.Body.Published": "已发布", "Component.Namespace.Master.Items.Body.PublishedTitle": "已生效的配置", "Component.Namespace.Master.Items.Body.ClickToSee": "点击查看", "Component.Namespace.Master.Items.Body.Grayscale": "灰", "Component.Namespace.Master.Items.Body.HaveGrayscale": "该配置有灰度配置,点击查看灰度的值", "Component.Namespace.Master.Items.Body.NewAdded": "新", "Component.Namespace.Master.Items.Body.NewAddedTips": "新增的配置", "Component.Namespace.Master.Items.Body.Modified": "改", "Component.Namespace.Master.Items.Body.ModifiedTips": "修改的配置", "Component.Namespace.Master.Items.Body.Deleted": "删", "Component.Namespace.Master.Items.Body.DeletedTips": "删除的配置", "Component.Namespace.Master.Items.Body.ModifyTips": "修改", "Component.Namespace.Master.Items.Body.DeleteTips": "删除", "Component.Namespace.Master.Items.Body.Link.Title": "覆盖的配置", "Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem": "无覆盖的配置", "Component.Namespace.Master.Items.Body.Public.Title": "公共的配置", "Component.Namespace.Master.Items.Body.Public.Published": "已发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublish": "未发布的配置", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1": "当前公共namespace的所有者", "Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2": "没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}应用里关联此namespace", "Component.Namespace.Master.Items.Body.Public.NoPublished": "无发布的配置", "Component.Namespace.Master.Items.Body.Public.PublishedAndCover": "覆盖此配置", "Component.Namespace.Master.Items.Body.NoPublished.Title": "无公共的配置", "Component.Namespace.Master.Items.Body.NoPublished.PublishedValue": "已发布的值", "Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue": "未发布的值", "Component.Namespace.Master.Items.Body.HistoryView.ItemType": "Type", "Component.Namespace.Master.Items.Body.HistoryView.ItemKey": "Key", "Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue": "Old Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue": " New Value", "Component.Namespace.Master.Items.Body.HistoryView.ItemComment": "Comment", "Component.Namespace.Master.Items.Body.HistoryView.NewAdded": "新增", "Component.Namespace.Master.Items.Body.HistoryView.Updated": "更新", "Component.Namespace.Master.Items.Body.HistoryView.Deleted": "删除", "Component.Namespace.Master.Items.Body.HistoryView.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.HistoryView.NoHistory": "无更改历史", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory": "过滤更改历史", "Component.Namespace.Master.Items.Body.HistoryView.FilterHistory.SortByKey": "按key过滤更改历史", "Component.Namespace.Master.Items.Body.Instance.Tips": "实例说明:只展示最近一天访问过Apollo的实例", "Component.Namespace.Master.Items.Body.Instance.UsedNewItem": "使用最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem": "使用非最新配置的实例", "Component.Namespace.Master.Items.Body.Instance.AllInstance": "所有实例", "Component.Namespace.Master.Items.Body.Instance.RefreshList": "刷新列表", "Component.Namespace.Master.Items.Body.Instance.ToSeeItem": "查看配置", "Component.Namespace.Master.Items.Body.Instance.LoadMore": "加载更多", "Component.Namespace.Master.Items.Body.Instance.ItemAppId": "App ID", "Component.Namespace.Master.Items.Body.Instance.ItemCluster": "Cluster Name", "Component.Namespace.Master.Items.Body.Instance.ItemDataCenter": "Data Center", "Component.Namespace.Master.Items.Body.Instance.ItemIp": "IP", "Component.Namespace.Master.Items.Body.Instance.ItemGetTime": "配置获取时间", "Component.Namespace.Master.Items.Body.Instance.NoInstanceTips": "无实例信息", "Component.PublishDeny.Title": "发布受限", "Component.PublishDeny.Tips1": "您不能发布哟~{{env}}环境配置的编辑和发布必须为不同的人,请找另一个具有当前namespace发布权的人操作发布~", "Component.PublishDeny.Tips2": "(如果是非工作时间或者特殊情况,您可以通过点击'紧急发布'按钮进行发布)", "Component.PublishDeny.EmergencyPublish": "紧急发布", "Component.PublishDeny.Close": "关闭", "Component.Publish.Title": "发布", "Component.Publish.Tips": "(只有发布过的配置才会被客户端获取到,此次发布只会作用于当前环境:{{env}})", "Component.Publish.Grayscale": "灰度发布", "Component.Publish.GrayscaleTips": "(灰度发布的配置只会作用于在灰度规则中配置的实例)", "Component.Publish.AllPublish": "全量发布", "Component.Publish.AllPublishTips": "(全量发布的配置会作用于全部的实例)", "Component.Publish.ToSeeChange": "查看变更", "Component.Publish.PublishedValue": "发布的值", "Component.Publish.Changes": "Changes", "Component.Publish.Key": "Key", "Component.Publish.NoPublishedValue": "未发布的值", "Component.Publish.ModifyUser": "修改人", "Component.Publish.ModifyTime": "修改时间", "Component.Publish.NewAdded": "新", "Component.Publish.NewAddedTips": "新增的配置", "Component.Publish.Modified": "改", "Component.Publish.ModifiedTips": "修改的配置", "Component.Publish.Deleted": "删", "Component.Publish.DeletedTips": "删除的配置", "Component.Publish.MasterValue": "主版本值", "Component.Publish.GrayValue": "灰度版本的值", "Component.Publish.GrayPublishedValue": "灰度版本发布的值", "Component.Publish.GrayNoPublishedValue": "灰度版本未发布的值", "Component.Publish.ItemNoChange": "配置没有变化", "Component.Publish.GrayItemNoChange": "灰度配置没有变化", "Component.Publish.NoGrayItems": "没有灰度的配置项", "Component.Publish.Release": "Release Name", "Component.Publish.ReleaseComment": "Comment", "Component.Publish.OpPublish": "发布", "Component.Rollback.To": "回滚到", "Component.Rollback.Tips": "此操作将会回滚到上一个发布版本,且当前版本作废,但不影响正在修改的配置。可在发布历史页面查看当前生效的版本", "Component.RollbackTo.Tips":"此操作将会回滚到此发布版本,且当前版本作废,但不影响正在修改的配置", "Component.Rollback.ClickToView": "点击查看", "Component.Rollback.ItemType": "Type", "Component.Rollback.ItemKey": "Key", "Component.Rollback.RollbackBeforeValue": "回滚前", "Component.Rollback.RollbackAfterValue": "回滚后", "Component.Rollback.Added": "新增", "Component.Rollback.Modified": "更新", "Component.Rollback.Deleted": "删除", "Component.Rollback.NoChange": "配置没有变化", "Component.Rollback.OpRollback": "回滚", "Component.ShowText.Title": "查看", "Login.Login": "登录", "Login.UserNameOrPasswordIncorrect": "用户名或密码错误", "Login.LogoutSuccessfully": "登出成功", "Index.MyProject": "我的应用", "Index.CreateProject": "创建应用", "Index.LoadMore": "加载更多", "Index.FavoriteItems": "收藏的应用", "Index.Topping": "置顶", "Index.FavoriteCancel": "取消收藏", "Index.FavoriteTip": "您还没有收藏过任何项目,在项目主页可以收藏项目哟~", "Index.RecentlyViewedItems": "最近浏览的项目", "Index.GetCreateAppRoleFailed": "获取创建应用权限信息失败", "Index.Topped": "置顶成功", "Index.CancelledFavorite": "取消收藏成功", "Index.PublicNamespace": "公共Namespace", "Index.SearchNamespace": "搜索公共Namespace(AppId、Namespace)", "Index.PublicNamespaceTip": "您还没有任何公共Namespace,在你的项目中可以创建哟~", "Index.appTable.operation": "操作", "Index.appTable.Format": "格式", "Index.appTable.Comment": "备注", "Cluster.CreateCluster": "新建集群", "Cluster.Tips.1": "通过添加集群,可以使同一份程序在不同的集群(如不同的数据中心)使用不同的配置", "Cluster.Tips.2": "如果不同集群使用一样的配置,则没有必要创建集群", "Cluster.Tips.3": "Apollo默认会读取机器上/opt/settings/server.properties(linux)或C:\\opt\\settings\\server.properties(windows)文件中的idc属性作为集群名字, 如SHAJQ(金桥数据中心)、SHAOY(欧阳数据中心)", "Cluster.Tips.4": "在这里创建的集群名字需要和机器上server.properties中的idc属性一致", "Cluster.CreateNameTips": "(部署集群如:SHAJQ,SHAOY 或自定义集群如:SHAJQ-xx,SHAJQ-yy)", "Cluster.ChooseEnvironment": "选择环境", "Cluster.LoadingEnvironmentError": "加载环境信息出错", "Cluster.ClusterCreated": "集群创建成功", "Cluster.ClusterCreateFailed": "集群创建失败", "Cluster.PleaseChooseEnvironment": "请选择环境", "Config.Title": "Apollo配置中心", "Config.AppIdNotFound": "不存在,", "Config.ClickByCreate": "点击创建", "Config.EnvList": "环境列表", "Config.EnvListTips": "通过切换环境、集群来管理不同环境、集群的配置", "Config.ProjectInfo": "应用信息", "Config.ModifyBasicProjectInfo": "修改应用基本信息", "Config.Favorite": "收藏", "Config.CancelFavorite": "取消收藏", "Config.MissEnv": "缺失的环境", "Config.MissNamespace": "缺失的Namespace", "Config.ProjectManage": "管理应用", "Config.AccessKeyManage": "管理密钥", "Config.CreateAppMissEnv": "补缺环境", "Config.CreateAppMissNamespace": "补缺Namespace", "Config.AddCluster": "添加集群", "Config.AddNamespace": "添加Namespace", "Config.CurrentlyOperatorEnv": "当前操作环境", "Config.DoNotRemindAgain": "不再提示", "Config.Note": "注意", "Config.ClusterIsDefaultTipContent": "所有不属于 '{{name}}' 集群的实例会使用default集群(当前页面)的配置,属于 '{{name}}' 的实例会使用对应集群的配置!", "Config.ClusterIsCustomTipContent": "属于 '{{name}}' 集群的实例只会使用 '{{name}}' 集群(当前页面)的配置,只有当对应namespace在当前集群没有发布过配置时,才会使用default集群的配置。", "Config.HasNotPublishNamespace": "以下环境/集群有未发布的配置,客户端获取不到未发布的配置,请及时发布。", "Config.RevokeItem.DialogTitle": "撤销配置", "Config.RevokeItem.DialogContent": "当前命名空间下已修改但尚未发布的配置将被撤销,确定要撤销么?", "Config.DeleteItem.DialogTitle": "删除配置", "Config.DeleteItem.DialogContent": "您正在删除 Key 为 <b> '{{config.key}}' </b> Value 为 <b> '{{config.value}}' </b> 的配置.<br>确定要删除配置吗?", "Config.PublishNoPermission.DialogTitle": "发布", "Config.PublishNoPermission.DialogContent": "您没有发布权限哦~ 请找应用管理员 '{{masterUsers}}' 分配发布权限", "Config.ModifyNoPermission.DialogTitle": "申请配置权限", "Config.ModifyNoPermission.DialogContent": "请找应用管理员 '{{masterUsers}}' 分配编辑或发布权限", "Config.MasterNoPermission.DialogTitle": "申请配置权限", "Config.MasterNoPermission.DialogContent": "您不是应用管理员, 只有应用管理员才有添加集群、namespace的权限。如需管理员权限,请找应用管理员 '{{masterUsers}}' 分配管理员权限", "Config.NamespaceLocked.DialogTitle": "编辑受限", "Config.NamespaceLocked.DialogContent": "当前namespace正在被 '{{lockOwner}}' 编辑,一次发布只能被一个人修改.", "Config.RollbackAlert.DialogTitle": "回滚", "Config.RollbackAlert.DialogContent": "确定要回滚吗?", "Config.EmergencyPublishAlert.DialogTitle": "紧急发布", "Config.EmergencyPublishAlert.DialogContent": "确定要紧急发布吗?", "Config.DeleteBranch.DialogTitle": "删除灰度", "Config.DeleteBranch.DialogContent": "删除灰度会丢失灰度的配置,确定要删除吗?", "Config.UpdateRuleTips.DialogTitle": "更新灰度规则提示", "Config.UpdateRuleTips.DialogContent": "灰度规则已生效,但发现灰度版本有未发布的配置,这些配置需要手动灰度发布才会生效", "Config.MergeAndReleaseDeny.DialogTitle": "全量发布", "Config.MergeAndReleaseDeny.DialogContent": "namespace主版本有未发布的配置,请先发布主版本配置", "Config.GrayReleaseWithoutRulesTips.DialogTitle": "缺失灰度规则提示", "Config.GrayReleaseWithoutRulesTips.DialogContent": "灰度版本还没有配置任何灰度规则,请配置灰度规则", "Config.DeleteNamespaceDenyForMasterInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForMasterInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.instancesCount}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}'),删除Namespace将导致实例获取不到配置。<br>请到 <ins>“实例列表”</ins> 确认实例信息,如确认相关实例都已经不再使用该Namespace配置,可以联系Apollo相关负责人删除实例信息(InstanceConfig)或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForBranchInstance.DialogTitle": "删除Namespace警告信息", "Config.DeleteNamespaceDenyForBranchInstance.DialogContent": "发现有 <b>'{{deleteNamespaceContext.namespace.branch.latestReleaseInstances.total}}'</b> 个实例正在使用Namespace('{{deleteNamespaceContext.namespace.baseInfo.namespaceName}}')灰度版本的配置,删除Namespace将导致实例获取不到配置。<br> 请到 <ins>“灰度版本” => “实例列表”</ins> 确认实例信息,如确认相关实例都已经不再使用该Namespace配置,可以联系Apollo相关负责人删除实例信息(InstanceConfig)或等待实例24小时自动过期后再来删除。", "Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.DialogContent": "删除Namespace失败提示", "Config.DeleteNamespaceDenyForPublicNamespace.PleaseEnterAppId": "请输入appId", "Config.SyntaxCheckFailed.DialogTitle": "语法检查错误", "Config.SyntaxCheckFailed.DialogContent": "删除Namespace失败提示", "Config.CreateBranchTips.DialogTitle": "创建灰度须知", "Config.CreateBranchTips.DialogContent": "通过创建灰度版本,您可以对某些配置做灰度测试<br>灰度流程为:<br>&nbsp;&nbsp;1.创建灰度版本 <br>&nbsp;&nbsp;2.配置灰度配置项<br>&nbsp;&nbsp;3.配置灰度规则.如果是私有的namespace可以按照客户端的IP进行灰度,如果是公共的namespace则可以同时按AppId和客户端的IP进行灰度<br>&nbsp;&nbsp;4.灰度发布<br>灰度版本最终有两种结果:<b>全量发布和放弃灰度</b><br><b>全量发布</b>:灰度的配置合到主版本并发布,所有的客户端都会使用合并后的配置<br><b>放弃灰度</b>:删除灰度版本,所有的客户端都会使用回主版本的配置<br>注意事项:<br>&nbsp;&nbsp;1.如果灰度版本已经有灰度发布过,那么修改灰度规则后,无需再次灰度发布就立即生效", "Config.ProjectMissEnvInfos": "当前应用有环境缺失,请点击页面左侧『补缺环境』补齐数据", "Config.ProjectMissNamespaceInfos": "当前环境有Namespace缺失,请点击页面左侧『补缺Namespace』补齐数据", "Config.SystemError": "系统出错,请重试或联系系统负责人", "Config.FavoriteSuccessfully": "收藏成功", "Config.FavoriteFailed": "收藏失败", "Config.CancelledFavorite": "取消收藏成功", "Config.CancelFavoriteFailed": "取消收藏失败", "Config.GetUserInfoFailed": "获取用户登录信息失败", "Config.LoadingAllNamespaceError": "加载配置信息出错", "Config.CancelFavoriteError": "取消收藏失败", "Config.Deleted": "删除成功", "Config.DeleteFailed": "删除失败", "Config.GrayscaleCreated": "创建灰度成功", "Config.GrayscaleCreateFailed": "创建灰度失败", "Config.BranchDeleted": "分支删除成功", "Config.BranchDeleteFailed": "分支删除失败", "Config.DeleteNamespaceFailedTips": "以下应用已关联此公共Namespace,必须先删除全部已关联的Namespace才能删除公共Namespace", "Config.DeleteNamespaceNoPermissionFailedTitle": "删除失败", "Config.DeleteNamespaceNoPermissionFailedTips": "您没有应用管理员权限,只有管理员才能删除Namespace,请找应用管理员 [{{users}}] 删除Namespace", "Delete.Title": "删除应用、集群、AppNamespace", "Delete.DeleteApp": "删除应用", "Delete.DeleteAppTips": "(由于删除应用影响面较大,所以现在暂时只允许系统管理员删除,请确保没有客户端读取该应用的配置后再做删除动作)", "Delete.AppIdTips": "(删除前请先查询应用信息)", "Delete.AppInfo": "应用信息", "Delete.DeleteCluster": "删除集群", "Delete.DeleteClusterTips": "(由于删除集群影响面较大,所以现在暂时只允许系统管理员删除,请确保没有客户端读取该集群的配置后再做删除动作)", "Delete.EnvName": "环境名称", "Delete.ClusterNameTips": "(删除前请先查询应用集群信息)", "Delete.ClusterInfo": "集群信息", "Delete.DeleteNamespace": "删除AppNamespace", "Delete.DeleteNamespaceTips": "(注意,所有环境的Namespace和AppNamespace都会被删除!如果只是要删除某个环境的Namespace,让用户到应用页面中自行删除!)", "Delete.DeleteNamespaceTips2": "目前用户可以自行删除关联的Namespace和私有的Namespace,不过无法删除AppNamespace元信息,因为删除AppNamespace影响面较大,所以现在暂时只允许系统管理员删除,对于公共Namespace需要确保没有应用关联了该AppNamespace。", "Delete.AppNamespaceName": "AppNamespace名称", "Delete.AppNamespaceNameTips": "(非properties类型的namespace请加上类型后缀,例如apollo.xml)", "Delete.AppNamespaceInfo": "AppNamespace信息", "Delete.IsRootUserTips": "当前页面只对Apollo管理员开放", "Delete.PleaseEnterAppId": "请输入appId", "Delete.AppIdNotFound": "AppId: '{{appId}}'不存在!", "Delete.AppInfoContent": "应用名:'{{appName}}' 部门:'{{departmentName}}({{departmentId}})' 负责人:'{{ownerName}}'", "Delete.ConfirmDeleteAppId": "确认删除AppId:'{{appId}}'?", "Delete.Deleted": "删除成功", "Delete.PleaseEnterAppIdAndEnvAndCluster": "请输入appId、环境和集群名称", "Delete.ClusterInfoContent": "AppId:'{{appId}}' 环境:'{{env}}' 集群名称:'{{clusterName}}'", "Delete.ConfirmDeleteCluster": "确认删除集群?AppId:'{{appId}}' 环境:'{{env}}' 集群名称:'{{clusterName}}'", "Delete.PleaseEnterAppIdAndNamespace": "请输入appId和AppNamespace名称", "Delete.AppNamespaceInfoContent": "AppId:'{{appId}}' AppNamespace名称:'{{namespace}}' isPublic:'{{isPublic}}'", "Delete.ConfirmDeleteNamespace": "确认删除所有环境的AppNamespace和Namespace?appId: '{{appId}}' 环境:'所有环境' AppNamespace名称:'{{namespace}}'", "Namespace.Title": "新建Namespace", "Namespace.UnderstandMore": "(点击了解更多Namespace相关知识)", "Namespace.Link.Tips1": "应用可以通过关联公共namespace来覆盖公共Namespace的配置", "Namespace.Link.Tips2": "如果应用不需要覆盖公共Namespace的配置,那么无需关联公共Namespace", "Namespace.CreatePublic.Tips1": "公共的Namespace的配置能被任何应用读取", "Namespace.CreatePublic.Tips2": "通过创建公共Namespace可以实现公共组件的配置,或多个应用共享同一份配置的需求", "Namespace.CreatePublic.Tips3": "如果其它应用需要覆盖公共部分的配置,可以在其它应用那里关联公共Namespace,然后在关联的Namespace里面配置需要覆盖的配置即可", "Namespace.CreatePublic.Tips4": "如果其它应用不需要覆盖公共部分的配置,那么就不需要在其它应用那里关联公共Namespace", "Namespace.CreatePrivate.Tips1": "私有Namespace的配置只能被所属的应用获取到", "Namespace.CreatePrivate.Tips2": "通过创建一个私有的Namespace可以实现分组管理配置", "Namespace.CreatePrivate.Tips3": "私有Namespace的格式可以是xml、yml、yaml、json、txt. 您可以通过apollo-client中ConfigFile接口来获取非properties格式Namespace的内容", "Namespace.CreatePrivate.Tips4": "1.3.0及以上版本的apollo-client针对yaml/yml提供了更好的支持,可以通过ConfigService.getConfig(\"someNamespace.yml\")直接获取Config对象,也可以通过@EnableApolloConfig(\"someNamespace.yml\")或apollo.bootstrap.namespaces=someNamespace.yml注入yml配置到Spring/SpringBoot中去", "Namespace.CreateNamespace": "创建Namespace", "Namespace.AssociationPublicNamespace": "关联公共Namespace", "Namespace.ChooseCluster": "选择集群", "Namespace.NamespaceName": "名称", "Namespace.AutoAddDepartmentPrefix": "自动添加部门前缀", "Namespace.AutoAddDepartmentPrefixTips": "(公共Namespace的名称需要全局唯一,添加部门前缀有助于保证全局唯一性)", "Namespace.NamespaceType": "类型", "Namespace.NamespaceType.Public": "public", "Namespace.NamespaceType.Private": "private", "Namespace.Remark": "备注", "Namespace.Namespace": "namespace", "Namespace.PleaseChooseNamespace": "请选择Namespace", "Namespace.LoadingPublicNamespaceError": "加载公共namespace错误", "Namespace.LoadingAppInfoError": "加载App信息出错", "Namespace.PleaseChooseCluster": "请选择集群", "Namespace.CheckNamespaceNameLengthTip": "namespace名称不能大于32个字符. 部门前缀:'{{departmentLength}}'个字符, 名称{{namespaceLength}}个字符", "ServiceConfig.Title": "应用配置", "ServiceConfig.Tips": "(维护ApolloPortalDB.ServerConfig表数据,如果已存在配置项则会覆盖,否则会创建配置项。配置更新后,一分钟后自动生效)", "ServiceConfig.Key": "key", "ServiceConfig.KeyTips": "(修改配置前请先查询该配置信息)", "ServiceConfig.Value": "value", "ServiceConfig.Comment": "comment", "ServiceConfig.Saved": "保存成功", "ServiceConfig.SaveFailed": "保存失败", "ServiceConfig.PleaseEnterKey": "请输入key", "ServiceConfig.KeyNotExistsAndCreateTip": "Key: '{{key}}' 不存在,点击保存后会创建该配置项", "ServiceConfig.KeyExistsAndSaveTip": "Key: '{{key}}' 已存在,点击保存后会覆盖该配置项", "AccessKey.Tips.1": "每个环境最多可添加5个访问密钥", "AccessKey.Tips.2": "一旦该环境有启用的访问密钥,客户端将被要求配置密钥,否则无法获取配置", "AccessKey.Tips.3": "配置访问密钥防止非法客户端获取该应用配置,配置方式如下(需要apollo-client 1.6.0+版本):", "AccessKey.Tips.3.1": "通过jvm参数-Dapollo.access-key.secret", "AccessKey.Tips.3.2": "通过操作系统环境变量APOLLO_ACCESS_KEY_SECRET", "AccessKey.Tips.3.3": "通过META-INF/app.properties或application.properties配置apollo.access-key.secret(注意多环境secret不一样)", "AccessKey.NoAccessKeyServiceTips": "该环境没有配置访问密钥", "AccessKey.ConfigAccessKeys.Secret": "访问密钥", "AccessKey.ConfigAccessKeys.Status": "状态", "AccessKey.ConfigAccessKeys.LastModify": "最后修改人", "AccessKey.ConfigAccessKeys.LastModifyTime": "最后修改时间", "AccessKey.ConfigAccessKeys.Operator": "操作", "AccessKey.Operator.Disable": "禁用", "AccessKey.Operator.Enable": "启用", "AccessKey.Operator.Disabled": "已禁用", "AccessKey.Operator.Enabled": "已启用", "AccessKey.Operator.Remove": "删除", "AccessKey.Operator.CreateSuccess": "访问密钥创建成功", "AccessKey.Operator.DisabledSuccess": "访问密钥禁用成功", "AccessKey.Operator.EnabledSuccess": "访问密钥启用成功", "AccessKey.Operator.RemoveSuccess": "访问密钥删除成功", "AccessKey.Operator.CreateError": "访问密钥创建失败", "AccessKey.Operator.DisabledError": "访问密钥禁用失败", "AccessKey.Operator.EnabledError": "访问密钥启用失败", "AccessKey.Operator.RemoveError": "访问密钥删除失败", "AccessKey.Operator.DisabledTips": "是否确定禁用该访问密钥?", "AccessKey.Operator.EnabledTips": " 是否确定启用该访问密钥?", "AccessKey.Operator.RemoveTips": " 是否确定删除该访问密钥?", "AccessKey.LoadError": "加载访问密钥出错", "SystemInfo.Title": "系统信息", "SystemInfo.SystemVersion": "系统版本", "SystemInfo.Tips1": "环境列表来自于ApolloPortalDB.ServerConfig中的<strong>apollo.portal.envs</strong>配置,可以到<a href=\"{{serverConfigUrl}}\">系统参数</a>页面配置,更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>apollo.portal.envs - 可支持的环境列表</strong>章节。", "SystemInfo.Tips2": "Meta server地址展示了该环境配置的meta server信息,更多信息可以参考<a href=\"{{wikiUrl}}\">分布式部署指南</a>中的<strong>配置apollo-portal的meta service信息</strong>章节。", "SystemInfo.Active": "Active", "SystemInfo.ActiveTips": "(当前环境状态异常,请结合下方系统信息和AdminService的Check Health结果排查)", "SystemInfo.MetaServerAddress": "Meta server地址", "SystemInfo.ConfigServices": "Config Services", "SystemInfo.ConfigServices.Name": "Name", "SystemInfo.ConfigServices.InstanceId": "Instance Id", "SystemInfo.ConfigServices.HomePageUrl": "Home Page Url", "SystemInfo.ConfigServices.CheckHealth": "Check Health", "SystemInfo.NoConfigServiceTips": "No config service found!", "SystemInfo.Check": "check", "SystemInfo.AdminServices": "Admin Services", "SystemInfo.AdminServices.Name": "Name", "SystemInfo.AdminServices.InstanceId": "Instance Id", "SystemInfo.AdminServices.HomePageUrl": "Home Page Url", "SystemInfo.AdminServices.CheckHealth": "Check Health", "SystemInfo.NoAdminServiceTips": "No admin service found!", "SystemInfo.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.Title": "系统权限管理", "SystemRole.AddCreateAppRoleToUser": "为用户添加创建应用权限", "SystemRole.AddCreateAppRoleToUserTips": "(系统参数中设置 role.create-application.enabled=true 会限制只有超级管理员和拥有创建应用权限的帐号可以创建应用)", "SystemRole.ChooseUser": "用户选择", "SystemRole.Add": "添加", "SystemRole.AuthorizedUser": "已拥有权限用户", "SystemRole.ModifyAppAdminUser": "修改应用管理员分配权限", "SystemRole.ModifyAppAdminUserTips": "(系统参数中设置 role.manage-app-master.enabled=true 会限制只有超级管理员和拥有管理员分配权限的帐号可以修改应用管理员)", "SystemRole.AppIdTips": "(请先查询应用信息)", "SystemRole.AppInfo": "应用信息", "SystemRole.AllowAppMasterAssignRole": "允许此用户作为管理员时添加Master", "SystemRole.DeleteAppMasterAssignRole": "禁止此用户作为管理员时添加Master", "SystemRole.IsRootUser": "当前页面只对Apollo管理员开放", "SystemRole.PleaseChooseUser": "请选择用户名", "SystemRole.Added": "添加成功", "SystemRole.AddFailed": "添加失败", "SystemRole.Deleted": "删除成功", "SystemRole.DeleteFailed": "删除失败", "SystemRole.GetCanCreateProjectUsersError": "获取拥有创建应用权限的用户列表出错", "SystemRole.PleaseEnterAppId": "请输入appId", "SystemRole.AppIdNotFound": "AppId: '{{appId}}' 不存在!", "SystemRole.AppInfoContent": "应用名:'{{appName}}' 部门:'{{departmentName}}({{departmentId}})' 负责人:'{{ownerName}}", "SystemRole.DeleteMasterAssignRoleTips": "确认删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限?", "SystemRole.DeletedMasterAssignRoleTips": "删除AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "SystemRole.AllowAppMasterAssignRoleTips": "确认添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限?", "SystemRole.AllowedAppMasterAssignRoleTips": "添加AppId: '{{appId}}' 的用户: '{{userId}}' 分配应用管理员的权限成功", "UserMange.Title": "用户管理", "UserMange.TitleTips": "(仅对默认的Spring Security简单认证方式有效: -Dapollo_profile=github,auth)", "UserMange.UserName": "用户登录账户", "UserMange.UserDisplayName": "用户名称", "UserMange.UserNameTips": "输入的用户名如果不存在,则新建。若已存在,则更新。", "UserMange.Pwd": "密码", "UserMange.Email": "邮箱", "UserMange.Created": "创建用户成功", "UserMange.CreateFailed": "创建用户失败", "Open.Manage.Title": "开放平台", "Open.Manage.CreateThirdApp": "创建第三方应用", "Open.Manage.CreateThirdAppTips": "(说明: 第三方应用可以通过Apollo开放平台来对配置进行管理)", "Open.Manage.ThirdAppId": "第三方应用ID", "Open.Manage.ThirdAppIdTips": "(创建前请先查询第三方应用是否已经申请过)", "Open.Manage.ThirdAppName": "第三方应用名称", "Open.Manage.ThirdAppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "Open.Manage.ProjectOwner": "应用负责人", "Open.Manage.Create": "创建", "Open.Manage.GrantPermission": "赋权", "Open.Manage.GrantPermissionTips": "(Namespace级别权限包括: 修改、发布Namespace。应用级别权限包括: 创建Namespace、修改或发布应用下任何Namespace)", "Open.Manage.Token": "Token", "Open.Manage.ManagedAppId": "被管理的AppId", "Open.Manage.ManagedNamespace": "被管理的Namespace", "Open.Manage.ManagedNamespaceTips": "(非properties类型的namespace请加上类型后缀,例如apollo.xml)", "Open.Manage.GrantType": "授权类型", "Open.Manage.GrantType.Namespace": "Namespace", "Open.Manage.GrantType.App": "App", "Open.Manage.GrantEnv": "环境", "Open.Manage.GrantEnvTips": "(不选择则所有环境都有权限,如果提示Namespace's role does not exist,请先打开该Namespace的授权页面触发一下权限的初始化动作)", "Open.Manage.PleaseEnterAppId": "请输入appId", "Open.Manage.AppNotCreated": "App('{{appId}}')未创建,请先创建", "Open.Manage.GrantSuccessfully": "赋权成功", "Open.Manage.GrantFailed": "赋权失败", "Namespace.Role.Title": "权限管理", "Namespace.Role.GrantModifyTo": "修改权", "Namespace.Role.GrantModifyTo2": "(可以修改配置)", "Namespace.Role.AllEnv": "所有环境", "Namespace.Role.GrantPublishTo": "发布权", "Namespace.Role.GrantPublishTo2": "(可以发布配置)", "Namespace.Role.Add": "添加", "Namespace.Role.NoPermission": "您没有权限哟!", "Namespace.Role.InitNamespacePermissionError": "初始化授权出错", "Namespace.Role.GetEnvGrantUserError": "加载 '{{env}}' 授权用户出错", "Namespace.Role.GetGrantUserError": "加载授权用户出错", "Namespace.Role.PleaseChooseUser": "请选择用户", "Namespace.Role.Added": "添加成功", "Namespace.Role.AddFailed": "添加失败", "Namespace.Role.Deleted": "删除成功", "Namespace.Role.DeleteFailed": "删除失败", "Config.Sync.Title": "同步配置", "Config.Sync.FistStep": "(第一步:选择同步信息)", "Config.Sync.SecondStep": "(第二步:检查Diff)", "Config.Sync.PreviousStep": "上一步", "Config.Sync.NextStep": "下一步", "Config.Sync.Sync": "同步", "Config.Sync.Tips": "Tips", "Config.Sync.Tips1": "通过同步配置功能,可以使多个环境、集群间的配置保持一致", "Config.Sync.Tips2": "需要注意的是,同步完之后需要发布后才会对应用生效", "Config.Sync.SyncNamespace": "同步的Namespace", "Config.Sync.SyncToCluster": "同步到哪个集群", "Config.Sync.NeedToSyncItem": "需要同步的配置", "Config.Sync.SortByLastModifyTime": "按最后更新时间过滤", "Config.Sync.BeginTime": "开始时间", "Config.Sync.EndTime": "结束时间", "Config.Sync.Filter": "过滤", "Config.Sync.Rest": "重置", "Config.Sync.ItemKey": "Key", "Config.Sync.ItemValue": "Value", "Config.Sync.ItemCreateTime": "Create Time", "Config.Sync.ItemUpdateTime": "Update Time", "Config.Sync.NoNeedSyncItem": "没有更新的配置", "Config.Sync.IgnoreSync": "忽略同步", "Config.Sync.Step2Type": "Type", "Config.Sync.Step2Key": "Key", "Config.Sync.Step2SyncBefore": "同步前", "Config.Sync.Step2SyncAfter": "同步后", "Config.Sync.Step2Comment": "Comment", "Config.Sync.Step2Operator": "操作", "Config.Sync.NewAdd": "新增", "Config.Sync.NoSyncItem": "不同步该配置", "Config.Sync.Delete": "删除", "Config.Sync.Update": "更新", "Config.Sync.SyncSuccessfully": "同步成功!", "Config.Sync.SyncFailed": "同步失败!", "Config.Sync.LoadingItemsError": "加载配置出错", "Config.Sync.PleaseChooseNeedSyncItems": "请选择需要同步的配置", "Config.Sync.PleaseChooseCluster": "请选择集群", "Config.History.Title": "发布历史", "Config.History.MasterVersionPublish": "主版本发布", "Config.History.MasterVersionRollback": "主版本回滚", "Config.History.GrayscaleOperator": "灰度操作", "Config.History.PublishHistory": "发布历史", "Config.History.OperationType0": "普通发布", "Config.History.OperationType1": "回滚", "Config.History.OperationType2": "灰度发布", "Config.History.OperationType3": "更新灰度规则", "Config.History.OperationType4": "灰度全量发布", "Config.History.OperationType5": "灰度发布(主版本发布)", "Config.History.OperationType6": "灰度发布(主版本回滚)", "Config.History.OperationType7": "放弃灰度", "Config.History.OperationType8": "删除灰度(全量发布)", "Config.History.UrgentPublish": "紧急发布", "Config.History.LoadMore": "加载更多", "Config.History.Abandoned": "已废弃", "Config.History.RollbackTo": "回滚到此版本", "Config.History.RollbackToTips": "回滚已发布的配置到此版本", "Config.History.ChangedItem": "变更的配置", "Config.History.ChangedItemTips": "查看此次发布与上次版本的变更", "Config.History.AllItem": "全部配置", "Config.History.AllItemTips": "查看此次发布的所有配置信息", "Config.History.ChangeType": "Type", "Config.History.ChangeKey": "Key", "Config.History.ChangeValue": "Value", "Config.History.ChangeOldValue": "Old Value", "Config.History.ChangeNewValue": "New Value", "Config.History.ChangeTypeNew": "新增", "Config.History.ChangeTypeModify": "修改", "Config.History.ChangeTypeDelete": "删除", "Config.History.NoChange": "无配置更改", "Config.History.NoItem": "无配置", "Config.History.GrayscaleRule": "灰度规则", "Config.History.GrayscaleAppId": "灰度的AppId", "Config.History.GrayscaleIp": "灰度的IP", "Config.History.NoGrayscaleRule": "无灰度规则", "Config.History.NoPermissionTips": "您不是该应用的管理员,也没有该Namespace的编辑或发布权限,无法查看发布历史", "Config.History.NoPublishHistory": "无发布历史信息", "Config.History.LoadingHistoryError": "无发布历史信息", "Config.Diff.Title": "比较配置", "Config.Diff.FirstStep": "(第一步:选择比较信息)", "Config.Diff.SecondStep": "(第二步:查看差异配置)", "Config.Diff.PreviousStep": "上一步", "Config.Diff.NextStep": "下一步", "Config.Diff.TipsTitle": "Tips", "Config.Diff.Tips": "通过比较配置功能,可以查看多个环境、集群间的配置差异", "Config.Diff.DiffCluster": "要比较的集群", "Config.Diff.HasDiffComment": "是否比较注释", "Config.Diff.PleaseChooseTwoCluster": "请至少选择两个集群", "ConfigExport.Title": "配置导出", "ConfigExport.TitleTips" : "超级管理员会下载所有应用的配置,普通用户只会下载自己应用的配置", "ConfigExport.Download": "下载", "App.CreateProject": "创建应用", "App.AppIdTips": "(应用唯一标识)", "App.AppNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.AppOwnerTips": "(开启应用管理员分配权限控制后,应用负责人和应用管理员默认为本账号,不可选择)", "App.AppAdminTips1": "(应用负责人默认具有应用管理员权限,", "App.AppAdminTips2": "应用管理员可以创建Namespace和集群、分配用户权限)", "App.AccessKey.NoPermissionTips": "您没有权限操作,请找 [{{users}}] 开通权限", "App.Setting.Title": "应用管理", "App.Setting.Admin": "管理员", "App.Setting.AdminTips": "(应用管理员具有以下权限: 1. 创建Namespace 2. 创建集群 3. 管理应用、Namespace权限)", "App.Setting.Add": "添加", "App.Setting.BasicInfo": "基本信息", "App.Setting.ProjectName": "应用名称", "App.Setting.ProjectNameTips": "(建议格式 xx-yy-zz 例:apollo-server)", "App.Setting.ProjectOwner": "应用负责人", "App.Setting.Modify": "修改应用信息", "App.Setting.Cancel": "取消修改", "App.Setting.NoPermissionTips": "您没有权限操作,请找 [{{users}}] 开通权限", "App.Setting.DeleteAdmin": "删除管理员", "App.Setting.CanNotDeleteAllAdmin": "不能删除所有的管理员", "App.Setting.PleaseChooseUser": "请选择用户", "App.Setting.Added": "添加成功", "App.Setting.AddFailed": "添加失败", "App.Setting.Deleted": "删除成功", "App.Setting.DeleteFailed": "删除失败", "App.Setting.Modified": "修改成功", "Valdr.App.AppId.Size": "AppId长度不能多于64个字符", "Valdr.App.AppId.Required": "AppId不能为空", "Valdr.App.appName.Size": "应用名称长度不能多于128个字符", "Valdr.App.appName.Required": "应用名称不能为空", "Valdr.Cluster.ClusterName.Size": "集群名称长度不能多于32个字符", "Valdr.Cluster.ClusterName.Required": "集群名称不能为空", "Valdr.AppNamespace.NamespaceName.Size": "Namespace名称长度不能多于32个字符", "Valdr.AppNamespace.NamespaceName.Required": "Namespace名称不能为空", "Valdr.AppNamespace.Comment.Size": "备注长度不能多于64个字符", "Valdr.Item.Key.Size": "Key长度不能多于128个字符", "Valdr.Item.Key.Required": "Key不能为空", "Valdr.Item.Comment.Size": "备注长度不能多于256个字符", "Valdr.Release.ReleaseName.Size": "Release Name长度不能多于64个字符", "Valdr.Release.ReleaseName.Required": "Release Name不能为空", "Valdr.Release.Comment.Size": "备注长度不能多于256个字符", "ApolloConfirmDialog.DefaultConfirmBtnName": "确认", "ApolloConfirmDialog.SearchPlaceHolder": "搜索应用Id、应用名、配置项Key", "RulesModal.ChooseInstances": "从实例列表中选择", "RulesModal.InvalidIp": "不合法的IP地址: '{{ip}}'", "RulesModal.GrayscaleAppIdCanNotBeNull": "灰度的AppId不能为空", "RulesModal.AppIdExistsRule": "已经存在AppId='{{appId}}'的规则", "RulesModal.IpListCanNotBeNull": "IP列表不能为空", "ItemModal.KeyExists": "key='{{key}}' 已存在", "ItemModal.AddedTips": "添加成功,如需生效请发布", "ItemModal.AddFailed": "添加失败", "ItemModal.PleaseChooseCluster": "请选择集群", "ItemModal.ModifiedTips": "更新成功, 如需生效请发布", "ItemModal.ModifyFailed": "更新失败", "ItemModal.Tabs": "制表符", "ItemModal.NewLine": "换行符", "ItemModal.Space": "空格", "ApolloNsPanel.LoadingHistoryError": "加载修改历史记录出错", "ApolloNsPanel.LoadingGrayscaleError": "加载修改历史记录出错", "ApolloNsPanel.Deleted": "删除成功", "ApolloNsPanel.GrayscaleModified": "灰度规则更新成功", "ApolloNsPanel.GrayscaleModifyFailed": "灰度规则更新失败", "ApolloNsPanel.ModifiedTips": "更新成功, 如需生效请发布", "ApolloNsPanel.ModifyFailed": "更新失败", "ApolloNsPanel.GrammarIsRight": "语法正确!", "ReleaseModal.Published": "发布成功", "ReleaseModal.PublishFailed": "发布失败", "ReleaseModal.GrayscalePublished": "灰度发布成功", "ReleaseModal.GrayscalePublishFailed": "灰度发布失败", "ReleaseModal.AllPublished": "全量发布成功", "ReleaseModal.AllPublishFailed": "全量发布失败", "Rollback.NoRollbackList": "没有可以回滚的发布历史", "Rollback.SameAsCurrentRelease": "该版本与当前版本相同", "Rollback.RollbackSuccessfully": "回滚成功", "Rollback.RollbackFailed": "回滚失败", "Revoke.RevokeFailed": "撤销失败", "Revoke.RevokeSuccessfully": "撤销成功" }
1
apolloconfig/apollo
3,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/index.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="index"> <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" media='all' href="vendor/font-awesome.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <title>{{'Common.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div id="app-list" class="hidden" ng-controller="IndexController"> <section class="media create-app-list"> <aside class="media-left text-center"> <h5>{{'Index.MyProject' | translate }}</h5> </aside> <aside class="media-body"> <div class="app-panel col-md-2 text-center" ng-click="goToCreateAppPage()" ng-if="hasCreateApplicationPermission"> <div href="#" class="thumbnail create-btn hover cursor-pointer"> <img src="img/plus-white.png" /> <h5>{{'Index.CreateProject' | translate }}</h5> </div> </div> <div class="app-panel col-md-2 text-center" ng-repeat="app in createdApps" ng-click="goToAppHomePage(app.appId)"> <div href="#" class="thumbnail hover cursor-pointer"> <h4 ng-bind="app.appId"></h4> <h5 ng-bind="app.name"></h5> </div> </div> <div class="app-panel col-md-2 text-center" ng-show="hasMoreCreatedApps" ng-click="getUserCreatedApps()"> <div href="#" class="thumbnail hover cursor-pointer"> <img class="more-img" src="img/more.png" /> <h5>{{'Index.LoadMore' | translate }}</h5> </div> </div> </aside> </section> <section class="media favorites-app-list"> <aside class="media-left text-center"> <h5>{{'Index.FavoriteItems' | translate }}</h5> </aside> <aside class="media-body"> <div class="app-panel col-md-2 text-center" ng-repeat="app in favorites" ng-click="goToAppHomePage(app.appId)" ng-mouseover="toggleOperationBtn(app)" ng-mouseout="toggleOperationBtn(app)"> <div class="thumbnail hover"> <h4 ng-bind="app.appId"></h4> <h5 ng-bind="app.name"></h5> <p class="operate-panel" ng-show="app.showOperationBtn"> <button class="btn btn-default btn-xs" title="{{'Index.Topping' | translate }}" ng-click="toTop(app.favoriteId);$event.stopPropagation();"> <img src="img/top.png" class="i-15"> </button> <button class="btn btn-default btn-xs" title="{{'Index.FavoriteCancel' | translate }}" ng-click="deleteFavorite(app.favoriteId);$event.stopPropagation();"> <img src="img/like.png" class="i-15"> </button> </p> </div> </div> <div class="col-md-2 text-center" ng-show="hasMoreFavorites" ng-click="getUserFavorites()"> <div href="#" class="thumbnail hover cursor-pointer"> <img class="more-img" src="img/more.png" /> <h5>{{'Index.LoadMore' | translate }}</h5> </div> </div> <div class="no-favorites text-center" ng-show="!favorites || favorites.length == 0"> <h4>{{'Index.FavoriteTip' | translate }}</h4> </div> </aside> </section> <section class="media visit-app-list" ng-show="visitedApps && visitedApps.length"> <aside class="media-left text-center"> <h5>{{'Index.RecentlyViewedItems' | translate }}</h5> </aside> <aside class="media-body"> <div class="app-panel col-md-2 text-center" ng-repeat="app in visitedApps" ng-click="goToAppHomePage(app.appId)"> <div class="thumbnail hover"> <h4 ng-bind="app.appId"></h4> <h5 ng-bind="app.name"></h5> </div> </div> </aside> </section> </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 type="application/javascript"> function getPrefixPath() { $.ajax({ method: 'get', async: false, url: 'prefix-path', success: function (res) { window.localStorage.setItem("prefixPath", res); } }) } getPrefixPath(); </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/FavoriteService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/controller/IndexController.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="index"> <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" media='all' href="vendor/font-awesome.min.css"> <link rel="stylesheet" type="text/css" href="styles/common-style.css"> <link rel="stylesheet" type="text/css" href="vendor/iconfont/iconfont.css"> <title>{{'Common.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div id="app-list" class="hidden" ng-controller="IndexController"> <div class="left-bar"> <div class="app-list-show" ng-click="changeContent('1')" ng-show="whichContent==='1'"> <i class="iconfont icon-02"></i> <h5>{{'Index.MyProject' | translate }}</h5> </div> <div class="app-list-choose" ng-click="changeContent('1')" ng-show="whichContent!=='1'"> <i class="iconfont icon-02" style="color: #666"></i> <h5>{{'Index.MyProject' | translate }}</h5> </div> <div class="favorite-list-show" ng-click="changeContent('2')" ng-show="whichContent==='2'"> <i class="iconfont icon-icon"></i> <h5>{{'Index.FavoriteItems' | translate }}</h5> </div> <div class="favorite-list-choose" ng-click="changeContent('2')" ng-show="whichContent!=='2'"> <i class="iconfont icon-icon" style="color: #666"></i> <h5>{{'Index.FavoriteItems' | translate }}</h5> </div> <div class="public-namespace-list-show" ng-click="changeContent('3')" ng-show="whichContent==='3'"> <i class="iconfont icon-gonggongziliao"></i> <h5>{{'Index.PublicNamespace' | translate }}</h5> </div> <div class="public-namespace-list-choose" ng-click="changeContent('3')" ng-show="whichContent!=='3'"> <i class="iconfont icon-gonggongziliao" style="color: #666"></i> <h5>{{'Index.PublicNamespace' | translate }}</h5> </div> <div class="visited-list-show" ng-click="changeContent('4')" ng-show="visitedApps && visitedApps.length && whichContent==='4'"> <i class="iconfont icon-liulan"></i> <h5>{{'Index.RecentlyViewedItems' | translate }}</h5> </div> <div class="visited-list-choose" ng-click="changeContent('4')" ng-show="visitedApps && visitedApps.length && whichContent!=='4'"> <i class="iconfont icon-liulan" style="color: #666"></i> <h5>{{'Index.RecentlyViewedItems' | translate }}</h5> </div> </div> <div class="main-table"> <div class="create-app-list" ng-show="whichContent==='1'"> <div style="width: 180px;margin-left: 30px" ng-click="goToCreateAppPage()" ng-if="hasCreateApplicationPermission"> <div href="#" class="thumbnail create-btn hover cursor-pointer" style="display: flex;justify-content: center;align-items: center"> <div><img src="img/plus-white.png" /></div> <div style="margin-left: 5px"><h5>{{'Index.CreateProject' | translate }}</h5></div> </div> </div> <div class="display-table" ng-show="createdApps.length > 0"> <table> <tr> <th style="width: 15%">{{'Common.AppId' | translate }}</th> <th style="width: 25%">{{'Common.AppName' | translate }}</th> <th style="width: 20%">{{'Common.Department' | translate }}</th> <th style="width: 20%">{{'Common.AppOwner' | translate }}</th> <th style="width: 20%">{{'Common.Email' | translate }}</th> </tr> <tr ng-repeat="app in createdApps" ng-click="goToAppHomePage(app.appId)" href="#" class="hover cursor-pointer"> <td style="width: 15%">{{ app.appId }}</td> <td style="width: 25%">{{ app.name }}</td> <td style="width: 20%">{{ app.orgName + '(' + app.orgId + ')' }}</td> <td style="width: 20%">{{ app.ownerName }}</td> <td style="width: 20%">{{ app.ownerEmail }}</td> </tr> </table> </div> <div ng-show="!hasMoreCreatedApps" style="height: 15px"></div> <div style="width: 180px;margin-left: 30px;margin-top: 20px" ng-show="hasMoreCreatedApps" ng-click="getUserCreatedApps()"> <div href="#" class="thumbnail hover cursor-pointer" style="display: flex;justify-content: center;align-items: center"> <div><img class="more-img" src="img/more.png" /></div> <div style="margin-left: 5px"><h5>{{'Index.LoadMore' | translate }}</h5></div> </div> </div> </div> <div class="favorites-app-list" ng-show="whichContent==='2'"> <div class="display-table" ng-show="favorites && favorites.length > 0"> <table> <tr> <th style="width: 15%">{{'Common.AppId' | translate }}</th> <th style="width: 25%">{{'Common.AppName' | translate }}</th> <th style="width: 15%">{{'Common.Department' | translate }}</th> <th style="width: 15%">{{'Common.AppOwner' | translate }}</th> <th style="width: 20%">{{'Common.Email' | translate }}</th> <th style="width: 10%">{{'Index.appTable.operation' | translate }}</th> </tr> <tr ng-repeat="app in favorites" ng-click="goToAppHomePage(app.appId)" ng-mouseover="toggleOperationBtn(app)" ng-mouseout="toggleOperationBtn(app)" href="#" class="hover cursor-pointer"> <td style="width: 15%">{{ app.appId }}</td> <td style="width: 25%">{{ app.name }}</td> <td style="width: 15%">{{ app.orgName + '(' + app.orgId + ')' }}</td> <td style="width: 15%">{{ app.ownerName }}</td> <td style="width: 20%">{{ app.ownerEmail }}</td> <td style="width: 10%"> <button class="btn btn-default btn-xs" title="{{'Index.Topping' | translate }}" ng-click="toTop(app.favoriteId);$event.stopPropagation();"> <img src="img/top.png" class="i-15"> </button> <button class="btn btn-default btn-xs" title="{{'Index.FavoriteCancel' | translate }}" ng-click="deleteFavorite(app.favoriteId);$event.stopPropagation();"> <img src="img/like.png" class="i-15"> </button> </td> </tr> </table> </div> <div class="no-favorites text-center" ng-show="!favorites || favorites.length == 0"> <h4>{{'Index.FavoriteTip' | translate }}</h4> </div> <div ng-show="!hasMoreFavorites" style="height: 15px"></div> <div style="width: 180px;margin-left: 30px;margin-top: 20px" ng-show="hasMoreFavorites" ng-click="getUserFavorites()"> <div href="#" class="thumbnail hover cursor-pointer" style="display: flex;justify-content: center;align-items: center"> <div><img class="more-img" src="img/more.png" /></div> <div style="margin-left: 5px"><h5>{{'Index.LoadMore' | translate }}</h5></div> </div> </div> </div> <div class="public-namespace-list" ng-show="whichContent==='3'"> <div class="wapper"> <select id="public-name-spaces-search-list" data-placeholder="{{'Index.SearchNamespace' | translate }}" style="width: 350px"> <option value=""></option> </select> </div> <div class="display-table" ng-show="publicNamespaces.length > 0"> <table> <tr> <th style="width: 20%">{{'Common.Namespace' | translate }}</th> <th style="width: 30%">{{'Common.AppId' | translate }}</th> <th style="width: 20%">{{'Index.appTable.Format' | translate }}</th> <th style="width: 30%">{{'Index.appTable.Comment' | translate }}</th> </tr> <tr ng-repeat="app in publicNamespaces" ng-click="goToAppHomePage(app.appId)" href="#" class="hover cursor-pointer"> <td style="width: 20%">{{ app.name }}</td> <td style="width: 30%">{{ app.appId }}</td> <td style="width: 20%">{{ app.format }}</td> <td style="width: 30%">{{ app.comment }}</td> </tr> </table> </div> <div class="no-public text-center" ng-show="!publicNamespaces || publicNamespaces.length == 0"> <h4>{{'Index.PublicNamespaceTip' | translate }}</h4> </div> <div ng-show="!hasMorePublicNamespaces" style="height: 15px"></div> <div style="width: 180px;margin-left: 30px;margin-top: 20px" ng-show="hasMorePublicNamespaces" ng-click="morePublicNamespace()"> <div href="#" class="thumbnail hover cursor-pointer" style="display: flex;justify-content: center;align-items: center"> <div><img class="more-img" src="img/more.png" /></div> <div style="margin-left: 5px"><h5>{{'Index.LoadMore' | translate }}</h5></div> </div> </div> </div> <div class="visit-app-list" ng-show="whichContent==='4'"> <div class="display-table" ng-show="visitedApps.length > 0"> <table> <tr> <th style="width: 15%">{{'Common.AppId' | translate }}</th> <th style="width: 25%">{{'Common.AppName' | translate }}</th> <th style="width: 20%">{{'Common.Department' | translate }}</th> <th style="width: 20%">{{'Common.AppOwner' | translate }}</th> <th style="width: 20%">{{'Common.Email' | translate }}</th> </tr> <tr ng-repeat="app in visitedApps" ng-click="goToAppHomePage(app.appId)" href="#" class="hover cursor-pointer"> <td style="width: 15%">{{ app.appId }}</td> <td style="width: 25%">{{ app.name }}</td> <td style="width: 20%">{{ app.orgName + '(' + app.orgId + ')' }}</td> <td style="width: 20%">{{ app.ownerName }}</td> <td style="width: 20%">{{ app.ownerEmail }}</td> </tr> </table> </div> <div style="height: 15px"></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 type="application/javascript"> function getPrefixPath() { $.ajax({ method: 'get', async: false, url: 'prefix-path', success: function (res) { window.localStorage.setItem("prefixPath", res); } }) } getPrefixPath(); </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/FavoriteService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/controller/IndexController.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/controller/IndexController.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. * */ index_module.controller('IndexController', ['$scope', '$window', '$translate', 'toastr', 'AppUtil', 'AppService', 'UserService', 'FavoriteService', IndexController]); function IndexController($scope, $window, $translate, toastr, AppUtil, AppService, UserService, FavoriteService) { $scope.userId = ''; $scope.getUserCreatedApps = getUserCreatedApps; $scope.getUserFavorites = getUserFavorites; $scope.goToAppHomePage = goToAppHomePage; $scope.goToCreateAppPage = goToCreateAppPage; $scope.toggleOperationBtn = toggleOperationBtn; $scope.toTop = toTop; $scope.deleteFavorite = deleteFavorite; function initCreateApplicationPermission() { AppService.has_create_application_role($scope.userId).then( function (value) { $scope.hasCreateApplicationPermission = value.hasCreateApplicationPermission; }, function (reason) { toastr.warning(AppUtil.errorMsg(reason), $translate.instant('Index.GetCreateAppRoleFailed')); } ) } UserService.load_user().then(function (result) { $scope.userId = result.userId; $scope.createdAppPage = 0; $scope.createdApps = []; $scope.hasMoreCreatedApps = true; $scope.favoritesPage = 0; $scope.favorites = []; $scope.hasMoreFavorites = true; $scope.visitedApps = []; initCreateApplicationPermission(); getUserCreatedApps(); getUserFavorites(); initUserVisitedApps(); }); function getUserCreatedApps() { var size = 10; AppService.find_app_by_owner($scope.userId, $scope.createdAppPage, size) .then(function (result) { $scope.createdAppPage += 1; $scope.hasMoreCreatedApps = result.length == size; if (!result || result.length == 0) { return; } result.forEach(function (app) { $scope.createdApps.push(app); }); }) } function getUserFavorites() { var size = 11; FavoriteService.findFavorites($scope.userId, '', $scope.favoritesPage, size) .then(function (result) { $scope.favoritesPage += 1; $scope.hasMoreFavorites = result.length == size; if ($scope.favoritesPage == 1) { $("#app-list").removeClass("hidden"); } if (!result || result.length == 0) { return; } var appIds = []; result.forEach(function (favorite) { appIds.push(favorite.appId); }); AppService.find_apps(appIds.join(",")) .then(function (apps) { //sort var appIdMapApp = {}; apps.forEach(function (app) { appIdMapApp[app.appId] = app; }); result.forEach(function (favorite) { var app = appIdMapApp[favorite.appId]; if (!app) { return; } app.favoriteId = favorite.id; $scope.favorites.push(app); }); }); }) } function initUserVisitedApps() { var VISITED_APPS_STORAGE_KEY = "VisitedAppsV2"; var visitedAppsObject = JSON.parse(localStorage.getItem(VISITED_APPS_STORAGE_KEY)); if (!visitedAppsObject) { visitedAppsObject = {}; } var userVisitedApps = visitedAppsObject[$scope.userId]; if (userVisitedApps && userVisitedApps.length > 0) { AppService.find_apps(userVisitedApps.join(",")) .then(function (apps) { //sort var appIdMapApp = {}; apps.forEach(function (app) { appIdMapApp[app.appId] = app; }); userVisitedApps.forEach(function (appId) { var app = appIdMapApp[appId]; if (app) { $scope.visitedApps.push(app); } }); }); } } function goToCreateAppPage() { $window.location.href = AppUtil.prefixPath() + "/app.html"; } function goToAppHomePage(appId) { $window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + appId; } function toggleOperationBtn(app) { app.showOperationBtn = !app.showOperationBtn; } function toTop(favoriteId) { FavoriteService.toTop(favoriteId).then(function () { toastr.success($translate.instant('Index.Topped')); refreshFavorites(); }) } function deleteFavorite(favoriteId) { FavoriteService.deleteFavorite(favoriteId).then(function () { toastr.success($translate.instant('Index.CancelledFavorite')); refreshFavorites(); }) } function refreshFavorites() { $scope.favoritesPage = 0; $scope.favorites = []; $scope.hasMoreFavorites = true; getUserFavorites(); } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ index_module.controller('IndexController', ['$scope', '$window', '$translate', 'toastr', 'AppUtil', 'AppService', 'UserService', 'FavoriteService', 'NamespaceService', IndexController] ) function IndexController($scope, $window, $translate, toastr, AppUtil, AppService, UserService, FavoriteService, NamespaceService) { $scope.userId = ''; $scope.whichContent = '1'; $scope.getUserCreatedApps = getUserCreatedApps; $scope.getUserFavorites = getUserFavorites; $scope.getPublicNamespaces = getPublicNamespaces; $scope.goToAppHomePage = goToAppHomePage; $scope.goToCreateAppPage = goToCreateAppPage; $scope.toggleOperationBtn = toggleOperationBtn; $scope.toTop = toTop; $scope.deleteFavorite = deleteFavorite; $scope.morePublicNamespace = morePublicNamespace; $scope.changeContent = changeContent; function initCreateApplicationPermission() { AppService.has_create_application_role($scope.userId).then( function (value) { $scope.hasCreateApplicationPermission = value.hasCreateApplicationPermission; }, function (reason) { toastr.warning(AppUtil.errorMsg(reason), $translate.instant('Index.GetCreateAppRoleFailed')); } ) } UserService.load_user().then(function (result) { $scope.userId = result.userId; $scope.createdAppPage = 0; $scope.createdApps = []; $scope.hasMoreCreatedApps = true; $scope.favoritesPage = 0; $scope.favorites = []; $scope.hasMoreFavorites = true; $scope.publicNamespacePage = 0; $scope.publicNamespaces = []; $scope.hasMorePublicNamespaces = true; $scope.allPublicNamespaces = []; $scope.visitedApps = []; initCreateApplicationPermission(); getUserCreatedApps(); getUserFavorites(); getPublicNamespaces(); initUserVisitedApps(); }); function getUserCreatedApps() { var size = 10; AppService.find_app_by_owner($scope.userId, $scope.createdAppPage, size) .then(function (result) { $scope.createdAppPage += 1; $scope.hasMoreCreatedApps = result.length == size; if (!result || result.length == 0) { return; } result.forEach(function (app) { $scope.createdApps.push(app); }); }) } function getUserFavorites() { var size = 11; FavoriteService.findFavorites($scope.userId, '', $scope.favoritesPage, size) .then(function (result) { $scope.favoritesPage += 1; $scope.hasMoreFavorites = result.length == size; if ($scope.favoritesPage == 1) { $("#app-list").removeClass("hidden"); } if (!result || result.length == 0) { return; } var appIds = []; result.forEach(function (favorite) { appIds.push(favorite.appId); }); AppService.find_apps(appIds.join(",")) .then(function (apps) { //sort var appIdMapApp = {}; apps.forEach(function (app) { appIdMapApp[app.appId] = app; }); result.forEach(function (favorite) { var app = appIdMapApp[favorite.appId]; if (!app) { return; } app.favoriteId = favorite.id; $scope.favorites.push(app); }); }); }) } function getPublicNamespaces() { NamespaceService.find_public_namespaces() .then(function (result) { $scope.allPublicNamespaces = result; morePublicNamespace(); var selectResult = []; angular.forEach(result,function (app) { selectResult.push({ id: app.appId, text: app.appId + ' / ' + app.name }) }); $('#public-name-spaces-search-list').select2({ data: selectResult, }); $('#public-name-spaces-search-list').on('select2:select', function () { var selected = $('#public-name-spaces-search-list').select2('data'); if (selected && selected.length) { goToAppHomePage(selected[0].id) } }); }) } function initUserVisitedApps() { var VISITED_APPS_STORAGE_KEY = "VisitedAppsV2"; var visitedAppsObject = JSON.parse(localStorage.getItem(VISITED_APPS_STORAGE_KEY)); if (!visitedAppsObject) { visitedAppsObject = {}; } var userVisitedApps = visitedAppsObject[$scope.userId]; if (userVisitedApps && userVisitedApps.length > 0) { AppService.find_apps(userVisitedApps.join(",")) .then(function (apps) { //sort var appIdMapApp = {}; apps.forEach(function (app) { appIdMapApp[app.appId] = app; }); userVisitedApps.forEach(function (appId) { var app = appIdMapApp[appId]; if (app) { $scope.visitedApps.push(app); } }); }); } } function goToCreateAppPage() { $window.location.href = AppUtil.prefixPath() + "/app.html"; } function goToAppHomePage(appId) { $window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + appId; } function toggleOperationBtn(app) { app.showOperationBtn = !app.showOperationBtn; } function toTop(favoriteId) { FavoriteService.toTop(favoriteId).then(function () { toastr.success($translate.instant('Index.Topped')); refreshFavorites(); }) } function deleteFavorite(favoriteId) { FavoriteService.deleteFavorite(favoriteId).then(function () { toastr.success($translate.instant('Index.CancelledFavorite')); refreshFavorites(); }) } function refreshFavorites() { $scope.favoritesPage = 0; $scope.favorites = []; $scope.hasMoreFavorites = true; getUserFavorites(); } function morePublicNamespace() { var rest = $scope.allPublicNamespaces.length - $scope.publicNamespacePage * 10; if (rest <= 10) { for (var i = 0; i < rest; i++) { $scope.publicNamespaces.push($scope.allPublicNamespaces[$scope.publicNamespacePage * 10 + i]) } $scope.hasMorePublicNamespaces = false; } else { for (var j = 0; j < 10; j++) { $scope.publicNamespaces.push($scope.allPublicNamespaces[$scope.publicNamespacePage * 10 + j]) } } $scope.publicNamespacePage += 1; } function changeContent(contentIndex) { $scope.whichContent = contentIndex; } }
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/styles/common-style.css
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ html, body { height: 100% } body { min-width: 960px; color: #797979; padding: 0 !important; margin: 0 !important; font-size: 13px; background: #f1f2f7; font-family: 'Open Sans', sans-serif; } body.modal-open { overflow: visible; } a { cursor: pointer; } p, td, span { word-wrap: break-word; word-break: break-all; } .modal { overflow-y: scroll } .no-radius { border-radius: 0; } .no-border { border: 0; } .no-margin { margin: 0; } .cursor-pointer { cursor: pointer; } .word-break { word-wrap: break-word; word-break: break-all; } .border { border: solid 1px #c3c3c3; } .padding-top-5 { padding-top: 5px; } .border-top { border-top: 1px solid #ddd; } .bg-info, .bg-primary, .bg-warning, .bg-danger, .bg-success { padding: 10px; } .active { background: #f5f5f5; } .label-default-light { background: #A4A4A4 } .panel-default .panel-heading { color: #797979; } pre, .pre { white-space: pre-wrap; /* Since CSS 2.1 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -pre-wrap; /* Opera 4-6 */ white-space: -o-pre-wrap; /* Opera 7 */ word-wrap: break-word; /* Internet Explorer 5.5+ */ } .hover:hover { background: #f5f5f5; cursor: pointer } .highlight { background: #ffa; } .hide-border-top { border-top: 0; } .logo { font-size: 25px; } .i-20 { height: 20px; width: 20px; } .i-25-20 { height: 20px; width: 25px; } .i-15 { height: 15px; width: 15px; } .badge { padding: 1px 4px; } .badge-grey { background: #777; color: #fff; } .badge-white { background: #ffffff; color: #6c6c6c; } .modal-dialog { width: 960px; } .apollo-container { min-height: 90%; } .navbar-default { background-color: #ffffff; border: none; } .footer { width: 100%; height: 75px; margin-top: 50px; padding-top: 25px; } /*panel*/ .panel { border: 1px solid #ddd; } table th { text-align: center; } /*首页*/ .site-notice { padding: 5px 0; text-align: center; background-color: #208d4e; } .site-notice { color: #eee; } .site-notice a { color: #ffffff; } .site-notice a:hover { text-underline: none; } .site-notice .selected { color: #000000; } .site-header { position: relative; text-align: center; background-color: #27AE60; color: #fff; margin-bottom: 0; } .site-header .search { border: 2px solid #27AE60; -webkit-box-shadow: none; box-shadow: none; font-size: 16px; padding: 13px 30px; border-radius: 0; height: auto; text-align: center; } .site-header h1 { font-size: 56px; text-shadow: -5px 5px 0 rgba(0, 0, 0, 0.1); } .site-header span { font-size: 14px; } .list-group { margin-top: 20px; } .side-bar { position: absolute; width: 195px; top: 85px; left: 15px; margin-bottom: 25px; background: #f1f2f7; z-index: 2; } .position-absolute { position: absolute; } .position-fix { position: fixed; } .view-mode-1 { margin-left: 235px; padding-right: 15px; } .view-mode-2 { padding: 0 15px; } .side-bar-switch { padding: 10px 10px; margin-right: 30px; } .node-treeview { color: #797979; } .apps .apps-description { color: gray; font-size: 16px; } .app { padding-bottom: 75px; overflow: hidden; } .app td, th { display: table-cell; vertical-align: inherit; } .project-info { width: 100%; } .panel-heading { border-color: #eff2f7; font-size: 16px; font-weight: 300; } .panel-heading .header-namespace { min-width: 415px; } .panel-heading .header-buttons { min-width: 405px; } #treeview .list-group { margin: 0; } #treeview .list-group .list-group-item { border: 0; border-top: 1px solid #eff2f7; } .project-info th { text-align: right; padding: 4px 2px; width: 5em; } .project-info td { border-bottom: 1px dotted gray; padding: 4px 6px; } .project-info td span { margin-right: 5px; } #config-info { min-height: 500px; } #config-edit { border: 1px solid #ddd; border-radius: 3px; } #config-edit .panel-heading { border-bottom: 1px solid #ddd; } .tocify-header { font-size: 14px; } .tocify-subheader { font-size: 13px; } .config-item-container .panel { border-radius: 0; } .config-item-container .panel-heading b { font-size: 18px; } .config-item-container .form-control[disabled] { background: #ffffff; border: 0; } .config-item-container .second-panel-heading .ns_btn { width: 25px; height: 25px; border-top: solid 1px #ffffff; } .config-item-container .second-panel-heading .nav-tabs .node_active { border-bottom: 3px #1b6d85 solid; } .config-item-container .config-items { height: 500px; overflow: scroll; } .config-item-container .panel-heading button img { width: 12px; height: 12px; } .config-item-container .panel-heading a img { width: 12px; height: 12px; } .config-item-container .panel-heading li img { width: 12px; height: 12px; } .config-item-container .second-panel-heading { height: 45px; } .config-item-container .second-panel-heading a { height: 35px; color: #555; font-size: 13px; margin-bottom: 2px; } .namespace-panel { border-top: 0; border-bottom: 0; } .namespace-panel .namespace-name { font-size: 20px; } .namespace-panel .namespace-label { margin-left: 5px; } .namespace-panel .namespace-attribute-panel { margin-left: 0; color: #fff; border-top: 0; background: #f1f2f7; } .namespace-panel .namespace-attribute-public { margin-right:5px; } .namespace-panel .second-panel-heading .nav-tabs { border-bottom: 0; } .namespace-panel .namespace-view-table td img { cursor: pointer; width: 23px; height: 23px; } .namespace-panel .namespace-view-table table { table-layout: inherit; } .namespace-panel .namespace-view-table td { word-wrap: break-word; } .namespace-panel .namespace-view-table .glyphicon { cursor: pointer; } .namespace-panel .namespace-view-table .search-input { padding: 15px 0 15px 10px; } .namespace-panel .namespace-view-table .search-input input { width: 500px; } .namespace-panel .no-config-panel { padding: 15px 0; } .namespace-panel .history-view { padding: 10px 20px; } .namespace-panel .instance-view .btn-primary .badge { color: #337ab7; background-color: #fff; } .namespace-panel .instance-view .btn-default .badge { background: #777; color: #fff; } .namespace-panel .rules-manage-view { padding: 45px 20px; } .line { width: 20px; border: 1px solid #ddd; } .editable-table > tbody > tr > td { padding: 4px } .editable-text { padding-left: 4px; padding-top: 4px; padding-bottom: 4px; display: inline-block; } .editable-table tbody > tr > td > .controls { / / width: 100 % } .editable-input { padding-left: 3px; } .editable-input.input-sm { height: 30px; font-size: 14px; padding-top: 4px; padding-bottom: 4px; } .list-group-item .btn-title { color: gray; font-size: 14px; margin: 0; } .list-group-item .icon-project-manage { background: url(../img/manage.png) no-repeat; } .list-group-item .icon-accesskey-manage { background: url(../img/secret.png) no-repeat; } .list-group-item .icon-plus-orange { background: url(../img/add.png) no-repeat; } .list-group-item .icon-text { background-size: 20px; background-position: 5% 50%; padding: 5px 0 5px 50px; } /*搜索框*/ ::-webkit-scrollbar { width: 0; height: 0; background: rgba(255, 255, 255, 0); } ::-webkit-scrollbar-thumb:vertical { background: rgba(255, 255, 255, 0); border-radius: 10px; } ::-webkit-scrollbar-thumb:vertical:hover { background: rgba(255, 255, 255, 0); } .app-list { width: 350px; height: 200px; position: absolute; margin-left: 0; cursor: pointer; background: #ffffff; border: 1px solid #ddd; overflow-y: scroll; z-index: 1000; } .app-list .app-item { font-size: medium; padding: 5px 10px; } .app-list .app-item:hover { color: #ffffff; background: #C3C3C3; } .app-list .app-selected { color: #ffffff; background: #c3c3c3; } .item-container { border: solid 1px #f1f2f7; margin-top: 15px; padding: 20px 15px } .item-container .item-info { margin-left: 5px; } .change-type-mark { width: 5px; height: 5px; } .release-history .media-body { padding-left: 20px; } .release-history .panel-body .load-more { margin-top: 20px; } .release-history .media-body textarea { margin-top: 10px; } .release-history .release-history-container { padding: 0; } .release-history .release-history-list { max-height: 750px; padding: 0; border-right: solid 1px #eff2f7; overflow: scroll; } .release-history .release-history-list .media { position: relative; margin: 0; padding: 10px; border-bottom: solid 1px #eff2f7; } .release-history .release-history-list .release-operation { position: absolute; right: 0; top: 0; width: 5px; height: 100%; } .release-history .release-history-list .media .media-left { padding-top: 10px; } .release-history .release-history-list .media .media-body .release-title { padding: 0; } .release-history .release-history-list .emergency-publish { position: absolute; left: 0; top: 0; } .release-history .release-history-list .load-more { height: 45px; background: #f5f5f5; } .release-history .release-operation-normal { background: #316510; } .release-history .release-operation-rollback { background: #997f1c; } .release-history .release-operation-gray { background: #999999; } .release-history .operation-caption-container { position: relative; } .release-history .section-title { padding: 15px 10px 0 10px; } .release-history .operation-caption { position: absolute; top: 45px; width: 100px; height: 18px; color: #fff; font-size: 12px; } .release-history .panel-heading .back-btn { position: absolute; top: 45px; right: 10px; } .release-history .release-info { padding: 0; border: 0; } .release-history .panel-heading { padding: 15px; } .release-history .panel-heading button img { width: 12px; height: 12px; } .empty-container { padding: 15px; } .valdr-message { display: none; } .valdr-message.ng-dirty.ng-invalid.ng-touched { display: inline; color: #a94442; } .form-group .form-control.ng-invalid.ng-dirty.ng-touched { border-color: #a94442; } .app-not-found { padding-top: 50px; font-size: 18px; } /*index page*/ #app-list h5 { word-wrap: break-word; word-break: break-all; } #app-list .media-body { padding-top: 15px; } #app-list .media { background: #fff; display: table; } #app-list .media-left { width: 1000px; color: #fff; display: table-cell; vertical-align: middle; } #app-list .more-img { width: 30px; height: 30px; } #app-list .app-panel { position: relative; height: 100px; } #app-list .operate-panel { position: absolute; top: 5px; right: 20px; } .create-app-list .media-left { background: #a9d96c; } .create-app-list .create-btn { background: #a9d96c; color: #fff; } .create-app-list .create-btn:hover { background: #81AB56; } .create-app-list .create-btn img { width: 26px; height: 26px; margin-top: 4px; } .favorites-app-list .media-left { background: #57c8f2; } .favorites-app-list .no-favorites { padding-bottom: 15px; } .visit-app-list .media-left { background: #41cac0; } #rulesModal .rules-ip-selector { width: 500px; height: 50px; } #rulesModal textarea { width: 500px; margin-bottom: 5px; } #rulesModal .rule-edit-panel { padding: 15px 0; } #rulesModal .add-rule { margin-left: 15px; } #rulesModal .select2-container .select2-search__field:not([placeholder='']) { width: auto !important; } .search-onblur { width: 165px; background: #f5f5f5; } .search-focus { width: 165px; background: #fff; } .project-setting .panel-body { padding-top: 35px; } .project-setting .panel-body .context { padding-left: 30px; padding-right: 30px; } .app-search-list .select2-container, .app-search-list .select2-container .select2-selection { height: 34px; } .app-search-list .select2-container .select2-selection .select2-selection__rendered { line-height: 34px; font-size: 14px; }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ html, body { height: 100% } body { min-width: 960px; color: #797979; padding: 0 !important; margin: 0 !important; font-size: 13px; background: #f1f2f7; font-family: 'Open Sans', sans-serif; } body.modal-open { overflow: visible; } a { cursor: pointer; } p, td, span { word-wrap: break-word; word-break: break-all; } .modal { overflow-y: scroll } .no-radius { border-radius: 0; } .no-border { border: 0; } .no-margin { margin: 0; } .cursor-pointer { cursor: pointer; } .word-break { word-wrap: break-word; word-break: break-all; } .border { border: solid 1px #c3c3c3; } .padding-top-5 { padding-top: 5px; } .border-top { border-top: 1px solid #ddd; } .bg-info, .bg-primary, .bg-warning, .bg-danger, .bg-success { padding: 10px; } .active { background: #f5f5f5; } .label-default-light { background: #A4A4A4 } .panel-default .panel-heading { color: #797979; } pre, .pre { white-space: pre-wrap; /* Since CSS 2.1 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -pre-wrap; /* Opera 4-6 */ white-space: -o-pre-wrap; /* Opera 7 */ word-wrap: break-word; /* Internet Explorer 5.5+ */ } .hover:hover { background: #f5f5f5; cursor: pointer } .highlight { background: #ffa; } .hide-border-top { border-top: 0; } .logo { font-size: 25px; } .i-20 { height: 20px; width: 20px; } .i-25-20 { height: 20px; width: 25px; } .i-15 { height: 15px; width: 15px; } .badge { padding: 1px 4px; } .badge-grey { background: #777; color: #fff; } .badge-white { background: #ffffff; color: #6c6c6c; } .modal-dialog { width: 960px; } .apollo-container { min-height: 90%; } .navbar-default { background-color: #ffffff; border: none; } .footer { width: 100%; height: 75px; margin-top: 50px; padding-top: 25px; } /*panel*/ .panel { border: 1px solid #ddd; } table th { text-align: center; } /*首页*/ .site-notice { padding: 5px 0; text-align: center; background-color: #208d4e; } .site-notice { color: #eee; } .site-notice a { color: #ffffff; } .site-notice a:hover { text-underline: none; } .site-notice .selected { color: #000000; } .site-header { position: relative; text-align: center; background-color: #27AE60; color: #fff; margin-bottom: 0; } .site-header .search { border: 2px solid #27AE60; -webkit-box-shadow: none; box-shadow: none; font-size: 16px; padding: 13px 30px; border-radius: 0; height: auto; text-align: center; } .site-header h1 { font-size: 56px; text-shadow: -5px 5px 0 rgba(0, 0, 0, 0.1); } .site-header span { font-size: 14px; } .list-group { margin-top: 20px; } .side-bar { position: absolute; width: 195px; top: 85px; left: 15px; margin-bottom: 25px; background: #f1f2f7; z-index: 2; } .position-absolute { position: absolute; } .position-fix { position: fixed; } .view-mode-1 { margin-left: 235px; padding-right: 15px; } .view-mode-2 { padding: 0 15px; } .side-bar-switch { padding: 10px 10px; margin-right: 30px; } .node-treeview { color: #797979; } .apps .apps-description { color: gray; font-size: 16px; } .app { padding-bottom: 75px; overflow: hidden; } .app td, th { display: table-cell; vertical-align: inherit; } .project-info { width: 100%; } .panel-heading { border-color: #eff2f7; font-size: 16px; font-weight: 300; } .panel-heading .header-namespace { min-width: 415px; } .panel-heading .header-buttons { min-width: 405px; } #treeview .list-group { margin: 0; } #treeview .list-group .list-group-item { border: 0; border-top: 1px solid #eff2f7; } .project-info th { text-align: right; padding: 4px 2px; width: 5em; } .project-info td { border-bottom: 1px dotted gray; padding: 4px 6px; } .project-info td span { margin-right: 5px; } #config-info { min-height: 500px; } #config-edit { border: 1px solid #ddd; border-radius: 3px; } #config-edit .panel-heading { border-bottom: 1px solid #ddd; } .tocify-header { font-size: 14px; } .tocify-subheader { font-size: 13px; } .config-item-container .panel { border-radius: 0; } .config-item-container .panel-heading b { font-size: 18px; } .config-item-container .form-control[disabled] { background: #ffffff; border: 0; } .config-item-container .second-panel-heading .ns_btn { width: 25px; height: 25px; border-top: solid 1px #ffffff; } .config-item-container .second-panel-heading .nav-tabs .node_active { border-bottom: 3px #1b6d85 solid; } .config-item-container .config-items { height: 500px; overflow: scroll; } .config-item-container .panel-heading button img { width: 12px; height: 12px; } .config-item-container .panel-heading a img { width: 12px; height: 12px; } .config-item-container .panel-heading li img { width: 12px; height: 12px; } .config-item-container .second-panel-heading { height: 45px; } .config-item-container .second-panel-heading a { height: 35px; color: #555; font-size: 13px; margin-bottom: 2px; } .namespace-panel { border-top: 0; border-bottom: 0; } .namespace-panel .namespace-name { font-size: 20px; } .namespace-panel .namespace-label { margin-left: 5px; } .namespace-panel .namespace-attribute-panel { margin-left: 0; color: #fff; border-top: 0; background: #f1f2f7; } .namespace-panel .namespace-attribute-public { margin-right:5px; } .namespace-panel .second-panel-heading .nav-tabs { border-bottom: 0; } .namespace-panel .namespace-view-table td img { cursor: pointer; width: 23px; height: 23px; } .namespace-panel .namespace-view-table table { table-layout: inherit; } .namespace-panel .namespace-view-table td { word-wrap: break-word; } .namespace-panel .namespace-view-table .glyphicon { cursor: pointer; } .namespace-panel .namespace-view-table .search-input { padding: 15px 0 15px 10px; } .namespace-panel .namespace-view-table .search-input input { width: 500px; } .namespace-panel .no-config-panel { padding: 15px 0; } .namespace-panel .history-view { padding: 10px 20px; } .namespace-panel .instance-view .btn-primary .badge { color: #337ab7; background-color: #fff; } .namespace-panel .instance-view .btn-default .badge { background: #777; color: #fff; } .namespace-panel .rules-manage-view { padding: 45px 20px; } .line { width: 20px; border: 1px solid #ddd; } .editable-table > tbody > tr > td { padding: 4px } .editable-text { padding-left: 4px; padding-top: 4px; padding-bottom: 4px; display: inline-block; } .editable-table tbody > tr > td > .controls { / / width: 100 % } .editable-input { padding-left: 3px; } .editable-input.input-sm { height: 30px; font-size: 14px; padding-top: 4px; padding-bottom: 4px; } .list-group-item .btn-title { color: gray; font-size: 14px; margin: 0; } .list-group-item .icon-project-manage { background: url(../img/manage.png) no-repeat; } .list-group-item .icon-accesskey-manage { background: url(../img/secret.png) no-repeat; } .list-group-item .icon-plus-orange { background: url(../img/add.png) no-repeat; } .list-group-item .icon-text { background-size: 20px; background-position: 5% 50%; padding: 5px 0 5px 50px; } /*搜索框*/ ::-webkit-scrollbar { width: 0; height: 0; background: rgba(255, 255, 255, 0); } ::-webkit-scrollbar-thumb:vertical { background: rgba(255, 255, 255, 0); border-radius: 10px; } ::-webkit-scrollbar-thumb:vertical:hover { background: rgba(255, 255, 255, 0); } .app-list { width: 350px; height: 200px; position: absolute; margin-left: 0; cursor: pointer; background: #ffffff; border: 1px solid #ddd; overflow-y: scroll; z-index: 1000; } .app-list .app-item { font-size: medium; padding: 5px 10px; } .app-list .app-item:hover { color: #ffffff; background: #C3C3C3; } .app-list .app-selected { color: #ffffff; background: #c3c3c3; } .item-container { border: solid 1px #f1f2f7; margin-top: 15px; padding: 20px 15px } .item-container .item-info { margin-left: 5px; } .change-type-mark { width: 5px; height: 5px; } .release-history .media-body { padding-left: 20px; } .release-history .panel-body .load-more { margin-top: 20px; } .release-history .media-body textarea { margin-top: 10px; } .release-history .release-history-container { padding: 0; } .release-history .release-history-list { max-height: 750px; padding: 0; border-right: solid 1px #eff2f7; overflow: scroll; } .release-history .release-history-list .media { position: relative; margin: 0; padding: 10px; border-bottom: solid 1px #eff2f7; } .release-history .release-history-list .release-operation { position: absolute; right: 0; top: 0; width: 5px; height: 100%; } .release-history .release-history-list .media .media-left { padding-top: 10px; } .release-history .release-history-list .media .media-body .release-title { padding: 0; } .release-history .release-history-list .emergency-publish { position: absolute; left: 0; top: 0; } .release-history .release-history-list .load-more { height: 45px; background: #f5f5f5; } .release-history .release-operation-normal { background: #316510; } .release-history .release-operation-rollback { background: #997f1c; } .release-history .release-operation-gray { background: #999999; } .release-history .operation-caption-container { position: relative; } .release-history .section-title { padding: 15px 10px 0 10px; } .release-history .operation-caption { position: absolute; top: 45px; width: 100px; height: 18px; color: #fff; font-size: 12px; } .release-history .panel-heading .back-btn { position: absolute; top: 45px; right: 10px; } .release-history .release-info { padding: 0; border: 0; } .release-history .panel-heading { padding: 15px; } .release-history .panel-heading button img { width: 12px; height: 12px; } .empty-container { padding: 15px; } .valdr-message { display: none; } .valdr-message.ng-dirty.ng-invalid.ng-touched { display: inline; color: #a94442; } .form-group .form-control.ng-invalid.ng-dirty.ng-touched { border-color: #a94442; } .app-not-found { padding-top: 50px; font-size: 18px; } /*index page*/ #app-list h5 { word-wrap: break-word; word-break: break-all; } #app-list { display: flex; background-color: #ffffff; width: 100vw; } #app-list .left-bar { width: 15%; min-width: 200px; } #app-list .main-table { padding-top: 15px; width: 85%; min-width: 500px; } #app-list .media-body { padding-top: 15px; } #app-list .media { background: #fff; display: table; } #app-list .media-left { min-width: 200px; max-width: 400px; color: #fff; display: table-cell; vertical-align: middle; } #app-list .more-img { width: 30px; height: 30px; } #app-list .app-panel { position: relative; height: 100px; } #app-list .operate-panel { position: absolute; top: 5px; right: 20px; } #app-list .display-table { padding: 15px; margin-left: 30px; margin-right: 30px; box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .09); } #app-list table { width: 100%; } #app-list tr { } #app-list th { border-bottom: 1px solid #E4E7ED; padding: 15px 8px 15px 8px; font-size: 16px; text-align: left; word-break: break-all; } #app-list td { border-bottom: 1px solid #E4E7ED; padding: 15px 8px 15px 8px; font-size: 14px; word-break: break-all; } .left-bar h5 { font-size: 15px; margin-left: 12px; } .left-bar .app-list-show { height: 60px; color: #409EFF; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .app-list-choose { height: 60px; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .app-list-choose:hover { background-color: #F2F6FC; } .left-bar .favorite-list-show { height: 60px; color: #409EFF; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .favorite-list-choose { height: 60px; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .favorite-list-choose:hover { background-color: #F2F6FC; } .left-bar .public-namespace-list-show { height: 60px; color: #409EFF; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .public-namespace-list-choose { height: 60px; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .public-namespace-list-choose:hover { background-color: #F2F6FC } .left-bar .visited-list-show { height: 60px; color: #409EFF; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .visited-list-choose { height: 60px; display: flex; align-items: center; justify-content: center; border-right: 1px solid #DCDFE6; cursor: pointer; } .left-bar .visited-list-choose:hover { background-color: #F2F6FC } .wapper { width: 600px; padding: 15px 0 30px 30px; } .select-wapper { width: 500px; height: 40px; position: relative; } .select-wapper>input { width: 100%; height: 100%; border: 1px solid #CCCCCC; font-size: 15px; padding: 0 10px 0 0; box-sizing: border-box; border-radius: 4px; padding: 5px; -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); box-shadow: inset 0 1px 1px rgba(0,0,0,.075); -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; } .select-wapper>input:focus { border: 1px solid rgb(102,175,233); -webkit-box-shadow: inset 0 1px 1px rgba(102,175,233, .075); box-shadow: inset 0 1px 1px rgba(122,156,211, .075); outline: none; } .select-wapper:after { content: ''; width: 0; height: 0; border-top: 8px solid #77705d; border-right: 5px solid transparent; border-left: 5px solid transparent; display: inline; position: absolute; right: 8px; top: 11px; } .select-wapper .select-content-panel { width: 100%; height: auto; max-height: 300px; position: absolute; top: 100%; left: 0; border: 1px solid rgb(122,156,211); margin-top: 0; padding: 0; overflow-y: auto; box-sizing: border-box; background-color: white; } .select-wapper .select-content-panel li { display: block; list-style: none; padding: 2px 10px; font-size: 14px; height: 30px; border: 0 !important; } .select-wapper .select-content-panel li:hover { background-color: rgb(30, 144, 255); color: white !important; } .select-wapper .select-content-panel li:active { background-color: rgb(30, 144, 255); color: white !important; } .select-wapper .item-bg { background-color: rgb(30, 144, 255); color: white !important; } .select-wapper .hidden-cls { display: none; } .create-app-list .media-left { background: #a9d96c; } .create-app-list .create-btn { background: #a9d96c; color: #fff; } .create-app-list .create-btn:hover { background: #81AB56; } .create-app-list .create-btn img { width: 26px; height: 26px; margin-top: 4px; } .favorites-app-list .media-left { background: #57c8f2; } .favorites-app-list .no-favorites { padding-bottom: 15px; } .public-namespace-list .media-left { background: #65c294; } .public-namespace-list .no-public { padding-bottom: 15px; } .visit-app-list .media-left { background: #41cac0; } #rulesModal .rules-ip-selector { width: 500px; height: 50px; } #rulesModal textarea { width: 500px; margin-bottom: 5px; } #rulesModal .rule-edit-panel { padding: 15px 0; } #rulesModal .add-rule { margin-left: 15px; } #rulesModal .select2-container .select2-search__field:not([placeholder='']) { width: auto !important; } .search-onblur { width: 165px; background: #f5f5f5; } .search-focus { width: 165px; background: #fff; } .project-setting .panel-body { padding-top: 35px; } .project-setting .panel-body .context { padding-left: 30px; padding-right: 30px; } .app-search-list .select2-container, .app-search-list .select2-container .select2-selection { height: 34px; } .app-search-list .select2-container .select2-selection .select2-selection__rendered { line-height: 34px; font-size: 14px; }
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/bootstrap/css/bootstrap.min.css
/*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! * Generated using the Bootstrap Customizer (http://v3.bootcss.com/customize/?id=822d18dc2e4e823a577b) * Config saved to config.json and https://gist.github.com/822d18dc2e4e823a577b *//*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100% } body { margin: 0 } article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block } audio, canvas, progress, video { display: inline-block; vertical-align: baseline } audio:not([controls]) { display: none; height: 0 } [hidden], template { display: none } a { background-color: transparent } a:active, a:hover { outline: 0 } abbr[title] { border-bottom: 1px dotted } b, strong { font-weight: bold } dfn { font-style: italic } h1 { font-size: 2em; margin: 0.67em 0 } mark { background: #ff0; color: #000 } small { font-size: 80% } sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline } sup { top: -0.5em } sub { bottom: -0.25em } img { border: 0 } svg:not(:root) { overflow: hidden } figure { margin: 1em 40px } hr { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; height: 0 } pre { overflow: auto } code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em } button, input, optgroup, select, textarea { color: inherit; font: inherit; margin: 0 } button { overflow: visible } button, select { text-transform: none } button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; cursor: pointer } button[disabled], html input[disabled] { cursor: default } button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0 } input { line-height: normal } input[type="checkbox"], input[type="radio"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; padding: 0 } input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto } input[type="search"] { -webkit-appearance: textfield; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none } fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em } legend { border: 0; padding: 0 } textarea { overflow: auto } optgroup { font-weight: bold } table { border-collapse: collapse; border-spacing: 0 } td, th { padding: 0 } /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { *, *:before, *:after { background: transparent !important; color: #000 !important; -webkit-box-shadow: none !important; box-shadow: none !important; text-shadow: none !important } a, a:visited { text-decoration: underline } a[href]:after { content: " (" attr(href) ")" } abbr[title]:after { content: " (" attr(title) ")" } a[href^="#"]:after, a[href^="javascript:"]:after { content: "" } pre, blockquote { border: 1px solid #999; page-break-inside: avoid } thead { display: table-header-group } tr, img { page-break-inside: avoid } img { max-width: 100% !important } p, h2, h3 { orphans: 3; widows: 3 } h2, h3 { page-break-after: avoid } .navbar { display: none } .btn > .caret, .dropup > .btn > .caret { border-top-color: #000 !important } .label { border: 1px solid #000 } .table { border-collapse: collapse !important } .table td, .table th { background-color: #fff !important } .table-bordered th, .table-bordered td { border: 1px solid #ddd !important } } @font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg') } .glyphicon { position: relative; top: 1px; display: inline-block; font-family: 'Glyphicons Halflings'; font-style: normal; font-weight: normal; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale } .glyphicon-asterisk:before { content: "\2a" } .glyphicon-plus:before { content: "\2b" } .glyphicon-euro:before, .glyphicon-eur:before { content: "\20ac" } .glyphicon-minus:before { content: "\2212" } .glyphicon-cloud:before { content: "\2601" } .glyphicon-envelope:before { content: "\2709" } .glyphicon-pencil:before { content: "\270f" } .glyphicon-glass:before { content: "\e001" } .glyphicon-music:before { content: "\e002" } .glyphicon-search:before { content: "\e003" } .glyphicon-heart:before { content: "\e005" } .glyphicon-star:before { content: "\e006" } .glyphicon-star-empty:before { content: "\e007" } .glyphicon-user:before { content: "\e008" } .glyphicon-film:before { content: "\e009" } .glyphicon-th-large:before { content: "\e010" } .glyphicon-th:before { content: "\e011" } .glyphicon-th-list:before { content: "\e012" } .glyphicon-ok:before { content: "\e013" } .glyphicon-remove:before { content: "\e014" } .glyphicon-zoom-in:before { content: "\e015" } .glyphicon-zoom-out:before { content: "\e016" } .glyphicon-off:before { content: "\e017" } .glyphicon-signal:before { content: "\e018" } .glyphicon-cog:before { content: "\e019" } .glyphicon-trash:before { content: "\e020" } .glyphicon-home:before { content: "\e021" } .glyphicon-file:before { content: "\e022" } .glyphicon-time:before { content: "\e023" } .glyphicon-road:before { content: "\e024" } .glyphicon-download-alt:before { content: "\e025" } .glyphicon-download:before { content: "\e026" } .glyphicon-upload:before { content: "\e027" } .glyphicon-inbox:before { content: "\e028" } .glyphicon-play-circle:before { content: "\e029" } .glyphicon-repeat:before { content: "\e030" } .glyphicon-refresh:before { content: "\e031" } .glyphicon-list-alt:before { content: "\e032" } .glyphicon-lock:before { content: "\e033" } .glyphicon-flag:before { content: "\e034" } .glyphicon-headphones:before { content: "\e035" } .glyphicon-volume-off:before { content: "\e036" } .glyphicon-volume-down:before { content: "\e037" } .glyphicon-volume-up:before { content: "\e038" } .glyphicon-qrcode:before { content: "\e039" } .glyphicon-barcode:before { content: "\e040" } .glyphicon-tag:before { content: "\e041" } .glyphicon-tags:before { content: "\e042" } .glyphicon-book:before { content: "\e043" } .glyphicon-bookmark:before { content: "\e044" } .glyphicon-print:before { content: "\e045" } .glyphicon-camera:before { content: "\e046" } .glyphicon-font:before { content: "\e047" } .glyphicon-bold:before { content: "\e048" } .glyphicon-italic:before { content: "\e049" } .glyphicon-text-height:before { content: "\e050" } .glyphicon-text-width:before { content: "\e051" } .glyphicon-align-left:before { content: "\e052" } .glyphicon-align-center:before { content: "\e053" } .glyphicon-align-right:before { content: "\e054" } .glyphicon-align-justify:before { content: "\e055" } .glyphicon-list:before { content: "\e056" } .glyphicon-indent-left:before { content: "\e057" } .glyphicon-indent-right:before { content: "\e058" } .glyphicon-facetime-video:before { content: "\e059" } .glyphicon-picture:before { content: "\e060" } .glyphicon-map-marker:before { content: "\e062" } .glyphicon-adjust:before { content: "\e063" } .glyphicon-tint:before { content: "\e064" } .glyphicon-edit:before { content: "\e065" } .glyphicon-share:before { content: "\e066" } .glyphicon-check:before { content: "\e067" } .glyphicon-move:before { content: "\e068" } .glyphicon-step-backward:before { content: "\e069" } .glyphicon-fast-backward:before { content: "\e070" } .glyphicon-backward:before { content: "\e071" } .glyphicon-play:before { content: "\e072" } .glyphicon-pause:before { content: "\e073" } .glyphicon-stop:before { content: "\e074" } .glyphicon-forward:before { content: "\e075" } .glyphicon-fast-forward:before { content: "\e076" } .glyphicon-step-forward:before { content: "\e077" } .glyphicon-eject:before { content: "\e078" } .glyphicon-chevron-left:before { content: "\e079" } .glyphicon-chevron-right:before { content: "\e080" } .glyphicon-plus-sign:before { content: "\e081" } .glyphicon-minus-sign:before { content: "\e082" } .glyphicon-remove-sign:before { content: "\e083" } .glyphicon-ok-sign:before { content: "\e084" } .glyphicon-question-sign:before { content: "\e085" } .glyphicon-info-sign:before { content: "\e086" } .glyphicon-screenshot:before { content: "\e087" } .glyphicon-remove-circle:before { content: "\e088" } .glyphicon-ok-circle:before { content: "\e089" } .glyphicon-ban-circle:before { content: "\e090" } .glyphicon-arrow-left:before { content: "\e091" } .glyphicon-arrow-right:before { content: "\e092" } .glyphicon-arrow-up:before { content: "\e093" } .glyphicon-arrow-down:before { content: "\e094" } .glyphicon-share-alt:before { content: "\e095" } .glyphicon-resize-full:before { content: "\e096" } .glyphicon-resize-small:before { content: "\e097" } .glyphicon-exclamation-sign:before { content: "\e101" } .glyphicon-gift:before { content: "\e102" } .glyphicon-leaf:before { content: "\e103" } .glyphicon-fire:before { content: "\e104" } .glyphicon-eye-open:before { content: "\e105" } .glyphicon-eye-close:before { content: "\e106" } .glyphicon-warning-sign:before { content: "\e107" } .glyphicon-plane:before { content: "\e108" } .glyphicon-calendar:before { content: "\e109" } .glyphicon-random:before { content: "\e110" } .glyphicon-comment:before { content: "\e111" } .glyphicon-magnet:before { content: "\e112" } .glyphicon-chevron-up:before { content: "\e113" } .glyphicon-chevron-down:before { content: "\e114" } .glyphicon-retweet:before { content: "\e115" } .glyphicon-shopping-cart:before { content: "\e116" } .glyphicon-folder-close:before { content: "\e117" } .glyphicon-folder-open:before { content: "\e118" } .glyphicon-resize-vertical:before { content: "\e119" } .glyphicon-resize-horizontal:before { content: "\e120" } .glyphicon-hdd:before { content: "\e121" } .glyphicon-bullhorn:before { content: "\e122" } .glyphicon-bell:before { content: "\e123" } .glyphicon-certificate:before { content: "\e124" } .glyphicon-thumbs-up:before { content: "\e125" } .glyphicon-thumbs-down:before { content: "\e126" } .glyphicon-hand-right:before { content: "\e127" } .glyphicon-hand-left:before { content: "\e128" } .glyphicon-hand-up:before { content: "\e129" } .glyphicon-hand-down:before { content: "\e130" } .glyphicon-circle-arrow-right:before { content: "\e131" } .glyphicon-circle-arrow-left:before { content: "\e132" } .glyphicon-circle-arrow-up:before { content: "\e133" } .glyphicon-circle-arrow-down:before { content: "\e134" } .glyphicon-globe:before { content: "\e135" } .glyphicon-wrench:before { content: "\e136" } .glyphicon-tasks:before { content: "\e137" } .glyphicon-filter:before { content: "\e138" } .glyphicon-briefcase:before { content: "\e139" } .glyphicon-fullscreen:before { content: "\e140" } .glyphicon-dashboard:before { content: "\e141" } .glyphicon-paperclip:before { content: "\e142" } .glyphicon-heart-empty:before { content: "\e143" } .glyphicon-link:before { content: "\e144" } .glyphicon-phone:before { content: "\e145" } .glyphicon-pushpin:before { content: "\e146" } .glyphicon-usd:before { content: "\e148" } .glyphicon-gbp:before { content: "\e149" } .glyphicon-sort:before { content: "\e150" } .glyphicon-sort-by-alphabet:before { content: "\e151" } .glyphicon-sort-by-alphabet-alt:before { content: "\e152" } .glyphicon-sort-by-order:before { content: "\e153" } .glyphicon-sort-by-order-alt:before { content: "\e154" } .glyphicon-sort-by-attributes:before { content: "\e155" } .glyphicon-sort-by-attributes-alt:before { content: "\e156" } .glyphicon-unchecked:before { content: "\e157" } .glyphicon-expand:before { content: "\e158" } .glyphicon-collapse-down:before { content: "\e159" } .glyphicon-collapse-up:before { content: "\e160" } .glyphicon-log-in:before { content: "\e161" } .glyphicon-flash:before { content: "\e162" } .glyphicon-log-out:before { content: "\e163" } .glyphicon-new-window:before { content: "\e164" } .glyphicon-record:before { content: "\e165" } .glyphicon-save:before { content: "\e166" } .glyphicon-open:before { content: "\e167" } .glyphicon-saved:before { content: "\e168" } .glyphicon-import:before { content: "\e169" } .glyphicon-export:before { content: "\e170" } .glyphicon-send:before { content: "\e171" } .glyphicon-floppy-disk:before { content: "\e172" } .glyphicon-floppy-saved:before { content: "\e173" } .glyphicon-floppy-remove:before { content: "\e174" } .glyphicon-floppy-save:before { content: "\e175" } .glyphicon-floppy-open:before { content: "\e176" } .glyphicon-credit-card:before { content: "\e177" } .glyphicon-transfer:before { content: "\e178" } .glyphicon-cutlery:before { content: "\e179" } .glyphicon-header:before { content: "\e180" } .glyphicon-compressed:before { content: "\e181" } .glyphicon-earphone:before { content: "\e182" } .glyphicon-phone-alt:before { content: "\e183" } .glyphicon-tower:before { content: "\e184" } .glyphicon-stats:before { content: "\e185" } .glyphicon-sd-video:before { content: "\e186" } .glyphicon-hd-video:before { content: "\e187" } .glyphicon-subtitles:before { content: "\e188" } .glyphicon-sound-stereo:before { content: "\e189" } .glyphicon-sound-dolby:before { content: "\e190" } .glyphicon-sound-5-1:before { content: "\e191" } .glyphicon-sound-6-1:before { content: "\e192" } .glyphicon-sound-7-1:before { content: "\e193" } .glyphicon-copyright-mark:before { content: "\e194" } .glyphicon-registration-mark:before { content: "\e195" } .glyphicon-cloud-download:before { content: "\e197" } .glyphicon-cloud-upload:before { content: "\e198" } .glyphicon-tree-conifer:before { content: "\e199" } .glyphicon-tree-deciduous:before { content: "\e200" } .glyphicon-cd:before { content: "\e201" } .glyphicon-save-file:before { content: "\e202" } .glyphicon-open-file:before { content: "\e203" } .glyphicon-level-up:before { content: "\e204" } .glyphicon-copy:before { content: "\e205" } .glyphicon-paste:before { content: "\e206" } .glyphicon-alert:before { content: "\e209" } .glyphicon-equalizer:before { content: "\e210" } .glyphicon-king:before { content: "\e211" } .glyphicon-queen:before { content: "\e212" } .glyphicon-pawn:before { content: "\e213" } .glyphicon-bishop:before { content: "\e214" } .glyphicon-knight:before { content: "\e215" } .glyphicon-baby-formula:before { content: "\e216" } .glyphicon-tent:before { content: "\26fa" } .glyphicon-blackboard:before { content: "\e218" } .glyphicon-bed:before { content: "\e219" } .glyphicon-apple:before { content: "\f8ff" } .glyphicon-erase:before { content: "\e221" } .glyphicon-hourglass:before { content: "\231b" } .glyphicon-lamp:before { content: "\e223" } .glyphicon-duplicate:before { content: "\e224" } .glyphicon-piggy-bank:before { content: "\e225" } .glyphicon-scissors:before { content: "\e226" } .glyphicon-bitcoin:before { content: "\e227" } .glyphicon-btc:before { content: "\e227" } .glyphicon-xbt:before { content: "\e227" } .glyphicon-yen:before { content: "\00a5" } .glyphicon-jpy:before { content: "\00a5" } .glyphicon-ruble:before { content: "\20bd" } .glyphicon-rub:before { content: "\20bd" } .glyphicon-scale:before { content: "\e230" } .glyphicon-ice-lolly:before { content: "\e231" } .glyphicon-ice-lolly-tasted:before { content: "\e232" } .glyphicon-education:before { content: "\e233" } .glyphicon-option-horizontal:before { content: "\e234" } .glyphicon-option-vertical:before { content: "\e235" } .glyphicon-menu-hamburger:before { content: "\e236" } .glyphicon-modal-window:before { content: "\e237" } .glyphicon-oil:before { content: "\e238" } .glyphicon-grain:before { content: "\e239" } .glyphicon-sunglasses:before { content: "\e240" } .glyphicon-text-size:before { content: "\e241" } .glyphicon-text-color:before { content: "\e242" } .glyphicon-text-background:before { content: "\e243" } .glyphicon-object-align-top:before { content: "\e244" } .glyphicon-object-align-bottom:before { content: "\e245" } .glyphicon-object-align-horizontal:before { content: "\e246" } .glyphicon-object-align-left:before { content: "\e247" } .glyphicon-object-align-vertical:before { content: "\e248" } .glyphicon-object-align-right:before { content: "\e249" } .glyphicon-triangle-right:before { content: "\e250" } .glyphicon-triangle-left:before { content: "\e251" } .glyphicon-triangle-bottom:before { content: "\e252" } .glyphicon-triangle-top:before { content: "\e253" } .glyphicon-console:before { content: "\e254" } .glyphicon-superscript:before { content: "\e255" } .glyphicon-subscript:before { content: "\e256" } .glyphicon-menu-left:before { content: "\e257" } .glyphicon-menu-right:before { content: "\e258" } .glyphicon-menu-down:before { content: "\e259" } .glyphicon-menu-up:before { content: "\e260" } * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } *:before, *:after { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } html { font-size: 10px; -webkit-tap-highlight-color: rgba(0, 0, 0, 0) } body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; color: #333; background-color: #fff } input, button, select, textarea { font-family: inherit; font-size: inherit; line-height: inherit } a { color: #337ab7; text-decoration: none } a:hover, a:focus { color: #23527c; text-decoration: underline } a:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } figure { margin: 0 } img { vertical-align: middle } .img-responsive, .thumbnail > img, .thumbnail a > img, .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto } .img-rounded { border-radius: 6px } .img-thumbnail { padding: 4px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out; transition: all .2s ease-in-out; display: inline-block; max-width: 100%; height: auto } .img-circle { border-radius: 50% } hr { margin-top: 20px; margin-bottom: 20px; border: 0; border-top: 1px solid #eee } .sr-only { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0 } .sr-only-focusable:active, .sr-only-focusable:focus { position: static; width: auto; height: auto; margin: 0; overflow: visible; clip: auto } [role="button"] { cursor: pointer } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small, h1 .small, h2 .small, h3 .small, h4 .small, h5 .small, h6 .small, .h1 .small, .h2 .small, .h3 .small, .h4 .small, .h5 .small, .h6 .small { font-weight: normal; line-height: 1; color: #777 } h1, .h1, h2, .h2, h3, .h3 { margin-top: 20px; margin-bottom: 10px } h1 small, .h1 small, h2 small, .h2 small, h3 small, .h3 small, h1 .small, .h1 .small, h2 .small, .h2 .small, h3 .small, .h3 .small { font-size: 65% } h4, .h4, h5, .h5, h6, .h6 { margin-top: 10px; margin-bottom: 10px } h4 small, .h4 small, h5 small, .h5 small, h6 small, .h6 small, h4 .small, .h4 .small, h5 .small, .h5 .small, h6 .small, .h6 .small { font-size: 75% } h1, .h1 { font-size: 36px } h2, .h2 { font-size: 30px } h3, .h3 { font-size: 24px } h4, .h4 { font-size: 18px } h5, .h5 { font-size: 14px } h6, .h6 { font-size: 12px } p { margin: 0 0 10px } .lead { margin-bottom: 20px; font-size: 16px; font-weight: 300; line-height: 1.4 } @media (min-width: 768px) { .lead { font-size: 21px } } small, .small { font-size: 85% } mark, .mark { background-color: #fcf8e3; padding: .2em } .text-left { text-align: left } .text-right { text-align: right } .text-center { text-align: center } .text-justify { text-align: justify } .text-nowrap { white-space: nowrap } .text-lowercase { text-transform: lowercase } .text-uppercase { text-transform: uppercase } .text-capitalize { text-transform: capitalize } .text-muted { color: #777 } .text-primary { color: #337ab7 } a.text-primary:hover, a.text-primary:focus { color: #286090 } .text-success { color: #3c763d } a.text-success:hover, a.text-success:focus { color: #2b542c } .text-info { color: #31708f } a.text-info:hover, a.text-info:focus { color: #245269 } .text-warning { color: #8a6d3b } a.text-warning:hover, a.text-warning:focus { color: #66512c } .text-danger { color: #a94442 } a.text-danger:hover, a.text-danger:focus { color: #843534 } .bg-primary { color: #fff; background-color: #337ab7 } a.bg-primary:hover, a.bg-primary:focus { background-color: #286090 } .bg-success { background-color: #dff0d8 } a.bg-success:hover, a.bg-success:focus { background-color: #c1e2b3 } .bg-info { background-color: #d9edf7 } a.bg-info:hover, a.bg-info:focus { background-color: #afd9ee } .bg-warning { background-color: #fcf8e3 } a.bg-warning:hover, a.bg-warning:focus { background-color: #f7ecb5 } .bg-danger { background-color: #f2dede } a.bg-danger:hover, a.bg-danger:focus { background-color: #e4b9b9 } .page-header { padding-bottom: 9px; margin: 40px 0 20px; border-bottom: 1px solid #eee } ul, ol { margin-top: 0; margin-bottom: 10px } ul ul, ol ul, ul ol, ol ol { margin-bottom: 0 } .list-unstyled { padding-left: 0; list-style: none } .list-inline { padding-left: 0; list-style: none; margin-left: -5px } .list-inline > li { display: inline-block; padding-left: 5px; padding-right: 5px } dl { margin-top: 0; margin-bottom: 20px } dt, dd { line-height: 1.42857143 } dt { font-weight: bold } dd { margin-left: 0 } @media (min-width: 768px) { .dl-horizontal dt { float: left; width: 160px; clear: left; text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap } .dl-horizontal dd { margin-left: 180px } } abbr[title], abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #777 } .initialism { font-size: 90%; text-transform: uppercase } blockquote { padding: 10px 20px; margin: 0 0 20px; font-size: 17.5px; border-left: 5px solid #eee } blockquote p:last-child, blockquote ul:last-child, blockquote ol:last-child { margin-bottom: 0 } blockquote footer, blockquote small, blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; color: #777 } blockquote footer:before, blockquote small:before, blockquote .small:before { content: '\2014 \00A0' } .blockquote-reverse, blockquote.pull-right { padding-right: 15px; padding-left: 0; border-right: 5px solid #eee; border-left: 0; text-align: right } .blockquote-reverse footer:before, blockquote.pull-right footer:before, .blockquote-reverse small:before, blockquote.pull-right small:before, .blockquote-reverse .small:before, blockquote.pull-right .small:before { content: '' } .blockquote-reverse footer:after, blockquote.pull-right footer:after, .blockquote-reverse small:after, blockquote.pull-right small:after, .blockquote-reverse .small:after, blockquote.pull-right .small:after { content: '\00A0 \2014' } address { margin-bottom: 20px; font-style: normal; line-height: 1.42857143 } code, kbd, pre, samp { font-family: Menlo, Monaco, Consolas, "Courier New", monospace } code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; border-radius: 4px } kbd { padding: 2px 4px; font-size: 90%; color: #fff; background-color: #333; border-radius: 3px; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25) } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; -webkit-box-shadow: none; box-shadow: none } pre { display: block; padding: 9.5px; margin: 0 0 10px; font-size: 13px; line-height: 1.42857143; word-break: break-all; word-wrap: break-word; color: #333; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px } pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap; background-color: transparent; border-radius: 0 } .pre-scrollable { max-height: 340px; overflow-y: scroll } .container { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } @media (min-width: 768px) { .container { width: 750px } } @media (min-width: 992px) { .container { width: 970px } } @media (min-width: 1200px) { .container { width: 1170px } } .container-fluid { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } .row { margin-left: -15px; margin-right: -15px } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left } .col-xs-12 { width: 100% } .col-xs-11 { width: 91.66666667% } .col-xs-10 { width: 83.33333333% } .col-xs-9 { width: 75% } .col-xs-8 { width: 66.66666667% } .col-xs-7 { width: 58.33333333% } .col-xs-6 { width: 50% } .col-xs-5 { width: 41.66666667% } .col-xs-4 { width: 33.33333333% } .col-xs-3 { width: 25% } .col-xs-2 { width: 16.66666667% } .col-xs-1 { width: 8.33333333% } .col-xs-pull-12 { right: 100% } .col-xs-pull-11 { right: 91.66666667% } .col-xs-pull-10 { right: 83.33333333% } .col-xs-pull-9 { right: 75% } .col-xs-pull-8 { right: 66.66666667% } .col-xs-pull-7 { right: 58.33333333% } .col-xs-pull-6 { right: 50% } .col-xs-pull-5 { right: 41.66666667% } .col-xs-pull-4 { right: 33.33333333% } .col-xs-pull-3 { right: 25% } .col-xs-pull-2 { right: 16.66666667% } .col-xs-pull-1 { right: 8.33333333% } .col-xs-pull-0 { right: auto } .col-xs-push-12 { left: 100% } .col-xs-push-11 { left: 91.66666667% } .col-xs-push-10 { left: 83.33333333% } .col-xs-push-9 { left: 75% } .col-xs-push-8 { left: 66.66666667% } .col-xs-push-7 { left: 58.33333333% } .col-xs-push-6 { left: 50% } .col-xs-push-5 { left: 41.66666667% } .col-xs-push-4 { left: 33.33333333% } .col-xs-push-3 { left: 25% } .col-xs-push-2 { left: 16.66666667% } .col-xs-push-1 { left: 8.33333333% } .col-xs-push-0 { left: auto } .col-xs-offset-12 { margin-left: 100% } .col-xs-offset-11 { margin-left: 91.66666667% } .col-xs-offset-10 { margin-left: 83.33333333% } .col-xs-offset-9 { margin-left: 75% } .col-xs-offset-8 { margin-left: 66.66666667% } .col-xs-offset-7 { margin-left: 58.33333333% } .col-xs-offset-6 { margin-left: 50% } .col-xs-offset-5 { margin-left: 41.66666667% } .col-xs-offset-4 { margin-left: 33.33333333% } .col-xs-offset-3 { margin-left: 25% } .col-xs-offset-2 { margin-left: 16.66666667% } .col-xs-offset-1 { margin-left: 8.33333333% } .col-xs-offset-0 { margin-left: 0 } @media (min-width: 768px) { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left } .col-sm-12 { width: 100% } .col-sm-11 { width: 91.66666667% } .col-sm-10 { width: 83.33333333% } .col-sm-9 { width: 75% } .col-sm-8 { width: 66.66666667% } .col-sm-7 { width: 58.33333333% } .col-sm-6 { width: 50% } .col-sm-5 { width: 41.66666667% } .col-sm-4 { width: 33.33333333% } .col-sm-3 { width: 25% } .col-sm-2 { width: 16.66666667% } .col-sm-1 { width: 8.33333333% } .col-sm-pull-12 { right: 100% } .col-sm-pull-11 { right: 91.66666667% } .col-sm-pull-10 { right: 83.33333333% } .col-sm-pull-9 { right: 75% } .col-sm-pull-8 { right: 66.66666667% } .col-sm-pull-7 { right: 58.33333333% } .col-sm-pull-6 { right: 50% } .col-sm-pull-5 { right: 41.66666667% } .col-sm-pull-4 { right: 33.33333333% } .col-sm-pull-3 { right: 25% } .col-sm-pull-2 { right: 16.66666667% } .col-sm-pull-1 { right: 8.33333333% } .col-sm-pull-0 { right: auto } .col-sm-push-12 { left: 100% } .col-sm-push-11 { left: 91.66666667% } .col-sm-push-10 { left: 83.33333333% } .col-sm-push-9 { left: 75% } .col-sm-push-8 { left: 66.66666667% } .col-sm-push-7 { left: 58.33333333% } .col-sm-push-6 { left: 50% } .col-sm-push-5 { left: 41.66666667% } .col-sm-push-4 { left: 33.33333333% } .col-sm-push-3 { left: 25% } .col-sm-push-2 { left: 16.66666667% } .col-sm-push-1 { left: 8.33333333% } .col-sm-push-0 { left: auto } .col-sm-offset-12 { margin-left: 100% } .col-sm-offset-11 { margin-left: 91.66666667% } .col-sm-offset-10 { margin-left: 83.33333333% } .col-sm-offset-9 { margin-left: 75% } .col-sm-offset-8 { margin-left: 66.66666667% } .col-sm-offset-7 { margin-left: 58.33333333% } .col-sm-offset-6 { margin-left: 50% } .col-sm-offset-5 { margin-left: 41.66666667% } .col-sm-offset-4 { margin-left: 33.33333333% } .col-sm-offset-3 { margin-left: 25% } .col-sm-offset-2 { margin-left: 16.66666667% } .col-sm-offset-1 { margin-left: 8.33333333% } .col-sm-offset-0 { margin-left: 0 } } @media (min-width: 992px) { .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { float: left } .col-md-12 { width: 100% } .col-md-11 { width: 91.66666667% } .col-md-10 { width: 83.33333333% } .col-md-9 { width: 75% } .col-md-8 { width: 66.66666667% } .col-md-7 { width: 58.33333333% } .col-md-6 { width: 50% } .col-md-5 { width: 41.66666667% } .col-md-4 { width: 33.33333333% } .col-md-3 { width: 25% } .col-md-2 { width: 16.66666667% } .col-md-1 { width: 8.33333333% } .col-md-pull-12 { right: 100% } .col-md-pull-11 { right: 91.66666667% } .col-md-pull-10 { right: 83.33333333% } .col-md-pull-9 { right: 75% } .col-md-pull-8 { right: 66.66666667% } .col-md-pull-7 { right: 58.33333333% } .col-md-pull-6 { right: 50% } .col-md-pull-5 { right: 41.66666667% } .col-md-pull-4 { right: 33.33333333% } .col-md-pull-3 { right: 25% } .col-md-pull-2 { right: 16.66666667% } .col-md-pull-1 { right: 8.33333333% } .col-md-pull-0 { right: auto } .col-md-push-12 { left: 100% } .col-md-push-11 { left: 91.66666667% } .col-md-push-10 { left: 83.33333333% } .col-md-push-9 { left: 75% } .col-md-push-8 { left: 66.66666667% } .col-md-push-7 { left: 58.33333333% } .col-md-push-6 { left: 50% } .col-md-push-5 { left: 41.66666667% } .col-md-push-4 { left: 33.33333333% } .col-md-push-3 { left: 25% } .col-md-push-2 { left: 16.66666667% } .col-md-push-1 { left: 8.33333333% } .col-md-push-0 { left: auto } .col-md-offset-12 { margin-left: 100% } .col-md-offset-11 { margin-left: 91.66666667% } .col-md-offset-10 { margin-left: 83.33333333% } .col-md-offset-9 { margin-left: 75% } .col-md-offset-8 { margin-left: 66.66666667% } .col-md-offset-7 { margin-left: 58.33333333% } .col-md-offset-6 { margin-left: 50% } .col-md-offset-5 { margin-left: 41.66666667% } .col-md-offset-4 { margin-left: 33.33333333% } .col-md-offset-3 { margin-left: 25% } .col-md-offset-2 { margin-left: 16.66666667% } .col-md-offset-1 { margin-left: 8.33333333% } .col-md-offset-0 { margin-left: 0 } } @media (min-width: 1200px) { .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { float: left } .col-lg-12 { width: 100% } .col-lg-11 { width: 91.66666667% } .col-lg-10 { width: 83.33333333% } .col-lg-9 { width: 75% } .col-lg-8 { width: 66.66666667% } .col-lg-7 { width: 58.33333333% } .col-lg-6 { width: 50% } .col-lg-5 { width: 41.66666667% } .col-lg-4 { width: 33.33333333% } .col-lg-3 { width: 25% } .col-lg-2 { width: 16.66666667% } .col-lg-1 { width: 8.33333333% } .col-lg-pull-12 { right: 100% } .col-lg-pull-11 { right: 91.66666667% } .col-lg-pull-10 { right: 83.33333333% } .col-lg-pull-9 { right: 75% } .col-lg-pull-8 { right: 66.66666667% } .col-lg-pull-7 { right: 58.33333333% } .col-lg-pull-6 { right: 50% } .col-lg-pull-5 { right: 41.66666667% } .col-lg-pull-4 { right: 33.33333333% } .col-lg-pull-3 { right: 25% } .col-lg-pull-2 { right: 16.66666667% } .col-lg-pull-1 { right: 8.33333333% } .col-lg-pull-0 { right: auto } .col-lg-push-12 { left: 100% } .col-lg-push-11 { left: 91.66666667% } .col-lg-push-10 { left: 83.33333333% } .col-lg-push-9 { left: 75% } .col-lg-push-8 { left: 66.66666667% } .col-lg-push-7 { left: 58.33333333% } .col-lg-push-6 { left: 50% } .col-lg-push-5 { left: 41.66666667% } .col-lg-push-4 { left: 33.33333333% } .col-lg-push-3 { left: 25% } .col-lg-push-2 { left: 16.66666667% } .col-lg-push-1 { left: 8.33333333% } .col-lg-push-0 { left: auto } .col-lg-offset-12 { margin-left: 100% } .col-lg-offset-11 { margin-left: 91.66666667% } .col-lg-offset-10 { margin-left: 83.33333333% } .col-lg-offset-9 { margin-left: 75% } .col-lg-offset-8 { margin-left: 66.66666667% } .col-lg-offset-7 { margin-left: 58.33333333% } .col-lg-offset-6 { margin-left: 50% } .col-lg-offset-5 { margin-left: 41.66666667% } .col-lg-offset-4 { margin-left: 33.33333333% } .col-lg-offset-3 { margin-left: 25% } .col-lg-offset-2 { margin-left: 16.66666667% } .col-lg-offset-1 { margin-left: 8.33333333% } .col-lg-offset-0 { margin-left: 0 } } table { background-color: transparent } caption { padding-top: 8px; padding-bottom: 8px; color: #777; text-align: left } th { text-align: left } .table { width: 100%; max-width: 100%; margin-bottom: 20px } .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { padding: 8px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd } .table > thead > tr > th { vertical-align: bottom; border-bottom: 2px solid #ddd } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, .table > thead:first-child > tr:first-child > th, .table > caption + thead > tr:first-child > td, .table > colgroup + thead > tr:first-child > td, .table > thead:first-child > tr:first-child > td { border-top: 0 } .table > tbody + tbody { border-top: 2px solid #ddd } .table .table { background-color: #fff } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td { padding: 5px } .table-bordered { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { border-bottom-width: 2px } .table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9 } .table-hover > tbody > tr:hover { background-color: #f5f5f5 } table col[class*="col-"] { position: static; float: none; display: table-column } table td[class*="col-"], table th[class*="col-"] { position: static; float: none; display: table-cell } .table > thead > tr > td.active, .table > tbody > tr > td.active, .table > tfoot > tr > td.active, .table > thead > tr > th.active, .table > tbody > tr > th.active, .table > tfoot > tr > th.active, .table > thead > tr.active > td, .table > tbody > tr.active > td, .table > tfoot > tr.active > td, .table > thead > tr.active > th, .table > tbody > tr.active > th, .table > tfoot > tr.active > th { background-color: #f5f5f5 } .table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th { background-color: #e8e8e8 } .table > thead > tr > td.success, .table > tbody > tr > td.success, .table > tfoot > tr > td.success, .table > thead > tr > th.success, .table > tbody > tr > th.success, .table > tfoot > tr > th.success, .table > thead > tr.success > td, .table > tbody > tr.success > td, .table > tfoot > tr.success > td, .table > thead > tr.success > th, .table > tbody > tr.success > th, .table > tfoot > tr.success > th { background-color: #dff0d8 } .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6 } .table > thead > tr > td.info, .table > tbody > tr > td.info, .table > tfoot > tr > td.info, .table > thead > tr > th.info, .table > tbody > tr > th.info, .table > tfoot > tr > th.info, .table > thead > tr.info > td, .table > tbody > tr.info > td, .table > tfoot > tr.info > td, .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { background-color: #d9edf7 } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { background-color: #c4e3f3 } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > tfoot > tr > td.warning, .table > thead > tr > th.warning, .table > tbody > tr > th.warning, .table > tfoot > tr > th.warning, .table > thead > tr.warning > td, .table > tbody > tr.warning > td, .table > tfoot > tr.warning > td, .table > thead > tr.warning > th, .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { background-color: #fcf8e3 } .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc } .table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > tfoot > tr > td.danger, .table > thead > tr > th.danger, .table > tbody > tr > th.danger, .table > tfoot > tr > th.danger, .table > thead > tr.danger > td, .table > tbody > tr.danger > td, .table > tfoot > tr.danger > td, .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { background-color: #f2dede } .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc } .table-responsive { overflow-x: auto; min-height: 0.01% } @media screen and (max-width: 767px) { .table-responsive { width: 100%; margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid #ddd } .table-responsive > .table { margin-bottom: 0 } .table-responsive > .table > thead > tr > th, .table-responsive > .table > tbody > tr > th, .table-responsive > .table > tfoot > tr > th, .table-responsive > .table > thead > tr > td, .table-responsive > .table > tbody > tr > td, .table-responsive > .table > tfoot > tr > td { white-space: nowrap } .table-responsive > .table-bordered { border: 0 } .table-responsive > .table-bordered > thead > tr > th:first-child, .table-responsive > .table-bordered > tbody > tr > th:first-child, .table-responsive > .table-bordered > tfoot > tr > th:first-child, .table-responsive > .table-bordered > thead > tr > td:first-child, .table-responsive > .table-bordered > tbody > tr > td:first-child, .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .table-responsive > .table-bordered > thead > tr > th:last-child, .table-responsive > .table-bordered > tbody > tr > th:last-child, .table-responsive > .table-bordered > tfoot > tr > th:last-child, .table-responsive > .table-bordered > thead > tr > td:last-child, .table-responsive > .table-bordered > tbody > tr > td:last-child, .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .table-responsive > .table-bordered > tbody > tr:last-child > th, .table-responsive > .table-bordered > tfoot > tr:last-child > th, .table-responsive > .table-bordered > tbody > tr:last-child > td, .table-responsive > .table-bordered > tfoot > tr:last-child > td { border-bottom: 0 } } fieldset { padding: 0; margin: 0; border: 0; min-width: 0 } legend { display: block; width: 100%; padding: 0; margin-bottom: 20px; font-size: 21px; line-height: inherit; color: #333; border: 0; border-bottom: 1px solid #e5e5e5 } label { display: inline-block; max-width: 100%; margin-bottom: 5px; font-weight: bold } input[type="search"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; line-height: normal } input[type="file"] { display: block } input[type="range"] { display: block; width: 100% } select[multiple], select[size] { height: auto } input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } output { display: block; padding-top: 7px; font-size: 14px; line-height: 1.42857143; color: #555 } .form-control { display: block; width: 100%; height: 34px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s } .form-control:focus { border-color: #66afe9; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6) } .form-control::-moz-placeholder { color: #999; opacity: 1 } .form-control:-ms-input-placeholder { color: #999 } .form-control::-webkit-input-placeholder { color: #999 } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { background-color: #eee; opacity: 1 } .form-control[disabled], fieldset[disabled] .form-control { cursor: not-allowed } textarea.form-control { height: auto } input[type="search"] { -webkit-appearance: none } @media screen and (-webkit-min-device-pixel-ratio: 0) { input[type="date"].form-control, input[type="time"].form-control, input[type="datetime-local"].form-control, input[type="month"].form-control { line-height: 34px } input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, input[type="month"].input-sm, .input-group-sm input[type="date"], .input-group-sm input[type="time"], .input-group-sm input[type="datetime-local"], .input-group-sm input[type="month"] { line-height: 30px } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, input[type="month"].input-lg, .input-group-lg input[type="date"], .input-group-lg input[type="time"], .input-group-lg input[type="datetime-local"], .input-group-lg input[type="month"] { line-height: 46px } } .form-group { margin-bottom: 15px } .radio, .checkbox { position: relative; display: block; margin-top: 10px; margin-bottom: 10px } .radio label, .checkbox label { min-height: 20px; padding-left: 20px; margin-bottom: 0; font-weight: normal; cursor: pointer } .radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; margin-left: -20px; margin-top: 4px \9 } .radio + .radio, .checkbox + .checkbox { margin-top: -5px } .radio-inline, .checkbox-inline { position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; vertical-align: middle; font-weight: normal; cursor: pointer } .radio-inline + .radio-inline, .checkbox-inline + .checkbox-inline { margin-top: 0; margin-left: 10px } input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"].disabled, input[type="checkbox"].disabled, fieldset[disabled] input[type="radio"], fieldset[disabled] input[type="checkbox"] { cursor: not-allowed } .radio-inline.disabled, .checkbox-inline.disabled, fieldset[disabled] .radio-inline, fieldset[disabled] .checkbox-inline { cursor: not-allowed } .radio.disabled label, .checkbox.disabled label, fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed } .form-control-static { padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; min-height: 34px } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0 } .input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-sm { height: 30px; line-height: 30px } textarea.input-sm, select[multiple].input-sm { height: auto } .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .form-group-sm select.form-control { height: 30px; line-height: 30px } .form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control { height: auto } .form-group-sm .form-control-static { height: 30px; min-height: 32px; padding: 6px 10px; font-size: 12px; line-height: 1.5 } .input-lg { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-lg { height: 46px; line-height: 46px } textarea.input-lg, select[multiple].input-lg { height: auto } .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .form-group-lg select.form-control { height: 46px; line-height: 46px } .form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control { height: auto } .form-group-lg .form-control-static { height: 46px; min-height: 38px; padding: 11px 16px; font-size: 18px; line-height: 1.3333333 } .has-feedback { position: relative } .has-feedback .form-control { padding-right: 42.5px } .form-control-feedback { position: absolute; top: 0; right: 0; z-index: 2; display: block; width: 34px; height: 34px; line-height: 34px; text-align: center; pointer-events: none } .input-lg + .form-control-feedback, .input-group-lg + .form-control-feedback, .form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px } .input-sm + .form-control-feedback, .input-group-sm + .form-control-feedback, .form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px } .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { color: #3c763d } .has-success .form-control { border-color: #3c763d; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-success .form-control:focus { border-color: #2b542c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168 } .has-success .input-group-addon { color: #3c763d; border-color: #3c763d; background-color: #dff0d8 } .has-success .form-control-feedback { color: #3c763d } .has-warning .help-block, .has-warning .control-label, .has-warning .radio, .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline, .has-warning.radio label, .has-warning.checkbox label, .has-warning.radio-inline label, .has-warning.checkbox-inline label { color: #8a6d3b } .has-warning .form-control { border-color: #8a6d3b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-warning .form-control:focus { border-color: #66512c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b } .has-warning .input-group-addon { color: #8a6d3b; border-color: #8a6d3b; background-color: #fcf8e3 } .has-warning .form-control-feedback { color: #8a6d3b } .has-error .help-block, .has-error .control-label, .has-error .radio, .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label { color: #a94442 } .has-error .form-control { border-color: #a94442; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-error .form-control:focus { border-color: #843534; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483 } .has-error .input-group-addon { color: #a94442; border-color: #a94442; background-color: #f2dede } .has-error .form-control-feedback { color: #a94442 } .has-feedback label ~ .form-control-feedback { top: 25px } .has-feedback label.sr-only ~ .form-control-feedback { top: 0 } .help-block { display: block; margin-top: 5px; margin-bottom: 10px; color: #737373 } @media (min-width: 768px) { .form-inline .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .form-inline .form-control { display: inline-block; width: auto; vertical-align: middle } .form-inline .form-control-static { display: inline-block } .form-inline .input-group { display: inline-table; vertical-align: middle } .form-inline .input-group .input-group-addon, .form-inline .input-group .input-group-btn, .form-inline .input-group .form-control { width: auto } .form-inline .input-group > .form-control { width: 100% } .form-inline .control-label { margin-bottom: 0; vertical-align: middle } .form-inline .radio, .form-inline .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .form-inline .radio label, .form-inline .checkbox label { padding-left: 0 } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .form-inline .has-feedback .form-control-feedback { top: 0 } } .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { margin-top: 0; margin-bottom: 0; padding-top: 7px } .form-horizontal .radio, .form-horizontal .checkbox { min-height: 27px } .form-horizontal .form-group { margin-left: -15px; margin-right: -15px } @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; margin-bottom: 0; padding-top: 7px } } .form-horizontal .has-feedback .form-control-feedback { right: 15px } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { padding-top: 14.333333px; font-size: 18px } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; font-size: 12px } } .btn { display: inline-block; margin-bottom: 0; font-weight: normal; text-align: center; vertical-align: middle; -ms-touch-action: manipulation; touch-action: manipulation; cursor: pointer; background-image: none; border: 1px solid transparent; white-space: nowrap; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none } .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:active.focus, .btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } .btn:hover, .btn:focus, .btn.focus { color: #333; text-decoration: none } .btn:active, .btn.active { outline: 0; background-image: none; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; opacity: .65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none } a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none } .btn-default { color: #333; background-color: #fff; border-color: #ccc } .btn-default:focus, .btn-default.focus { color: #333; background-color: #e6e6e6; border-color: #8c8c8c } .btn-default:hover { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active:hover, .btn-default.active:hover, .open > .dropdown-toggle.btn-default:hover, .btn-default:active:focus, .btn-default.active:focus, .open > .dropdown-toggle.btn-default:focus, .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus { color: #333; background-color: #d4d4d4; border-color: #8c8c8c } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { background-image: none } .btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, fieldset[disabled] .btn-default.focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { background-color: #fff; border-color: #ccc } .btn-default .badge { color: #fff; background-color: #333 } .btn-primary { color: #fff; background-color: #337ab7; border-color: #2e6da4 } .btn-primary:focus, .btn-primary.focus { color: #fff; background-color: #286090; border-color: #122b40 } .btn-primary:hover { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active:hover, .btn-primary.active:hover, .open > .dropdown-toggle.btn-primary:hover, .btn-primary:active:focus, .btn-primary.active:focus, .open > .dropdown-toggle.btn-primary:focus, .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus { color: #fff; background-color: #204d74; border-color: #122b40 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { background-image: none } .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary.focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #337ab7; border-color: #2e6da4 } .btn-primary .badge { color: #337ab7; background-color: #fff } .btn-success { color: #fff; background-color: #5cb85c; border-color: #4cae4c } .btn-success:focus, .btn-success.focus { color: #fff; background-color: #449d44; border-color: #255625 } .btn-success:hover { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active:hover, .btn-success.active:hover, .open > .dropdown-toggle.btn-success:hover, .btn-success:active:focus, .btn-success.active:focus, .open > .dropdown-toggle.btn-success:focus, .btn-success:active.focus, .btn-success.active.focus, .open > .dropdown-toggle.btn-success.focus { color: #fff; background-color: #398439; border-color: #255625 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { background-image: none } .btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, .btn-success.disabled.focus, .btn-success[disabled].focus, fieldset[disabled] .btn-success.focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { background-color: #5cb85c; border-color: #4cae4c } .btn-success .badge { color: #5cb85c; background-color: #fff } .btn-info { color: #fff; background-color: #5bc0de; border-color: #46b8da } .btn-info:focus, .btn-info.focus { color: #fff; background-color: #31b0d5; border-color: #1b6d85 } .btn-info:hover { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active:hover, .btn-info.active:hover, .open > .dropdown-toggle.btn-info:hover, .btn-info:active:focus, .btn-info.active:focus, .open > .dropdown-toggle.btn-info:focus, .btn-info:active.focus, .btn-info.active.focus, .open > .dropdown-toggle.btn-info.focus { color: #fff; background-color: #269abc; border-color: #1b6d85 } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { background-image: none } .btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, .btn-info.disabled.focus, .btn-info[disabled].focus, fieldset[disabled] .btn-info.focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { background-color: #5bc0de; border-color: #46b8da } .btn-info .badge { color: #5bc0de; background-color: #fff } .btn-warning { color: #fff; background-color: #f0ad4e; border-color: #eea236 } .btn-warning:focus, .btn-warning.focus { color: #fff; background-color: #ec971f; border-color: #985f0d } .btn-warning:hover { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active:hover, .btn-warning.active:hover, .open > .dropdown-toggle.btn-warning:hover, .btn-warning:active:focus, .btn-warning.active:focus, .open > .dropdown-toggle.btn-warning:focus, .btn-warning:active.focus, .btn-warning.active.focus, .open > .dropdown-toggle.btn-warning.focus { color: #fff; background-color: #d58512; border-color: #985f0d } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { background-image: none } .btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled.focus, .btn-warning[disabled].focus, fieldset[disabled] .btn-warning.focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { background-color: #f0ad4e; border-color: #eea236 } .btn-warning .badge { color: #f0ad4e; background-color: #fff } .btn-danger { color: #fff; background-color: #d9534f; border-color: #d43f3a } .btn-danger:focus, .btn-danger.focus { color: #fff; background-color: #c9302c; border-color: #761c19 } .btn-danger:hover { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active:hover, .btn-danger.active:hover, .open > .dropdown-toggle.btn-danger:hover, .btn-danger:active:focus, .btn-danger.active:focus, .open > .dropdown-toggle.btn-danger:focus, .btn-danger:active.focus, .btn-danger.active.focus, .open > .dropdown-toggle.btn-danger.focus { color: #fff; background-color: #ac2925; border-color: #761c19 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { background-image: none } .btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled.focus, .btn-danger[disabled].focus, fieldset[disabled] .btn-danger.focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { background-color: #d9534f; border-color: #d43f3a } .btn-danger .badge { color: #d9534f; background-color: #fff } .btn-link { color: #337ab7; font-weight: normal; border-radius: 0 } .btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; -webkit-box-shadow: none; box-shadow: none } .btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent } .btn-link:hover, .btn-link:focus { color: #23527c; text-decoration: underline; background-color: transparent } .btn-link[disabled]:hover, fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { color: #777; text-decoration: none } .btn-lg, .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-block { display: block; width: 100% } .btn-block + .btn-block { margin-top: 5px } input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { width: 100% } .fade { opacity: 0; -webkit-transition: opacity .15s linear; -o-transition: opacity .15s linear; transition: opacity .15s linear } .fade.in { opacity: 1 } .collapse { display: none } .collapse.in { display: block } tr.collapse.in { display: table-row } tbody.collapse.in { display: table-row-group } .collapsing { position: relative; height: 0; overflow: hidden; -webkit-transition-property: height, visibility; -o-transition-property: height, visibility; transition-property: height, visibility; -webkit-transition-duration: .35s; -o-transition-duration: .35s; transition-duration: .35s; -webkit-transition-timing-function: ease; -o-transition-timing-function: ease; transition-timing-function: ease } .caret { display: inline-block; width: 0; height: 0; margin-left: 2px; vertical-align: middle; border-top: 4px dashed; border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent } .dropup, .dropdown { position: relative } .dropdown-toggle:focus { outline: 0 } .dropdown-menu { position: absolute; top: 100%; left: 0; z-index: 1000; display: none; float: left; min-width: 160px; padding: 5px 0; margin: 2px 0 0; list-style: none; font-size: 14px; text-align: left; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); -webkit-background-clip: padding-box; background-clip: padding-box } .dropdown-menu.pull-right { right: 0; left: auto } .dropdown-menu .divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.42857143; color: #333; white-space: nowrap } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; color: #262626; background-color: #f5f5f5 } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { color: #fff; text-decoration: none; outline: 0; background-color: #337ab7 } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #777 } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); cursor: not-allowed } .open > .dropdown-menu { display: block } .open > a { outline: 0 } .dropdown-menu-right { left: auto; right: 0 } .dropdown-menu-left { left: 0; right: auto } .dropdown-header { display: block; padding: 3px 20px; font-size: 12px; line-height: 1.42857143; color: #777; white-space: nowrap } .dropdown-backdrop { position: fixed; left: 0; right: 0; bottom: 0; top: 0; z-index: 990 } .pull-right > .dropdown-menu { right: 0; left: auto } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px dashed; border-bottom: 4px solid \9; content: "" } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 2px } @media (min-width: 768px) { .navbar-right .dropdown-menu { left: auto; right: 0 } .navbar-right .dropdown-menu-left { left: 0; right: auto } } .btn-group, .btn-group-vertical { position: relative; display: inline-block; vertical-align: middle } .btn-group > .btn, .btn-group-vertical > .btn { position: relative; float: left } .btn-group > .btn:hover, .btn-group-vertical > .btn:hover, .btn-group > .btn:focus, .btn-group-vertical > .btn:focus, .btn-group > .btn:active, .btn-group-vertical > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn.active { z-index: 2 } .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, .btn-group .btn-group + .btn-group { margin-left: -1px } .btn-toolbar { margin-left: -5px } .btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left } .btn-toolbar > .btn, .btn-toolbar > .btn-group, .btn-toolbar > .input-group { margin-left: 5px } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { border-radius: 0 } .btn-group > .btn:first-child { margin-left: 0 } .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group > .btn-group { float: left } .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0 } .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px } .btn-group > .btn-lg + .dropdown-toggle { padding-left: 12px; padding-right: 12px } .btn-group.open .dropdown-toggle { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn-group.open .dropdown-toggle.btn-link { -webkit-box-shadow: none; box-shadow: none } .btn .caret { margin-left: 0 } .btn-lg .caret { border-width: 5px 5px 0; border-bottom-width: 0 } .dropup .btn-lg .caret { border-width: 0 5px 5px } .btn-group-vertical > .btn, .btn-group-vertical > .btn-group, .btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; max-width: 100% } .btn-group-vertical > .btn-group > .btn { float: none } .btn-group-vertical > .btn + .btn, .btn-group-vertical > .btn + .btn-group, .btn-group-vertical > .btn-group + .btn, .btn-group-vertical > .btn-group + .btn-group { margin-top: -1px; margin-left: 0 } .btn-group-vertical > .btn:not(:first-child):not(:last-child) { border-radius: 0 } .btn-group-vertical > .btn:first-child:not(:last-child) { border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn:last-child:not(:first-child) { border-bottom-left-radius: 4px; border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-justified { display: table; width: 100%; table-layout: fixed; border-collapse: separate } .btn-group-justified > .btn, .btn-group-justified > .btn-group { float: none; display: table-cell; width: 1% } .btn-group-justified > .btn-group .btn { width: 100% } .btn-group-justified > .btn-group .dropdown-menu { left: auto } [data-toggle="buttons"] > .btn input[type="radio"], [data-toggle="buttons"] > .btn-group > .btn input[type="radio"], [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; clip: rect(0, 0, 0, 0); pointer-events: none } .input-group { position: relative; display: table; border-collapse: separate } .input-group[class*="col-"] { float: none; padding-left: 0; padding-right: 0 } .input-group .form-control { position: relative; z-index: 2; float: left; width: 100%; margin-bottom: 0 } .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { height: 46px; line-height: 46px } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, textarea.input-group-lg > .input-group-btn > .btn, select[multiple].input-group-lg > .form-control, select[multiple].input-group-lg > .input-group-addon, select[multiple].input-group-lg > .input-group-btn > .btn { height: auto } .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-btn > .btn { height: 30px; line-height: 30px } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-btn > .btn, select[multiple].input-group-sm > .form-control, select[multiple].input-group-sm > .input-group-addon, select[multiple].input-group-sm > .input-group-btn > .btn { height: auto } .input-group-addon, .input-group-btn, .input-group .form-control { display: table-cell } .input-group-addon:not(:first-child):not(:last-child), .input-group-btn:not(:first-child):not(:last-child), .input-group .form-control:not(:first-child):not(:last-child) { border-radius: 0 } .input-group-addon, .input-group-btn { width: 1%; white-space: nowrap; vertical-align: middle } .input-group-addon { padding: 6px 12px; font-size: 14px; font-weight: normal; line-height: 1; color: #555; text-align: center; background-color: #eee; border: 1px solid #ccc; border-radius: 4px } .input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; border-radius: 3px } .input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; border-radius: 6px } .input-group-addon input[type="radio"], .input-group-addon input[type="checkbox"] { margin-top: 0 } .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { border-bottom-right-radius: 0; border-top-right-radius: 0 } .input-group-addon:first-child { border-right: 0 } .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { border-bottom-left-radius: 0; border-top-left-radius: 0 } .input-group-addon:last-child { border-left: 0 } .input-group-btn { position: relative; font-size: 0; white-space: nowrap } .input-group-btn > .btn { position: relative } .input-group-btn > .btn + .btn { margin-left: -1px } .input-group-btn > .btn:hover, .input-group-btn > .btn:focus, .input-group-btn > .btn:active { z-index: 2 } .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group { margin-right: -1px } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { z-index: 2; margin-left: -1px } .nav { margin-bottom: 0; padding-left: 0; list-style: none } .nav > li { position: relative; display: block } .nav > li > a { position: relative; display: block; padding: 10px 15px } .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; background-color: #eee } .nav > li.disabled > a { color: #777 } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { color: #777; text-decoration: none; background-color: transparent; cursor: not-allowed } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #eee; border-color: #337ab7 } .nav .nav-divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .nav > li > a > img { max-width: none } .nav-tabs { border-bottom: 1px solid #ddd } .nav-tabs > li { float: left; margin-bottom: -1px } .nav-tabs > li > a { margin-right: 2px; line-height: 1.42857143; border: 1px solid transparent; border-radius: 4px 4px 0 0 } .nav-tabs > li > a:hover { border-color: #eee #eee #ddd } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #555; background-color: #fff; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default } .nav-tabs.nav-justified { width: 100%; border-bottom: 0 } .nav-tabs.nav-justified > li { float: none } .nav-tabs.nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-tabs.nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-tabs.nav-justified > li { display: table-cell; width: 1% } .nav-tabs.nav-justified > li > a { margin-bottom: 0 } } .nav-tabs.nav-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border-bottom-color: #fff } } .nav-pills > li { float: left } .nav-pills > li > a { border-radius: 4px } .nav-pills > li + li { margin-left: 2px } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; background-color: #337ab7 } .nav-stacked > li { float: none } .nav-stacked > li + li { margin-top: 2px; margin-left: 0 } .nav-justified { width: 100% } .nav-justified > li { float: none } .nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-justified > li { display: table-cell; width: 1% } .nav-justified > li > a { margin-bottom: 0 } } .nav-tabs-justified { border-bottom: 0 } .nav-tabs-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border-bottom-color: #fff } } .tab-content > .tab-pane { display: none } .tab-content > .active { display: block } .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar { position: relative; min-height: 50px; margin-bottom: 20px; border: 1px solid transparent } @media (min-width: 768px) { .navbar { border-radius: 4px } } @media (min-width: 768px) { .navbar-header { float: left } } .navbar-collapse { overflow-x: visible; padding-right: 15px; padding-left: 15px; border-top: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch } .navbar-collapse.in { overflow-y: auto } @media (min-width: 768px) { .navbar-collapse { width: auto; border-top: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-collapse.collapse { display: block !important; height: auto !important; padding-bottom: 0; overflow: visible !important } .navbar-collapse.in { overflow-y: visible } .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { padding-left: 0; padding-right: 0 } } .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 340px } @media (max-device-width: 480px) and (orientation: landscape) { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 200px } } .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: -15px; margin-left: -15px } @media (min-width: 768px) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: 0; margin-left: 0 } } .navbar-static-top { z-index: 1000; border-width: 0 0 1px } @media (min-width: 768px) { .navbar-static-top { border-radius: 0 } } .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; right: 0; left: 0; z-index: 1030 } @media (min-width: 768px) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0 } } .navbar-fixed-top { top: 0; border-width: 0 0 1px } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; border-width: 1px 0 0 } .navbar-brand { float: left; padding: 15px 15px; font-size: 18px; line-height: 20px; height: 50px } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none } .navbar-brand > img { display: block } @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px } } .navbar-toggle { position: relative; float: right; margin-right: 15px; padding: 9px 10px; margin-top: 8px; margin-bottom: 8px; background-color: transparent; background-image: none; border: 1px solid transparent; border-radius: 4px } .navbar-toggle:focus { outline: 0 } .navbar-toggle .icon-bar { display: block; width: 22px; height: 2px; border-radius: 1px } .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px } @media (min-width: 768px) { .navbar-toggle { display: none } } .navbar-nav { margin: 7.5px -15px } .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; line-height: 20px } @media (max-width: 767px) { .navbar-nav .open .dropdown-menu { position: static; float: none; width: auto; margin-top: 0; background-color: transparent; border: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-nav .open .dropdown-menu > li > a, .navbar-nav .open .dropdown-menu .dropdown-header { padding: 5px 15px 5px 25px } .navbar-nav .open .dropdown-menu > li > a { line-height: 20px } .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus { background-image: none } } @media (min-width: 768px) { .navbar-nav { float: left; margin: 0 } .navbar-nav > li { float: left } .navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px } } .navbar-form { margin-left: -15px; margin-right: -15px; padding: 10px 15px; border-top: 1px solid transparent; border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); margin-top: 8px; margin-bottom: 8px } @media (min-width: 768px) { .navbar-form .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .navbar-form .form-control { display: inline-block; width: auto; vertical-align: middle } .navbar-form .form-control-static { display: inline-block } .navbar-form .input-group { display: inline-table; vertical-align: middle } .navbar-form .input-group .input-group-addon, .navbar-form .input-group .input-group-btn, .navbar-form .input-group .form-control { width: auto } .navbar-form .input-group > .form-control { width: 100% } .navbar-form .control-label { margin-bottom: 0; vertical-align: middle } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .navbar-form .radio label, .navbar-form .checkbox label { padding-left: 0 } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .navbar-form .has-feedback .form-control-feedback { top: 0 } } @media (max-width: 767px) { .navbar-form .form-group { margin-bottom: 5px } .navbar-form .form-group:last-child { margin-bottom: 0 } } @media (min-width: 768px) { .navbar-form { width: auto; border: 0; margin-left: 0; margin-right: 0; padding-top: 0; padding-bottom: 0; -webkit-box-shadow: none; box-shadow: none } } .navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; border-top-right-radius: 4px; border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .navbar-btn { margin-top: 8px; margin-bottom: 8px } .navbar-btn.btn-sm { margin-top: 10px; margin-bottom: 10px } .navbar-btn.btn-xs { margin-top: 14px; margin-bottom: 14px } .navbar-text { margin-top: 15px; margin-bottom: 15px } @media (min-width: 768px) { .navbar-text { float: left; margin-left: 15px; margin-right: 15px } } @media (min-width: 768px) { .navbar-left { float: left !important } .navbar-right { float: right !important; margin-right: -15px } .navbar-right ~ .navbar-right { margin-right: 0 } } .navbar-default { background-color: #f8f8f8; border-color: #e7e7e7 } .navbar-default .navbar-brand { color: #777 } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { color: #5e5e5e; background-color: transparent } .navbar-default .navbar-text { color: #777 } .navbar-default .navbar-nav > li > a { color: #777 } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { color: #ccc; background-color: transparent } .navbar-default .navbar-toggle { border-color: #ddd } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #ddd } .navbar-default .navbar-toggle .icon-bar { background-color: #888 } .navbar-default .navbar-collapse, .navbar-default .navbar-form { border-color: #e7e7e7 } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #e7e7e7; color: #555 } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777 } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #ccc; background-color: transparent } } .navbar-default .navbar-link { color: #777 } .navbar-default .navbar-link:hover { color: #333 } .navbar-default .btn-link { color: #777 } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { color: #333 } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { color: #ccc } .navbar-inverse { background-color: #222; border-color: #080808 } .navbar-inverse .navbar-brand { color: #9d9d9d } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-text { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { color: #444; background-color: transparent } .navbar-inverse .navbar-toggle { border-color: #333 } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { background-color: #333 } .navbar-inverse .navbar-toggle .icon-bar { background-color: #fff } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { border-color: #101010 } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background-color: #080808; color: #fff } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu .divider { background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #444; background-color: transparent } } .navbar-inverse .navbar-link { color: #9d9d9d } .navbar-inverse .navbar-link:hover { color: #fff } .navbar-inverse .btn-link { color: #9d9d9d } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { color: #fff } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { color: #444 } .breadcrumb { padding: 8px 15px; margin-bottom: 20px; list-style: none; background-color: #f5f5f5; border-radius: 4px } .breadcrumb > li { display: inline-block } .breadcrumb > li + li:before { content: "/\00a0"; padding: 0 5px; color: #ccc } .breadcrumb > .active { color: #777 } .pagination { display: inline-block; padding-left: 0; margin: 20px 0; border-radius: 4px } .pagination > li { display: inline } .pagination > li > a, .pagination > li > span { position: relative; float: left; padding: 6px 12px; line-height: 1.42857143; text-decoration: none; color: #337ab7; background-color: #fff; border: 1px solid #ddd; margin-left: -1px } .pagination > li:first-child > a, .pagination > li:first-child > span { margin-left: 0; border-bottom-left-radius: 4px; border-top-left-radius: 4px } .pagination > li:last-child > a, .pagination > li:last-child > span { border-bottom-right-radius: 4px; border-top-right-radius: 4px } .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { z-index: 3; color: #23527c; background-color: #eee; border-color: #ddd } .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7; cursor: default } .pagination > .disabled > span, .pagination > .disabled > span:hover, .pagination > .disabled > span:focus, .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { color: #777; background-color: #fff; border-color: #ddd; cursor: not-allowed } .pagination-lg > li > a, .pagination-lg > li > span { padding: 10px 16px; font-size: 18px; line-height: 1.3333333 } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; border-top-left-radius: 6px } .pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span { border-bottom-right-radius: 6px; border-top-right-radius: 6px } .pagination-sm > li > a, .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; line-height: 1.5 } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { border-bottom-left-radius: 3px; border-top-left-radius: 3px } .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span { border-bottom-right-radius: 3px; border-top-right-radius: 3px } .pager { padding-left: 0; margin: 20px 0; list-style: none; text-align: center } .pager li { display: inline } .pager li > a, .pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; border-radius: 15px } .pager li > a:hover, .pager li > a:focus { text-decoration: none; background-color: #eee } .pager .next > a, .pager .next > span { float: right } .pager .previous > a, .pager .previous > span { float: left } .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { color: #777; background-color: #fff; cursor: not-allowed } .label { display: inline; padding: .2em .6em .3em; font-size: 75%; font-weight: bold; line-height: 1; color: #fff; text-align: center; white-space: nowrap; vertical-align: baseline; border-radius: .25em } a.label:hover, a.label:focus { color: #fff; text-decoration: none; cursor: pointer } .label:empty { display: none } .btn .label { position: relative; top: -1px } .label-default { background-color: #777 } .label-default[href]:hover, .label-default[href]:focus { background-color: #5e5e5e } .label-primary { background-color: #337ab7 } .label-primary[href]:hover, .label-primary[href]:focus { background-color: #286090 } .label-success { background-color: #5cb85c } .label-success[href]:hover, .label-success[href]:focus { background-color: #449d44 } .label-info { background-color: #5bc0de } .label-info[href]:hover, .label-info[href]:focus { background-color: #31b0d5 } .label-warning { background-color: #f0ad4e } .label-warning[href]:hover, .label-warning[href]:focus { background-color: #ec971f } .label-danger { background-color: #d9534f } .label-danger[href]:hover, .label-danger[href]:focus { background-color: #c9302c } .badge { display: inline-block; min-width: 10px; padding: 3px 7px; font-size: 12px; font-weight: bold; color: #fff; line-height: 1; vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777; border-radius: 10px } .badge:empty { display: none } .btn .badge { position: relative; top: -1px } .btn-xs .badge, .btn-group-xs > .btn .badge { top: 0; padding: 1px 5px } a.badge:hover, a.badge:focus { color: #fff; text-decoration: none; cursor: pointer } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #337ab7; background-color: #fff } .list-group-item > .badge { float: right } .list-group-item > .badge + .badge { margin-right: 5px } .nav-pills > li > a > .badge { margin-left: 3px } .jumbotron { padding-top: 30px; padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eee } .jumbotron h1, .jumbotron .h1 { color: inherit } .jumbotron p { margin-bottom: 15px; font-size: 21px; font-weight: 200 } .jumbotron > hr { border-top-color: #d5d5d5 } .container .jumbotron, .container-fluid .jumbotron { border-radius: 6px } .jumbotron .container { max-width: 100% } @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; padding-bottom: 48px } .container .jumbotron, .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px } .jumbotron h1, .jumbotron .h1 { font-size: 63px } } .thumbnail { display: block; padding: 4px; margin-bottom: 20px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: border .2s ease-in-out; -o-transition: border .2s ease-in-out; transition: border .2s ease-in-out } .thumbnail > img, .thumbnail a > img { margin-left: auto; margin-right: auto } a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { border-color: #337ab7 } .thumbnail .caption { padding: 9px; color: #333 } .alert { padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 4px } .alert h4 { margin-top: 0; color: inherit } .alert .alert-link { font-weight: bold } .alert > p, .alert > ul { margin-bottom: 0 } .alert > p + p { margin-top: 5px } .alert-dismissable, .alert-dismissible { padding-right: 35px } .alert-dismissable .close, .alert-dismissible .close { position: relative; top: -2px; right: -21px; color: inherit } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #3c763d } .alert-success hr { border-top-color: #c9e2b3 } .alert-success .alert-link { color: #2b542c } .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #31708f } .alert-info hr { border-top-color: #a6e1ec } .alert-info .alert-link { color: #245269 } .alert-warning { background-color: #fcf8e3; border-color: #faebcc; color: #8a6d3b } .alert-warning hr { border-top-color: #f7e1b5 } .alert-warning .alert-link { color: #66512c } .alert-danger { background-color: #f2dede; border-color: #ebccd1; color: #a94442 } .alert-danger hr { border-top-color: #e4b9c0 } .alert-danger .alert-link { color: #843534 } @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @-o-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } .progress { overflow: hidden; height: 20px; margin-bottom: 20px; background-color: #f5f5f5; border-radius: 4px; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1) } .progress-bar { float: left; width: 0%; height: 100%; font-size: 12px; line-height: 20px; color: #fff; text-align: center; background-color: #337ab7; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width .6s ease; -o-transition: width .6s ease; transition: width .6s ease } .progress-striped .progress-bar, .progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px } .progress.active .progress-bar, .progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite } .progress-bar-success { background-color: #5cb85c } .progress-striped .progress-bar-success { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-info { background-color: #5bc0de } .progress-striped .progress-bar-info { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-warning { background-color: #f0ad4e } .progress-striped .progress-bar-warning { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-danger { background-color: #d9534f } .progress-striped .progress-bar-danger { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .media { margin-top: 15px } .media:first-child { margin-top: 0 } .media, .media-body { zoom: 1; overflow: hidden } .media-body { width: 10000px } .media-object { display: block } .media-object.img-thumbnail { max-width: none } .media-right, .media > .pull-right { padding-left: 10px } .media-left, .media > .pull-left { padding-right: 10px } .media-left, .media-right, .media-body { display: table-cell; vertical-align: top } .media-middle { vertical-align: middle } .media-bottom { vertical-align: bottom } .media-heading { margin-top: 0; margin-bottom: 5px } .media-list { padding-left: 0; list-style: none } .list-group { margin-bottom: 20px; padding-left: 0 } .list-group-item { position: relative; display: block; padding: 10px 15px; margin-bottom: -1px; background-color: #fff; border: 1px solid #ddd } .list-group-item:first-child { border-top-right-radius: 4px; border-top-left-radius: 4px } .list-group-item:last-child { margin-bottom: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px } a.list-group-item, button.list-group-item { color: #555 } a.list-group-item .list-group-item-heading, button.list-group-item .list-group-item-heading { color: #333 } a.list-group-item:hover, button.list-group-item:hover, a.list-group-item:focus, button.list-group-item:focus { text-decoration: none; color: #555; background-color: #f5f5f5 } button.list-group-item { width: 100%; text-align: left } .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { background-color: #eee; color: #777; cursor: not-allowed } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, .list-group-item.disabled:focus .list-group-item-heading { color: inherit } .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { color: #777 } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7 } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, .list-group-item.active:focus .list-group-item-heading, .list-group-item.active .list-group-item-heading > small, .list-group-item.active:hover .list-group-item-heading > small, .list-group-item.active:focus .list-group-item-heading > small, .list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading > .small, .list-group-item.active:focus .list-group-item-heading > .small { color: inherit } .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { color: #c7ddef } .list-group-item-success { color: #3c763d; background-color: #dff0d8 } a.list-group-item-success, button.list-group-item-success { color: #3c763d } a.list-group-item-success .list-group-item-heading, button.list-group-item-success .list-group-item-heading { color: inherit } a.list-group-item-success:hover, button.list-group-item-success:hover, a.list-group-item-success:focus, button.list-group-item-success:focus { color: #3c763d; background-color: #d0e9c6 } a.list-group-item-success.active, button.list-group-item-success.active, a.list-group-item-success.active:hover, button.list-group-item-success.active:hover, a.list-group-item-success.active:focus, button.list-group-item-success.active:focus { color: #fff; background-color: #3c763d; border-color: #3c763d } .list-group-item-info { color: #31708f; background-color: #d9edf7 } a.list-group-item-info, button.list-group-item-info { color: #31708f } a.list-group-item-info .list-group-item-heading, button.list-group-item-info .list-group-item-heading { color: inherit } a.list-group-item-info:hover, button.list-group-item-info:hover, a.list-group-item-info:focus, button.list-group-item-info:focus { color: #31708f; background-color: #c4e3f3 } a.list-group-item-info.active, button.list-group-item-info.active, a.list-group-item-info.active:hover, button.list-group-item-info.active:hover, a.list-group-item-info.active:focus, button.list-group-item-info.active:focus { color: #fff; background-color: #31708f; border-color: #31708f } .list-group-item-warning { color: #8a6d3b; background-color: #fcf8e3 } a.list-group-item-warning, button.list-group-item-warning { color: #8a6d3b } a.list-group-item-warning .list-group-item-heading, button.list-group-item-warning .list-group-item-heading { color: inherit } a.list-group-item-warning:hover, button.list-group-item-warning:hover, a.list-group-item-warning:focus, button.list-group-item-warning:focus { color: #8a6d3b; background-color: #faf2cc } a.list-group-item-warning.active, button.list-group-item-warning.active, a.list-group-item-warning.active:hover, button.list-group-item-warning.active:hover, a.list-group-item-warning.active:focus, button.list-group-item-warning.active:focus { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b } .list-group-item-danger { color: #a94442; background-color: #f2dede } a.list-group-item-danger, button.list-group-item-danger { color: #a94442 } a.list-group-item-danger .list-group-item-heading, button.list-group-item-danger .list-group-item-heading { color: inherit } a.list-group-item-danger:hover, button.list-group-item-danger:hover, a.list-group-item-danger:focus, button.list-group-item-danger:focus { color: #a94442; background-color: #ebcccc } a.list-group-item-danger.active, button.list-group-item-danger.active, a.list-group-item-danger.active:hover, button.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus, button.list-group-item-danger.active:focus { color: #fff; background-color: #a94442; border-color: #a94442 } .list-group-item-heading { margin-top: 0; margin-bottom: 5px } .list-group-item-text { margin-bottom: 0; line-height: 1.3 } .panel { margin-bottom: 20px; background-color: #fff; border: 1px solid transparent; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) } .panel-body { padding: 15px } .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel-heading > .dropdown .dropdown-toggle { color: inherit } .panel-title { margin-top: 0; margin-bottom: 0; font-size: 16px; color: inherit } .panel-title > a, .panel-title > small, .panel-title > .small, .panel-title > small > a, .panel-title > .small > a { color: inherit } .panel-footer { padding: 10px 15px; background-color: #f5f5f5; border-top: 1px solid #ddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .list-group, .panel > .panel-collapse > .list-group { margin-bottom: 0 } .panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item { border-width: 1px 0; border-radius: 0 } .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { border-bottom: 0; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0 } .list-group + .panel-footer { border-top-width: 0 } .panel > .table, .panel > .table-responsive > .table, .panel > .panel-collapse > .table { margin-bottom: 0 } .panel > .table caption, .panel > .table-responsive > .table caption, .panel > .panel-collapse > .table caption { padding-left: 15px; padding-right: 15px } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { border-top-right-radius: 3px } .panel > .table:last-child, .panel > .table-responsive:last-child > .table:last-child { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { border-bottom-right-radius: 3px } .panel > .panel-body + .table, .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { border-top: 1px solid #ddd } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { border-top: 0 } .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0 } .panel > .table-bordered > thead > tr > th:first-child, .panel > .table-responsive > .table-bordered > thead > tr > th:first-child, .panel > .table-bordered > tbody > tr > th:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, .panel > .table-bordered > tfoot > tr > th:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, .panel > .table-bordered > thead > tr > td:first-child, .panel > .table-responsive > .table-bordered > thead > tr > td:first-child, .panel > .table-bordered > tbody > tr > td:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, .panel > .table-bordered > tfoot > tr > td:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .panel > .table-bordered > thead > tr > th:last-child, .panel > .table-responsive > .table-bordered > thead > tr > th:last-child, .panel > .table-bordered > tbody > tr > th:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, .panel > .table-bordered > tfoot > tr > th:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, .panel > .table-bordered > thead > tr > td:last-child, .panel > .table-responsive > .table-bordered > thead > tr > td:last-child, .panel > .table-bordered > tbody > tr > td:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, .panel > .table-bordered > tfoot > tr > td:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .panel > .table-bordered > thead > tr:first-child > td, .panel > .table-responsive > .table-bordered > thead > tr:first-child > td, .panel > .table-bordered > tbody > tr:first-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, .panel > .table-bordered > thead > tr:first-child > th, .panel > .table-responsive > .table-bordered > thead > tr:first-child > th, .panel > .table-bordered > tbody > tr:first-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { border-bottom: 0 } .panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tfoot > tr:last-child > td, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, .panel > .table-bordered > tfoot > tr:last-child > th, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { border-bottom: 0 } .panel > .table-responsive { border: 0; margin-bottom: 0 } .panel-group { margin-bottom: 20px } .panel-group .panel { margin-bottom: 0; border-radius: 4px } .panel-group .panel + .panel { margin-top: 5px } .panel-group .panel-heading { border-bottom: 0 } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #ddd } .panel-group .panel-footer { border-top: 0 } .panel-group .panel-footer + .panel-collapse .panel-body { border-bottom: 1px solid #ddd } .panel-default { border-color: #ddd } .panel-default > .panel-heading { color: #333; background-color: #f5f5f5; border-color: #ddd } .panel-default > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ddd } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #333 } .panel-default > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ddd } .panel-primary { border-color: #337ab7 } .panel-primary > .panel-heading { color: #fff; background-color: #337ab7; border-color: #337ab7 } .panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #337ab7 } .panel-primary > .panel-heading .badge { color: #337ab7; background-color: #fff } .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #337ab7 } .panel-success { border-color: #d6e9c6 } .panel-success > .panel-heading { color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6 } .panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #d6e9c6 } .panel-success > .panel-heading .badge { color: #dff0d8; background-color: #3c763d } .panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #d6e9c6 } .panel-info { border-color: #bce8f1 } .panel-info > .panel-heading { color: #31708f; background-color: #d9edf7; border-color: #bce8f1 } .panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #bce8f1 } .panel-info > .panel-heading .badge { color: #d9edf7; background-color: #31708f } .panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #bce8f1 } .panel-warning { border-color: #faebcc } .panel-warning > .panel-heading { color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc } .panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #faebcc } .panel-warning > .panel-heading .badge { color: #fcf8e3; background-color: #8a6d3b } .panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #faebcc } .panel-danger { border-color: #ebccd1 } .panel-danger > .panel-heading { color: #a94442; background-color: #f2dede; border-color: #ebccd1 } .panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ebccd1 } .panel-danger > .panel-heading .badge { color: #f2dede; background-color: #a94442 } .panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ebccd1 } .embed-responsive { position: relative; display: block; height: 0; padding: 0; overflow: hidden } .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, .embed-responsive object, .embed-responsive video { position: absolute; top: 0; left: 0; bottom: 0; height: 100%; width: 100%; border: 0 } .embed-responsive-16by9 { padding-bottom: 56.25% } .embed-responsive-4by3 { padding-bottom: 75% } .well { min-height: 20px; padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #e3e3e3; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05) } .well blockquote { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15) } .well-lg { padding: 24px; border-radius: 6px } .well-sm { padding: 9px; border-radius: 3px } .close { float: right; font-size: 21px; font-weight: bold; line-height: 1; color: #000; text-shadow: 0 1px 0 #fff; opacity: .2; filter: alpha(opacity=20) } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; opacity: .5; filter: alpha(opacity=50) } button.close { padding: 0; cursor: pointer; background: transparent; border: 0; -webkit-appearance: none } .modal-open { overflow: hidden } .modal { display: none; overflow: hidden; position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1050; -webkit-overflow-scrolling: touch; outline: 0 } .modal.fade .modal-dialog { -webkit-transform: translate(0, -25%); -ms-transform: translate(0, -25%); -o-transform: translate(0, -25%); transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -ms-transform: translate(0, 0); -o-transform: translate(0, 0); transform: translate(0, 0) } .modal-open .modal { overflow-x: hidden; overflow-y: auto } .modal-dialog { position: relative; width: auto; margin: 10px } .modal-content { position: relative; background-color: #fff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); -webkit-background-clip: padding-box; background-clip: padding-box; outline: 0 } .modal-backdrop { position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1040; background-color: #000 } .modal-backdrop.fade { opacity: 0; filter: alpha(opacity=0) } .modal-backdrop.in { opacity: .5; filter: alpha(opacity=50) } .modal-header { padding: 15px; border-bottom: 1px solid #e5e5e5; min-height: 16.42857143px } .modal-header .close { margin-top: -2px } .modal-title { margin: 0; line-height: 1.42857143 } .modal-body { position: relative; padding: 15px } .modal-footer { padding: 15px; text-align: right; border-top: 1px solid #e5e5e5 } .modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0 } .modal-footer .btn-group .btn + .btn { margin-left: -1px } .modal-footer .btn-block + .btn-block { margin-left: 0 } .modal-scrollbar-measure { position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll } @media (min-width: 768px) { .modal-dialog { width: 600px; margin: 30px auto } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5) } .modal-sm { width: 300px } } @media (min-width: 992px) { .modal-lg { width: 900px } } .tooltip { position: absolute; z-index: 1070; display: block; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 12px; opacity: 0; filter: alpha(opacity=0) } .tooltip.in { opacity: .9; filter: alpha(opacity=90) } .tooltip.top { margin-top: -3px; padding: 5px 0 } .tooltip.right { margin-left: 3px; padding: 0 5px } .tooltip.bottom { margin-top: 3px; padding: 5px 0 } .tooltip.left { margin-left: -3px; padding: 0 5px } .tooltip-inner { max-width: 200px; padding: 3px 8px; color: #fff; text-align: center; background-color: #000; border-radius: 4px } .tooltip-arrow { position: absolute; width: 0; height: 0; border-color: transparent; border-style: solid } .tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-left .tooltip-arrow { bottom: 0; right: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-right .tooltip-arrow { bottom: 0; left: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; border-right-color: #000 } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; border-left-color: #000 } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-left .tooltip-arrow { top: 0; right: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-right .tooltip-arrow { top: 0; left: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .popover { position: absolute; top: 0; left: 0; z-index: 1060; display: none; max-width: 276px; padding: 1px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 14px; background-color: #fff; -webkit-background-clip: padding-box; background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) } .popover.top { margin-top: -10px } .popover.right { margin-left: 10px } .popover.bottom { margin-top: 10px } .popover.left { margin-left: -10px } .popover-title { margin: 0; padding: 8px 14px; font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; border-radius: 5px 5px 0 0 } .popover-content { padding: 9px 14px } .popover > .arrow, .popover > .arrow:after { position: absolute; display: block; width: 0; height: 0; border-color: transparent; border-style: solid } .popover > .arrow { border-width: 11px } .popover > .arrow:after { border-width: 10px; content: "" } .popover.top > .arrow { left: 50%; margin-left: -11px; border-bottom-width: 0; border-top-color: #999; border-top-color: rgba(0, 0, 0, 0.25); bottom: -11px } .popover.top > .arrow:after { content: " "; bottom: 1px; margin-left: -10px; border-bottom-width: 0; border-top-color: #fff } .popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; border-left-width: 0; border-right-color: #999; border-right-color: rgba(0, 0, 0, 0.25) } .popover.right > .arrow:after { content: " "; left: 1px; bottom: -10px; border-left-width: 0; border-right-color: #fff } .popover.bottom > .arrow { left: 50%; margin-left: -11px; border-top-width: 0; border-bottom-color: #999; border-bottom-color: rgba(0, 0, 0, 0.25); top: -11px } .popover.bottom > .arrow:after { content: " "; top: 1px; margin-left: -10px; border-top-width: 0; border-bottom-color: #fff } .popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; border-right-width: 0; border-left-color: #999; border-left-color: rgba(0, 0, 0, 0.25) } .popover.left > .arrow:after { content: " "; right: 1px; border-right-width: 0; border-left-color: #fff; bottom: -10px } .carousel { position: relative } .carousel-inner { position: relative; overflow: hidden; width: 100% } .carousel-inner > .item { display: none; position: relative; -webkit-transition: .6s ease-in-out left; -o-transition: .6s ease-in-out left; transition: .6s ease-in-out left } .carousel-inner > .item > img, .carousel-inner > .item > a > img { line-height: 1 } @media all and (transform-3d),(-webkit-transform-3d) { .carousel-inner > .item { -webkit-transition: -webkit-transform 0.6s ease-in-out; -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; perspective: 1000px } .carousel-inner > .item.next, .carousel-inner > .item.active.right { -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0 } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0 } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0 } } .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { display: block } .carousel-inner > .active { left: 0 } .carousel-inner > .next, .carousel-inner > .prev { position: absolute; top: 0; width: 100% } .carousel-inner > .next { left: 100% } .carousel-inner > .prev { left: -100% } .carousel-inner > .next.left, .carousel-inner > .prev.right { left: 0 } .carousel-inner > .active.left { left: -100% } .carousel-inner > .active.right { left: 100% } .carousel-control { position: absolute; top: 0; left: 0; bottom: 0; width: 15%; opacity: .5; filter: alpha(opacity=50); font-size: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-control.left { background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1) } .carousel-control.right { left: auto; right: 0; background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1) } .carousel-control:hover, .carousel-control:focus { outline: 0; color: #fff; text-decoration: none; opacity: .9; filter: alpha(opacity=90) } .carousel-control .icon-prev, .carousel-control .icon-next, .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; margin-top: -10px; z-index: 5; display: inline-block } .carousel-control .icon-prev, .carousel-control .glyphicon-chevron-left { left: 50%; margin-left: -10px } .carousel-control .icon-next, .carousel-control .glyphicon-chevron-right { right: 50%; margin-right: -10px } .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; height: 20px; line-height: 1; font-family: serif } .carousel-control .icon-prev:before { content: '\2039' } .carousel-control .icon-next:before { content: '\203a' } .carousel-indicators { position: absolute; bottom: 10px; left: 50%; z-index: 15; width: 60%; margin-left: -30%; padding-left: 0; list-style: none; text-align: center } .carousel-indicators li { display: inline-block; width: 10px; height: 10px; margin: 1px; text-indent: -999px; border: 1px solid #fff; border-radius: 10px; cursor: pointer; background-color: #000 \9; background-color: rgba(0, 0, 0, 0) } .carousel-indicators .active { margin: 0; width: 12px; height: 12px; background-color: #fff } .carousel-caption { position: absolute; left: 15%; right: 15%; bottom: 20px; z-index: 10; padding-top: 20px; padding-bottom: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-caption .btn { text-shadow: none } @media screen and (min-width: 768px) { .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; height: 30px; margin-top: -15px; font-size: 30px } .carousel-control .glyphicon-chevron-left, .carousel-control .icon-prev { margin-left: -15px } .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { margin-right: -15px } .carousel-caption { left: 20%; right: 20%; padding-bottom: 30px } .carousel-indicators { bottom: 20px } } .clearfix:before, .clearfix:after, .dl-horizontal dd:before, .dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, .container-fluid:after, .row:before, .row:after, .form-horizontal .form-group:before, .form-horizontal .form-group:after, .btn-toolbar:before, .btn-toolbar:after, .btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after, .nav:before, .nav:after, .navbar:before, .navbar:after, .navbar-header:before, .navbar-header:after, .navbar-collapse:before, .navbar-collapse:after, .pager:before, .pager:after, .panel-body:before, .panel-body:after, .modal-footer:before, .modal-footer:after { content: " "; display: table } .clearfix:after, .dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, .form-horizontal .form-group:after, .btn-toolbar:after, .btn-group-vertical > .btn-group:after, .nav:after, .navbar:after, .navbar-header:after, .navbar-collapse:after, .pager:after, .panel-body:after, .modal-footer:after { clear: both } .center-block { display: block; margin-left: auto; margin-right: auto } .pull-right { float: right !important } .pull-left { float: left !important } .hide { display: none !important } .show { display: block !important } .invisible { visibility: hidden } .text-hide { font: 0/0 a; color: transparent; text-shadow: none; background-color: transparent; border: 0 } .hidden { display: none !important } .affix { position: fixed } @-ms-viewport { width: device-width } .visible-xs, .visible-sm, .visible-md, .visible-lg { display: none !important } .visible-xs-block, .visible-xs-inline, .visible-xs-inline-block, .visible-sm-block, .visible-sm-inline, .visible-sm-inline-block, .visible-md-block, .visible-md-inline, .visible-md-inline-block, .visible-lg-block, .visible-lg-inline, .visible-lg-inline-block { display: none !important } @media (max-width: 767px) { .visible-xs { display: block !important } table.visible-xs { display: table !important } tr.visible-xs { display: table-row !important } th.visible-xs, td.visible-xs { display: table-cell !important } } @media (max-width: 767px) { .visible-xs-block { display: block !important } } @media (max-width: 767px) { .visible-xs-inline { display: inline !important } } @media (max-width: 767px) { .visible-xs-inline-block { display: inline-block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important } table.visible-sm { display: table !important } tr.visible-sm { display: table-row !important } th.visible-sm, td.visible-sm { display: table-cell !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-block { display: block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline { display: inline !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline-block { display: inline-block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important } table.visible-md { display: table !important } tr.visible-md { display: table-row !important } th.visible-md, td.visible-md { display: table-cell !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-block { display: block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline { display: inline !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline-block { display: inline-block !important } } @media (min-width: 1200px) { .visible-lg { display: block !important } table.visible-lg { display: table !important } tr.visible-lg { display: table-row !important } th.visible-lg, td.visible-lg { display: table-cell !important } } @media (min-width: 1200px) { .visible-lg-block { display: block !important } } @media (min-width: 1200px) { .visible-lg-inline { display: inline !important } } @media (min-width: 1200px) { .visible-lg-inline-block { display: inline-block !important } } @media (max-width: 767px) { .hidden-xs { display: none !important } } @media (min-width: 768px) and (max-width: 991px) { .hidden-sm { display: none !important } } @media (min-width: 992px) and (max-width: 1199px) { .hidden-md { display: none !important } } @media (min-width: 1200px) { .hidden-lg { display: none !important } } .visible-print { display: none !important } @media print { .visible-print { display: block !important } table.visible-print { display: table !important } tr.visible-print { display: table-row !important } th.visible-print, td.visible-print { display: table-cell !important } } .visible-print-block { display: none !important } @media print { .visible-print-block { display: block !important } } .visible-print-inline { display: none !important } @media print { .visible-print-inline { display: inline !important } } .visible-print-inline-block { display: none !important } @media print { .visible-print-inline-block { display: inline-block !important } } @media print { .hidden-print { display: none !important } }
/*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! * Generated using the Bootstrap Customizer (http://v3.bootcss.com/customize/?id=822d18dc2e4e823a577b) * Config saved to config.json and https://gist.github.com/822d18dc2e4e823a577b *//*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100% } body { margin: 0 } article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block } audio, canvas, progress, video { display: inline-block; vertical-align: baseline } audio:not([controls]) { display: none; height: 0 } [hidden], template { display: none } a { background-color: transparent } a:active, a:hover { outline: 0 } abbr[title] { border-bottom: 1px dotted } b, strong { font-weight: bold } dfn { font-style: italic } h1 { font-size: 2em; margin: 0.67em 0 } mark { background: #ff0; color: #000 } small { font-size: 80% } sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline } sup { top: -0.5em } sub { bottom: -0.25em } img { border: 0 } svg:not(:root) { overflow: hidden } figure { margin: 1em 40px } hr { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box; height: 0 } pre { overflow: auto } code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em } button, input, optgroup, select, textarea { color: inherit; font: inherit; margin: 0 } button { overflow: visible } button, select { text-transform: none } button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; cursor: pointer } button[disabled], html input[disabled] { cursor: default } button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0 } input { line-height: normal } input[type="checkbox"], input[type="radio"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; padding: 0 } input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto } input[type="search"] { -webkit-appearance: textfield; -webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box } input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none } fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em } legend { border: 0; padding: 0 } textarea { overflow: auto } optgroup { font-weight: bold } table { border-collapse: collapse; border-spacing: 0 } td, th { padding: 0 } /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { *, *:before, *:after { background: transparent !important; color: #000 !important; -webkit-box-shadow: none !important; box-shadow: none !important; text-shadow: none !important } a, a:visited { text-decoration: underline } a[href]:after { content: " (" attr(href) ")" } abbr[title]:after { content: " (" attr(title) ")" } a[href^="#"]:after, a[href^="javascript:"]:after { content: "" } pre, blockquote { border: 1px solid #999; page-break-inside: avoid } thead { display: table-header-group } tr, img { page-break-inside: avoid } img { max-width: 100% !important } p, h2, h3 { orphans: 3; widows: 3 } h2, h3 { page-break-after: avoid } .navbar { display: none } .btn > .caret, .dropup > .btn > .caret { border-top-color: #000 !important } .label { border: 1px solid #000 } .table { border-collapse: collapse !important } .table td, .table th { background-color: #fff !important } .table-bordered th, .table-bordered td { border: 1px solid #ddd !important } } @font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg') } .glyphicon { position: relative; top: 1px; display: inline-block; font-family: 'Glyphicons Halflings'; font-style: normal; font-weight: normal; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale } .glyphicon-asterisk:before { content: "\2a" } .glyphicon-plus:before { content: "\2b" } .glyphicon-euro:before, .glyphicon-eur:before { content: "\20ac" } .glyphicon-minus:before { content: "\2212" } .glyphicon-cloud:before { content: "\2601" } .glyphicon-envelope:before { content: "\2709" } .glyphicon-pencil:before { content: "\270f" } .glyphicon-glass:before { content: "\e001" } .glyphicon-music:before { content: "\e002" } .glyphicon-search:before { content: "\e003" } .glyphicon-heart:before { content: "\e005" } .glyphicon-star:before { content: "\e006" } .glyphicon-star-empty:before { content: "\e007" } .glyphicon-user:before { content: "\e008" } .glyphicon-film:before { content: "\e009" } .glyphicon-th-large:before { content: "\e010" } .glyphicon-th:before { content: "\e011" } .glyphicon-th-list:before { content: "\e012" } .glyphicon-ok:before { content: "\e013" } .glyphicon-remove:before { content: "\e014" } .glyphicon-zoom-in:before { content: "\e015" } .glyphicon-zoom-out:before { content: "\e016" } .glyphicon-off:before { content: "\e017" } .glyphicon-signal:before { content: "\e018" } .glyphicon-cog:before { content: "\e019" } .glyphicon-trash:before { content: "\e020" } .glyphicon-home:before { content: "\e021" } .glyphicon-file:before { content: "\e022" } .glyphicon-time:before { content: "\e023" } .glyphicon-road:before { content: "\e024" } .glyphicon-download-alt:before { content: "\e025" } .glyphicon-download:before { content: "\e026" } .glyphicon-upload:before { content: "\e027" } .glyphicon-inbox:before { content: "\e028" } .glyphicon-play-circle:before { content: "\e029" } .glyphicon-repeat:before { content: "\e030" } .glyphicon-refresh:before { content: "\e031" } .glyphicon-list-alt:before { content: "\e032" } .glyphicon-lock:before { content: "\e033" } .glyphicon-flag:before { content: "\e034" } .glyphicon-headphones:before { content: "\e035" } .glyphicon-volume-off:before { content: "\e036" } .glyphicon-volume-down:before { content: "\e037" } .glyphicon-volume-up:before { content: "\e038" } .glyphicon-qrcode:before { content: "\e039" } .glyphicon-barcode:before { content: "\e040" } .glyphicon-tag:before { content: "\e041" } .glyphicon-tags:before { content: "\e042" } .glyphicon-book:before { content: "\e043" } .glyphicon-bookmark:before { content: "\e044" } .glyphicon-print:before { content: "\e045" } .glyphicon-camera:before { content: "\e046" } .glyphicon-font:before { content: "\e047" } .glyphicon-bold:before { content: "\e048" } .glyphicon-italic:before { content: "\e049" } .glyphicon-text-height:before { content: "\e050" } .glyphicon-text-width:before { content: "\e051" } .glyphicon-align-left:before { content: "\e052" } .glyphicon-align-center:before { content: "\e053" } .glyphicon-align-right:before { content: "\e054" } .glyphicon-align-justify:before { content: "\e055" } .glyphicon-list:before { content: "\e056" } .glyphicon-indent-left:before { content: "\e057" } .glyphicon-indent-right:before { content: "\e058" } .glyphicon-facetime-video:before { content: "\e059" } .glyphicon-picture:before { content: "\e060" } .glyphicon-map-marker:before { content: "\e062" } .glyphicon-adjust:before { content: "\e063" } .glyphicon-tint:before { content: "\e064" } .glyphicon-edit:before { content: "\e065" } .glyphicon-share:before { content: "\e066" } .glyphicon-check:before { content: "\e067" } .glyphicon-move:before { content: "\e068" } .glyphicon-step-backward:before { content: "\e069" } .glyphicon-fast-backward:before { content: "\e070" } .glyphicon-backward:before { content: "\e071" } .glyphicon-play:before { content: "\e072" } .glyphicon-pause:before { content: "\e073" } .glyphicon-stop:before { content: "\e074" } .glyphicon-forward:before { content: "\e075" } .glyphicon-fast-forward:before { content: "\e076" } .glyphicon-step-forward:before { content: "\e077" } .glyphicon-eject:before { content: "\e078" } .glyphicon-chevron-left:before { content: "\e079" } .glyphicon-chevron-right:before { content: "\e080" } .glyphicon-plus-sign:before { content: "\e081" } .glyphicon-minus-sign:before { content: "\e082" } .glyphicon-remove-sign:before { content: "\e083" } .glyphicon-ok-sign:before { content: "\e084" } .glyphicon-question-sign:before { content: "\e085" } .glyphicon-info-sign:before { content: "\e086" } .glyphicon-screenshot:before { content: "\e087" } .glyphicon-remove-circle:before { content: "\e088" } .glyphicon-ok-circle:before { content: "\e089" } .glyphicon-ban-circle:before { content: "\e090" } .glyphicon-arrow-left:before { content: "\e091" } .glyphicon-arrow-right:before { content: "\e092" } .glyphicon-arrow-up:before { content: "\e093" } .glyphicon-arrow-down:before { content: "\e094" } .glyphicon-share-alt:before { content: "\e095" } .glyphicon-resize-full:before { content: "\e096" } .glyphicon-resize-small:before { content: "\e097" } .glyphicon-exclamation-sign:before { content: "\e101" } .glyphicon-gift:before { content: "\e102" } .glyphicon-leaf:before { content: "\e103" } .glyphicon-fire:before { content: "\e104" } .glyphicon-eye-open:before { content: "\e105" } .glyphicon-eye-close:before { content: "\e106" } .glyphicon-warning-sign:before { content: "\e107" } .glyphicon-plane:before { content: "\e108" } .glyphicon-calendar:before { content: "\e109" } .glyphicon-random:before { content: "\e110" } .glyphicon-comment:before { content: "\e111" } .glyphicon-magnet:before { content: "\e112" } .glyphicon-chevron-up:before { content: "\e113" } .glyphicon-chevron-down:before { content: "\e114" } .glyphicon-retweet:before { content: "\e115" } .glyphicon-shopping-cart:before { content: "\e116" } .glyphicon-folder-close:before { content: "\e117" } .glyphicon-folder-open:before { content: "\e118" } .glyphicon-resize-vertical:before { content: "\e119" } .glyphicon-resize-horizontal:before { content: "\e120" } .glyphicon-hdd:before { content: "\e121" } .glyphicon-bullhorn:before { content: "\e122" } .glyphicon-bell:before { content: "\e123" } .glyphicon-certificate:before { content: "\e124" } .glyphicon-thumbs-up:before { content: "\e125" } .glyphicon-thumbs-down:before { content: "\e126" } .glyphicon-hand-right:before { content: "\e127" } .glyphicon-hand-left:before { content: "\e128" } .glyphicon-hand-up:before { content: "\e129" } .glyphicon-hand-down:before { content: "\e130" } .glyphicon-circle-arrow-right:before { content: "\e131" } .glyphicon-circle-arrow-left:before { content: "\e132" } .glyphicon-circle-arrow-up:before { content: "\e133" } .glyphicon-circle-arrow-down:before { content: "\e134" } .glyphicon-globe:before { content: "\e135" } .glyphicon-wrench:before { content: "\e136" } .glyphicon-tasks:before { content: "\e137" } .glyphicon-filter:before { content: "\e138" } .glyphicon-briefcase:before { content: "\e139" } .glyphicon-fullscreen:before { content: "\e140" } .glyphicon-dashboard:before { content: "\e141" } .glyphicon-paperclip:before { content: "\e142" } .glyphicon-heart-empty:before { content: "\e143" } .glyphicon-link:before { content: "\e144" } .glyphicon-phone:before { content: "\e145" } .glyphicon-pushpin:before { content: "\e146" } .glyphicon-usd:before { content: "\e148" } .glyphicon-gbp:before { content: "\e149" } .glyphicon-sort:before { content: "\e150" } .glyphicon-sort-by-alphabet:before { content: "\e151" } .glyphicon-sort-by-alphabet-alt:before { content: "\e152" } .glyphicon-sort-by-order:before { content: "\e153" } .glyphicon-sort-by-order-alt:before { content: "\e154" } .glyphicon-sort-by-attributes:before { content: "\e155" } .glyphicon-sort-by-attributes-alt:before { content: "\e156" } .glyphicon-unchecked:before { content: "\e157" } .glyphicon-expand:before { content: "\e158" } .glyphicon-collapse-down:before { content: "\e159" } .glyphicon-collapse-up:before { content: "\e160" } .glyphicon-log-in:before { content: "\e161" } .glyphicon-flash:before { content: "\e162" } .glyphicon-log-out:before { content: "\e163" } .glyphicon-new-window:before { content: "\e164" } .glyphicon-record:before { content: "\e165" } .glyphicon-save:before { content: "\e166" } .glyphicon-open:before { content: "\e167" } .glyphicon-saved:before { content: "\e168" } .glyphicon-import:before { content: "\e169" } .glyphicon-export:before { content: "\e170" } .glyphicon-send:before { content: "\e171" } .glyphicon-floppy-disk:before { content: "\e172" } .glyphicon-floppy-saved:before { content: "\e173" } .glyphicon-floppy-remove:before { content: "\e174" } .glyphicon-floppy-save:before { content: "\e175" } .glyphicon-floppy-open:before { content: "\e176" } .glyphicon-credit-card:before { content: "\e177" } .glyphicon-transfer:before { content: "\e178" } .glyphicon-cutlery:before { content: "\e179" } .glyphicon-header:before { content: "\e180" } .glyphicon-compressed:before { content: "\e181" } .glyphicon-earphone:before { content: "\e182" } .glyphicon-phone-alt:before { content: "\e183" } .glyphicon-tower:before { content: "\e184" } .glyphicon-stats:before { content: "\e185" } .glyphicon-sd-video:before { content: "\e186" } .glyphicon-hd-video:before { content: "\e187" } .glyphicon-subtitles:before { content: "\e188" } .glyphicon-sound-stereo:before { content: "\e189" } .glyphicon-sound-dolby:before { content: "\e190" } .glyphicon-sound-5-1:before { content: "\e191" } .glyphicon-sound-6-1:before { content: "\e192" } .glyphicon-sound-7-1:before { content: "\e193" } .glyphicon-copyright-mark:before { content: "\e194" } .glyphicon-registration-mark:before { content: "\e195" } .glyphicon-cloud-download:before { content: "\e197" } .glyphicon-cloud-upload:before { content: "\e198" } .glyphicon-tree-conifer:before { content: "\e199" } .glyphicon-tree-deciduous:before { content: "\e200" } .glyphicon-cd:before { content: "\e201" } .glyphicon-save-file:before { content: "\e202" } .glyphicon-open-file:before { content: "\e203" } .glyphicon-level-up:before { content: "\e204" } .glyphicon-copy:before { content: "\e205" } .glyphicon-paste:before { content: "\e206" } .glyphicon-alert:before { content: "\e209" } .glyphicon-equalizer:before { content: "\e210" } .glyphicon-king:before { content: "\e211" } .glyphicon-queen:before { content: "\e212" } .glyphicon-pawn:before { content: "\e213" } .glyphicon-bishop:before { content: "\e214" } .glyphicon-knight:before { content: "\e215" } .glyphicon-baby-formula:before { content: "\e216" } .glyphicon-tent:before { content: "\26fa" } .glyphicon-blackboard:before { content: "\e218" } .glyphicon-bed:before { content: "\e219" } .glyphicon-apple:before { content: "\f8ff" } .glyphicon-erase:before { content: "\e221" } .glyphicon-hourglass:before { content: "\231b" } .glyphicon-lamp:before { content: "\e223" } .glyphicon-duplicate:before { content: "\e224" } .glyphicon-piggy-bank:before { content: "\e225" } .glyphicon-scissors:before { content: "\e226" } .glyphicon-bitcoin:before { content: "\e227" } .glyphicon-btc:before { content: "\e227" } .glyphicon-xbt:before { content: "\e227" } .glyphicon-yen:before { content: "\00a5" } .glyphicon-jpy:before { content: "\00a5" } .glyphicon-ruble:before { content: "\20bd" } .glyphicon-rub:before { content: "\20bd" } .glyphicon-scale:before { content: "\e230" } .glyphicon-ice-lolly:before { content: "\e231" } .glyphicon-ice-lolly-tasted:before { content: "\e232" } .glyphicon-education:before { content: "\e233" } .glyphicon-option-horizontal:before { content: "\e234" } .glyphicon-option-vertical:before { content: "\e235" } .glyphicon-menu-hamburger:before { content: "\e236" } .glyphicon-modal-window:before { content: "\e237" } .glyphicon-oil:before { content: "\e238" } .glyphicon-grain:before { content: "\e239" } .glyphicon-sunglasses:before { content: "\e240" } .glyphicon-text-size:before { content: "\e241" } .glyphicon-text-color:before { content: "\e242" } .glyphicon-text-background:before { content: "\e243" } .glyphicon-object-align-top:before { content: "\e244" } .glyphicon-object-align-bottom:before { content: "\e245" } .glyphicon-object-align-horizontal:before { content: "\e246" } .glyphicon-object-align-left:before { content: "\e247" } .glyphicon-object-align-vertical:before { content: "\e248" } .glyphicon-object-align-right:before { content: "\e249" } .glyphicon-triangle-right:before { content: "\e250" } .glyphicon-triangle-left:before { content: "\e251" } .glyphicon-triangle-bottom:before { content: "\e252" } .glyphicon-triangle-top:before { content: "\e253" } .glyphicon-console:before { content: "\e254" } .glyphicon-superscript:before { content: "\e255" } .glyphicon-subscript:before { content: "\e256" } .glyphicon-menu-left:before { content: "\e257" } .glyphicon-menu-right:before { content: "\e258" } .glyphicon-menu-down:before { content: "\e259" } .glyphicon-menu-up:before { content: "\e260" } * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } *:before, *:after { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } html { font-size: 10px; -webkit-tap-highlight-color: rgba(0, 0, 0, 0) } body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.42857143; color: #333; background-color: #fff } input, button, select, textarea { font-family: inherit; font-size: inherit; line-height: inherit } a { color: #337ab7; text-decoration: none } a:hover, a:focus { color: #23527c; text-decoration: underline } a:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } figure { margin: 0 } img { vertical-align: middle } .img-responsive, .thumbnail > img, .thumbnail a > img, .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto } .img-rounded { border-radius: 6px } .img-thumbnail { padding: 4px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out; transition: all .2s ease-in-out; display: inline-block; max-width: 100%; height: auto } .img-circle { border-radius: 50% } hr { margin-top: 20px; margin-bottom: 20px; border: 0; border-top: 1px solid #eee } .sr-only { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0, 0, 0, 0); border: 0 } .sr-only-focusable:active, .sr-only-focusable:focus { position: static; width: auto; height: auto; margin: 0; overflow: visible; clip: auto } [role="button"] { cursor: pointer } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: inherit; font-weight: 500; line-height: 1.1; color: inherit } h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small, h1 .small, h2 .small, h3 .small, h4 .small, h5 .small, h6 .small, .h1 .small, .h2 .small, .h3 .small, .h4 .small, .h5 .small, .h6 .small { font-weight: normal; line-height: 1; color: #777 } h1, .h1, h2, .h2, h3, .h3 { margin-top: 20px; margin-bottom: 10px } h1 small, .h1 small, h2 small, .h2 small, h3 small, .h3 small, h1 .small, .h1 .small, h2 .small, .h2 .small, h3 .small, .h3 .small { font-size: 65% } h4, .h4, h5, .h5, h6, .h6 { margin-top: 10px; margin-bottom: 10px } h4 small, .h4 small, h5 small, .h5 small, h6 small, .h6 small, h4 .small, .h4 .small, h5 .small, .h5 .small, h6 .small, .h6 .small { font-size: 75% } h1, .h1 { font-size: 36px } h2, .h2 { font-size: 30px } h3, .h3 { font-size: 24px } h4, .h4 { font-size: 18px } h5, .h5 { font-size: 14px } h6, .h6 { font-size: 12px } p { margin: 0 0 10px } .lead { margin-bottom: 20px; font-size: 16px; font-weight: 300; line-height: 1.4 } @media (min-width: 768px) { .lead { font-size: 21px } } small, .small { font-size: 85% } mark, .mark { background-color: #fcf8e3; padding: .2em } .text-left { text-align: left } .text-right { text-align: right } .text-center { text-align: center } .text-justify { text-align: justify } .text-nowrap { white-space: nowrap } .text-lowercase { text-transform: lowercase } .text-uppercase { text-transform: uppercase } .text-capitalize { text-transform: capitalize } .text-muted { color: #777 } .text-primary { color: #337ab7 } a.text-primary:hover, a.text-primary:focus { color: #286090 } .text-success { color: #3c763d } a.text-success:hover, a.text-success:focus { color: #2b542c } .text-info { color: #31708f } a.text-info:hover, a.text-info:focus { color: #245269 } .text-warning { color: #8a6d3b } a.text-warning:hover, a.text-warning:focus { color: #66512c } .text-danger { color: #a94442 } a.text-danger:hover, a.text-danger:focus { color: #843534 } .bg-primary { color: #fff; background-color: #337ab7 } a.bg-primary:hover, a.bg-primary:focus { background-color: #286090 } .bg-success { background-color: #dff0d8 } a.bg-success:hover, a.bg-success:focus { background-color: #c1e2b3 } .bg-info { background-color: #d9edf7 } a.bg-info:hover, a.bg-info:focus { background-color: #afd9ee } .bg-warning { background-color: #fcf8e3 } a.bg-warning:hover, a.bg-warning:focus { background-color: #f7ecb5 } .bg-danger { background-color: #f2dede } a.bg-danger:hover, a.bg-danger:focus { background-color: #e4b9b9 } .page-header { padding-bottom: 9px; margin: 40px 0 20px; border-bottom: 1px solid #eee } ul, ol { margin-top: 0; margin-bottom: 10px } ul ul, ol ul, ul ol, ol ol { margin-bottom: 0 } .list-unstyled { padding-left: 0; list-style: none } .list-inline { padding-left: 0; list-style: none; margin-left: -5px } .list-inline > li { display: inline-block; padding-left: 5px; padding-right: 5px } dl { margin-top: 0; margin-bottom: 20px } dt, dd { line-height: 1.42857143 } dt { font-weight: bold } dd { margin-left: 0 } @media (min-width: 768px) { .dl-horizontal dt { float: left; width: 160px; clear: left; text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap } .dl-horizontal dd { margin-left: 180px } } abbr[title], abbr[data-original-title] { cursor: help; border-bottom: 1px dotted #777 } .initialism { font-size: 90%; text-transform: uppercase } blockquote { padding: 10px 20px; margin: 0 0 20px; font-size: 17.5px; border-left: 5px solid #eee } blockquote p:last-child, blockquote ul:last-child, blockquote ol:last-child { margin-bottom: 0 } blockquote footer, blockquote small, blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; color: #777 } blockquote footer:before, blockquote small:before, blockquote .small:before { content: '\2014 \00A0' } .blockquote-reverse, blockquote.pull-right { padding-right: 15px; padding-left: 0; border-right: 5px solid #eee; border-left: 0; text-align: right } .blockquote-reverse footer:before, blockquote.pull-right footer:before, .blockquote-reverse small:before, blockquote.pull-right small:before, .blockquote-reverse .small:before, blockquote.pull-right .small:before { content: '' } .blockquote-reverse footer:after, blockquote.pull-right footer:after, .blockquote-reverse small:after, blockquote.pull-right small:after, .blockquote-reverse .small:after, blockquote.pull-right .small:after { content: '\00A0 \2014' } address { margin-bottom: 20px; font-style: normal; line-height: 1.42857143 } code, kbd, pre, samp { font-family: Menlo, Monaco, Consolas, "Courier New", monospace } code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; border-radius: 4px } kbd { padding: 2px 4px; font-size: 90%; color: #fff; background-color: #333; border-radius: 3px; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25) } kbd kbd { padding: 0; font-size: 100%; font-weight: bold; -webkit-box-shadow: none; box-shadow: none } pre { display: block; padding: 9.5px; margin: 0 0 10px; font-size: 13px; line-height: 1.42857143; word-break: break-all; word-wrap: break-word; color: #333; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px } pre code { padding: 0; font-size: inherit; color: inherit; white-space: pre-wrap; background-color: transparent; border-radius: 0 } .pre-scrollable { max-height: 340px; overflow-y: scroll } .container { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } @media (min-width: 768px) { .container { width: 750px } } @media (min-width: 992px) { .container { width: 970px } } @media (min-width: 1200px) { .container { width: 1170px } } .container-fluid { margin-right: auto; margin-left: auto; padding-left: 15px; padding-right: 15px } .row { margin-left: -15px; margin-right: -15px } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; padding-left: 15px; padding-right: 15px } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { float: left } .col-xs-12 { width: 100% } .col-xs-11 { width: 91.66666667% } .col-xs-10 { width: 83.33333333% } .col-xs-9 { width: 75% } .col-xs-8 { width: 66.66666667% } .col-xs-7 { width: 58.33333333% } .col-xs-6 { width: 50% } .col-xs-5 { width: 41.66666667% } .col-xs-4 { width: 33.33333333% } .col-xs-3 { width: 25% } .col-xs-2 { width: 16.66666667% } .col-xs-1 { width: 8.33333333% } .col-xs-pull-12 { right: 100% } .col-xs-pull-11 { right: 91.66666667% } .col-xs-pull-10 { right: 83.33333333% } .col-xs-pull-9 { right: 75% } .col-xs-pull-8 { right: 66.66666667% } .col-xs-pull-7 { right: 58.33333333% } .col-xs-pull-6 { right: 50% } .col-xs-pull-5 { right: 41.66666667% } .col-xs-pull-4 { right: 33.33333333% } .col-xs-pull-3 { right: 25% } .col-xs-pull-2 { right: 16.66666667% } .col-xs-pull-1 { right: 8.33333333% } .col-xs-pull-0 { right: auto } .col-xs-push-12 { left: 100% } .col-xs-push-11 { left: 91.66666667% } .col-xs-push-10 { left: 83.33333333% } .col-xs-push-9 { left: 75% } .col-xs-push-8 { left: 66.66666667% } .col-xs-push-7 { left: 58.33333333% } .col-xs-push-6 { left: 50% } .col-xs-push-5 { left: 41.66666667% } .col-xs-push-4 { left: 33.33333333% } .col-xs-push-3 { left: 25% } .col-xs-push-2 { left: 16.66666667% } .col-xs-push-1 { left: 8.33333333% } .col-xs-push-0 { left: auto } .col-xs-offset-12 { margin-left: 100% } .col-xs-offset-11 { margin-left: 91.66666667% } .col-xs-offset-10 { margin-left: 83.33333333% } .col-xs-offset-9 { margin-left: 75% } .col-xs-offset-8 { margin-left: 66.66666667% } .col-xs-offset-7 { margin-left: 58.33333333% } .col-xs-offset-6 { margin-left: 50% } .col-xs-offset-5 { margin-left: 41.66666667% } .col-xs-offset-4 { margin-left: 33.33333333% } .col-xs-offset-3 { margin-left: 25% } .col-xs-offset-2 { margin-left: 16.66666667% } .col-xs-offset-1 { margin-left: 8.33333333% } .col-xs-offset-0 { margin-left: 0 } @media (min-width: 768px) { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { float: left } .col-sm-12 { width: 100% } .col-sm-11 { width: 91.66666667% } .col-sm-10 { width: 83.33333333% } .col-sm-9 { width: 75% } .col-sm-8 { width: 66.66666667% } .col-sm-7 { width: 58.33333333% } .col-sm-6 { width: 50% } .col-sm-5 { width: 41.66666667% } .col-sm-4 { width: 33.33333333% } .col-sm-3 { width: 25% } .col-sm-2 { width: 16.66666667% } .col-sm-1 { width: 8.33333333% } .col-sm-pull-12 { right: 100% } .col-sm-pull-11 { right: 91.66666667% } .col-sm-pull-10 { right: 83.33333333% } .col-sm-pull-9 { right: 75% } .col-sm-pull-8 { right: 66.66666667% } .col-sm-pull-7 { right: 58.33333333% } .col-sm-pull-6 { right: 50% } .col-sm-pull-5 { right: 41.66666667% } .col-sm-pull-4 { right: 33.33333333% } .col-sm-pull-3 { right: 25% } .col-sm-pull-2 { right: 16.66666667% } .col-sm-pull-1 { right: 8.33333333% } .col-sm-pull-0 { right: auto } .col-sm-push-12 { left: 100% } .col-sm-push-11 { left: 91.66666667% } .col-sm-push-10 { left: 83.33333333% } .col-sm-push-9 { left: 75% } .col-sm-push-8 { left: 66.66666667% } .col-sm-push-7 { left: 58.33333333% } .col-sm-push-6 { left: 50% } .col-sm-push-5 { left: 41.66666667% } .col-sm-push-4 { left: 33.33333333% } .col-sm-push-3 { left: 25% } .col-sm-push-2 { left: 16.66666667% } .col-sm-push-1 { left: 8.33333333% } .col-sm-push-0 { left: auto } .col-sm-offset-12 { margin-left: 100% } .col-sm-offset-11 { margin-left: 91.66666667% } .col-sm-offset-10 { margin-left: 83.33333333% } .col-sm-offset-9 { margin-left: 75% } .col-sm-offset-8 { margin-left: 66.66666667% } .col-sm-offset-7 { margin-left: 58.33333333% } .col-sm-offset-6 { margin-left: 50% } .col-sm-offset-5 { margin-left: 41.66666667% } .col-sm-offset-4 { margin-left: 33.33333333% } .col-sm-offset-3 { margin-left: 25% } .col-sm-offset-2 { margin-left: 16.66666667% } .col-sm-offset-1 { margin-left: 8.33333333% } .col-sm-offset-0 { margin-left: 0 } } @media (min-width: 992px) { .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { float: left } .col-md-12 { width: 100% } .col-md-11 { width: 91.66666667% } .col-md-10 { width: 83.33333333% } .col-md-9 { width: 75% } .col-md-8 { width: 66.66666667% } .col-md-7 { width: 58.33333333% } .col-md-6 { width: 50% } .col-md-5 { width: 41.66666667% } .col-md-4 { width: 33.33333333% } .col-md-3 { width: 25% } .col-md-2 { width: 16.66666667% } .col-md-1 { width: 8.33333333% } .col-md-pull-12 { right: 100% } .col-md-pull-11 { right: 91.66666667% } .col-md-pull-10 { right: 83.33333333% } .col-md-pull-9 { right: 75% } .col-md-pull-8 { right: 66.66666667% } .col-md-pull-7 { right: 58.33333333% } .col-md-pull-6 { right: 50% } .col-md-pull-5 { right: 41.66666667% } .col-md-pull-4 { right: 33.33333333% } .col-md-pull-3 { right: 25% } .col-md-pull-2 { right: 16.66666667% } .col-md-pull-1 { right: 8.33333333% } .col-md-pull-0 { right: auto } .col-md-push-12 { left: 100% } .col-md-push-11 { left: 91.66666667% } .col-md-push-10 { left: 83.33333333% } .col-md-push-9 { left: 75% } .col-md-push-8 { left: 66.66666667% } .col-md-push-7 { left: 58.33333333% } .col-md-push-6 { left: 50% } .col-md-push-5 { left: 41.66666667% } .col-md-push-4 { left: 33.33333333% } .col-md-push-3 { left: 25% } .col-md-push-2 { left: 16.66666667% } .col-md-push-1 { left: 8.33333333% } .col-md-push-0 { left: auto } .col-md-offset-12 { margin-left: 100% } .col-md-offset-11 { margin-left: 91.66666667% } .col-md-offset-10 { margin-left: 83.33333333% } .col-md-offset-9 { margin-left: 75% } .col-md-offset-8 { margin-left: 66.66666667% } .col-md-offset-7 { margin-left: 58.33333333% } .col-md-offset-6 { margin-left: 50% } .col-md-offset-5 { margin-left: 41.66666667% } .col-md-offset-4 { margin-left: 33.33333333% } .col-md-offset-3 { margin-left: 25% } .col-md-offset-2 { margin-left: 16.66666667% } .col-md-offset-1 { margin-left: 8.33333333% } .col-md-offset-0 { margin-left: 0 } } @media (min-width: 1200px) { .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { float: left } .col-lg-12 { width: 100% } .col-lg-11 { width: 91.66666667% } .col-lg-10 { width: 83.33333333% } .col-lg-9 { width: 75% } .col-lg-8 { width: 66.66666667% } .col-lg-7 { width: 58.33333333% } .col-lg-6 { width: 50% } .col-lg-5 { width: 41.66666667% } .col-lg-4 { width: 33.33333333% } .col-lg-3 { width: 25% } .col-lg-2 { width: 16.66666667% } .col-lg-1 { width: 8.33333333% } .col-lg-pull-12 { right: 100% } .col-lg-pull-11 { right: 91.66666667% } .col-lg-pull-10 { right: 83.33333333% } .col-lg-pull-9 { right: 75% } .col-lg-pull-8 { right: 66.66666667% } .col-lg-pull-7 { right: 58.33333333% } .col-lg-pull-6 { right: 50% } .col-lg-pull-5 { right: 41.66666667% } .col-lg-pull-4 { right: 33.33333333% } .col-lg-pull-3 { right: 25% } .col-lg-pull-2 { right: 16.66666667% } .col-lg-pull-1 { right: 8.33333333% } .col-lg-pull-0 { right: auto } .col-lg-push-12 { left: 100% } .col-lg-push-11 { left: 91.66666667% } .col-lg-push-10 { left: 83.33333333% } .col-lg-push-9 { left: 75% } .col-lg-push-8 { left: 66.66666667% } .col-lg-push-7 { left: 58.33333333% } .col-lg-push-6 { left: 50% } .col-lg-push-5 { left: 41.66666667% } .col-lg-push-4 { left: 33.33333333% } .col-lg-push-3 { left: 25% } .col-lg-push-2 { left: 16.66666667% } .col-lg-push-1 { left: 8.33333333% } .col-lg-push-0 { left: auto } .col-lg-offset-12 { margin-left: 100% } .col-lg-offset-11 { margin-left: 91.66666667% } .col-lg-offset-10 { margin-left: 83.33333333% } .col-lg-offset-9 { margin-left: 75% } .col-lg-offset-8 { margin-left: 66.66666667% } .col-lg-offset-7 { margin-left: 58.33333333% } .col-lg-offset-6 { margin-left: 50% } .col-lg-offset-5 { margin-left: 41.66666667% } .col-lg-offset-4 { margin-left: 33.33333333% } .col-lg-offset-3 { margin-left: 25% } .col-lg-offset-2 { margin-left: 16.66666667% } .col-lg-offset-1 { margin-left: 8.33333333% } .col-lg-offset-0 { margin-left: 0 } } table { background-color: transparent } caption { padding-top: 8px; padding-bottom: 8px; color: #777; text-align: left } th { text-align: left } .table { width: 100%; max-width: 100%; margin-bottom: 20px } .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { padding: 8px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd } .table > thead > tr > th { vertical-align: bottom; border-bottom: 2px solid #ddd } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, .table > thead:first-child > tr:first-child > th, .table > caption + thead > tr:first-child > td, .table > colgroup + thead > tr:first-child > td, .table > thead:first-child > tr:first-child > td { border-top: 0 } .table > tbody + tbody { border-top: 2px solid #ddd } .table .table { background-color: #fff } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td { padding: 5px } .table-bordered { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { border: 1px solid #ddd } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { border-bottom-width: 2px } .table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9 } .table-hover > tbody > tr:hover { background-color: #f5f5f5 } table col[class*="col-"] { position: static; float: none; display: table-column } table td[class*="col-"], table th[class*="col-"] { position: static; float: none; display: table-cell } .table > thead > tr > td.active, .table > tbody > tr > td.active, .table > tfoot > tr > td.active, .table > thead > tr > th.active, .table > tbody > tr > th.active, .table > tfoot > tr > th.active, .table > thead > tr.active > td, .table > tbody > tr.active > td, .table > tfoot > tr.active > td, .table > thead > tr.active > th, .table > tbody > tr.active > th, .table > tfoot > tr.active > th { background-color: #f5f5f5 } .table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th { background-color: #e8e8e8 } .table > thead > tr > td.success, .table > tbody > tr > td.success, .table > tfoot > tr > td.success, .table > thead > tr > th.success, .table > tbody > tr > th.success, .table > tfoot > tr > th.success, .table > thead > tr.success > td, .table > tbody > tr.success > td, .table > tfoot > tr.success > td, .table > thead > tr.success > th, .table > tbody > tr.success > th, .table > tfoot > tr.success > th { background-color: #dff0d8 } .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { background-color: #d0e9c6 } .table > thead > tr > td.info, .table > tbody > tr > td.info, .table > tfoot > tr > td.info, .table > thead > tr > th.info, .table > tbody > tr > th.info, .table > tfoot > tr > th.info, .table > thead > tr.info > td, .table > tbody > tr.info > td, .table > tfoot > tr.info > td, .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { background-color: #d9edf7 } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { background-color: #c4e3f3 } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, .table > tfoot > tr > td.warning, .table > thead > tr > th.warning, .table > tbody > tr > th.warning, .table > tfoot > tr > th.warning, .table > thead > tr.warning > td, .table > tbody > tr.warning > td, .table > tfoot > tr.warning > td, .table > thead > tr.warning > th, .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { background-color: #fcf8e3 } .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { background-color: #faf2cc } .table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > tfoot > tr > td.danger, .table > thead > tr > th.danger, .table > tbody > tr > th.danger, .table > tfoot > tr > th.danger, .table > thead > tr.danger > td, .table > tbody > tr.danger > td, .table > tfoot > tr.danger > td, .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { background-color: #f2dede } .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { background-color: #ebcccc } .table-responsive { overflow-x: auto; min-height: 0.01% } @media screen and (max-width: 767px) { .table-responsive { width: 100%; margin-bottom: 15px; overflow-y: hidden; -ms-overflow-style: -ms-autohiding-scrollbar; border: 1px solid #ddd } .table-responsive > .table { margin-bottom: 0 } .table-responsive > .table > thead > tr > th, .table-responsive > .table > tbody > tr > th, .table-responsive > .table > tfoot > tr > th, .table-responsive > .table > thead > tr > td, .table-responsive > .table > tbody > tr > td, .table-responsive > .table > tfoot > tr > td { white-space: nowrap } .table-responsive > .table-bordered { border: 0 } .table-responsive > .table-bordered > thead > tr > th:first-child, .table-responsive > .table-bordered > tbody > tr > th:first-child, .table-responsive > .table-bordered > tfoot > tr > th:first-child, .table-responsive > .table-bordered > thead > tr > td:first-child, .table-responsive > .table-bordered > tbody > tr > td:first-child, .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .table-responsive > .table-bordered > thead > tr > th:last-child, .table-responsive > .table-bordered > tbody > tr > th:last-child, .table-responsive > .table-bordered > tfoot > tr > th:last-child, .table-responsive > .table-bordered > thead > tr > td:last-child, .table-responsive > .table-bordered > tbody > tr > td:last-child, .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .table-responsive > .table-bordered > tbody > tr:last-child > th, .table-responsive > .table-bordered > tfoot > tr:last-child > th, .table-responsive > .table-bordered > tbody > tr:last-child > td, .table-responsive > .table-bordered > tfoot > tr:last-child > td { border-bottom: 0 } } fieldset { padding: 0; margin: 0; border: 0; min-width: 0 } legend { display: block; width: 100%; padding: 0; margin-bottom: 20px; font-size: 21px; line-height: inherit; color: #333; border: 0; border-bottom: 1px solid #e5e5e5 } label { display: inline-block; max-width: 100%; margin-bottom: 5px; font-weight: bold } input[type="search"] { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box } input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; line-height: normal } input[type="file"] { display: block } input[type="range"] { display: block; width: 100% } select[multiple], select[size] { height: auto } input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } output { display: block; padding-top: 7px; font-size: 14px; line-height: 1.42857143; color: #555 } .form-control { display: block; width: 100%; height: 34px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s } .form-control:focus { border-color: #66afe9; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6) } .form-control::-moz-placeholder { color: #999; opacity: 1 } .form-control:-ms-input-placeholder { color: #999 } .form-control::-webkit-input-placeholder { color: #999 } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { background-color: #eee; opacity: 1 } .form-control[disabled], fieldset[disabled] .form-control { cursor: not-allowed } textarea.form-control { height: auto } input[type="search"] { -webkit-appearance: none } @media screen and (-webkit-min-device-pixel-ratio: 0) { input[type="date"].form-control, input[type="time"].form-control, input[type="datetime-local"].form-control, input[type="month"].form-control { line-height: 34px } input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, input[type="month"].input-sm, .input-group-sm input[type="date"], .input-group-sm input[type="time"], .input-group-sm input[type="datetime-local"], .input-group-sm input[type="month"] { line-height: 30px } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, input[type="month"].input-lg, .input-group-lg input[type="date"], .input-group-lg input[type="time"], .input-group-lg input[type="datetime-local"], .input-group-lg input[type="month"] { line-height: 46px } } .form-group { margin-bottom: 15px } .radio, .checkbox { position: relative; display: block; margin-top: 10px; margin-bottom: 10px } .radio label, .checkbox label { min-height: 20px; padding-left: 20px; margin-bottom: 0; font-weight: normal; cursor: pointer } .radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] { position: absolute; margin-left: -20px; margin-top: 4px \9 } .radio + .radio, .checkbox + .checkbox { margin-top: -5px } .radio-inline, .checkbox-inline { position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; vertical-align: middle; font-weight: normal; cursor: pointer } .radio-inline + .radio-inline, .checkbox-inline + .checkbox-inline { margin-top: 0; margin-left: 10px } input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"].disabled, input[type="checkbox"].disabled, fieldset[disabled] input[type="radio"], fieldset[disabled] input[type="checkbox"] { cursor: not-allowed } .radio-inline.disabled, .checkbox-inline.disabled, fieldset[disabled] .radio-inline, fieldset[disabled] .checkbox-inline { cursor: not-allowed } .radio.disabled label, .checkbox.disabled label, fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed } .form-control-static { padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; min-height: 34px } .form-control-static.input-lg, .form-control-static.input-sm { padding-left: 0; padding-right: 0 } .input-sm { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-sm { height: 30px; line-height: 30px } textarea.input-sm, select[multiple].input-sm { height: auto } .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .form-group-sm select.form-control { height: 30px; line-height: 30px } .form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control { height: auto } .form-group-sm .form-control-static { height: 30px; min-height: 32px; padding: 6px 10px; font-size: 12px; line-height: 1.5 } .input-lg { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-lg { height: 46px; line-height: 46px } textarea.input-lg, select[multiple].input-lg { height: auto } .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .form-group-lg select.form-control { height: 46px; line-height: 46px } .form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control { height: auto } .form-group-lg .form-control-static { height: 46px; min-height: 38px; padding: 11px 16px; font-size: 18px; line-height: 1.3333333 } .has-feedback { position: relative } .has-feedback .form-control { padding-right: 42.5px } .form-control-feedback { position: absolute; top: 0; right: 0; z-index: 2; display: block; width: 34px; height: 34px; line-height: 34px; text-align: center; pointer-events: none } .input-lg + .form-control-feedback, .input-group-lg + .form-control-feedback, .form-group-lg .form-control + .form-control-feedback { width: 46px; height: 46px; line-height: 46px } .input-sm + .form-control-feedback, .input-group-sm + .form-control-feedback, .form-group-sm .form-control + .form-control-feedback { width: 30px; height: 30px; line-height: 30px } .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { color: #3c763d } .has-success .form-control { border-color: #3c763d; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-success .form-control:focus { border-color: #2b542c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168 } .has-success .input-group-addon { color: #3c763d; border-color: #3c763d; background-color: #dff0d8 } .has-success .form-control-feedback { color: #3c763d } .has-warning .help-block, .has-warning .control-label, .has-warning .radio, .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline, .has-warning.radio label, .has-warning.checkbox label, .has-warning.radio-inline label, .has-warning.checkbox-inline label { color: #8a6d3b } .has-warning .form-control { border-color: #8a6d3b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-warning .form-control:focus { border-color: #66512c; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b } .has-warning .input-group-addon { color: #8a6d3b; border-color: #8a6d3b; background-color: #fcf8e3 } .has-warning .form-control-feedback { color: #8a6d3b } .has-error .help-block, .has-error .control-label, .has-error .radio, .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label { color: #a94442 } .has-error .form-control { border-color: #a94442; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) } .has-error .form-control:focus { border-color: #843534; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483 } .has-error .input-group-addon { color: #a94442; border-color: #a94442; background-color: #f2dede } .has-error .form-control-feedback { color: #a94442 } .has-feedback label ~ .form-control-feedback { top: 25px } .has-feedback label.sr-only ~ .form-control-feedback { top: 0 } .help-block { display: block; margin-top: 5px; margin-bottom: 10px; color: #737373 } @media (min-width: 768px) { .form-inline .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .form-inline .form-control { display: inline-block; width: auto; vertical-align: middle } .form-inline .form-control-static { display: inline-block } .form-inline .input-group { display: inline-table; vertical-align: middle } .form-inline .input-group .input-group-addon, .form-inline .input-group .input-group-btn, .form-inline .input-group .form-control { width: auto } .form-inline .input-group > .form-control { width: 100% } .form-inline .control-label { margin-bottom: 0; vertical-align: middle } .form-inline .radio, .form-inline .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .form-inline .radio label, .form-inline .checkbox label { padding-left: 0 } .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .form-inline .has-feedback .form-control-feedback { top: 0 } } .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { margin-top: 0; margin-bottom: 0; padding-top: 7px } .form-horizontal .radio, .form-horizontal .checkbox { min-height: 27px } .form-horizontal .form-group { margin-left: -15px; margin-right: -15px } @media (min-width: 768px) { .form-horizontal .control-label { text-align: right; margin-bottom: 0; padding-top: 7px } } .form-horizontal .has-feedback .form-control-feedback { right: 15px } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { padding-top: 14.333333px; font-size: 18px } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { padding-top: 6px; font-size: 12px } } .btn { display: inline-block; margin-bottom: 0; font-weight: normal; text-align: center; vertical-align: middle; -ms-touch-action: manipulation; touch-action: manipulation; cursor: pointer; background-image: none; border: 1px solid transparent; white-space: nowrap; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; border-radius: 4px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none } .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:active.focus, .btn.active.focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px } .btn:hover, .btn:focus, .btn.focus { color: #333; text-decoration: none } .btn:active, .btn.active { outline: 0; background-image: none; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn.disabled, .btn[disabled], fieldset[disabled] .btn { cursor: not-allowed; opacity: .65; filter: alpha(opacity=65); -webkit-box-shadow: none; box-shadow: none } a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none } .btn-default { color: #333; background-color: #fff; border-color: #ccc } .btn-default:focus, .btn-default.focus { color: #333; background-color: #e6e6e6; border-color: #8c8c8c } .btn-default:hover { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { color: #333; background-color: #e6e6e6; border-color: #adadad } .btn-default:active:hover, .btn-default.active:hover, .open > .dropdown-toggle.btn-default:hover, .btn-default:active:focus, .btn-default.active:focus, .open > .dropdown-toggle.btn-default:focus, .btn-default:active.focus, .btn-default.active.focus, .open > .dropdown-toggle.btn-default.focus { color: #333; background-color: #d4d4d4; border-color: #8c8c8c } .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { background-image: none } .btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled.focus, .btn-default[disabled].focus, fieldset[disabled] .btn-default.focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { background-color: #fff; border-color: #ccc } .btn-default .badge { color: #fff; background-color: #333 } .btn-primary { color: #fff; background-color: #337ab7; border-color: #2e6da4 } .btn-primary:focus, .btn-primary.focus { color: #fff; background-color: #286090; border-color: #122b40 } .btn-primary:hover { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #fff; background-color: #286090; border-color: #204d74 } .btn-primary:active:hover, .btn-primary.active:hover, .open > .dropdown-toggle.btn-primary:hover, .btn-primary:active:focus, .btn-primary.active:focus, .open > .dropdown-toggle.btn-primary:focus, .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus { color: #fff; background-color: #204d74; border-color: #122b40 } .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { background-image: none } .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled.focus, .btn-primary[disabled].focus, fieldset[disabled] .btn-primary.focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #337ab7; border-color: #2e6da4 } .btn-primary .badge { color: #337ab7; background-color: #fff } .btn-success { color: #fff; background-color: #5cb85c; border-color: #4cae4c } .btn-success:focus, .btn-success.focus { color: #fff; background-color: #449d44; border-color: #255625 } .btn-success:hover { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { color: #fff; background-color: #449d44; border-color: #398439 } .btn-success:active:hover, .btn-success.active:hover, .open > .dropdown-toggle.btn-success:hover, .btn-success:active:focus, .btn-success.active:focus, .open > .dropdown-toggle.btn-success:focus, .btn-success:active.focus, .btn-success.active.focus, .open > .dropdown-toggle.btn-success.focus { color: #fff; background-color: #398439; border-color: #255625 } .btn-success:active, .btn-success.active, .open > .dropdown-toggle.btn-success { background-image: none } .btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, .btn-success.disabled.focus, .btn-success[disabled].focus, fieldset[disabled] .btn-success.focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { background-color: #5cb85c; border-color: #4cae4c } .btn-success .badge { color: #5cb85c; background-color: #fff } .btn-info { color: #fff; background-color: #5bc0de; border-color: #46b8da } .btn-info:focus, .btn-info.focus { color: #fff; background-color: #31b0d5; border-color: #1b6d85 } .btn-info:hover { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { color: #fff; background-color: #31b0d5; border-color: #269abc } .btn-info:active:hover, .btn-info.active:hover, .open > .dropdown-toggle.btn-info:hover, .btn-info:active:focus, .btn-info.active:focus, .open > .dropdown-toggle.btn-info:focus, .btn-info:active.focus, .btn-info.active.focus, .open > .dropdown-toggle.btn-info.focus { color: #fff; background-color: #269abc; border-color: #1b6d85 } .btn-info:active, .btn-info.active, .open > .dropdown-toggle.btn-info { background-image: none } .btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, .btn-info.disabled.focus, .btn-info[disabled].focus, fieldset[disabled] .btn-info.focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { background-color: #5bc0de; border-color: #46b8da } .btn-info .badge { color: #5bc0de; background-color: #fff } .btn-warning { color: #fff; background-color: #f0ad4e; border-color: #eea236 } .btn-warning:focus, .btn-warning.focus { color: #fff; background-color: #ec971f; border-color: #985f0d } .btn-warning:hover { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { color: #fff; background-color: #ec971f; border-color: #d58512 } .btn-warning:active:hover, .btn-warning.active:hover, .open > .dropdown-toggle.btn-warning:hover, .btn-warning:active:focus, .btn-warning.active:focus, .open > .dropdown-toggle.btn-warning:focus, .btn-warning:active.focus, .btn-warning.active.focus, .open > .dropdown-toggle.btn-warning.focus { color: #fff; background-color: #d58512; border-color: #985f0d } .btn-warning:active, .btn-warning.active, .open > .dropdown-toggle.btn-warning { background-image: none } .btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled.focus, .btn-warning[disabled].focus, fieldset[disabled] .btn-warning.focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { background-color: #f0ad4e; border-color: #eea236 } .btn-warning .badge { color: #f0ad4e; background-color: #fff } .btn-danger { color: #fff; background-color: #d9534f; border-color: #d43f3a } .btn-danger:focus, .btn-danger.focus { color: #fff; background-color: #c9302c; border-color: #761c19 } .btn-danger:hover { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { color: #fff; background-color: #c9302c; border-color: #ac2925 } .btn-danger:active:hover, .btn-danger.active:hover, .open > .dropdown-toggle.btn-danger:hover, .btn-danger:active:focus, .btn-danger.active:focus, .open > .dropdown-toggle.btn-danger:focus, .btn-danger:active.focus, .btn-danger.active.focus, .open > .dropdown-toggle.btn-danger.focus { color: #fff; background-color: #ac2925; border-color: #761c19 } .btn-danger:active, .btn-danger.active, .open > .dropdown-toggle.btn-danger { background-image: none } .btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled.focus, .btn-danger[disabled].focus, fieldset[disabled] .btn-danger.focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { background-color: #d9534f; border-color: #d43f3a } .btn-danger .badge { color: #d9534f; background-color: #fff } .btn-link { color: #337ab7; font-weight: normal; border-radius: 0 } .btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; -webkit-box-shadow: none; box-shadow: none } .btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent } .btn-link:hover, .btn-link:focus { color: #23527c; text-decoration: underline; background-color: transparent } .btn-link[disabled]:hover, fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { color: #777; text-decoration: none } .btn-lg, .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; border-radius: 3px } .btn-block { display: block; width: 100% } .btn-block + .btn-block { margin-top: 5px } input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { width: 100% } .fade { opacity: 0; -webkit-transition: opacity .15s linear; -o-transition: opacity .15s linear; transition: opacity .15s linear } .fade.in { opacity: 1 } .collapse { display: none } .collapse.in { display: block } tr.collapse.in { display: table-row } tbody.collapse.in { display: table-row-group } .collapsing { position: relative; height: 0; overflow: hidden; -webkit-transition-property: height, visibility; -o-transition-property: height, visibility; transition-property: height, visibility; -webkit-transition-duration: .35s; -o-transition-duration: .35s; transition-duration: .35s; -webkit-transition-timing-function: ease; -o-transition-timing-function: ease; transition-timing-function: ease } .caret { display: inline-block; width: 0; height: 0; margin-left: 2px; vertical-align: middle; border-top: 4px dashed; border-top: 4px solid \9; border-right: 4px solid transparent; border-left: 4px solid transparent } .dropup, .dropdown { position: relative } .dropdown-toggle:focus { outline: 0 } .dropdown-menu { position: absolute; top: 100%; left: 0; z-index: 1000; display: none; float: left; min-width: 160px; padding: 5px 0; margin: 2px 0 0; list-style: none; font-size: 14px; text-align: left; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); -webkit-background-clip: padding-box; background-clip: padding-box } .dropdown-menu.pull-right { right: 0; left: auto } .dropdown-menu .divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.42857143; color: #333; white-space: nowrap } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; color: #262626; background-color: #f5f5f5 } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { color: #fff; text-decoration: none; outline: 0; background-color: #337ab7 } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #777 } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); cursor: not-allowed } .open > .dropdown-menu { display: block } .open > a { outline: 0 } .dropdown-menu-right { left: auto; right: 0 } .dropdown-menu-left { left: 0; right: auto } .dropdown-header { display: block; padding: 3px 20px; font-size: 12px; line-height: 1.42857143; color: #777; white-space: nowrap } .dropdown-backdrop { position: fixed; left: 0; right: 0; bottom: 0; top: 0; z-index: 990 } .pull-right > .dropdown-menu { right: 0; left: auto } .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; border-bottom: 4px dashed; border-bottom: 4px solid \9; content: "" } .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; margin-bottom: 2px } @media (min-width: 768px) { .navbar-right .dropdown-menu { left: auto; right: 0 } .navbar-right .dropdown-menu-left { left: 0; right: auto } } .btn-group, .btn-group-vertical { position: relative; display: inline-block; vertical-align: middle } .btn-group > .btn, .btn-group-vertical > .btn { position: relative; float: left } .btn-group > .btn:hover, .btn-group-vertical > .btn:hover, .btn-group > .btn:focus, .btn-group-vertical > .btn:focus, .btn-group > .btn:active, .btn-group-vertical > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn.active { z-index: 2 } .btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, .btn-group .btn-group + .btn-group { margin-left: -1px } .btn-toolbar { margin-left: -5px } .btn-toolbar .btn, .btn-toolbar .btn-group, .btn-toolbar .input-group { float: left } .btn-toolbar > .btn, .btn-toolbar > .btn-group, .btn-toolbar > .input-group { margin-left: 5px } .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { border-radius: 0 } .btn-group > .btn:first-child { margin-left: 0 } .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group > .btn-group { float: left } .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-top-right-radius: 0 } .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-bottom-left-radius: 0; border-top-left-radius: 0 } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0 } .btn-group > .btn + .dropdown-toggle { padding-left: 8px; padding-right: 8px } .btn-group > .btn-lg + .dropdown-toggle { padding-left: 12px; padding-right: 12px } .btn-group.open .dropdown-toggle { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125) } .btn-group.open .dropdown-toggle.btn-link { -webkit-box-shadow: none; box-shadow: none } .btn .caret { margin-left: 0 } .btn-lg .caret { border-width: 5px 5px 0; border-bottom-width: 0 } .dropup .btn-lg .caret { border-width: 0 5px 5px } .btn-group-vertical > .btn, .btn-group-vertical > .btn-group, .btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; max-width: 100% } .btn-group-vertical > .btn-group > .btn { float: none } .btn-group-vertical > .btn + .btn, .btn-group-vertical > .btn + .btn-group, .btn-group-vertical > .btn-group + .btn, .btn-group-vertical > .btn-group + .btn-group { margin-top: -1px; margin-left: 0 } .btn-group-vertical > .btn:not(:first-child):not(:last-child) { border-radius: 0 } .btn-group-vertical > .btn:first-child:not(:last-child) { border-top-right-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn:last-child:not(:first-child) { border-bottom-left-radius: 4px; border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0 } .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .btn-group-justified { display: table; width: 100%; table-layout: fixed; border-collapse: separate } .btn-group-justified > .btn, .btn-group-justified > .btn-group { float: none; display: table-cell; width: 1% } .btn-group-justified > .btn-group .btn { width: 100% } .btn-group-justified > .btn-group .dropdown-menu { left: auto } [data-toggle="buttons"] > .btn input[type="radio"], [data-toggle="buttons"] > .btn-group > .btn input[type="radio"], [data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] { position: absolute; clip: rect(0, 0, 0, 0); pointer-events: none } .input-group { position: relative; display: table; border-collapse: separate } .input-group[class*="col-"] { float: none; padding-left: 0; padding-right: 0 } .input-group .form-control { position: relative; z-index: 2; float: left; width: 100%; margin-bottom: 0 } .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; border-radius: 6px } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { height: 46px; line-height: 46px } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, textarea.input-group-lg > .input-group-btn > .btn, select[multiple].input-group-lg > .form-control, select[multiple].input-group-lg > .input-group-addon, select[multiple].input-group-lg > .input-group-btn > .btn { height: auto } .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { height: 30px; padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-btn > .btn { height: 30px; line-height: 30px } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-btn > .btn, select[multiple].input-group-sm > .form-control, select[multiple].input-group-sm > .input-group-addon, select[multiple].input-group-sm > .input-group-btn > .btn { height: auto } .input-group-addon, .input-group-btn, .input-group .form-control { display: table-cell } .input-group-addon:not(:first-child):not(:last-child), .input-group-btn:not(:first-child):not(:last-child), .input-group .form-control:not(:first-child):not(:last-child) { border-radius: 0 } .input-group-addon, .input-group-btn { width: 1%; white-space: nowrap; vertical-align: middle } .input-group-addon { padding: 6px 12px; font-size: 14px; font-weight: normal; line-height: 1; color: #555; text-align: center; background-color: #eee; border: 1px solid #ccc; border-radius: 4px } .input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; border-radius: 3px } .input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; border-radius: 6px } .input-group-addon input[type="radio"], .input-group-addon input[type="checkbox"] { margin-top: 0 } .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { border-bottom-right-radius: 0; border-top-right-radius: 0 } .input-group-addon:first-child { border-right: 0 } .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { border-bottom-left-radius: 0; border-top-left-radius: 0 } .input-group-addon:last-child { border-left: 0 } .input-group-btn { position: relative; font-size: 0; white-space: nowrap } .input-group-btn > .btn { position: relative } .input-group-btn > .btn + .btn { margin-left: -1px } .input-group-btn > .btn:hover, .input-group-btn > .btn:focus, .input-group-btn > .btn:active { z-index: 2 } .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group { margin-right: -1px } .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group { z-index: 2; margin-left: -1px } .nav { margin-bottom: 0; padding-left: 0; list-style: none } .nav > li { position: relative; display: block } .nav > li > a { position: relative; display: block; padding: 10px 15px } .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; background-color: #eee } .nav > li.disabled > a { color: #777 } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { color: #777; text-decoration: none; background-color: transparent; cursor: not-allowed } .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { background-color: #eee; border-color: #337ab7 } .nav .nav-divider { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5 } .nav > li > a > img { max-width: none } .nav-tabs { border-bottom: 1px solid #ddd } .nav-tabs > li { float: left; margin-bottom: -1px } .nav-tabs > li > a { margin-right: 2px; line-height: 1.42857143; border: 1px solid transparent; border-radius: 4px 4px 0 0 } .nav-tabs > li > a:hover { border-color: #eee #eee #ddd } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #555; background-color: #fff; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default } .nav-tabs.nav-justified { width: 100%; border-bottom: 0 } .nav-tabs.nav-justified > li { float: none } .nav-tabs.nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-tabs.nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-tabs.nav-justified > li { display: table-cell; width: 1% } .nav-tabs.nav-justified > li > a { margin-bottom: 0 } } .nav-tabs.nav-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { border-bottom-color: #fff } } .nav-pills > li { float: left } .nav-pills > li > a { border-radius: 4px } .nav-pills > li + li { margin-left: 2px } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; background-color: #337ab7 } .nav-stacked > li { float: none } .nav-stacked > li + li { margin-top: 2px; margin-left: 0 } .nav-justified { width: 100% } .nav-justified > li { float: none } .nav-justified > li > a { text-align: center; margin-bottom: 5px } .nav-justified > .dropdown .dropdown-menu { top: auto; left: auto } @media (min-width: 768px) { .nav-justified > li { display: table-cell; width: 1% } .nav-justified > li > a { margin-bottom: 0 } } .nav-tabs-justified { border-bottom: 0 } .nav-tabs-justified > li > a { margin-right: 0; border-radius: 4px } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border: 1px solid #ddd } @media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #ddd; border-radius: 4px 4px 0 0 } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { border-bottom-color: #fff } } .tab-content > .tab-pane { display: none } .tab-content > .active { display: block } .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar { position: relative; min-height: 50px; margin-bottom: 20px; border: 1px solid transparent } @media (min-width: 768px) { .navbar { border-radius: 4px } } @media (min-width: 768px) { .navbar-header { float: left } } .navbar-collapse { overflow-x: visible; padding-right: 15px; padding-left: 15px; border-top: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); -webkit-overflow-scrolling: touch } .navbar-collapse.in { overflow-y: auto } @media (min-width: 768px) { .navbar-collapse { width: auto; border-top: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-collapse.collapse { display: block !important; height: auto !important; padding-bottom: 0; overflow: visible !important } .navbar-collapse.in { overflow-y: visible } .navbar-fixed-top .navbar-collapse, .navbar-static-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { padding-left: 0; padding-right: 0 } } .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 340px } @media (max-device-width: 480px) and (orientation: landscape) { .navbar-fixed-top .navbar-collapse, .navbar-fixed-bottom .navbar-collapse { max-height: 200px } } .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: -15px; margin-left: -15px } @media (min-width: 768px) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-collapse { margin-right: 0; margin-left: 0 } } .navbar-static-top { z-index: 1000; border-width: 0 0 1px } @media (min-width: 768px) { .navbar-static-top { border-radius: 0 } } .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; right: 0; left: 0; z-index: 1030 } @media (min-width: 768px) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0 } } .navbar-fixed-top { top: 0; border-width: 0 0 1px } .navbar-fixed-bottom { bottom: 0; margin-bottom: 0; border-width: 1px 0 0 } .navbar-brand { float: left; padding: 15px 15px; font-size: 18px; line-height: 20px; height: 50px } .navbar-brand:hover, .navbar-brand:focus { text-decoration: none } .navbar-brand > img { display: block } @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px } } .navbar-toggle { position: relative; float: right; margin-right: 15px; padding: 9px 10px; margin-top: 8px; margin-bottom: 8px; background-color: transparent; background-image: none; border: 1px solid transparent; border-radius: 4px } .navbar-toggle:focus { outline: 0 } .navbar-toggle .icon-bar { display: block; width: 22px; height: 2px; border-radius: 1px } .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px } @media (min-width: 768px) { .navbar-toggle { display: none } } .navbar-nav { margin: 7.5px -15px } .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; line-height: 20px } @media (max-width: 767px) { .navbar-nav .open .dropdown-menu { position: static; float: none; width: auto; margin-top: 0; background-color: transparent; border: 0; -webkit-box-shadow: none; box-shadow: none } .navbar-nav .open .dropdown-menu > li > a, .navbar-nav .open .dropdown-menu .dropdown-header { padding: 5px 15px 5px 25px } .navbar-nav .open .dropdown-menu > li > a { line-height: 20px } .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:focus { background-image: none } } @media (min-width: 768px) { .navbar-nav { float: left; margin: 0 } .navbar-nav > li { float: left } .navbar-nav > li > a { padding-top: 15px; padding-bottom: 15px } } .navbar-form { margin-left: -15px; margin-right: -15px; padding: 10px 15px; border-top: 1px solid transparent; border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); margin-top: 8px; margin-bottom: 8px } @media (min-width: 768px) { .navbar-form .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle } .navbar-form .form-control { display: inline-block; width: auto; vertical-align: middle } .navbar-form .form-control-static { display: inline-block } .navbar-form .input-group { display: inline-table; vertical-align: middle } .navbar-form .input-group .input-group-addon, .navbar-form .input-group .input-group-btn, .navbar-form .input-group .form-control { width: auto } .navbar-form .input-group > .form-control { width: 100% } .navbar-form .control-label { margin-bottom: 0; vertical-align: middle } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; margin-top: 0; margin-bottom: 0; vertical-align: middle } .navbar-form .radio label, .navbar-form .checkbox label { padding-left: 0 } .navbar-form .radio input[type="radio"], .navbar-form .checkbox input[type="checkbox"] { position: relative; margin-left: 0 } .navbar-form .has-feedback .form-control-feedback { top: 0 } } @media (max-width: 767px) { .navbar-form .form-group { margin-bottom: 5px } .navbar-form .form-group:last-child { margin-bottom: 0 } } @media (min-width: 768px) { .navbar-form { width: auto; border: 0; margin-left: 0; margin-right: 0; padding-top: 0; padding-bottom: 0; -webkit-box-shadow: none; box-shadow: none } } .navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; border-top-left-radius: 0 } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { margin-bottom: 0; border-top-right-radius: 4px; border-top-left-radius: 4px; border-bottom-right-radius: 0; border-bottom-left-radius: 0 } .navbar-btn { margin-top: 8px; margin-bottom: 8px } .navbar-btn.btn-sm { margin-top: 10px; margin-bottom: 10px } .navbar-btn.btn-xs { margin-top: 14px; margin-bottom: 14px } .navbar-text { margin-top: 15px; margin-bottom: 15px } @media (min-width: 768px) { .navbar-text { float: left; margin-left: 15px; margin-right: 15px } } @media (min-width: 768px) { .navbar-left { float: left !important } .navbar-right { float: right !important; margin-right: -15px } .navbar-right ~ .navbar-right { margin-right: 0 } } .navbar-default { background-color: #f8f8f8; border-color: #e7e7e7 } .navbar-default .navbar-brand { color: #777 } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { color: #5e5e5e; background-color: transparent } .navbar-default .navbar-text { color: #777 } .navbar-default .navbar-nav > li > a { color: #777 } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, .navbar-default .navbar-nav > .disabled > a:focus { color: #ccc; background-color: transparent } .navbar-default .navbar-toggle { border-color: #ddd } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #ddd } .navbar-default .navbar-toggle .icon-bar { background-color: #888 } .navbar-default .navbar-collapse, .navbar-default .navbar-form { border-color: #e7e7e7 } .wapper .navbar-form { border-color: #e7e7e7 } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { background-color: #e7e7e7; color: #555 } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777 } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { color: #333; background-color: transparent } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555; background-color: #e7e7e7 } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #ccc; background-color: transparent } } .navbar-default .navbar-link { color: #777 } .navbar-default .navbar-link:hover { color: #333 } .navbar-default .btn-link { color: #777 } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { color: #333 } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[disabled]:focus, fieldset[disabled] .navbar-default .btn-link:focus { color: #ccc } .navbar-inverse { background-color: #222; border-color: #080808 } .navbar-inverse .navbar-brand { color: #9d9d9d } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-text { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { color: #444; background-color: transparent } .navbar-inverse .navbar-toggle { border-color: #333 } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { background-color: #333 } .navbar-inverse .navbar-toggle .icon-bar { background-color: #fff } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { border-color: #101010 } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { background-color: #080808; color: #fff } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu .divider { background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #9d9d9d } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { color: #fff; background-color: transparent } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff; background-color: #080808 } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #444; background-color: transparent } } .navbar-inverse .navbar-link { color: #9d9d9d } .navbar-inverse .navbar-link:hover { color: #fff } .navbar-inverse .btn-link { color: #9d9d9d } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { color: #fff } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link[disabled]:focus, fieldset[disabled] .navbar-inverse .btn-link:focus { color: #444 } .breadcrumb { padding: 8px 15px; margin-bottom: 20px; list-style: none; background-color: #f5f5f5; border-radius: 4px } .breadcrumb > li { display: inline-block } .breadcrumb > li + li:before { content: "/\00a0"; padding: 0 5px; color: #ccc } .breadcrumb > .active { color: #777 } .pagination { display: inline-block; padding-left: 0; margin: 20px 0; border-radius: 4px } .pagination > li { display: inline } .pagination > li > a, .pagination > li > span { position: relative; float: left; padding: 6px 12px; line-height: 1.42857143; text-decoration: none; color: #337ab7; background-color: #fff; border: 1px solid #ddd; margin-left: -1px } .pagination > li:first-child > a, .pagination > li:first-child > span { margin-left: 0; border-bottom-left-radius: 4px; border-top-left-radius: 4px } .pagination > li:last-child > a, .pagination > li:last-child > span { border-bottom-right-radius: 4px; border-top-right-radius: 4px } .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { z-index: 3; color: #23527c; background-color: #eee; border-color: #ddd } .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7; cursor: default } .pagination > .disabled > span, .pagination > .disabled > span:hover, .pagination > .disabled > span:focus, .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { color: #777; background-color: #fff; border-color: #ddd; cursor: not-allowed } .pagination-lg > li > a, .pagination-lg > li > span { padding: 10px 16px; font-size: 18px; line-height: 1.3333333 } .pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; border-top-left-radius: 6px } .pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span { border-bottom-right-radius: 6px; border-top-right-radius: 6px } .pagination-sm > li > a, .pagination-sm > li > span { padding: 5px 10px; font-size: 12px; line-height: 1.5 } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { border-bottom-left-radius: 3px; border-top-left-radius: 3px } .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span { border-bottom-right-radius: 3px; border-top-right-radius: 3px } .pager { padding-left: 0; margin: 20px 0; list-style: none; text-align: center } .pager li { display: inline } .pager li > a, .pager li > span { display: inline-block; padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; border-radius: 15px } .pager li > a:hover, .pager li > a:focus { text-decoration: none; background-color: #eee } .pager .next > a, .pager .next > span { float: right } .pager .previous > a, .pager .previous > span { float: left } .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { color: #777; background-color: #fff; cursor: not-allowed } .label { display: inline; padding: .2em .6em .3em; font-size: 75%; font-weight: bold; line-height: 1; color: #fff; text-align: center; white-space: nowrap; vertical-align: baseline; border-radius: .25em } a.label:hover, a.label:focus { color: #fff; text-decoration: none; cursor: pointer } .label:empty { display: none } .btn .label { position: relative; top: -1px } .label-default { background-color: #777 } .label-default[href]:hover, .label-default[href]:focus { background-color: #5e5e5e } .label-primary { background-color: #337ab7 } .label-primary[href]:hover, .label-primary[href]:focus { background-color: #286090 } .label-success { background-color: #5cb85c } .label-success[href]:hover, .label-success[href]:focus { background-color: #449d44 } .label-info { background-color: #5bc0de } .label-info[href]:hover, .label-info[href]:focus { background-color: #31b0d5 } .label-warning { background-color: #f0ad4e } .label-warning[href]:hover, .label-warning[href]:focus { background-color: #ec971f } .label-danger { background-color: #d9534f } .label-danger[href]:hover, .label-danger[href]:focus { background-color: #c9302c } .badge { display: inline-block; min-width: 10px; padding: 3px 7px; font-size: 12px; font-weight: bold; color: #fff; line-height: 1; vertical-align: middle; white-space: nowrap; text-align: center; background-color: #777; border-radius: 10px } .badge:empty { display: none } .btn .badge { position: relative; top: -1px } .btn-xs .badge, .btn-group-xs > .btn .badge { top: 0; padding: 1px 5px } a.badge:hover, a.badge:focus { color: #fff; text-decoration: none; cursor: pointer } .list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #337ab7; background-color: #fff } .list-group-item > .badge { float: right } .list-group-item > .badge + .badge { margin-right: 5px } .nav-pills > li > a > .badge { margin-left: 3px } .jumbotron { padding-top: 30px; padding-bottom: 30px; margin-bottom: 30px; color: inherit; background-color: #eee } .jumbotron h1, .jumbotron .h1 { color: inherit } .jumbotron p { margin-bottom: 15px; font-size: 21px; font-weight: 200 } .jumbotron > hr { border-top-color: #d5d5d5 } .container .jumbotron, .container-fluid .jumbotron { border-radius: 6px } .jumbotron .container { max-width: 100% } @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; padding-bottom: 48px } .container .jumbotron, .container-fluid .jumbotron { padding-left: 60px; padding-right: 60px } .jumbotron h1, .jumbotron .h1 { font-size: 63px } } .thumbnail { display: block; padding: 4px; margin-bottom: 20px; line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; border-radius: 4px; -webkit-transition: border .2s ease-in-out; -o-transition: border .2s ease-in-out; transition: border .2s ease-in-out } .thumbnail > img, .thumbnail a > img { margin-left: auto; margin-right: auto } a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { border-color: #337ab7 } .thumbnail .caption { padding: 9px; color: #333 } .alert { padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 4px } .alert h4 { margin-top: 0; color: inherit } .alert .alert-link { font-weight: bold } .alert > p, .alert > ul { margin-bottom: 0 } .alert > p + p { margin-top: 5px } .alert-dismissable, .alert-dismissible { padding-right: 35px } .alert-dismissable .close, .alert-dismissible .close { position: relative; top: -2px; right: -21px; color: inherit } .alert-success { background-color: #dff0d8; border-color: #d6e9c6; color: #3c763d } .alert-success hr { border-top-color: #c9e2b3 } .alert-success .alert-link { color: #2b542c } .alert-info { background-color: #d9edf7; border-color: #bce8f1; color: #31708f } .alert-info hr { border-top-color: #a6e1ec } .alert-info .alert-link { color: #245269 } .alert-warning { background-color: #fcf8e3; border-color: #faebcc; color: #8a6d3b } .alert-warning hr { border-top-color: #f7e1b5 } .alert-warning .alert-link { color: #66512c } .alert-danger { background-color: #f2dede; border-color: #ebccd1; color: #a94442 } .alert-danger hr { border-top-color: #e4b9c0 } .alert-danger .alert-link { color: #843534 } @-webkit-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @-o-keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } @keyframes progress-bar-stripes { from { background-position: 40px 0 } to { background-position: 0 0 } } .progress { overflow: hidden; height: 20px; margin-bottom: 20px; background-color: #f5f5f5; border-radius: 4px; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1) } .progress-bar { float: left; width: 0%; height: 100%; font-size: 12px; line-height: 20px; color: #fff; text-align: center; background-color: #337ab7; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width .6s ease; -o-transition: width .6s ease; transition: width .6s ease } .progress-striped .progress-bar, .progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px } .progress.active .progress-bar, .progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite } .progress-bar-success { background-color: #5cb85c } .progress-striped .progress-bar-success { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-info { background-color: #5bc0de } .progress-striped .progress-bar-info { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-warning { background-color: #f0ad4e } .progress-striped .progress-bar-warning { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .progress-bar-danger { background-color: #d9534f } .progress-striped .progress-bar-danger { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent) } .media { margin-top: 15px } .media:first-child { margin-top: 0 } .media, .media-body { zoom: 1; overflow: hidden } .media-body { width: 10000px } .media-object { display: block } .media-object.img-thumbnail { max-width: none } .media-right, .media > .pull-right { padding-left: 10px } .media-left, .media > .pull-left { padding-right: 10px } .media-left, .media-right, .media-body { display: table-cell; vertical-align: top } .media-middle { vertical-align: middle } .media-bottom { vertical-align: bottom } .media-heading { margin-top: 0; margin-bottom: 5px } .media-list { padding-left: 0; list-style: none } .list-group { margin-bottom: 20px; padding-left: 0 } .list-group-item { position: relative; display: block; padding: 10px 15px; margin-bottom: -1px; background-color: #fff; border: 1px solid #ddd } .list-group-item:first-child { border-top-right-radius: 4px; border-top-left-radius: 4px } .list-group-item:last-child { margin-bottom: 0; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px } a.list-group-item, button.list-group-item { color: #555 } a.list-group-item .list-group-item-heading, button.list-group-item .list-group-item-heading { color: #333 } a.list-group-item:hover, button.list-group-item:hover, a.list-group-item:focus, button.list-group-item:focus { text-decoration: none; color: #555; background-color: #f5f5f5 } button.list-group-item { width: 100%; text-align: left } .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { background-color: #eee; color: #777; cursor: not-allowed } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, .list-group-item.disabled:focus .list-group-item-heading { color: inherit } .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { color: #777 } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #fff; background-color: #337ab7; border-color: #337ab7 } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, .list-group-item.active:focus .list-group-item-heading, .list-group-item.active .list-group-item-heading > small, .list-group-item.active:hover .list-group-item-heading > small, .list-group-item.active:focus .list-group-item-heading > small, .list-group-item.active .list-group-item-heading > .small, .list-group-item.active:hover .list-group-item-heading > .small, .list-group-item.active:focus .list-group-item-heading > .small { color: inherit } .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { color: #c7ddef } .list-group-item-success { color: #3c763d; background-color: #dff0d8 } a.list-group-item-success, button.list-group-item-success { color: #3c763d } a.list-group-item-success .list-group-item-heading, button.list-group-item-success .list-group-item-heading { color: inherit } a.list-group-item-success:hover, button.list-group-item-success:hover, a.list-group-item-success:focus, button.list-group-item-success:focus { color: #3c763d; background-color: #d0e9c6 } a.list-group-item-success.active, button.list-group-item-success.active, a.list-group-item-success.active:hover, button.list-group-item-success.active:hover, a.list-group-item-success.active:focus, button.list-group-item-success.active:focus { color: #fff; background-color: #3c763d; border-color: #3c763d } .list-group-item-info { color: #31708f; background-color: #d9edf7 } a.list-group-item-info, button.list-group-item-info { color: #31708f } a.list-group-item-info .list-group-item-heading, button.list-group-item-info .list-group-item-heading { color: inherit } a.list-group-item-info:hover, button.list-group-item-info:hover, a.list-group-item-info:focus, button.list-group-item-info:focus { color: #31708f; background-color: #c4e3f3 } a.list-group-item-info.active, button.list-group-item-info.active, a.list-group-item-info.active:hover, button.list-group-item-info.active:hover, a.list-group-item-info.active:focus, button.list-group-item-info.active:focus { color: #fff; background-color: #31708f; border-color: #31708f } .list-group-item-warning { color: #8a6d3b; background-color: #fcf8e3 } a.list-group-item-warning, button.list-group-item-warning { color: #8a6d3b } a.list-group-item-warning .list-group-item-heading, button.list-group-item-warning .list-group-item-heading { color: inherit } a.list-group-item-warning:hover, button.list-group-item-warning:hover, a.list-group-item-warning:focus, button.list-group-item-warning:focus { color: #8a6d3b; background-color: #faf2cc } a.list-group-item-warning.active, button.list-group-item-warning.active, a.list-group-item-warning.active:hover, button.list-group-item-warning.active:hover, a.list-group-item-warning.active:focus, button.list-group-item-warning.active:focus { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b } .list-group-item-danger { color: #a94442; background-color: #f2dede } a.list-group-item-danger, button.list-group-item-danger { color: #a94442 } a.list-group-item-danger .list-group-item-heading, button.list-group-item-danger .list-group-item-heading { color: inherit } a.list-group-item-danger:hover, button.list-group-item-danger:hover, a.list-group-item-danger:focus, button.list-group-item-danger:focus { color: #a94442; background-color: #ebcccc } a.list-group-item-danger.active, button.list-group-item-danger.active, a.list-group-item-danger.active:hover, button.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus, button.list-group-item-danger.active:focus { color: #fff; background-color: #a94442; border-color: #a94442 } .list-group-item-heading { margin-top: 0; margin-bottom: 5px } .list-group-item-text { margin-bottom: 0; line-height: 1.3 } .panel { margin-bottom: 20px; background-color: #fff; border: 1px solid transparent; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) } .panel-body { padding: 15px } .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel-heading > .dropdown .dropdown-toggle { color: inherit } .panel-title { margin-top: 0; margin-bottom: 0; font-size: 16px; color: inherit } .panel-title > a, .panel-title > small, .panel-title > .small, .panel-title > small > a, .panel-title > .small > a { color: inherit } .panel-footer { padding: 10px 15px; background-color: #f5f5f5; border-top: 1px solid #ddd; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .list-group, .panel > .panel-collapse > .list-group { margin-bottom: 0 } .panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item { border-width: 1px 0; border-radius: 0 } .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { border-top: 0; border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .list-group:last-child .list-group-item:last-child, .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child { border-bottom: 0; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { border-top-right-radius: 0; border-top-left-radius: 0 } .panel-heading + .list-group .list-group-item:first-child { border-top-width: 0 } .list-group + .panel-footer { border-top-width: 0 } .panel > .table, .panel > .table-responsive > .table, .panel > .panel-collapse > .table { margin-bottom: 0 } .panel > .table caption, .panel > .table-responsive > .table caption, .panel > .panel-collapse > .table caption { padding-left: 15px; padding-right: 15px } .panel > .table:first-child, .panel > .table-responsive:first-child > .table:first-child { border-top-right-radius: 3px; border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, .panel > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { border-top-left-radius: 3px } .panel > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, .panel > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { border-top-right-radius: 3px } .panel > .table:last-child, .panel > .table-responsive:last-child > .table:last-child { border-bottom-right-radius: 3px; border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { border-bottom-left-radius: 3px } .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { border-bottom-right-radius: 3px } .panel > .panel-body + .table, .panel > .panel-body + .table-responsive, .panel > .table + .panel-body, .panel > .table-responsive + .panel-body { border-top: 1px solid #ddd } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { border-top: 0 } .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0 } .panel > .table-bordered > thead > tr > th:first-child, .panel > .table-responsive > .table-bordered > thead > tr > th:first-child, .panel > .table-bordered > tbody > tr > th:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, .panel > .table-bordered > tfoot > tr > th:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, .panel > .table-bordered > thead > tr > td:first-child, .panel > .table-responsive > .table-bordered > thead > tr > td:first-child, .panel > .table-bordered > tbody > tr > td:first-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, .panel > .table-bordered > tfoot > tr > td:first-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { border-left: 0 } .panel > .table-bordered > thead > tr > th:last-child, .panel > .table-responsive > .table-bordered > thead > tr > th:last-child, .panel > .table-bordered > tbody > tr > th:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, .panel > .table-bordered > tfoot > tr > th:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, .panel > .table-bordered > thead > tr > td:last-child, .panel > .table-responsive > .table-bordered > thead > tr > td:last-child, .panel > .table-bordered > tbody > tr > td:last-child, .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, .panel > .table-bordered > tfoot > tr > td:last-child, .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { border-right: 0 } .panel > .table-bordered > thead > tr:first-child > td, .panel > .table-responsive > .table-bordered > thead > tr:first-child > td, .panel > .table-bordered > tbody > tr:first-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, .panel > .table-bordered > thead > tr:first-child > th, .panel > .table-responsive > .table-bordered > thead > tr:first-child > th, .panel > .table-bordered > tbody > tr:first-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:first-child > th { border-bottom: 0 } .panel > .table-bordered > tbody > tr:last-child > td, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, .panel > .table-bordered > tfoot > tr:last-child > td, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td, .panel > .table-bordered > tbody > tr:last-child > th, .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, .panel > .table-bordered > tfoot > tr:last-child > th, .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th { border-bottom: 0 } .panel > .table-responsive { border: 0; margin-bottom: 0 } .panel-group { margin-bottom: 20px } .panel-group .panel { margin-bottom: 0; border-radius: 4px } .panel-group .panel + .panel { margin-top: 5px } .panel-group .panel-heading { border-bottom: 0 } .panel-group .panel-heading + .panel-collapse > .panel-body, .panel-group .panel-heading + .panel-collapse > .list-group { border-top: 1px solid #ddd } .panel-group .panel-footer { border-top: 0 } .panel-group .panel-footer + .panel-collapse .panel-body { border-bottom: 1px solid #ddd } .panel-default { border-color: #ddd } .panel-default > .panel-heading { color: #333; background-color: #f5f5f5; border-color: #ddd } .panel-default > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ddd } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #333 } .panel-default > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ddd } .panel-primary { border-color: #337ab7 } .panel-primary > .panel-heading { color: #fff; background-color: #337ab7; border-color: #337ab7 } .panel-primary > .panel-heading + .panel-collapse > .panel-body { border-top-color: #337ab7 } .panel-primary > .panel-heading .badge { color: #337ab7; background-color: #fff } .panel-primary > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #337ab7 } .panel-success { border-color: #d6e9c6 } .panel-success > .panel-heading { color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6 } .panel-success > .panel-heading + .panel-collapse > .panel-body { border-top-color: #d6e9c6 } .panel-success > .panel-heading .badge { color: #dff0d8; background-color: #3c763d } .panel-success > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #d6e9c6 } .panel-info { border-color: #bce8f1 } .panel-info > .panel-heading { color: #31708f; background-color: #d9edf7; border-color: #bce8f1 } .panel-info > .panel-heading + .panel-collapse > .panel-body { border-top-color: #bce8f1 } .panel-info > .panel-heading .badge { color: #d9edf7; background-color: #31708f } .panel-info > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #bce8f1 } .panel-warning { border-color: #faebcc } .panel-warning > .panel-heading { color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc } .panel-warning > .panel-heading + .panel-collapse > .panel-body { border-top-color: #faebcc } .panel-warning > .panel-heading .badge { color: #fcf8e3; background-color: #8a6d3b } .panel-warning > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #faebcc } .panel-danger { border-color: #ebccd1 } .panel-danger > .panel-heading { color: #a94442; background-color: #f2dede; border-color: #ebccd1 } .panel-danger > .panel-heading + .panel-collapse > .panel-body { border-top-color: #ebccd1 } .panel-danger > .panel-heading .badge { color: #f2dede; background-color: #a94442 } .panel-danger > .panel-footer + .panel-collapse > .panel-body { border-bottom-color: #ebccd1 } .embed-responsive { position: relative; display: block; height: 0; padding: 0; overflow: hidden } .embed-responsive .embed-responsive-item, .embed-responsive iframe, .embed-responsive embed, .embed-responsive object, .embed-responsive video { position: absolute; top: 0; left: 0; bottom: 0; height: 100%; width: 100%; border: 0 } .embed-responsive-16by9 { padding-bottom: 56.25% } .embed-responsive-4by3 { padding-bottom: 75% } .well { min-height: 20px; padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #e3e3e3; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05) } .well blockquote { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15) } .well-lg { padding: 24px; border-radius: 6px } .well-sm { padding: 9px; border-radius: 3px } .close { float: right; font-size: 21px; font-weight: bold; line-height: 1; color: #000; text-shadow: 0 1px 0 #fff; opacity: .2; filter: alpha(opacity=20) } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; opacity: .5; filter: alpha(opacity=50) } button.close { padding: 0; cursor: pointer; background: transparent; border: 0; -webkit-appearance: none } .modal-open { overflow: hidden } .modal { display: none; overflow: hidden; position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1050; -webkit-overflow-scrolling: touch; outline: 0 } .modal.fade .modal-dialog { -webkit-transform: translate(0, -25%); -ms-transform: translate(0, -25%); -o-transform: translate(0, -25%); transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; -o-transition: -o-transform 0.3s ease-out; transition: transform 0.3s ease-out } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); -ms-transform: translate(0, 0); -o-transform: translate(0, 0); transform: translate(0, 0) } .modal-open .modal { overflow-x: hidden; overflow-y: auto } .modal-dialog { position: relative; width: auto; margin: 10px } .modal-content { position: relative; background-color: #fff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); -webkit-background-clip: padding-box; background-clip: padding-box; outline: 0 } .modal-backdrop { position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 1040; background-color: #000 } .modal-backdrop.fade { opacity: 0; filter: alpha(opacity=0) } .modal-backdrop.in { opacity: .5; filter: alpha(opacity=50) } .modal-header { padding: 15px; border-bottom: 1px solid #e5e5e5; min-height: 16.42857143px } .modal-header .close { margin-top: -2px } .modal-title { margin: 0; line-height: 1.42857143 } .modal-body { position: relative; padding: 15px } .modal-footer { padding: 15px; text-align: right; border-top: 1px solid #e5e5e5 } .modal-footer .btn + .btn { margin-left: 5px; margin-bottom: 0 } .modal-footer .btn-group .btn + .btn { margin-left: -1px } .modal-footer .btn-block + .btn-block { margin-left: 0 } .modal-scrollbar-measure { position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll } @media (min-width: 768px) { .modal-dialog { width: 600px; margin: 30px auto } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5) } .modal-sm { width: 300px } } @media (min-width: 992px) { .modal-lg { width: 900px } } .tooltip { position: absolute; z-index: 1070; display: block; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 12px; opacity: 0; filter: alpha(opacity=0) } .tooltip.in { opacity: .9; filter: alpha(opacity=90) } .tooltip.top { margin-top: -3px; padding: 5px 0 } .tooltip.right { margin-left: 3px; padding: 0 5px } .tooltip.bottom { margin-top: 3px; padding: 5px 0 } .tooltip.left { margin-left: -3px; padding: 0 5px } .tooltip-inner { max-width: 200px; padding: 3px 8px; color: #fff; text-align: center; background-color: #000; border-radius: 4px } .tooltip-arrow { position: absolute; width: 0; height: 0; border-color: transparent; border-style: solid } .tooltip.top .tooltip-arrow { bottom: 0; left: 50%; margin-left: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-left .tooltip-arrow { bottom: 0; right: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.top-right .tooltip-arrow { bottom: 0; left: 5px; margin-bottom: -5px; border-width: 5px 5px 0; border-top-color: #000 } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; border-right-color: #000 } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; border-left-color: #000 } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-left .tooltip-arrow { top: 0; right: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .tooltip.bottom-right .tooltip-arrow { top: 0; left: 5px; margin-top: -5px; border-width: 0 5px 5px; border-bottom-color: #000 } .popover { position: absolute; top: 0; left: 0; z-index: 1060; display: none; max-width: 276px; padding: 1px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-style: normal; font-weight: normal; letter-spacing: normal; line-break: auto; line-height: 1.42857143; text-align: left; text-align: start; text-decoration: none; text-shadow: none; text-transform: none; white-space: normal; word-break: normal; word-spacing: normal; word-wrap: normal; font-size: 14px; background-color: #fff; -webkit-background-clip: padding-box; background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2) } .popover.top { margin-top: -10px } .popover.right { margin-left: 10px } .popover.bottom { margin-top: 10px } .popover.left { margin-left: -10px } .popover-title { margin: 0; padding: 8px 14px; font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; border-radius: 5px 5px 0 0 } .popover-content { padding: 9px 14px } .popover > .arrow, .popover > .arrow:after { position: absolute; display: block; width: 0; height: 0; border-color: transparent; border-style: solid } .popover > .arrow { border-width: 11px } .popover > .arrow:after { border-width: 10px; content: "" } .popover.top > .arrow { left: 50%; margin-left: -11px; border-bottom-width: 0; border-top-color: #999; border-top-color: rgba(0, 0, 0, 0.25); bottom: -11px } .popover.top > .arrow:after { content: " "; bottom: 1px; margin-left: -10px; border-bottom-width: 0; border-top-color: #fff } .popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; border-left-width: 0; border-right-color: #999; border-right-color: rgba(0, 0, 0, 0.25) } .popover.right > .arrow:after { content: " "; left: 1px; bottom: -10px; border-left-width: 0; border-right-color: #fff } .popover.bottom > .arrow { left: 50%; margin-left: -11px; border-top-width: 0; border-bottom-color: #999; border-bottom-color: rgba(0, 0, 0, 0.25); top: -11px } .popover.bottom > .arrow:after { content: " "; top: 1px; margin-left: -10px; border-top-width: 0; border-bottom-color: #fff } .popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; border-right-width: 0; border-left-color: #999; border-left-color: rgba(0, 0, 0, 0.25) } .popover.left > .arrow:after { content: " "; right: 1px; border-right-width: 0; border-left-color: #fff; bottom: -10px } .carousel { position: relative } .carousel-inner { position: relative; overflow: hidden; width: 100% } .carousel-inner > .item { display: none; position: relative; -webkit-transition: .6s ease-in-out left; -o-transition: .6s ease-in-out left; transition: .6s ease-in-out left } .carousel-inner > .item > img, .carousel-inner > .item > a > img { line-height: 1 } @media all and (transform-3d),(-webkit-transform-3d) { .carousel-inner > .item { -webkit-transition: -webkit-transform 0.6s ease-in-out; -o-transition: -o-transform 0.6s ease-in-out; transition: transform 0.6s ease-in-out; -webkit-backface-visibility: hidden; backface-visibility: hidden; -webkit-perspective: 1000px; perspective: 1000px } .carousel-inner > .item.next, .carousel-inner > .item.active.right { -webkit-transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0); left: 0 } .carousel-inner > .item.prev, .carousel-inner > .item.active.left { -webkit-transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0); left: 0 } .carousel-inner > .item.next.left, .carousel-inner > .item.prev.right, .carousel-inner > .item.active { -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); left: 0 } } .carousel-inner > .active, .carousel-inner > .next, .carousel-inner > .prev { display: block } .carousel-inner > .active { left: 0 } .carousel-inner > .next, .carousel-inner > .prev { position: absolute; top: 0; width: 100% } .carousel-inner > .next { left: 100% } .carousel-inner > .prev { left: -100% } .carousel-inner > .next.left, .carousel-inner > .prev.right { left: 0 } .carousel-inner > .active.left { left: -100% } .carousel-inner > .active.right { left: 100% } .carousel-control { position: absolute; top: 0; left: 0; bottom: 0; width: 15%; opacity: .5; filter: alpha(opacity=50); font-size: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-control.left { background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1) } .carousel-control.right { left: auto; right: 0; background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-image: -webkit-gradient(linear, left top, right top, color-stop(0, rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1) } .carousel-control:hover, .carousel-control:focus { outline: 0; color: #fff; text-decoration: none; opacity: .9; filter: alpha(opacity=90) } .carousel-control .icon-prev, .carousel-control .icon-next, .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; margin-top: -10px; z-index: 5; display: inline-block } .carousel-control .icon-prev, .carousel-control .glyphicon-chevron-left { left: 50%; margin-left: -10px } .carousel-control .icon-next, .carousel-control .glyphicon-chevron-right { right: 50%; margin-right: -10px } .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; height: 20px; line-height: 1; font-family: serif } .carousel-control .icon-prev:before { content: '\2039' } .carousel-control .icon-next:before { content: '\203a' } .carousel-indicators { position: absolute; bottom: 10px; left: 50%; z-index: 15; width: 60%; margin-left: -30%; padding-left: 0; list-style: none; text-align: center } .carousel-indicators li { display: inline-block; width: 10px; height: 10px; margin: 1px; text-indent: -999px; border: 1px solid #fff; border-radius: 10px; cursor: pointer; background-color: #000 \9; background-color: rgba(0, 0, 0, 0) } .carousel-indicators .active { margin: 0; width: 12px; height: 12px; background-color: #fff } .carousel-caption { position: absolute; left: 15%; right: 15%; bottom: 20px; z-index: 10; padding-top: 20px; padding-bottom: 20px; color: #fff; text-align: center; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6) } .carousel-caption .btn { text-shadow: none } @media screen and (min-width: 768px) { .carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { width: 30px; height: 30px; margin-top: -15px; font-size: 30px } .carousel-control .glyphicon-chevron-left, .carousel-control .icon-prev { margin-left: -15px } .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { margin-right: -15px } .carousel-caption { left: 20%; right: 20%; padding-bottom: 30px } .carousel-indicators { bottom: 20px } } .clearfix:before, .clearfix:after, .dl-horizontal dd:before, .dl-horizontal dd:after, .container:before, .container:after, .container-fluid:before, .container-fluid:after, .row:before, .row:after, .form-horizontal .form-group:before, .form-horizontal .form-group:after, .btn-toolbar:before, .btn-toolbar:after, .btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after, .nav:before, .nav:after, .navbar:before, .navbar:after, .navbar-header:before, .navbar-header:after, .navbar-collapse:before, .navbar-collapse:after, .pager:before, .pager:after, .panel-body:before, .panel-body:after, .modal-footer:before, .modal-footer:after { content: " "; display: table } .clearfix:after, .dl-horizontal dd:after, .container:after, .container-fluid:after, .row:after, .form-horizontal .form-group:after, .btn-toolbar:after, .btn-group-vertical > .btn-group:after, .nav:after, .navbar:after, .navbar-header:after, .navbar-collapse:after, .pager:after, .panel-body:after, .modal-footer:after { clear: both } .center-block { display: block; margin-left: auto; margin-right: auto } .pull-right { float: right !important } .pull-left { float: left !important } .hide { display: none !important } .show { display: block !important } .invisible { visibility: hidden } .text-hide { font: 0/0 a; color: transparent; text-shadow: none; background-color: transparent; border: 0 } .hidden { display: none !important } .affix { position: fixed } @-ms-viewport { width: device-width } .visible-xs, .visible-sm, .visible-md, .visible-lg { display: none !important } .visible-xs-block, .visible-xs-inline, .visible-xs-inline-block, .visible-sm-block, .visible-sm-inline, .visible-sm-inline-block, .visible-md-block, .visible-md-inline, .visible-md-inline-block, .visible-lg-block, .visible-lg-inline, .visible-lg-inline-block { display: none !important } @media (max-width: 767px) { .visible-xs { display: block !important } table.visible-xs { display: table !important } tr.visible-xs { display: table-row !important } th.visible-xs, td.visible-xs { display: table-cell !important } } @media (max-width: 767px) { .visible-xs-block { display: block !important } } @media (max-width: 767px) { .visible-xs-inline { display: inline !important } } @media (max-width: 767px) { .visible-xs-inline-block { display: inline-block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm { display: block !important } table.visible-sm { display: table !important } tr.visible-sm { display: table-row !important } th.visible-sm, td.visible-sm { display: table-cell !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-block { display: block !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline { display: inline !important } } @media (min-width: 768px) and (max-width: 991px) { .visible-sm-inline-block { display: inline-block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md { display: block !important } table.visible-md { display: table !important } tr.visible-md { display: table-row !important } th.visible-md, td.visible-md { display: table-cell !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-block { display: block !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline { display: inline !important } } @media (min-width: 992px) and (max-width: 1199px) { .visible-md-inline-block { display: inline-block !important } } @media (min-width: 1200px) { .visible-lg { display: block !important } table.visible-lg { display: table !important } tr.visible-lg { display: table-row !important } th.visible-lg, td.visible-lg { display: table-cell !important } } @media (min-width: 1200px) { .visible-lg-block { display: block !important } } @media (min-width: 1200px) { .visible-lg-inline { display: inline !important } } @media (min-width: 1200px) { .visible-lg-inline-block { display: inline-block !important } } @media (max-width: 767px) { .hidden-xs { display: none !important } } @media (min-width: 768px) and (max-width: 991px) { .hidden-sm { display: none !important } } @media (min-width: 992px) and (max-width: 1199px) { .hidden-md { display: none !important } } @media (min-width: 1200px) { .hidden-lg { display: none !important } } .visible-print { display: none !important } @media print { .visible-print { display: block !important } table.visible-print { display: table !important } tr.visible-print { display: table-row !important } th.visible-print, td.visible-print { display: table-cell !important } } .visible-print-block { display: none !important } @media print { .visible-print-block { display: block !important } } .visible-print-inline { display: none !important } @media print { .visible-print-inline { display: inline !important } } .visible-print-inline-block { display: none !important } @media print { .visible-print-inline-block { display: inline-block !important } } @media print { .hidden-print { display: none !important } }
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/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,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/zh/development/apollo-release-guide.md
# 1. 升级版本 在 Apollo 工程下全文替换版本号,例如 1.9.1-SNAPSHOT 升级到 1.9.1。替换过程中,一定要注意非版本号的地方替换。 # 2. 撰写发布报告 两个版本之间每一个 PR 都会记录在 [https://github.com/ctripcorp/apollo/blob/master/CHANGES.md](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md) 里,所以撰写发布报告只需要从 CHANGES.md 里提取即可。发布报告参考:[https://github.com/ctripcorp/apollo/releases/tag/v1.8.0](https://github.com/ctripcorp/apollo/releases/tag/v1.8.0) ​ # 3. 版本验证 版本验证主要包含三方面的验证: 1. 新引入的代码变更验证,例如新功能、bugfix 1. Apollo 核心主流程验证,包括:配置发布,动态推送,灰度推送等 1. 升级过程验证,包括:经典部署模式、docker 模式、k8s 模式 # 4. 版本发布 ## 4.1 打 tag 1. 拉取 master 最新代码 1. git pull origin master 2. 打 tag 1. git tag ${new-version} 3. push tag 1. git push origin tag ${new-version} ## 4.2 打包 ### 4.2.1 前置检查 在打包之前检查本地环境, mvn -v 确保 java 版本是 1.8, 例如以下输出: > mvn -v > Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d)Maven home: /usr/local/Cellar/maven/3.8.1/libexec > Java version: 1.8.0_301, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk1.8.0_301.jdk/Contents/Home/jre > Default locale: zh_CN, platform encoding: UTF-8 > OS name: "mac os x", version: "10.16", arch: "x86_64", family: "mac" ### 4.2.2 打包 在 ${apollo_home}/scripts/ 目录下执行: > ./build.sh 如果报以下错误: > zsh: ./build.sh: bad interpreter: /bin/sh^M: no such file or directory 则需要执行以下命令转换成 unix > brew install dos2unix > dos2unix build.sh ### 4.2.3 计算构建包的 checksum 计算 configservice checksum >在 ${apollo_home}/apollo-configservice/target/ 目录下执行: > >shasum apollo-configservice-${new-version}-github.zip > apollo-configservice-${new-version}-github.zip.sha1 计算 adminservice checksum >在 ${apollo_home}/apollo-adminservice/target/ 目录下执行: > >shasum apollo-adminservice-${new-version}-github.zip > apollo-adminservice-${new-version}-github.zip.sha1 计算 portal checksum >在 ${apollo_home}/apollo-portal/target/ 目录下执行: > > shasum apollo-portal-${new-version}-github.zip > apollo-portal-${new-version}-github.zip.sha1 ## 4.3 创建 pre-release github 创建 pre-release ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/create-release.png) 填写 Release Note & 上传包 ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/fill-release-form.png) ## 4.4 预发布 Apollo-Client Jar 包 通过 github workflow 来发布。 [https://github.com/ctripcorp/apollo/actions/workflows/release.yml](https://github.com/ctripcorp/apollo/actions/workflows/release.yml) ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/publish-sdk.png) > 注意:如果发布的是 SNAPSHOT 版本,使用默认值 snapshots 即可,如果发布的是正式版本(不带 SNAPSHOT),则需要修改为 releases 才可以正常发布。 ## 4.5 版本发布 PMC 投票 投票是为了让各个 PMC 成员协作验证版本的内容,防止发布有问题的版本。 投票具体的形式为在 Discussions 发起一个帖子,可参考:[https://github.com/ctripcorp/apollo/discussions/3899](https://github.com/ctripcorp/apollo/discussions/3899) ## 4.6 正式发布 Apollo-Client Jar 到仓库 ## 4.7 发布 Docker 镜像 ### 4.7.1 构建镜像 在 4.2 步骤打完包的前提下,在 apollo 根目录下执行 > mvn docker:build -pl apollo-configservice,apollo-adminservice,apollo-portal 注意:如果出现报错,可能需要重启一下本地 docker ### 4.7.2 Push 镜像到仓库 仓库地址:[https://hub.docker.com/u/apolloconfig](https://hub.docker.com/u/apolloconfig) 依次 Push configservice/adminservice/portal,切记 latest 版本也要 push。 ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/push-images-to-hub.png) ​ ## 4.8 更新 helm chart ### 4.8.1 更新 chart 内容 1. cd ${apollo_home}/scripts/helm 1. helm package apollo-portal && helm package apollo-service 1. mv *.tgz ${apollo_home}/apollo/docs/charts/ 1. cd ${apollo_home}/apollo/docs/charts/ 1. helm repo index . ### 4.8.2 分支合并到 master 创建一个 pull request,把上述产物合并到 master 分支。 # 5. 发布公告 参考:[https://github.com/ctripcorp/apollo/discussions/3740](https://github.com/ctripcorp/apollo/discussions/3740)
# 1. 升级版本 在 Apollo 工程下全文替换版本号,例如 1.9.1-SNAPSHOT 升级到 1.9.1。替换过程中,一定要注意非版本号的地方替换。 # 2. 撰写发布报告 两个版本之间每一个 PR 都会记录在 [https://github.com/ctripcorp/apollo/blob/master/CHANGES.md](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md) 里,所以撰写发布报告只需要从 CHANGES.md 里提取即可。发布报告参考:[https://github.com/ctripcorp/apollo/releases/tag/v1.8.0](https://github.com/ctripcorp/apollo/releases/tag/v1.8.0) ​ # 3. 版本验证 版本验证主要包含三方面的验证: 1. 新引入的代码变更验证,例如新功能、bugfix 1. Apollo 核心主流程验证,包括:配置发布,动态推送,灰度推送等 1. 升级过程验证,包括:经典部署模式、docker 模式、k8s 模式 # 4. 版本发布 ## 4.1 打 tag 1. 拉取 master 最新代码 1. git pull origin master 2. 打 tag 1. git tag ${new-version} 3. push tag 1. git push origin tag ${new-version} ## 4.2 打包 ### 4.2.1 前置检查 在打包之前检查本地环境, mvn -v 确保 java 版本是 1.8, 例如以下输出: > mvn -v > Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d)Maven home: /usr/local/Cellar/maven/3.8.1/libexec > Java version: 1.8.0_301, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk1.8.0_301.jdk/Contents/Home/jre > Default locale: zh_CN, platform encoding: UTF-8 > OS name: "mac os x", version: "10.16", arch: "x86_64", family: "mac" ### 4.2.2 打包 在 ${apollo_home}/scripts/ 目录下执行: > ./build.sh 如果报以下错误: > zsh: ./build.sh: bad interpreter: /bin/sh^M: no such file or directory 则需要执行以下命令转换成 unix > brew install dos2unix > dos2unix build.sh ### 4.2.3 计算构建包的 checksum 计算 configservice checksum >在 ${apollo_home}/apollo-configservice/target/ 目录下执行: > >shasum apollo-configservice-${new-version}-github.zip > apollo-configservice-${new-version}-github.zip.sha1 计算 adminservice checksum >在 ${apollo_home}/apollo-adminservice/target/ 目录下执行: > >shasum apollo-adminservice-${new-version}-github.zip > apollo-adminservice-${new-version}-github.zip.sha1 计算 portal checksum >在 ${apollo_home}/apollo-portal/target/ 目录下执行: > > shasum apollo-portal-${new-version}-github.zip > apollo-portal-${new-version}-github.zip.sha1 ## 4.3 创建 pre-release github 创建 pre-release ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/create-release.png) 填写 Release Note & 上传包 ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/fill-release-form.png) ## 4.4 预发布 Apollo-Client Jar 包 通过 github workflow 来发布。 [https://github.com/ctripcorp/apollo/actions/workflows/release.yml](https://github.com/ctripcorp/apollo/actions/workflows/release.yml) ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/publish-sdk.png) > 注意:如果发布的是 SNAPSHOT 版本,使用默认值 snapshots 即可,如果发布的是正式版本(不带 SNAPSHOT),则需要修改为 releases 才可以正常发布。 ## 4.5 版本发布 PMC 投票 投票是为了让各个 PMC 成员协作验证版本的内容,防止发布有问题的版本。 投票具体的形式为在 Discussions 发起一个帖子,可参考:[https://github.com/ctripcorp/apollo/discussions/3899](https://github.com/ctripcorp/apollo/discussions/3899) ## 4.6 正式发布 Apollo-Client Jar 到仓库 ## 4.7 发布 Docker 镜像 ### 4.7.1 构建镜像 在 4.2 步骤打完包的前提下,在 apollo 根目录下执行 > mvn docker:build -pl apollo-configservice,apollo-adminservice,apollo-portal 注意:如果出现报错,可能需要重启一下本地 docker ### 4.7.2 Push 镜像到仓库 仓库地址:[https://hub.docker.com/u/apolloconfig](https://hub.docker.com/u/apolloconfig) 依次 Push configservice/adminservice/portal,切记 latest 版本也要 push。 ![image.png](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/local-development/push-images-to-hub.png) ​ ## 4.8 更新 helm chart ### 4.8.1 更新 chart 内容 1. cd ${apollo_home}/scripts/helm 1. helm package apollo-portal && helm package apollo-service 1. mv *.tgz ${apollo_home}/apollo/docs/charts/ 1. cd ${apollo_home}/apollo/docs/charts/ 1. helm repo index . ### 4.8.2 分支合并到 master 创建一个 pull request,把上述产物合并到 master 分支。 # 5. 发布公告 参考:[https://github.com/ctripcorp/apollo/discussions/3740](https://github.com/ctripcorp/apollo/discussions/3740)
-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/NamespaceBranchService.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('NamespaceBranchService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_namespace_branch: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches' }, create_branch: { method: 'POST', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches' }, delete_branch: { method: 'DELETE', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName' }, merge_and_release_branch: { method: 'POST', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName/merge' }, find_branch_gray_rules: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName/rules' }, update_branch_gray_rules: { method: 'PUT', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName/rules' } }); function find_namespace_branch(appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.find_namespace_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function create_branch(appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.create_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName }, {}, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function delete_branch(appId, env, clusterName, namespaceName, branchName) { var d = $q.defer(); resource.delete_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function merge_and_release_branch(appId, env, clusterName, namespaceName, branchName, title, comment, isEmergencyPublish, deleteBranch) { var d = $q.defer(); resource.merge_and_release_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName, deleteBranch:deleteBranch }, { releaseTitle: title, releaseComment: comment, isEmergencyPublish: isEmergencyPublish }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function find_branch_gray_rules(appId, env, clusterName, namespaceName, branchName) { var d = $q.defer(); resource.find_branch_gray_rules({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function update_branch_gray_rules(appId, env, clusterName, namespaceName, branchName, newRules) { var d = $q.defer(); resource.update_branch_gray_rules({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName }, newRules, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } return { findNamespaceBranch: find_namespace_branch, createBranch: create_branch, deleteBranch: delete_branch, mergeAndReleaseBranch: merge_and_release_branch, findBranchGrayRules: find_branch_gray_rules, updateBranchGrayRules: update_branch_gray_rules } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('NamespaceBranchService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_namespace_branch: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches' }, create_branch: { method: 'POST', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches' }, delete_branch: { method: 'DELETE', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName' }, merge_and_release_branch: { method: 'POST', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName/merge' }, find_branch_gray_rules: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName/rules' }, update_branch_gray_rules: { method: 'PUT', isArray: false, url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/clusters/:clusterName/namespaces/:namespaceName/branches/:branchName/rules' } }); function find_namespace_branch(appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.find_namespace_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function create_branch(appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.create_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName }, {}, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function delete_branch(appId, env, clusterName, namespaceName, branchName) { var d = $q.defer(); resource.delete_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function merge_and_release_branch(appId, env, clusterName, namespaceName, branchName, title, comment, isEmergencyPublish, deleteBranch) { var d = $q.defer(); resource.merge_and_release_branch({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName, deleteBranch:deleteBranch }, { releaseTitle: title, releaseComment: comment, isEmergencyPublish: isEmergencyPublish }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function find_branch_gray_rules(appId, env, clusterName, namespaceName, branchName) { var d = $q.defer(); resource.find_branch_gray_rules({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } function update_branch_gray_rules(appId, env, clusterName, namespaceName, branchName, newRules) { var d = $q.defer(); resource.update_branch_gray_rules({ appId: appId, env: env, clusterName: clusterName, namespaceName: namespaceName, branchName: branchName }, newRules, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } return { findNamespaceBranch: find_namespace_branch, createBranch: create_branch, deleteBranch: delete_branch, mergeAndReleaseBranch: merge_and_release_branch, findBranchGrayRules: find_branch_gray_rules, updateBranchGrayRules: update_branch_gray_rules } }]);
-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/InstanceService.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('InstanceService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_instances_by_release: { method: 'GET', url: AppUtil.prefixPath() + '/envs/:env/instances/by-release' }, find_instances_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace' }, find_by_releases_not_in: { method: 'GET', isArray: true, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace-and-releases-not-in' }, get_instance_count_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + "/envs/:env/instances/by-namespace/count" } }); var instanceService = { findInstancesByRelease: function (env, releaseId, page, size) { if (!size) { size = 20; } var d = $q.defer(); resource.find_instances_by_release({ env: env, releaseId: releaseId, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, findInstancesByNamespace: function (appId, env, clusterName, namespaceName, instanceAppId, page, size) { if (!size) { size = 20; } var d = $q.defer(); var instanceAppIdRequest = instanceAppId; instanceService.lastInstanceAppIdRequest = instanceAppIdRequest; resource.find_instances_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, instanceAppId: instanceAppId, page: page, size: size }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.resolve(result); }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.reject(result); }); return d.promise; }, findByReleasesNotIn: function (appId, env, clusterName, namespaceName, releaseIds) { var d = $q.defer(); resource.find_by_releases_not_in({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, releaseIds: releaseIds }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, getInstanceCountByNamespace: function (appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.get_instance_count_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } }; return instanceService; }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('InstanceService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { find_instances_by_release: { method: 'GET', url: AppUtil.prefixPath() + '/envs/:env/instances/by-release' }, find_instances_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace' }, find_by_releases_not_in: { method: 'GET', isArray: true, url: AppUtil.prefixPath() + '/envs/:env/instances/by-namespace-and-releases-not-in' }, get_instance_count_by_namespace: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + "/envs/:env/instances/by-namespace/count" } }); var instanceService = { findInstancesByRelease: function (env, releaseId, page, size) { if (!size) { size = 20; } var d = $q.defer(); resource.find_instances_by_release({ env: env, releaseId: releaseId, page: page, size: size }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, findInstancesByNamespace: function (appId, env, clusterName, namespaceName, instanceAppId, page, size) { if (!size) { size = 20; } var d = $q.defer(); var instanceAppIdRequest = instanceAppId; instanceService.lastInstanceAppIdRequest = instanceAppIdRequest; resource.find_instances_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, instanceAppId: instanceAppId, page: page, size: size }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.resolve(result); }, function (result) { if (instanceAppIdRequest != instanceService.lastInstanceAppIdRequest) { return; } d.reject(result); }); return d.promise; }, findByReleasesNotIn: function (appId, env, clusterName, namespaceName, releaseIds) { var d = $q.defer(); resource.find_by_releases_not_in({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName, releaseIds: releaseIds }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, getInstanceCountByNamespace: function (appId, env, clusterName, namespaceName) { var d = $q.defer(); resource.get_instance_count_by_namespace({ env: env, appId: appId, clusterName: clusterName, namespaceName: namespaceName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; } }; return instanceService; }]);
-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/cluster.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="cluster"> <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>{{'Cluster.CreateCluster' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container hidden" ng-controller="ClusterController"> <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"> <h4>{{'Cluster.CreateCluster' | translate }}</h4> </div> <div class="col-md-6 text-right"> <a type="button" class="btn btn-info" href="config.html?#/appid={{appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> </header> <div class="panel-body"> <div class="alert alert-info no-radius" role="alert"> <strong>Tips:</strong> <ul> <li>{{'Cluster.Tips.1' | translate }}</li> <li>{{'Cluster.Tips.2' | translate }}</li> <li>{{'Cluster.Tips.3' | translate }}</li> <li>{{'Cluster.Tips.4' | translate }}</li> </ul> </div> <form class="form-horizontal" name="clusterForm" valdr-type="Cluster" ng-show="step == 1" ng-submit="create()"> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }}</label> <div class="col-sm-6"> <label class="form-control-static" ng-bind="appId"></label> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.ClusterName' | translate }}</label> <div class="col-sm-6"> <input type="text" class="form-control" name="clusterName" ng-model="clusterName"> <small>{{'Cluster.CreateNameTips' | translate }}</small> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Cluster.ChooseEnvironment' | translate }}</label> <div class="col-sm-5"> <table class="table table-hover" style="width: 100px"> <tbody> <tr style="cursor: pointer" ng-repeat="env in envs" ng-click="toggleEnvCheckedStatus(env)"> <td width="10%"><input type="checkbox" ng-checked="env.checked" ng-click="switchChecked(env, $event)"></td> <td width="30%" ng-bind="env.name"></td> </tr> </tbody> </table> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <button type="submit" class="btn btn-primary" ng-disabled="clusterForm.$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> <!--valdr--> <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/ClusterService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/controller/ClusterController.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="cluster"> <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>{{'Cluster.CreateCluster' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid apollo-container hidden" ng-controller="ClusterController"> <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"> <h4>{{'Cluster.CreateCluster' | translate }}</h4> </div> <div class="col-md-6 text-right"> <a type="button" class="btn btn-info" href="config.html?#/appid={{appId}}">{{'Common.ReturnToIndex' | translate }} </a> </div> </div> </header> <div class="panel-body"> <div class="alert alert-info no-radius" role="alert"> <strong>Tips:</strong> <ul> <li>{{'Cluster.Tips.1' | translate }}</li> <li>{{'Cluster.Tips.2' | translate }}</li> <li>{{'Cluster.Tips.3' | translate }}</li> <li>{{'Cluster.Tips.4' | translate }}</li> </ul> </div> <form class="form-horizontal" name="clusterForm" valdr-type="Cluster" ng-show="step == 1" ng-submit="create()"> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.AppId' | translate }}</label> <div class="col-sm-6"> <label class="form-control-static" ng-bind="appId"></label> </div> </div> <div class="form-group" valdr-form-group> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Common.ClusterName' | translate }}</label> <div class="col-sm-6"> <input type="text" class="form-control" name="clusterName" ng-model="clusterName"> <small>{{'Cluster.CreateNameTips' | translate }}</small> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label"> <apollorequiredfield></apollorequiredfield> {{'Cluster.ChooseEnvironment' | translate }}</label> <div class="col-sm-5"> <table class="table table-hover" style="width: 100px"> <tbody> <tr style="cursor: pointer" ng-repeat="env in envs" ng-click="toggleEnvCheckedStatus(env)"> <td width="10%"><input type="checkbox" ng-checked="env.checked" ng-click="switchChecked(env, $event)"></td> <td width="30%" ng-bind="env.name"></td> </tr> </tbody> </table> </div> </div> <div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <button type="submit" class="btn btn-primary" ng-disabled="clusterForm.$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> <!--valdr--> <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/ClusterService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/controller/ClusterController.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/PageCommon.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. * */ $(document).ready(function () { // bootstrap tooltip & textarea scroll setInterval(function () { $('[data-tooltip="tooltip"]').tooltip({ trigger : 'hover' }); }, 1000); }); // (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 // (new Date()).Format("yyyy-M-d h:m:s.S") ==> 2006-7-2 8:9:4.18 Date.prototype.Format = function (fmt) { var o = { "M+": this.getMonth() + 1, //月份 "d+": this.getDate(), //日 "h+": this.getHours(), //小时 "m+": this.getMinutes(), //分 "s+": this.getSeconds(), //秒 "q+": Math.floor((this.getMonth() + 3) / 3), //季度 "S": this.getMilliseconds() //毫秒 }; if (/(y+)/.test(fmt)) { fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)); } for (var k in o) { if (new RegExp("(" + k + ")").test(fmt)) { fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); } } return fmt; };
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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).ready(function () { // bootstrap tooltip & textarea scroll setInterval(function () { $('[data-tooltip="tooltip"]').tooltip({ trigger : 'hover' }); }, 1000); }); // (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 // (new Date()).Format("yyyy-M-d h:m:s.S") ==> 2006-7-2 8:9:4.18 Date.prototype.Format = function (fmt) { var o = { "M+": this.getMonth() + 1, //月份 "d+": this.getDate(), //日 "h+": this.getHours(), //小时 "m+": this.getMinutes(), //分 "s+": this.getSeconds(), //秒 "q+": Math.floor((this.getMonth() + 3) / 3), //季度 "S": this.getMilliseconds() //毫秒 }; if (/(y+)/.test(fmt)) { fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)); } for (var k in o) { if (new RegExp("(" + k + ")").test(fmt)) { fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); } } return fmt; };
-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/merge-and-publish-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('mergeandpublishmodal', mergeAndPublishDirective); function mergeAndPublishDirective(AppUtil, EventManager) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/merge-and-publish-modal.html', transclude: true, replace: true, scope: { appId: '=', env: '=', cluster: '=' }, link: function (scope) { scope.showReleaseModal = showReleaseModal; EventManager.subscribe(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, function (context) { var branch = context.branch; scope.toReleaseNamespace = branch; scope.toDeleteBranch = branch; scope.isEmergencyPublish = context.isEmergencyPublish ? context.isEmergencyPublish : false; var branchStatusMerge = 2; branch.branchStatus = branchStatusMerge; branch.mergeAndPublish = true; AppUtil.showModal('#mergeAndPublishModal'); }); function showReleaseModal() { EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: scope.toReleaseNamespace, isEmergencyPublish: scope.isEmergencyPublish }); } } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('mergeandpublishmodal', mergeAndPublishDirective); function mergeAndPublishDirective(AppUtil, EventManager) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/merge-and-publish-modal.html', transclude: true, replace: true, scope: { appId: '=', env: '=', cluster: '=' }, link: function (scope) { scope.showReleaseModal = showReleaseModal; EventManager.subscribe(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, function (context) { var branch = context.branch; scope.toReleaseNamespace = branch; scope.toDeleteBranch = branch; scope.isEmergencyPublish = context.isEmergencyPublish ? context.isEmergencyPublish : false; var branchStatusMerge = 2; branch.branchStatus = branchStatusMerge; branch.mergeAndPublish = true; AppUtil.showModal('#mergeAndPublishModal'); }); function showReleaseModal() { EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: scope.toReleaseNamespace, isEmergencyPublish: scope.isEmergencyPublish }); } } } }
-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/CommonService.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('CommonService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { page_setting: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/page-settings' } }); return { getPageSetting: function () { return AppUtil.ajax(resource.page_setting, {}); } } }]);
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 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('CommonService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) { var resource = $resource('', {}, { page_setting: { method: 'GET', isArray: false, url: AppUtil.prefixPath() + '/page-settings' } }); return { getPageSetting: function () { return AppUtil.ajax(resource.page_setting, {}); } } }]);
-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/bootstrap/js/bootstrap.min.js
/*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! * Generated using the Bootstrap Customizer (http://v3.bootcss.com/customize/?id=822d18dc2e4e823a577b) * Config saved to config.json and https://gist.github.com/822d18dc2e4e823a577b */ if ("undefined" == typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery"); +function (t) { "use strict"; var e = t.fn.jquery.split(" ")[0].split("."); if (e[0] < 2 && e[1] < 9 || 1 == e[0] && 9 == e[1] && e[2] < 1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher") }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var i = t(this), n = i.data("bs.alert"); n || i.data("bs.alert", n = new o(this)), "string" == typeof e && n[e].call(i) }) } var i = '[data-dismiss="alert"]', o = function (e) { t(e).on("click", i, this.close) }; o.VERSION = "3.3.5", o.TRANSITION_DURATION = 150, o.prototype.close = function (e) { function i() { a.detach().trigger("closed.bs.alert").remove() } var n = t(this), s = n.attr("data-target"); s || (s = n.attr("href"), s = s && s.replace(/.*(?=#[^\s]*$)/, "")); var a = t(s); e && e.preventDefault(), a.length || (a = n.closest(".alert")), a.trigger(e = t.Event("close.bs.alert")), e.isDefaultPrevented() || (a.removeClass("in"), t.support.transition && a.hasClass("fade") ? a.one("bsTransitionEnd", i).emulateTransitionEnd(o.TRANSITION_DURATION) : i()) }; var n = t.fn.alert; t.fn.alert = e, t.fn.alert.Constructor = o, t.fn.alert.noConflict = function () { return t.fn.alert = n, this }, t(document).on("click.bs.alert.data-api", i, o.prototype.close) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.button"), s = "object" == typeof e && e; n || o.data("bs.button", n = new i(this, s)), "toggle" == e ? n.toggle() : e && n.setState(e) }) } var i = function (e, o) { this.$element = t(e), this.options = t.extend({}, i.DEFAULTS, o), this.isLoading = !1 }; i.VERSION = "3.3.5", i.DEFAULTS = {loadingText: "loading..."}, i.prototype.setState = function (e) { var i = "disabled", o = this.$element, n = o.is("input") ? "val" : "html", s = o.data(); e += "Text", null == s.resetText && o.data("resetText", o[n]()), setTimeout(t.proxy(function () { o[n](null == s[e] ? this.options[e] : s[e]), "loadingText" == e ? (this.isLoading = !0, o.addClass(i).attr(i, i)) : this.isLoading && (this.isLoading = !1, o.removeClass(i).removeAttr(i)) }, this), 0) }, i.prototype.toggle = function () { var t = !0, e = this.$element.closest('[data-toggle="buttons"]'); if (e.length) { var i = this.$element.find("input"); "radio" == i.prop("type") ? (i.prop("checked") && (t = !1), e.find(".active").removeClass("active"), this.$element.addClass("active")) : "checkbox" == i.prop("type") && (i.prop("checked") !== this.$element.hasClass("active") && (t = !1), this.$element.toggleClass("active")), i.prop("checked", this.$element.hasClass("active")), t && i.trigger("change") } else this.$element.attr("aria-pressed", !this.$element.hasClass("active")), this.$element.toggleClass("active") }; var o = t.fn.button; t.fn.button = e, t.fn.button.Constructor = i, t.fn.button.noConflict = function () { return t.fn.button = o, this }, t(document).on("click.bs.button.data-api", '[data-toggle^="button"]', function (i) { var o = t(i.target); o.hasClass("btn") || (o = o.closest(".btn")), e.call(o, "toggle"), t(i.target).is('input[type="radio"]') || t(i.target).is('input[type="checkbox"]') || i.preventDefault() }).on("focus.bs.button.data-api blur.bs.button.data-api", '[data-toggle^="button"]', function (e) { t(e.target).closest(".btn").toggleClass("focus", /^focus(in)?$/.test(e.type)) }) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.carousel"), s = t.extend({}, i.DEFAULTS, o.data(), "object" == typeof e && e), a = "string" == typeof e ? e : s.slide; n || o.data("bs.carousel", n = new i(this, s)), "number" == typeof e ? n.to(e) : a ? n[a]() : s.interval && n.pause().cycle() }) } var i = function (e, i) { this.$element = t(e), this.$indicators = this.$element.find(".carousel-indicators"), this.options = i, this.paused = null, this.sliding = null, this.interval = null, this.$active = null, this.$items = null, this.options.keyboard && this.$element.on("keydown.bs.carousel", t.proxy(this.keydown, this)), "hover" == this.options.pause && !("ontouchstart" in document.documentElement) && this.$element.on("mouseenter.bs.carousel", t.proxy(this.pause, this)).on("mouseleave.bs.carousel", t.proxy(this.cycle, this)) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 600, i.DEFAULTS = { interval: 5e3, pause: "hover", wrap: !0, keyboard: !0 }, i.prototype.keydown = function (t) { if (!/input|textarea/i.test(t.target.tagName)) { switch (t.which) { case 37: this.prev(); break; case 39: this.next(); break; default: return } t.preventDefault() } }, i.prototype.cycle = function (e) { return e || (this.paused = !1), this.interval && clearInterval(this.interval), this.options.interval && !this.paused && (this.interval = setInterval(t.proxy(this.next, this), this.options.interval)), this }, i.prototype.getItemIndex = function (t) { return this.$items = t.parent().children(".item"), this.$items.index(t || this.$active) }, i.prototype.getItemForDirection = function (t, e) { var i = this.getItemIndex(e), o = "prev" == t && 0 === i || "next" == t && i == this.$items.length - 1; if (o && !this.options.wrap)return e; var n = "prev" == t ? -1 : 1, s = (i + n) % this.$items.length; return this.$items.eq(s) }, i.prototype.to = function (t) { var e = this, i = this.getItemIndex(this.$active = this.$element.find(".item.active")); return t > this.$items.length - 1 || 0 > t ? void 0 : this.sliding ? this.$element.one("slid.bs.carousel", function () { e.to(t) }) : i == t ? this.pause().cycle() : this.slide(t > i ? "next" : "prev", this.$items.eq(t)) }, i.prototype.pause = function (e) { return e || (this.paused = !0), this.$element.find(".next, .prev").length && t.support.transition && (this.$element.trigger(t.support.transition.end), this.cycle(!0)), this.interval = clearInterval(this.interval), this }, i.prototype.next = function () { return this.sliding ? void 0 : this.slide("next") }, i.prototype.prev = function () { return this.sliding ? void 0 : this.slide("prev") }, i.prototype.slide = function (e, o) { var n = this.$element.find(".item.active"), s = o || this.getItemForDirection(e, n), a = this.interval, r = "next" == e ? "left" : "right", l = this; if (s.hasClass("active"))return this.sliding = !1; var h = s[0], d = t.Event("slide.bs.carousel", {relatedTarget: h, direction: r}); if (this.$element.trigger(d), !d.isDefaultPrevented()) { if (this.sliding = !0, a && this.pause(), this.$indicators.length) { this.$indicators.find(".active").removeClass("active"); var p = t(this.$indicators.children()[this.getItemIndex(s)]); p && p.addClass("active") } var c = t.Event("slid.bs.carousel", {relatedTarget: h, direction: r}); return t.support.transition && this.$element.hasClass("slide") ? (s.addClass(e), s[0].offsetWidth, n.addClass(r), s.addClass(r), n.one("bsTransitionEnd", function () { s.removeClass([e, r].join(" ")).addClass("active"), n.removeClass(["active", r].join(" ")), l.sliding = !1, setTimeout(function () { l.$element.trigger(c) }, 0) }).emulateTransitionEnd(i.TRANSITION_DURATION)) : (n.removeClass("active"), s.addClass("active"), this.sliding = !1, this.$element.trigger(c)), a && this.cycle(), this } }; var o = t.fn.carousel; t.fn.carousel = e, t.fn.carousel.Constructor = i, t.fn.carousel.noConflict = function () { return t.fn.carousel = o, this }; var n = function (i) { var o, n = t(this), s = t(n.attr("data-target") || (o = n.attr("href")) && o.replace(/.*(?=#[^\s]+$)/, "")); if (s.hasClass("carousel")) { var a = t.extend({}, s.data(), n.data()), r = n.attr("data-slide-to"); r && (a.interval = !1), e.call(s, a), r && s.data("bs.carousel").to(r), i.preventDefault() } }; t(document).on("click.bs.carousel.data-api", "[data-slide]", n).on("click.bs.carousel.data-api", "[data-slide-to]", n), t(window).on("load", function () { t('[data-ride="carousel"]').each(function () { var i = t(this); e.call(i, i.data()) }) }) }(jQuery), +function (t) { "use strict"; function e(e) { var i = e.attr("data-target"); i || (i = e.attr("href"), i = i && /#[A-Za-z]/.test(i) && i.replace(/.*(?=#[^\s]*$)/, "")); var o = i && t(i); return o && o.length ? o : e.parent() } function i(i) { i && 3 === i.which || (t(n).remove(), t(s).each(function () { var o = t(this), n = e(o), s = {relatedTarget: this}; n.hasClass("open") && (i && "click" == i.type && /input|textarea/i.test(i.target.tagName) && t.contains(n[0], i.target) || (n.trigger(i = t.Event("hide.bs.dropdown", s)), i.isDefaultPrevented() || (o.attr("aria-expanded", "false"), n.removeClass("open").trigger("hidden.bs.dropdown", s)))) })) } function o(e) { return this.each(function () { var i = t(this), o = i.data("bs.dropdown"); o || i.data("bs.dropdown", o = new a(this)), "string" == typeof e && o[e].call(i) }) } var n = ".dropdown-backdrop", s = '[data-toggle="dropdown"]', a = function (e) { t(e).on("click.bs.dropdown", this.toggle) }; a.VERSION = "3.3.5", a.prototype.toggle = function (o) { var n = t(this); if (!n.is(".disabled, :disabled")) { var s = e(n), a = s.hasClass("open"); if (i(), !a) { "ontouchstart" in document.documentElement && !s.closest(".navbar-nav").length && t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click", i); var r = {relatedTarget: this}; if (s.trigger(o = t.Event("show.bs.dropdown", r)), o.isDefaultPrevented())return; n.trigger("focus").attr("aria-expanded", "true"), s.toggleClass("open").trigger("shown.bs.dropdown", r) } return !1 } }, a.prototype.keydown = function (i) { if (/(38|40|27|32)/.test(i.which) && !/input|textarea/i.test(i.target.tagName)) { var o = t(this); if (i.preventDefault(), i.stopPropagation(), !o.is(".disabled, :disabled")) { var n = e(o), a = n.hasClass("open"); if (!a && 27 != i.which || a && 27 == i.which)return 27 == i.which && n.find(s).trigger("focus"), o.trigger("click"); var r = " li:not(.disabled):visible a", l = n.find(".dropdown-menu" + r); if (l.length) { var h = l.index(i.target); 38 == i.which && h > 0 && h--, 40 == i.which && h < l.length - 1 && h++, ~h || (h = 0), l.eq(h).trigger("focus") } } } }; var r = t.fn.dropdown; t.fn.dropdown = o, t.fn.dropdown.Constructor = a, t.fn.dropdown.noConflict = function () { return t.fn.dropdown = r, this }, t(document).on("click.bs.dropdown.data-api", i).on("click.bs.dropdown.data-api", ".dropdown form", function (t) { t.stopPropagation() }).on("click.bs.dropdown.data-api", s, a.prototype.toggle).on("keydown.bs.dropdown.data-api", s, a.prototype.keydown).on("keydown.bs.dropdown.data-api", ".dropdown-menu", a.prototype.keydown) }(jQuery), +function (t) { "use strict"; function e(e, o) { return this.each(function () { var n = t(this), s = n.data("bs.modal"), a = t.extend({}, i.DEFAULTS, n.data(), "object" == typeof e && e); s || n.data("bs.modal", s = new i(this, a)), "string" == typeof e ? s[e](o) : a.show && s.show(o) }) } var i = function (e, i) { this.options = i, this.$body = t(document.body), this.$element = t(e), this.$dialog = this.$element.find(".modal-dialog"), this.$backdrop = null, this.isShown = null, this.originalBodyPad = null, this.scrollbarWidth = 0, this.ignoreBackdropClick = !1, this.options.remote && this.$element.find(".modal-content").load(this.options.remote, t.proxy(function () { this.$element.trigger("loaded.bs.modal") }, this)) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 300, i.BACKDROP_TRANSITION_DURATION = 150, i.DEFAULTS = { backdrop: !0, keyboard: !0, show: !0 }, i.prototype.toggle = function (t) { return this.isShown ? this.hide() : this.show(t) }, i.prototype.show = function (e) { var o = this, n = t.Event("show.bs.modal", {relatedTarget: e}); this.$element.trigger(n), this.isShown || n.isDefaultPrevented() || (this.isShown = !0, this.checkScrollbar(), this.setScrollbar(), this.$body.addClass("modal-open"), this.escape(), this.resize(), this.$element.on("click.dismiss.bs.modal", '[data-dismiss="modal"]', t.proxy(this.hide, this)), this.$dialog.on("mousedown.dismiss.bs.modal", function () { o.$element.one("mouseup.dismiss.bs.modal", function (e) { t(e.target).is(o.$element) && (o.ignoreBackdropClick = !0) }) }), this.backdrop(function () { var n = t.support.transition && o.$element.hasClass("fade"); o.$element.parent().length || o.$element.appendTo(o.$body), o.$element.show().scrollTop(0), o.adjustDialog(), n && o.$element[0].offsetWidth, o.$element.addClass("in"), o.enforceFocus(); var s = t.Event("shown.bs.modal", {relatedTarget: e}); n ? o.$dialog.one("bsTransitionEnd", function () { o.$element.trigger("focus").trigger(s) }).emulateTransitionEnd(i.TRANSITION_DURATION) : o.$element.trigger("focus").trigger(s) })) }, i.prototype.hide = function (e) { e && e.preventDefault(), e = t.Event("hide.bs.modal"), this.$element.trigger(e), this.isShown && !e.isDefaultPrevented() && (this.isShown = !1, this.escape(), this.resize(), t(document).off("focusin.bs.modal"), this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"), this.$dialog.off("mousedown.dismiss.bs.modal"), t.support.transition && this.$element.hasClass("fade") ? this.$element.one("bsTransitionEnd", t.proxy(this.hideModal, this)).emulateTransitionEnd(i.TRANSITION_DURATION) : this.hideModal()) }, i.prototype.enforceFocus = function () { t(document).off("focusin.bs.modal").on("focusin.bs.modal", t.proxy(function (t) { this.$element[0] === t.target || this.$element.has(t.target).length || this.$element.trigger("focus") }, this)) }, i.prototype.escape = function () { this.isShown && this.options.keyboard ? this.$element.on("keydown.dismiss.bs.modal", t.proxy(function (t) { 27 == t.which && this.hide() }, this)) : this.isShown || this.$element.off("keydown.dismiss.bs.modal") }, i.prototype.resize = function () { this.isShown ? t(window).on("resize.bs.modal", t.proxy(this.handleUpdate, this)) : t(window).off("resize.bs.modal") }, i.prototype.hideModal = function () { var t = this; this.$element.hide(), this.backdrop(function () { t.$body.removeClass("modal-open"), t.resetAdjustments(), t.resetScrollbar(), t.$element.trigger("hidden.bs.modal") }) }, i.prototype.removeBackdrop = function () { this.$backdrop && this.$backdrop.remove(), this.$backdrop = null }, i.prototype.backdrop = function (e) { var o = this, n = this.$element.hasClass("fade") ? "fade" : ""; if (this.isShown && this.options.backdrop) { var s = t.support.transition && n; if (this.$backdrop = t(document.createElement("div")).addClass("modal-backdrop " + n).appendTo(this.$body), this.$element.on("click.dismiss.bs.modal", t.proxy(function (t) { return this.ignoreBackdropClick ? void(this.ignoreBackdropClick = !1) : void(t.target === t.currentTarget && ("static" == this.options.backdrop ? this.$element[0].focus() : this.hide())) }, this)), s && this.$backdrop[0].offsetWidth, this.$backdrop.addClass("in"), !e)return; s ? this.$backdrop.one("bsTransitionEnd", e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION) : e() } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass("in"); var a = function () { o.removeBackdrop(), e && e() }; t.support.transition && this.$element.hasClass("fade") ? this.$backdrop.one("bsTransitionEnd", a).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION) : a() } else e && e() }, i.prototype.handleUpdate = function () { this.adjustDialog() }, i.prototype.adjustDialog = function () { var t = this.$element[0].scrollHeight > document.documentElement.clientHeight; this.$element.css({ paddingLeft: !this.bodyIsOverflowing && t ? this.scrollbarWidth : "", paddingRight: this.bodyIsOverflowing && !t ? this.scrollbarWidth : "" }) }, i.prototype.resetAdjustments = function () { this.$element.css({paddingLeft: "", paddingRight: ""}) }, i.prototype.checkScrollbar = function () { var t = window.innerWidth; if (!t) { var e = document.documentElement.getBoundingClientRect(); t = e.right - Math.abs(e.left) } this.bodyIsOverflowing = document.body.clientWidth < t, this.scrollbarWidth = this.measureScrollbar() }, i.prototype.setScrollbar = function () { var t = parseInt(this.$body.css("padding-right") || 0, 10); this.originalBodyPad = document.body.style.paddingRight || "", this.bodyIsOverflowing && this.$body.css("padding-right", t + this.scrollbarWidth) }, i.prototype.resetScrollbar = function () { this.$body.css("padding-right", this.originalBodyPad) }, i.prototype.measureScrollbar = function () { var t = document.createElement("div"); t.className = "modal-scrollbar-measure", this.$body.append(t); var e = t.offsetWidth - t.clientWidth; return this.$body[0].removeChild(t), e }; var o = t.fn.modal; t.fn.modal = e, t.fn.modal.Constructor = i, t.fn.modal.noConflict = function () { return t.fn.modal = o, this }, t(document).on("click.bs.modal.data-api", '[data-toggle="modal"]', function (i) { var o = t(this), n = o.attr("href"), s = t(o.attr("data-target") || n && n.replace(/.*(?=#[^\s]+$)/, "")), a = s.data("bs.modal") ? "toggle" : t.extend({remote: !/#/.test(n) && n}, s.data(), o.data()); o.is("a") && i.preventDefault(), s.one("show.bs.modal", function (t) { t.isDefaultPrevented() || s.one("hidden.bs.modal", function () { o.is(":visible") && o.trigger("focus") }) }), e.call(s, a, this) }) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.tooltip"), s = "object" == typeof e && e; (n || !/destroy|hide/.test(e)) && (n || o.data("bs.tooltip", n = new i(this, s)), "string" == typeof e && n[e]()) }) } var i = function (t, e) { this.type = null, this.options = null, this.enabled = null, this.timeout = null, this.hoverState = null, this.$element = null, this.inState = null, this.init("tooltip", t, e) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 150, i.DEFAULTS = { animation: !0, placement: "top", selector: !1, template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>', trigger: "hover focus", title: "", delay: 0, html: !1, container: !1, viewport: {selector: "body", padding: 0} }, i.prototype.init = function (e, i, o) { if (this.enabled = !0, this.type = e, this.$element = t(i), this.options = this.getOptions(o), this.$viewport = this.options.viewport && t(t.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : this.options.viewport.selector || this.options.viewport), this.inState = { click: !1, hover: !1, focus: !1 }, this.$element[0] instanceof document.constructor && !this.options.selector)throw new Error("`selector` option must be specified when initializing " + this.type + " on the window.document object!"); for (var n = this.options.trigger.split(" "), s = n.length; s--;) { var a = n[s]; if ("click" == a)this.$element.on("click." + this.type, this.options.selector, t.proxy(this.toggle, this)); else if ("manual" != a) { var r = "hover" == a ? "mouseenter" : "focusin", l = "hover" == a ? "mouseleave" : "focusout"; this.$element.on(r + "." + this.type, this.options.selector, t.proxy(this.enter, this)), this.$element.on(l + "." + this.type, this.options.selector, t.proxy(this.leave, this)) } } this.options.selector ? this._options = t.extend({}, this.options, { trigger: "manual", selector: "" }) : this.fixTitle() }, i.prototype.getDefaults = function () { return i.DEFAULTS }, i.prototype.getOptions = function (e) { return e = t.extend({}, this.getDefaults(), this.$element.data(), e), e.delay && "number" == typeof e.delay && (e.delay = { show: e.delay, hide: e.delay }), e }, i.prototype.getDelegateOptions = function () { var e = {}, i = this.getDefaults(); return this._options && t.each(this._options, function (t, o) { i[t] != o && (e[t] = o) }), e }, i.prototype.enter = function (e) { var i = e instanceof this.constructor ? e : t(e.currentTarget).data("bs." + this.type); return i || (i = new this.constructor(e.currentTarget, this.getDelegateOptions()), t(e.currentTarget).data("bs." + this.type, i)), e instanceof t.Event && (i.inState["focusin" == e.type ? "focus" : "hover"] = !0), i.tip().hasClass("in") || "in" == i.hoverState ? void(i.hoverState = "in") : (clearTimeout(i.timeout), i.hoverState = "in", i.options.delay && i.options.delay.show ? void(i.timeout = setTimeout(function () { "in" == i.hoverState && i.show() }, i.options.delay.show)) : i.show()) }, i.prototype.isInStateTrue = function () { for (var t in this.inState)if (this.inState[t])return !0; return !1 }, i.prototype.leave = function (e) { var i = e instanceof this.constructor ? e : t(e.currentTarget).data("bs." + this.type); return i || (i = new this.constructor(e.currentTarget, this.getDelegateOptions()), t(e.currentTarget).data("bs." + this.type, i)), e instanceof t.Event && (i.inState["focusout" == e.type ? "focus" : "hover"] = !1), i.isInStateTrue() ? void 0 : (clearTimeout(i.timeout), i.hoverState = "out", i.options.delay && i.options.delay.hide ? void(i.timeout = setTimeout(function () { "out" == i.hoverState && i.hide() }, i.options.delay.hide)) : i.hide()) }, i.prototype.show = function () { var e = t.Event("show.bs." + this.type); if (this.hasContent() && this.enabled) { this.$element.trigger(e); var o = t.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]); if (e.isDefaultPrevented() || !o)return; var n = this, s = this.tip(), a = this.getUID(this.type); this.setContent(), s.attr("id", a), this.$element.attr("aria-describedby", a), this.options.animation && s.addClass("fade"); var r = "function" == typeof this.options.placement ? this.options.placement.call(this, s[0], this.$element[0]) : this.options.placement, l = /\s?auto?\s?/i, h = l.test(r); h && (r = r.replace(l, "") || "top"), s.detach().css({ top: 0, left: 0, display: "block" }).addClass(r).data("bs." + this.type, this), this.options.container ? s.appendTo(this.options.container) : s.insertAfter(this.$element), this.$element.trigger("inserted.bs." + this.type); var d = this.getPosition(), p = s[0].offsetWidth, c = s[0].offsetHeight; if (h) { var f = r, u = this.getPosition(this.$viewport); r = "bottom" == r && d.bottom + c > u.bottom ? "top" : "top" == r && d.top - c < u.top ? "bottom" : "right" == r && d.right + p > u.width ? "left" : "left" == r && d.left - p < u.left ? "right" : r, s.removeClass(f).addClass(r) } var g = this.getCalculatedOffset(r, d, p, c); this.applyPlacement(g, r); var m = function () { var t = n.hoverState; n.$element.trigger("shown.bs." + n.type), n.hoverState = null, "out" == t && n.leave(n) }; t.support.transition && this.$tip.hasClass("fade") ? s.one("bsTransitionEnd", m).emulateTransitionEnd(i.TRANSITION_DURATION) : m() } }, i.prototype.applyPlacement = function (e, i) { var o = this.tip(), n = o[0].offsetWidth, s = o[0].offsetHeight, a = parseInt(o.css("margin-top"), 10), r = parseInt(o.css("margin-left"), 10); isNaN(a) && (a = 0), isNaN(r) && (r = 0), e.top += a, e.left += r, t.offset.setOffset(o[0], t.extend({ using: function (t) { o.css({top: Math.round(t.top), left: Math.round(t.left)}) } }, e), 0), o.addClass("in"); var l = o[0].offsetWidth, h = o[0].offsetHeight; "top" == i && h != s && (e.top = e.top + s - h); var d = this.getViewportAdjustedDelta(i, e, l, h); d.left ? e.left += d.left : e.top += d.top; var p = /top|bottom/.test(i), c = p ? 2 * d.left - n + l : 2 * d.top - s + h, f = p ? "offsetWidth" : "offsetHeight"; o.offset(e), this.replaceArrow(c, o[0][f], p) }, i.prototype.replaceArrow = function (t, e, i) { this.arrow().css(i ? "left" : "top", 50 * (1 - t / e) + "%").css(i ? "top" : "left", "") }, i.prototype.setContent = function () { var t = this.tip(), e = this.getTitle(); t.find(".tooltip-inner")[this.options.html ? "html" : "text"](e), t.removeClass("fade in top bottom left right") }, i.prototype.hide = function (e) { function o() { "in" != n.hoverState && s.detach(), n.$element.removeAttr("aria-describedby").trigger("hidden.bs." + n.type), e && e() } var n = this, s = t(this.$tip), a = t.Event("hide.bs." + this.type); return this.$element.trigger(a), a.isDefaultPrevented() ? void 0 : (s.removeClass("in"), t.support.transition && s.hasClass("fade") ? s.one("bsTransitionEnd", o).emulateTransitionEnd(i.TRANSITION_DURATION) : o(), this.hoverState = null, this) }, i.prototype.fixTitle = function () { var t = this.$element; (t.attr("title") || "string" != typeof t.attr("data-original-title")) && t.attr("data-original-title", t.attr("title") || "").attr("title", "") }, i.prototype.hasContent = function () { return this.getTitle() }, i.prototype.getPosition = function (e) { e = e || this.$element; var i = e[0], o = "BODY" == i.tagName, n = i.getBoundingClientRect(); null == n.width && (n = t.extend({}, n, {width: n.right - n.left, height: n.bottom - n.top})); var s = o ? { top: 0, left: 0 } : e.offset(), a = {scroll: o ? document.documentElement.scrollTop || document.body.scrollTop : e.scrollTop()}, r = o ? { width: t(window).width(), height: t(window).height() } : null; return t.extend({}, n, a, r, s) }, i.prototype.getCalculatedOffset = function (t, e, i, o) { return "bottom" == t ? { top: e.top + e.height, left: e.left + e.width / 2 - i / 2 } : "top" == t ? { top: e.top - o, left: e.left + e.width / 2 - i / 2 } : "left" == t ? {top: e.top + e.height / 2 - o / 2, left: e.left - i} : { top: e.top + e.height / 2 - o / 2, left: e.left + e.width } }, i.prototype.getViewportAdjustedDelta = function (t, e, i, o) { var n = {top: 0, left: 0}; if (!this.$viewport)return n; var s = this.options.viewport && this.options.viewport.padding || 0, a = this.getPosition(this.$viewport); if (/right|left/.test(t)) { var r = e.top - s - a.scroll, l = e.top + s - a.scroll + o; r < a.top ? n.top = a.top - r : l > a.top + a.height && (n.top = a.top + a.height - l) } else { var h = e.left - s, d = e.left + s + i; h < a.left ? n.left = a.left - h : d > a.right && (n.left = a.left + a.width - d) } return n }, i.prototype.getTitle = function () { var t, e = this.$element, i = this.options; return t = e.attr("data-original-title") || ("function" == typeof i.title ? i.title.call(e[0]) : i.title) }, i.prototype.getUID = function (t) { do t += ~~(1e6 * Math.random()); while (document.getElementById(t)); return t }, i.prototype.tip = function () { if (!this.$tip && (this.$tip = t(this.options.template), 1 != this.$tip.length))throw new Error(this.type + " `template` option must consist of exactly 1 top-level element!"); return this.$tip }, i.prototype.arrow = function () { return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") }, i.prototype.enable = function () { this.enabled = !0 }, i.prototype.disable = function () { this.enabled = !1 }, i.prototype.toggleEnabled = function () { this.enabled = !this.enabled }, i.prototype.toggle = function (e) { var i = this; e && (i = t(e.currentTarget).data("bs." + this.type), i || (i = new this.constructor(e.currentTarget, this.getDelegateOptions()), t(e.currentTarget).data("bs." + this.type, i))), e ? (i.inState.click = !i.inState.click, i.isInStateTrue() ? i.enter(i) : i.leave(i)) : i.tip().hasClass("in") ? i.leave(i) : i.enter(i) }, i.prototype.destroy = function () { var t = this; clearTimeout(this.timeout), this.hide(function () { t.$element.off("." + t.type).removeData("bs." + t.type), t.$tip && t.$tip.detach(), t.$tip = null, t.$arrow = null, t.$viewport = null }) }; var o = t.fn.tooltip; t.fn.tooltip = e, t.fn.tooltip.Constructor = i, t.fn.tooltip.noConflict = function () { return t.fn.tooltip = o, this } }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.popover"), s = "object" == typeof e && e; (n || !/destroy|hide/.test(e)) && (n || o.data("bs.popover", n = new i(this, s)), "string" == typeof e && n[e]()) }) } var i = function (t, e) { this.init("popover", t, e) }; if (!t.fn.tooltip)throw new Error("Popover requires tooltip.js"); i.VERSION = "3.3.5", i.DEFAULTS = t.extend({}, t.fn.tooltip.Constructor.DEFAULTS, { placement: "right", trigger: "click", content: "", template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' }), i.prototype = t.extend({}, t.fn.tooltip.Constructor.prototype), i.prototype.constructor = i, i.prototype.getDefaults = function () { return i.DEFAULTS }, i.prototype.setContent = function () { var t = this.tip(), e = this.getTitle(), i = this.getContent(); t.find(".popover-title")[this.options.html ? "html" : "text"](e), t.find(".popover-content").children().detach().end()[this.options.html ? "string" == typeof i ? "html" : "append" : "text"](i), t.removeClass("fade top bottom left right in"), t.find(".popover-title").html() || t.find(".popover-title").hide() }, i.prototype.hasContent = function () { return this.getTitle() || this.getContent() }, i.prototype.getContent = function () { var t = this.$element, e = this.options; return t.attr("data-content") || ("function" == typeof e.content ? e.content.call(t[0]) : e.content) }, i.prototype.arrow = function () { return this.$arrow = this.$arrow || this.tip().find(".arrow") }; var o = t.fn.popover; t.fn.popover = e, t.fn.popover.Constructor = i, t.fn.popover.noConflict = function () { return t.fn.popover = o, this } }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.tab"); n || o.data("bs.tab", n = new i(this)), "string" == typeof e && n[e]() }) } var i = function (e) { this.element = t(e) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 150, i.prototype.show = function () { var e = this.element, i = e.closest("ul:not(.dropdown-menu)"), o = e.data("target"); if (o || (o = e.attr("href"), o = o && o.replace(/.*(?=#[^\s]*$)/, "")), !e.parent("li").hasClass("active")) { var n = i.find(".active:last a"), s = t.Event("hide.bs.tab", {relatedTarget: e[0]}), a = t.Event("show.bs.tab", {relatedTarget: n[0]}); if (n.trigger(s), e.trigger(a), !a.isDefaultPrevented() && !s.isDefaultPrevented()) { var r = t(o); this.activate(e.closest("li"), i), this.activate(r, r.parent(), function () { n.trigger({type: "hidden.bs.tab", relatedTarget: e[0]}), e.trigger({ type: "shown.bs.tab", relatedTarget: n[0] }) }) } } }, i.prototype.activate = function (e, o, n) { function s() { a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded", !1), e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded", !0), r ? (e[0].offsetWidth, e.addClass("in")) : e.removeClass("fade"), e.parent(".dropdown-menu").length && e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded", !0), n && n() } var a = o.find("> .active"), r = n && t.support.transition && (a.length && a.hasClass("fade") || !!o.find("> .fade").length); a.length && r ? a.one("bsTransitionEnd", s).emulateTransitionEnd(i.TRANSITION_DURATION) : s(), a.removeClass("in") }; var o = t.fn.tab; t.fn.tab = e, t.fn.tab.Constructor = i, t.fn.tab.noConflict = function () { return t.fn.tab = o, this }; var n = function (i) { i.preventDefault(), e.call(t(this), "show") }; t(document).on("click.bs.tab.data-api", '[data-toggle="tab"]', n).on("click.bs.tab.data-api", '[data-toggle="pill"]', n) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.affix"), s = "object" == typeof e && e; n || o.data("bs.affix", n = new i(this, s)), "string" == typeof e && n[e]() }) } var i = function (e, o) { this.options = t.extend({}, i.DEFAULTS, o), this.$target = t(this.options.target).on("scroll.bs.affix.data-api", t.proxy(this.checkPosition, this)).on("click.bs.affix.data-api", t.proxy(this.checkPositionWithEventLoop, this)), this.$element = t(e), this.affixed = null, this.unpin = null, this.pinnedOffset = null, this.checkPosition() }; i.VERSION = "3.3.5", i.RESET = "affix affix-top affix-bottom", i.DEFAULTS = { offset: 0, target: window }, i.prototype.getState = function (t, e, i, o) { var n = this.$target.scrollTop(), s = this.$element.offset(), a = this.$target.height(); if (null != i && "top" == this.affixed)return i > n ? "top" : !1; if ("bottom" == this.affixed)return null != i ? n + this.unpin <= s.top ? !1 : "bottom" : t - o >= n + a ? !1 : "bottom"; var r = null == this.affixed, l = r ? n : s.top, h = r ? a : e; return null != i && i >= n ? "top" : null != o && l + h >= t - o ? "bottom" : !1 }, i.prototype.getPinnedOffset = function () { if (this.pinnedOffset)return this.pinnedOffset; this.$element.removeClass(i.RESET).addClass("affix"); var t = this.$target.scrollTop(), e = this.$element.offset(); return this.pinnedOffset = e.top - t }, i.prototype.checkPositionWithEventLoop = function () { setTimeout(t.proxy(this.checkPosition, this), 1) }, i.prototype.checkPosition = function () { if (this.$element.is(":visible")) { var e = this.$element.height(), o = this.options.offset, n = o.top, s = o.bottom, a = Math.max(t(document).height(), t(document.body).height()); "object" != typeof o && (s = n = o), "function" == typeof n && (n = o.top(this.$element)), "function" == typeof s && (s = o.bottom(this.$element)); var r = this.getState(a, e, n, s); if (this.affixed != r) { null != this.unpin && this.$element.css("top", ""); var l = "affix" + (r ? "-" + r : ""), h = t.Event(l + ".bs.affix"); if (this.$element.trigger(h), h.isDefaultPrevented())return; this.affixed = r, this.unpin = "bottom" == r ? this.getPinnedOffset() : null, this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix", "affixed") + ".bs.affix") } "bottom" == r && this.$element.offset({top: a - e - s}) } }; var o = t.fn.affix; t.fn.affix = e, t.fn.affix.Constructor = i, t.fn.affix.noConflict = function () { return t.fn.affix = o, this }, t(window).on("load", function () { t('[data-spy="affix"]').each(function () { var i = t(this), o = i.data(); o.offset = o.offset || {}, null != o.offsetBottom && (o.offset.bottom = o.offsetBottom), null != o.offsetTop && (o.offset.top = o.offsetTop), e.call(i, o) }) }) }(jQuery), +function (t) { "use strict"; function e(e) { var i, o = e.attr("data-target") || (i = e.attr("href")) && i.replace(/.*(?=#[^\s]+$)/, ""); return t(o) } function i(e) { return this.each(function () { var i = t(this), n = i.data("bs.collapse"), s = t.extend({}, o.DEFAULTS, i.data(), "object" == typeof e && e); !n && s.toggle && /show|hide/.test(e) && (s.toggle = !1), n || i.data("bs.collapse", n = new o(this, s)), "string" == typeof e && n[e]() }) } var o = function (e, i) { this.$element = t(e), this.options = t.extend({}, o.DEFAULTS, i), this.$trigger = t('[data-toggle="collapse"][href="#' + e.id + '"],[data-toggle="collapse"][data-target="#' + e.id + '"]'), this.transitioning = null, this.options.parent ? this.$parent = this.getParent() : this.addAriaAndCollapsedClass(this.$element, this.$trigger), this.options.toggle && this.toggle() }; o.VERSION = "3.3.5", o.TRANSITION_DURATION = 350, o.DEFAULTS = {toggle: !0}, o.prototype.dimension = function () { var t = this.$element.hasClass("width"); return t ? "width" : "height" }, o.prototype.show = function () { if (!this.transitioning && !this.$element.hasClass("in")) { var e, n = this.$parent && this.$parent.children(".panel").children(".in, .collapsing"); if (!(n && n.length && (e = n.data("bs.collapse"), e && e.transitioning))) { var s = t.Event("show.bs.collapse"); if (this.$element.trigger(s), !s.isDefaultPrevented()) { n && n.length && (i.call(n, "hide"), e || n.data("bs.collapse", null)); var a = this.dimension(); this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded", !0), this.$trigger.removeClass("collapsed").attr("aria-expanded", !0), this.transitioning = 1; var r = function () { this.$element.removeClass("collapsing").addClass("collapse in")[a](""), this.transitioning = 0, this.$element.trigger("shown.bs.collapse") }; if (!t.support.transition)return r.call(this); var l = t.camelCase(["scroll", a].join("-")); this.$element.one("bsTransitionEnd", t.proxy(r, this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l]); } } } }, o.prototype.hide = function () { if (!this.transitioning && this.$element.hasClass("in")) { var e = t.Event("hide.bs.collapse"); if (this.$element.trigger(e), !e.isDefaultPrevented()) { var i = this.dimension(); this.$element[i](this.$element[i]())[0].offsetHeight, this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded", !1), this.$trigger.addClass("collapsed").attr("aria-expanded", !1), this.transitioning = 1; var n = function () { this.transitioning = 0, this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse") }; return t.support.transition ? void this.$element[i](0).one("bsTransitionEnd", t.proxy(n, this)).emulateTransitionEnd(o.TRANSITION_DURATION) : n.call(this) } } }, o.prototype.toggle = function () { this[this.$element.hasClass("in") ? "hide" : "show"]() }, o.prototype.getParent = function () { return t(this.options.parent).find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]').each(t.proxy(function (i, o) { var n = t(o); this.addAriaAndCollapsedClass(e(n), n) }, this)).end() }, o.prototype.addAriaAndCollapsedClass = function (t, e) { var i = t.hasClass("in"); t.attr("aria-expanded", i), e.toggleClass("collapsed", !i).attr("aria-expanded", i) }; var n = t.fn.collapse; t.fn.collapse = i, t.fn.collapse.Constructor = o, t.fn.collapse.noConflict = function () { return t.fn.collapse = n, this }, t(document).on("click.bs.collapse.data-api", '[data-toggle="collapse"]', function (o) { var n = t(this); n.attr("data-target") || o.preventDefault(); var s = e(n), a = s.data("bs.collapse"), r = a ? "toggle" : n.data(); i.call(s, r) }) }(jQuery), +function (t) { "use strict"; function e(i, o) { this.$body = t(document.body), this.$scrollElement = t(t(i).is(document.body) ? window : i), this.options = t.extend({}, e.DEFAULTS, o), this.selector = (this.options.target || "") + " .nav li > a", this.offsets = [], this.targets = [], this.activeTarget = null, this.scrollHeight = 0, this.$scrollElement.on("scroll.bs.scrollspy", t.proxy(this.process, this)), this.refresh(), this.process() } function i(i) { return this.each(function () { var o = t(this), n = o.data("bs.scrollspy"), s = "object" == typeof i && i; n || o.data("bs.scrollspy", n = new e(this, s)), "string" == typeof i && n[i]() }) } e.VERSION = "3.3.5", e.DEFAULTS = {offset: 10}, e.prototype.getScrollHeight = function () { return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) }, e.prototype.refresh = function () { var e = this, i = "offset", o = 0; this.offsets = [], this.targets = [], this.scrollHeight = this.getScrollHeight(), t.isWindow(this.$scrollElement[0]) || (i = "position", o = this.$scrollElement.scrollTop()), this.$body.find(this.selector).map(function () { var e = t(this), n = e.data("target") || e.attr("href"), s = /^#./.test(n) && t(n); return s && s.length && s.is(":visible") && [[s[i]().top + o, n]] || null }).sort(function (t, e) { return t[0] - e[0] }).each(function () { e.offsets.push(this[0]), e.targets.push(this[1]) }) }, e.prototype.process = function () { var t, e = this.$scrollElement.scrollTop() + this.options.offset, i = this.getScrollHeight(), o = this.options.offset + i - this.$scrollElement.height(), n = this.offsets, s = this.targets, a = this.activeTarget; if (this.scrollHeight != i && this.refresh(), e >= o)return a != (t = s[s.length - 1]) && this.activate(t); if (a && e < n[0])return this.activeTarget = null, this.clear(); for (t = n.length; t--;)a != s[t] && e >= n[t] && (void 0 === n[t + 1] || e < n[t + 1]) && this.activate(s[t]) }, e.prototype.activate = function (e) { this.activeTarget = e, this.clear(); var i = this.selector + '[data-target="' + e + '"],' + this.selector + '[href="' + e + '"]', o = t(i).parents("li").addClass("active"); o.parent(".dropdown-menu").length && (o = o.closest("li.dropdown").addClass("active")), o.trigger("activate.bs.scrollspy") }, e.prototype.clear = function () { t(this.selector).parentsUntil(this.options.target, ".active").removeClass("active") }; var o = t.fn.scrollspy; t.fn.scrollspy = i, t.fn.scrollspy.Constructor = e, t.fn.scrollspy.noConflict = function () { return t.fn.scrollspy = o, this }, t(window).on("load.bs.scrollspy.data-api", function () { t('[data-spy="scroll"]').each(function () { var e = t(this); i.call(e, e.data()) }) }) }(jQuery), +function (t) { "use strict"; function e() { var t = document.createElement("bootstrap"), e = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd otransitionend", transition: "transitionend" }; for (var i in e)if (void 0 !== t.style[i])return {end: e[i]}; return !1 } t.fn.emulateTransitionEnd = function (e) { var i = !1, o = this; t(this).one("bsTransitionEnd", function () { i = !0 }); var n = function () { i || t(o).trigger(t.support.transition.end) }; return setTimeout(n, e), this }, t(function () { t.support.transition = e(), t.support.transition && (t.event.special.bsTransitionEnd = { bindType: t.support.transition.end, delegateType: t.support.transition.end, handle: function (e) { return t(e.target).is(this) ? e.handleObj.handler.apply(this, arguments) : void 0 } }) }) }(jQuery);
/*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! * Generated using the Bootstrap Customizer (http://v3.bootcss.com/customize/?id=822d18dc2e4e823a577b) * Config saved to config.json and https://gist.github.com/822d18dc2e4e823a577b */ if ("undefined" == typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery"); +function (t) { "use strict"; var e = t.fn.jquery.split(" ")[0].split("."); if (e[0] < 2 && e[1] < 9 || 1 == e[0] && 9 == e[1] && e[2] < 1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher") }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var i = t(this), n = i.data("bs.alert"); n || i.data("bs.alert", n = new o(this)), "string" == typeof e && n[e].call(i) }) } var i = '[data-dismiss="alert"]', o = function (e) { t(e).on("click", i, this.close) }; o.VERSION = "3.3.5", o.TRANSITION_DURATION = 150, o.prototype.close = function (e) { function i() { a.detach().trigger("closed.bs.alert").remove() } var n = t(this), s = n.attr("data-target"); s || (s = n.attr("href"), s = s && s.replace(/.*(?=#[^\s]*$)/, "")); var a = t(s); e && e.preventDefault(), a.length || (a = n.closest(".alert")), a.trigger(e = t.Event("close.bs.alert")), e.isDefaultPrevented() || (a.removeClass("in"), t.support.transition && a.hasClass("fade") ? a.one("bsTransitionEnd", i).emulateTransitionEnd(o.TRANSITION_DURATION) : i()) }; var n = t.fn.alert; t.fn.alert = e, t.fn.alert.Constructor = o, t.fn.alert.noConflict = function () { return t.fn.alert = n, this }, t(document).on("click.bs.alert.data-api", i, o.prototype.close) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.button"), s = "object" == typeof e && e; n || o.data("bs.button", n = new i(this, s)), "toggle" == e ? n.toggle() : e && n.setState(e) }) } var i = function (e, o) { this.$element = t(e), this.options = t.extend({}, i.DEFAULTS, o), this.isLoading = !1 }; i.VERSION = "3.3.5", i.DEFAULTS = {loadingText: "loading..."}, i.prototype.setState = function (e) { var i = "disabled", o = this.$element, n = o.is("input") ? "val" : "html", s = o.data(); e += "Text", null == s.resetText && o.data("resetText", o[n]()), setTimeout(t.proxy(function () { o[n](null == s[e] ? this.options[e] : s[e]), "loadingText" == e ? (this.isLoading = !0, o.addClass(i).attr(i, i)) : this.isLoading && (this.isLoading = !1, o.removeClass(i).removeAttr(i)) }, this), 0) }, i.prototype.toggle = function () { var t = !0, e = this.$element.closest('[data-toggle="buttons"]'); if (e.length) { var i = this.$element.find("input"); "radio" == i.prop("type") ? (i.prop("checked") && (t = !1), e.find(".active").removeClass("active"), this.$element.addClass("active")) : "checkbox" == i.prop("type") && (i.prop("checked") !== this.$element.hasClass("active") && (t = !1), this.$element.toggleClass("active")), i.prop("checked", this.$element.hasClass("active")), t && i.trigger("change") } else this.$element.attr("aria-pressed", !this.$element.hasClass("active")), this.$element.toggleClass("active") }; var o = t.fn.button; t.fn.button = e, t.fn.button.Constructor = i, t.fn.button.noConflict = function () { return t.fn.button = o, this }, t(document).on("click.bs.button.data-api", '[data-toggle^="button"]', function (i) { var o = t(i.target); o.hasClass("btn") || (o = o.closest(".btn")), e.call(o, "toggle"), t(i.target).is('input[type="radio"]') || t(i.target).is('input[type="checkbox"]') || i.preventDefault() }).on("focus.bs.button.data-api blur.bs.button.data-api", '[data-toggle^="button"]', function (e) { t(e.target).closest(".btn").toggleClass("focus", /^focus(in)?$/.test(e.type)) }) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.carousel"), s = t.extend({}, i.DEFAULTS, o.data(), "object" == typeof e && e), a = "string" == typeof e ? e : s.slide; n || o.data("bs.carousel", n = new i(this, s)), "number" == typeof e ? n.to(e) : a ? n[a]() : s.interval && n.pause().cycle() }) } var i = function (e, i) { this.$element = t(e), this.$indicators = this.$element.find(".carousel-indicators"), this.options = i, this.paused = null, this.sliding = null, this.interval = null, this.$active = null, this.$items = null, this.options.keyboard && this.$element.on("keydown.bs.carousel", t.proxy(this.keydown, this)), "hover" == this.options.pause && !("ontouchstart" in document.documentElement) && this.$element.on("mouseenter.bs.carousel", t.proxy(this.pause, this)).on("mouseleave.bs.carousel", t.proxy(this.cycle, this)) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 600, i.DEFAULTS = { interval: 5e3, pause: "hover", wrap: !0, keyboard: !0 }, i.prototype.keydown = function (t) { if (!/input|textarea/i.test(t.target.tagName)) { switch (t.which) { case 37: this.prev(); break; case 39: this.next(); break; default: return } t.preventDefault() } }, i.prototype.cycle = function (e) { return e || (this.paused = !1), this.interval && clearInterval(this.interval), this.options.interval && !this.paused && (this.interval = setInterval(t.proxy(this.next, this), this.options.interval)), this }, i.prototype.getItemIndex = function (t) { return this.$items = t.parent().children(".item"), this.$items.index(t || this.$active) }, i.prototype.getItemForDirection = function (t, e) { var i = this.getItemIndex(e), o = "prev" == t && 0 === i || "next" == t && i == this.$items.length - 1; if (o && !this.options.wrap)return e; var n = "prev" == t ? -1 : 1, s = (i + n) % this.$items.length; return this.$items.eq(s) }, i.prototype.to = function (t) { var e = this, i = this.getItemIndex(this.$active = this.$element.find(".item.active")); return t > this.$items.length - 1 || 0 > t ? void 0 : this.sliding ? this.$element.one("slid.bs.carousel", function () { e.to(t) }) : i == t ? this.pause().cycle() : this.slide(t > i ? "next" : "prev", this.$items.eq(t)) }, i.prototype.pause = function (e) { return e || (this.paused = !0), this.$element.find(".next, .prev").length && t.support.transition && (this.$element.trigger(t.support.transition.end), this.cycle(!0)), this.interval = clearInterval(this.interval), this }, i.prototype.next = function () { return this.sliding ? void 0 : this.slide("next") }, i.prototype.prev = function () { return this.sliding ? void 0 : this.slide("prev") }, i.prototype.slide = function (e, o) { var n = this.$element.find(".item.active"), s = o || this.getItemForDirection(e, n), a = this.interval, r = "next" == e ? "left" : "right", l = this; if (s.hasClass("active"))return this.sliding = !1; var h = s[0], d = t.Event("slide.bs.carousel", {relatedTarget: h, direction: r}); if (this.$element.trigger(d), !d.isDefaultPrevented()) { if (this.sliding = !0, a && this.pause(), this.$indicators.length) { this.$indicators.find(".active").removeClass("active"); var p = t(this.$indicators.children()[this.getItemIndex(s)]); p && p.addClass("active") } var c = t.Event("slid.bs.carousel", {relatedTarget: h, direction: r}); return t.support.transition && this.$element.hasClass("slide") ? (s.addClass(e), s[0].offsetWidth, n.addClass(r), s.addClass(r), n.one("bsTransitionEnd", function () { s.removeClass([e, r].join(" ")).addClass("active"), n.removeClass(["active", r].join(" ")), l.sliding = !1, setTimeout(function () { l.$element.trigger(c) }, 0) }).emulateTransitionEnd(i.TRANSITION_DURATION)) : (n.removeClass("active"), s.addClass("active"), this.sliding = !1, this.$element.trigger(c)), a && this.cycle(), this } }; var o = t.fn.carousel; t.fn.carousel = e, t.fn.carousel.Constructor = i, t.fn.carousel.noConflict = function () { return t.fn.carousel = o, this }; var n = function (i) { var o, n = t(this), s = t(n.attr("data-target") || (o = n.attr("href")) && o.replace(/.*(?=#[^\s]+$)/, "")); if (s.hasClass("carousel")) { var a = t.extend({}, s.data(), n.data()), r = n.attr("data-slide-to"); r && (a.interval = !1), e.call(s, a), r && s.data("bs.carousel").to(r), i.preventDefault() } }; t(document).on("click.bs.carousel.data-api", "[data-slide]", n).on("click.bs.carousel.data-api", "[data-slide-to]", n), t(window).on("load", function () { t('[data-ride="carousel"]').each(function () { var i = t(this); e.call(i, i.data()) }) }) }(jQuery), +function (t) { "use strict"; function e(e) { var i = e.attr("data-target"); i || (i = e.attr("href"), i = i && /#[A-Za-z]/.test(i) && i.replace(/.*(?=#[^\s]*$)/, "")); var o = i && t(i); return o && o.length ? o : e.parent() } function i(i) { i && 3 === i.which || (t(n).remove(), t(s).each(function () { var o = t(this), n = e(o), s = {relatedTarget: this}; n.hasClass("open") && (i && "click" == i.type && /input|textarea/i.test(i.target.tagName) && t.contains(n[0], i.target) || (n.trigger(i = t.Event("hide.bs.dropdown", s)), i.isDefaultPrevented() || (o.attr("aria-expanded", "false"), n.removeClass("open").trigger("hidden.bs.dropdown", s)))) })) } function o(e) { return this.each(function () { var i = t(this), o = i.data("bs.dropdown"); o || i.data("bs.dropdown", o = new a(this)), "string" == typeof e && o[e].call(i) }) } var n = ".dropdown-backdrop", s = '[data-toggle="dropdown"]', a = function (e) { t(e).on("click.bs.dropdown", this.toggle) }; a.VERSION = "3.3.5", a.prototype.toggle = function (o) { var n = t(this); if (!n.is(".disabled, :disabled")) { var s = e(n), a = s.hasClass("open"); if (i(), !a) { "ontouchstart" in document.documentElement && !s.closest(".navbar-nav").length && t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click", i); var r = {relatedTarget: this}; if (s.trigger(o = t.Event("show.bs.dropdown", r)), o.isDefaultPrevented())return; n.trigger("focus").attr("aria-expanded", "true"), s.toggleClass("open").trigger("shown.bs.dropdown", r) } return !1 } }, a.prototype.keydown = function (i) { if (/(38|40|27|32)/.test(i.which) && !/input|textarea/i.test(i.target.tagName)) { var o = t(this); if (i.preventDefault(), i.stopPropagation(), !o.is(".disabled, :disabled")) { var n = e(o), a = n.hasClass("open"); if (!a && 27 != i.which || a && 27 == i.which)return 27 == i.which && n.find(s).trigger("focus"), o.trigger("click"); var r = " li:not(.disabled):visible a", l = n.find(".dropdown-menu" + r); if (l.length) { var h = l.index(i.target); 38 == i.which && h > 0 && h--, 40 == i.which && h < l.length - 1 && h++, ~h || (h = 0), l.eq(h).trigger("focus") } } } }; var r = t.fn.dropdown; t.fn.dropdown = o, t.fn.dropdown.Constructor = a, t.fn.dropdown.noConflict = function () { return t.fn.dropdown = r, this }, t(document).on("click.bs.dropdown.data-api", i).on("click.bs.dropdown.data-api", ".dropdown form", function (t) { t.stopPropagation() }).on("click.bs.dropdown.data-api", s, a.prototype.toggle).on("keydown.bs.dropdown.data-api", s, a.prototype.keydown).on("keydown.bs.dropdown.data-api", ".dropdown-menu", a.prototype.keydown) }(jQuery), +function (t) { "use strict"; function e(e, o) { return this.each(function () { var n = t(this), s = n.data("bs.modal"), a = t.extend({}, i.DEFAULTS, n.data(), "object" == typeof e && e); s || n.data("bs.modal", s = new i(this, a)), "string" == typeof e ? s[e](o) : a.show && s.show(o) }) } var i = function (e, i) { this.options = i, this.$body = t(document.body), this.$element = t(e), this.$dialog = this.$element.find(".modal-dialog"), this.$backdrop = null, this.isShown = null, this.originalBodyPad = null, this.scrollbarWidth = 0, this.ignoreBackdropClick = !1, this.options.remote && this.$element.find(".modal-content").load(this.options.remote, t.proxy(function () { this.$element.trigger("loaded.bs.modal") }, this)) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 300, i.BACKDROP_TRANSITION_DURATION = 150, i.DEFAULTS = { backdrop: !0, keyboard: !0, show: !0 }, i.prototype.toggle = function (t) { return this.isShown ? this.hide() : this.show(t) }, i.prototype.show = function (e) { var o = this, n = t.Event("show.bs.modal", {relatedTarget: e}); this.$element.trigger(n), this.isShown || n.isDefaultPrevented() || (this.isShown = !0, this.checkScrollbar(), this.setScrollbar(), this.$body.addClass("modal-open"), this.escape(), this.resize(), this.$element.on("click.dismiss.bs.modal", '[data-dismiss="modal"]', t.proxy(this.hide, this)), this.$dialog.on("mousedown.dismiss.bs.modal", function () { o.$element.one("mouseup.dismiss.bs.modal", function (e) { t(e.target).is(o.$element) && (o.ignoreBackdropClick = !0) }) }), this.backdrop(function () { var n = t.support.transition && o.$element.hasClass("fade"); o.$element.parent().length || o.$element.appendTo(o.$body), o.$element.show().scrollTop(0), o.adjustDialog(), n && o.$element[0].offsetWidth, o.$element.addClass("in"), o.enforceFocus(); var s = t.Event("shown.bs.modal", {relatedTarget: e}); n ? o.$dialog.one("bsTransitionEnd", function () { o.$element.trigger("focus").trigger(s) }).emulateTransitionEnd(i.TRANSITION_DURATION) : o.$element.trigger("focus").trigger(s) })) }, i.prototype.hide = function (e) { e && e.preventDefault(), e = t.Event("hide.bs.modal"), this.$element.trigger(e), this.isShown && !e.isDefaultPrevented() && (this.isShown = !1, this.escape(), this.resize(), t(document).off("focusin.bs.modal"), this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"), this.$dialog.off("mousedown.dismiss.bs.modal"), t.support.transition && this.$element.hasClass("fade") ? this.$element.one("bsTransitionEnd", t.proxy(this.hideModal, this)).emulateTransitionEnd(i.TRANSITION_DURATION) : this.hideModal()) }, i.prototype.enforceFocus = function () { t(document).off("focusin.bs.modal").on("focusin.bs.modal", t.proxy(function (t) { this.$element[0] === t.target || this.$element.has(t.target).length || this.$element.trigger("focus") }, this)) }, i.prototype.escape = function () { this.isShown && this.options.keyboard ? this.$element.on("keydown.dismiss.bs.modal", t.proxy(function (t) { 27 == t.which && this.hide() }, this)) : this.isShown || this.$element.off("keydown.dismiss.bs.modal") }, i.prototype.resize = function () { this.isShown ? t(window).on("resize.bs.modal", t.proxy(this.handleUpdate, this)) : t(window).off("resize.bs.modal") }, i.prototype.hideModal = function () { var t = this; this.$element.hide(), this.backdrop(function () { t.$body.removeClass("modal-open"), t.resetAdjustments(), t.resetScrollbar(), t.$element.trigger("hidden.bs.modal") }) }, i.prototype.removeBackdrop = function () { this.$backdrop && this.$backdrop.remove(), this.$backdrop = null }, i.prototype.backdrop = function (e) { var o = this, n = this.$element.hasClass("fade") ? "fade" : ""; if (this.isShown && this.options.backdrop) { var s = t.support.transition && n; if (this.$backdrop = t(document.createElement("div")).addClass("modal-backdrop " + n).appendTo(this.$body), this.$element.on("click.dismiss.bs.modal", t.proxy(function (t) { return this.ignoreBackdropClick ? void(this.ignoreBackdropClick = !1) : void(t.target === t.currentTarget && ("static" == this.options.backdrop ? this.$element[0].focus() : this.hide())) }, this)), s && this.$backdrop[0].offsetWidth, this.$backdrop.addClass("in"), !e)return; s ? this.$backdrop.one("bsTransitionEnd", e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION) : e() } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass("in"); var a = function () { o.removeBackdrop(), e && e() }; t.support.transition && this.$element.hasClass("fade") ? this.$backdrop.one("bsTransitionEnd", a).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION) : a() } else e && e() }, i.prototype.handleUpdate = function () { this.adjustDialog() }, i.prototype.adjustDialog = function () { var t = this.$element[0].scrollHeight > document.documentElement.clientHeight; this.$element.css({ paddingLeft: !this.bodyIsOverflowing && t ? this.scrollbarWidth : "", paddingRight: this.bodyIsOverflowing && !t ? this.scrollbarWidth : "" }) }, i.prototype.resetAdjustments = function () { this.$element.css({paddingLeft: "", paddingRight: ""}) }, i.prototype.checkScrollbar = function () { var t = window.innerWidth; if (!t) { var e = document.documentElement.getBoundingClientRect(); t = e.right - Math.abs(e.left) } this.bodyIsOverflowing = document.body.clientWidth < t, this.scrollbarWidth = this.measureScrollbar() }, i.prototype.setScrollbar = function () { var t = parseInt(this.$body.css("padding-right") || 0, 10); this.originalBodyPad = document.body.style.paddingRight || "", this.bodyIsOverflowing && this.$body.css("padding-right", t + this.scrollbarWidth) }, i.prototype.resetScrollbar = function () { this.$body.css("padding-right", this.originalBodyPad) }, i.prototype.measureScrollbar = function () { var t = document.createElement("div"); t.className = "modal-scrollbar-measure", this.$body.append(t); var e = t.offsetWidth - t.clientWidth; return this.$body[0].removeChild(t), e }; var o = t.fn.modal; t.fn.modal = e, t.fn.modal.Constructor = i, t.fn.modal.noConflict = function () { return t.fn.modal = o, this }, t(document).on("click.bs.modal.data-api", '[data-toggle="modal"]', function (i) { var o = t(this), n = o.attr("href"), s = t(o.attr("data-target") || n && n.replace(/.*(?=#[^\s]+$)/, "")), a = s.data("bs.modal") ? "toggle" : t.extend({remote: !/#/.test(n) && n}, s.data(), o.data()); o.is("a") && i.preventDefault(), s.one("show.bs.modal", function (t) { t.isDefaultPrevented() || s.one("hidden.bs.modal", function () { o.is(":visible") && o.trigger("focus") }) }), e.call(s, a, this) }) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.tooltip"), s = "object" == typeof e && e; (n || !/destroy|hide/.test(e)) && (n || o.data("bs.tooltip", n = new i(this, s)), "string" == typeof e && n[e]()) }) } var i = function (t, e) { this.type = null, this.options = null, this.enabled = null, this.timeout = null, this.hoverState = null, this.$element = null, this.inState = null, this.init("tooltip", t, e) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 150, i.DEFAULTS = { animation: !0, placement: "top", selector: !1, template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>', trigger: "hover focus", title: "", delay: 0, html: !1, container: !1, viewport: {selector: "body", padding: 0} }, i.prototype.init = function (e, i, o) { if (this.enabled = !0, this.type = e, this.$element = t(i), this.options = this.getOptions(o), this.$viewport = this.options.viewport && t(t.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : this.options.viewport.selector || this.options.viewport), this.inState = { click: !1, hover: !1, focus: !1 }, this.$element[0] instanceof document.constructor && !this.options.selector)throw new Error("`selector` option must be specified when initializing " + this.type + " on the window.document object!"); for (var n = this.options.trigger.split(" "), s = n.length; s--;) { var a = n[s]; if ("click" == a)this.$element.on("click." + this.type, this.options.selector, t.proxy(this.toggle, this)); else if ("manual" != a) { var r = "hover" == a ? "mouseenter" : "focusin", l = "hover" == a ? "mouseleave" : "focusout"; this.$element.on(r + "." + this.type, this.options.selector, t.proxy(this.enter, this)), this.$element.on(l + "." + this.type, this.options.selector, t.proxy(this.leave, this)) } } this.options.selector ? this._options = t.extend({}, this.options, { trigger: "manual", selector: "" }) : this.fixTitle() }, i.prototype.getDefaults = function () { return i.DEFAULTS }, i.prototype.getOptions = function (e) { return e = t.extend({}, this.getDefaults(), this.$element.data(), e), e.delay && "number" == typeof e.delay && (e.delay = { show: e.delay, hide: e.delay }), e }, i.prototype.getDelegateOptions = function () { var e = {}, i = this.getDefaults(); return this._options && t.each(this._options, function (t, o) { i[t] != o && (e[t] = o) }), e }, i.prototype.enter = function (e) { var i = e instanceof this.constructor ? e : t(e.currentTarget).data("bs." + this.type); return i || (i = new this.constructor(e.currentTarget, this.getDelegateOptions()), t(e.currentTarget).data("bs." + this.type, i)), e instanceof t.Event && (i.inState["focusin" == e.type ? "focus" : "hover"] = !0), i.tip().hasClass("in") || "in" == i.hoverState ? void(i.hoverState = "in") : (clearTimeout(i.timeout), i.hoverState = "in", i.options.delay && i.options.delay.show ? void(i.timeout = setTimeout(function () { "in" == i.hoverState && i.show() }, i.options.delay.show)) : i.show()) }, i.prototype.isInStateTrue = function () { for (var t in this.inState)if (this.inState[t])return !0; return !1 }, i.prototype.leave = function (e) { var i = e instanceof this.constructor ? e : t(e.currentTarget).data("bs." + this.type); return i || (i = new this.constructor(e.currentTarget, this.getDelegateOptions()), t(e.currentTarget).data("bs." + this.type, i)), e instanceof t.Event && (i.inState["focusout" == e.type ? "focus" : "hover"] = !1), i.isInStateTrue() ? void 0 : (clearTimeout(i.timeout), i.hoverState = "out", i.options.delay && i.options.delay.hide ? void(i.timeout = setTimeout(function () { "out" == i.hoverState && i.hide() }, i.options.delay.hide)) : i.hide()) }, i.prototype.show = function () { var e = t.Event("show.bs." + this.type); if (this.hasContent() && this.enabled) { this.$element.trigger(e); var o = t.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]); if (e.isDefaultPrevented() || !o)return; var n = this, s = this.tip(), a = this.getUID(this.type); this.setContent(), s.attr("id", a), this.$element.attr("aria-describedby", a), this.options.animation && s.addClass("fade"); var r = "function" == typeof this.options.placement ? this.options.placement.call(this, s[0], this.$element[0]) : this.options.placement, l = /\s?auto?\s?/i, h = l.test(r); h && (r = r.replace(l, "") || "top"), s.detach().css({ top: 0, left: 0, display: "block" }).addClass(r).data("bs." + this.type, this), this.options.container ? s.appendTo(this.options.container) : s.insertAfter(this.$element), this.$element.trigger("inserted.bs." + this.type); var d = this.getPosition(), p = s[0].offsetWidth, c = s[0].offsetHeight; if (h) { var f = r, u = this.getPosition(this.$viewport); r = "bottom" == r && d.bottom + c > u.bottom ? "top" : "top" == r && d.top - c < u.top ? "bottom" : "right" == r && d.right + p > u.width ? "left" : "left" == r && d.left - p < u.left ? "right" : r, s.removeClass(f).addClass(r) } var g = this.getCalculatedOffset(r, d, p, c); this.applyPlacement(g, r); var m = function () { var t = n.hoverState; n.$element.trigger("shown.bs." + n.type), n.hoverState = null, "out" == t && n.leave(n) }; t.support.transition && this.$tip.hasClass("fade") ? s.one("bsTransitionEnd", m).emulateTransitionEnd(i.TRANSITION_DURATION) : m() } }, i.prototype.applyPlacement = function (e, i) { var o = this.tip(), n = o[0].offsetWidth, s = o[0].offsetHeight, a = parseInt(o.css("margin-top"), 10), r = parseInt(o.css("margin-left"), 10); isNaN(a) && (a = 0), isNaN(r) && (r = 0), e.top += a, e.left += r, t.offset.setOffset(o[0], t.extend({ using: function (t) { o.css({top: Math.round(t.top), left: Math.round(t.left)}) } }, e), 0), o.addClass("in"); var l = o[0].offsetWidth, h = o[0].offsetHeight; "top" == i && h != s && (e.top = e.top + s - h); var d = this.getViewportAdjustedDelta(i, e, l, h); d.left ? e.left += d.left : e.top += d.top; var p = /top|bottom/.test(i), c = p ? 2 * d.left - n + l : 2 * d.top - s + h, f = p ? "offsetWidth" : "offsetHeight"; o.offset(e), this.replaceArrow(c, o[0][f], p) }, i.prototype.replaceArrow = function (t, e, i) { this.arrow().css(i ? "left" : "top", 50 * (1 - t / e) + "%").css(i ? "top" : "left", "") }, i.prototype.setContent = function () { var t = this.tip(), e = this.getTitle(); t.find(".tooltip-inner")[this.options.html ? "html" : "text"](e), t.removeClass("fade in top bottom left right") }, i.prototype.hide = function (e) { function o() { "in" != n.hoverState && s.detach(), n.$element.removeAttr("aria-describedby").trigger("hidden.bs." + n.type), e && e() } var n = this, s = t(this.$tip), a = t.Event("hide.bs." + this.type); return this.$element.trigger(a), a.isDefaultPrevented() ? void 0 : (s.removeClass("in"), t.support.transition && s.hasClass("fade") ? s.one("bsTransitionEnd", o).emulateTransitionEnd(i.TRANSITION_DURATION) : o(), this.hoverState = null, this) }, i.prototype.fixTitle = function () { var t = this.$element; (t.attr("title") || "string" != typeof t.attr("data-original-title")) && t.attr("data-original-title", t.attr("title") || "").attr("title", "") }, i.prototype.hasContent = function () { return this.getTitle() }, i.prototype.getPosition = function (e) { e = e || this.$element; var i = e[0], o = "BODY" == i.tagName, n = i.getBoundingClientRect(); null == n.width && (n = t.extend({}, n, {width: n.right - n.left, height: n.bottom - n.top})); var s = o ? { top: 0, left: 0 } : e.offset(), a = {scroll: o ? document.documentElement.scrollTop || document.body.scrollTop : e.scrollTop()}, r = o ? { width: t(window).width(), height: t(window).height() } : null; return t.extend({}, n, a, r, s) }, i.prototype.getCalculatedOffset = function (t, e, i, o) { return "bottom" == t ? { top: e.top + e.height, left: e.left + e.width / 2 - i / 2 } : "top" == t ? { top: e.top - o, left: e.left + e.width / 2 - i / 2 } : "left" == t ? {top: e.top + e.height / 2 - o / 2, left: e.left - i} : { top: e.top + e.height / 2 - o / 2, left: e.left + e.width } }, i.prototype.getViewportAdjustedDelta = function (t, e, i, o) { var n = {top: 0, left: 0}; if (!this.$viewport)return n; var s = this.options.viewport && this.options.viewport.padding || 0, a = this.getPosition(this.$viewport); if (/right|left/.test(t)) { var r = e.top - s - a.scroll, l = e.top + s - a.scroll + o; r < a.top ? n.top = a.top - r : l > a.top + a.height && (n.top = a.top + a.height - l) } else { var h = e.left - s, d = e.left + s + i; h < a.left ? n.left = a.left - h : d > a.right && (n.left = a.left + a.width - d) } return n }, i.prototype.getTitle = function () { var t, e = this.$element, i = this.options; return t = e.attr("data-original-title") || ("function" == typeof i.title ? i.title.call(e[0]) : i.title) }, i.prototype.getUID = function (t) { do t += ~~(1e6 * Math.random()); while (document.getElementById(t)); return t }, i.prototype.tip = function () { if (!this.$tip && (this.$tip = t(this.options.template), 1 != this.$tip.length))throw new Error(this.type + " `template` option must consist of exactly 1 top-level element!"); return this.$tip }, i.prototype.arrow = function () { return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") }, i.prototype.enable = function () { this.enabled = !0 }, i.prototype.disable = function () { this.enabled = !1 }, i.prototype.toggleEnabled = function () { this.enabled = !this.enabled }, i.prototype.toggle = function (e) { var i = this; e && (i = t(e.currentTarget).data("bs." + this.type), i || (i = new this.constructor(e.currentTarget, this.getDelegateOptions()), t(e.currentTarget).data("bs." + this.type, i))), e ? (i.inState.click = !i.inState.click, i.isInStateTrue() ? i.enter(i) : i.leave(i)) : i.tip().hasClass("in") ? i.leave(i) : i.enter(i) }, i.prototype.destroy = function () { var t = this; clearTimeout(this.timeout), this.hide(function () { t.$element.off("." + t.type).removeData("bs." + t.type), t.$tip && t.$tip.detach(), t.$tip = null, t.$arrow = null, t.$viewport = null }) }; var o = t.fn.tooltip; t.fn.tooltip = e, t.fn.tooltip.Constructor = i, t.fn.tooltip.noConflict = function () { return t.fn.tooltip = o, this } }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.popover"), s = "object" == typeof e && e; (n || !/destroy|hide/.test(e)) && (n || o.data("bs.popover", n = new i(this, s)), "string" == typeof e && n[e]()) }) } var i = function (t, e) { this.init("popover", t, e) }; if (!t.fn.tooltip)throw new Error("Popover requires tooltip.js"); i.VERSION = "3.3.5", i.DEFAULTS = t.extend({}, t.fn.tooltip.Constructor.DEFAULTS, { placement: "right", trigger: "click", content: "", template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' }), i.prototype = t.extend({}, t.fn.tooltip.Constructor.prototype), i.prototype.constructor = i, i.prototype.getDefaults = function () { return i.DEFAULTS }, i.prototype.setContent = function () { var t = this.tip(), e = this.getTitle(), i = this.getContent(); t.find(".popover-title")[this.options.html ? "html" : "text"](e), t.find(".popover-content").children().detach().end()[this.options.html ? "string" == typeof i ? "html" : "append" : "text"](i), t.removeClass("fade top bottom left right in"), t.find(".popover-title").html() || t.find(".popover-title").hide() }, i.prototype.hasContent = function () { return this.getTitle() || this.getContent() }, i.prototype.getContent = function () { var t = this.$element, e = this.options; return t.attr("data-content") || ("function" == typeof e.content ? e.content.call(t[0]) : e.content) }, i.prototype.arrow = function () { return this.$arrow = this.$arrow || this.tip().find(".arrow") }; var o = t.fn.popover; t.fn.popover = e, t.fn.popover.Constructor = i, t.fn.popover.noConflict = function () { return t.fn.popover = o, this } }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.tab"); n || o.data("bs.tab", n = new i(this)), "string" == typeof e && n[e]() }) } var i = function (e) { this.element = t(e) }; i.VERSION = "3.3.5", i.TRANSITION_DURATION = 150, i.prototype.show = function () { var e = this.element, i = e.closest("ul:not(.dropdown-menu)"), o = e.data("target"); if (o || (o = e.attr("href"), o = o && o.replace(/.*(?=#[^\s]*$)/, "")), !e.parent("li").hasClass("active")) { var n = i.find(".active:last a"), s = t.Event("hide.bs.tab", {relatedTarget: e[0]}), a = t.Event("show.bs.tab", {relatedTarget: n[0]}); if (n.trigger(s), e.trigger(a), !a.isDefaultPrevented() && !s.isDefaultPrevented()) { var r = t(o); this.activate(e.closest("li"), i), this.activate(r, r.parent(), function () { n.trigger({type: "hidden.bs.tab", relatedTarget: e[0]}), e.trigger({ type: "shown.bs.tab", relatedTarget: n[0] }) }) } } }, i.prototype.activate = function (e, o, n) { function s() { a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded", !1), e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded", !0), r ? (e[0].offsetWidth, e.addClass("in")) : e.removeClass("fade"), e.parent(".dropdown-menu").length && e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded", !0), n && n() } var a = o.find("> .active"), r = n && t.support.transition && (a.length && a.hasClass("fade") || !!o.find("> .fade").length); a.length && r ? a.one("bsTransitionEnd", s).emulateTransitionEnd(i.TRANSITION_DURATION) : s(), a.removeClass("in") }; var o = t.fn.tab; t.fn.tab = e, t.fn.tab.Constructor = i, t.fn.tab.noConflict = function () { return t.fn.tab = o, this }; var n = function (i) { i.preventDefault(), e.call(t(this), "show") }; t(document).on("click.bs.tab.data-api", '[data-toggle="tab"]', n).on("click.bs.tab.data-api", '[data-toggle="pill"]', n) }(jQuery), +function (t) { "use strict"; function e(e) { return this.each(function () { var o = t(this), n = o.data("bs.affix"), s = "object" == typeof e && e; n || o.data("bs.affix", n = new i(this, s)), "string" == typeof e && n[e]() }) } var i = function (e, o) { this.options = t.extend({}, i.DEFAULTS, o), this.$target = t(this.options.target).on("scroll.bs.affix.data-api", t.proxy(this.checkPosition, this)).on("click.bs.affix.data-api", t.proxy(this.checkPositionWithEventLoop, this)), this.$element = t(e), this.affixed = null, this.unpin = null, this.pinnedOffset = null, this.checkPosition() }; i.VERSION = "3.3.5", i.RESET = "affix affix-top affix-bottom", i.DEFAULTS = { offset: 0, target: window }, i.prototype.getState = function (t, e, i, o) { var n = this.$target.scrollTop(), s = this.$element.offset(), a = this.$target.height(); if (null != i && "top" == this.affixed)return i > n ? "top" : !1; if ("bottom" == this.affixed)return null != i ? n + this.unpin <= s.top ? !1 : "bottom" : t - o >= n + a ? !1 : "bottom"; var r = null == this.affixed, l = r ? n : s.top, h = r ? a : e; return null != i && i >= n ? "top" : null != o && l + h >= t - o ? "bottom" : !1 }, i.prototype.getPinnedOffset = function () { if (this.pinnedOffset)return this.pinnedOffset; this.$element.removeClass(i.RESET).addClass("affix"); var t = this.$target.scrollTop(), e = this.$element.offset(); return this.pinnedOffset = e.top - t }, i.prototype.checkPositionWithEventLoop = function () { setTimeout(t.proxy(this.checkPosition, this), 1) }, i.prototype.checkPosition = function () { if (this.$element.is(":visible")) { var e = this.$element.height(), o = this.options.offset, n = o.top, s = o.bottom, a = Math.max(t(document).height(), t(document.body).height()); "object" != typeof o && (s = n = o), "function" == typeof n && (n = o.top(this.$element)), "function" == typeof s && (s = o.bottom(this.$element)); var r = this.getState(a, e, n, s); if (this.affixed != r) { null != this.unpin && this.$element.css("top", ""); var l = "affix" + (r ? "-" + r : ""), h = t.Event(l + ".bs.affix"); if (this.$element.trigger(h), h.isDefaultPrevented())return; this.affixed = r, this.unpin = "bottom" == r ? this.getPinnedOffset() : null, this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix", "affixed") + ".bs.affix") } "bottom" == r && this.$element.offset({top: a - e - s}) } }; var o = t.fn.affix; t.fn.affix = e, t.fn.affix.Constructor = i, t.fn.affix.noConflict = function () { return t.fn.affix = o, this }, t(window).on("load", function () { t('[data-spy="affix"]').each(function () { var i = t(this), o = i.data(); o.offset = o.offset || {}, null != o.offsetBottom && (o.offset.bottom = o.offsetBottom), null != o.offsetTop && (o.offset.top = o.offsetTop), e.call(i, o) }) }) }(jQuery), +function (t) { "use strict"; function e(e) { var i, o = e.attr("data-target") || (i = e.attr("href")) && i.replace(/.*(?=#[^\s]+$)/, ""); return t(o) } function i(e) { return this.each(function () { var i = t(this), n = i.data("bs.collapse"), s = t.extend({}, o.DEFAULTS, i.data(), "object" == typeof e && e); !n && s.toggle && /show|hide/.test(e) && (s.toggle = !1), n || i.data("bs.collapse", n = new o(this, s)), "string" == typeof e && n[e]() }) } var o = function (e, i) { this.$element = t(e), this.options = t.extend({}, o.DEFAULTS, i), this.$trigger = t('[data-toggle="collapse"][href="#' + e.id + '"],[data-toggle="collapse"][data-target="#' + e.id + '"]'), this.transitioning = null, this.options.parent ? this.$parent = this.getParent() : this.addAriaAndCollapsedClass(this.$element, this.$trigger), this.options.toggle && this.toggle() }; o.VERSION = "3.3.5", o.TRANSITION_DURATION = 350, o.DEFAULTS = {toggle: !0}, o.prototype.dimension = function () { var t = this.$element.hasClass("width"); return t ? "width" : "height" }, o.prototype.show = function () { if (!this.transitioning && !this.$element.hasClass("in")) { var e, n = this.$parent && this.$parent.children(".panel").children(".in, .collapsing"); if (!(n && n.length && (e = n.data("bs.collapse"), e && e.transitioning))) { var s = t.Event("show.bs.collapse"); if (this.$element.trigger(s), !s.isDefaultPrevented()) { n && n.length && (i.call(n, "hide"), e || n.data("bs.collapse", null)); var a = this.dimension(); this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded", !0), this.$trigger.removeClass("collapsed").attr("aria-expanded", !0), this.transitioning = 1; var r = function () { this.$element.removeClass("collapsing").addClass("collapse in")[a](""), this.transitioning = 0, this.$element.trigger("shown.bs.collapse") }; if (!t.support.transition)return r.call(this); var l = t.camelCase(["scroll", a].join("-")); this.$element.one("bsTransitionEnd", t.proxy(r, this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l]); } } } }, o.prototype.hide = function () { if (!this.transitioning && this.$element.hasClass("in")) { var e = t.Event("hide.bs.collapse"); if (this.$element.trigger(e), !e.isDefaultPrevented()) { var i = this.dimension(); this.$element[i](this.$element[i]())[0].offsetHeight, this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded", !1), this.$trigger.addClass("collapsed").attr("aria-expanded", !1), this.transitioning = 1; var n = function () { this.transitioning = 0, this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse") }; return t.support.transition ? void this.$element[i](0).one("bsTransitionEnd", t.proxy(n, this)).emulateTransitionEnd(o.TRANSITION_DURATION) : n.call(this) } } }, o.prototype.toggle = function () { this[this.$element.hasClass("in") ? "hide" : "show"]() }, o.prototype.getParent = function () { return t(this.options.parent).find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]').each(t.proxy(function (i, o) { var n = t(o); this.addAriaAndCollapsedClass(e(n), n) }, this)).end() }, o.prototype.addAriaAndCollapsedClass = function (t, e) { var i = t.hasClass("in"); t.attr("aria-expanded", i), e.toggleClass("collapsed", !i).attr("aria-expanded", i) }; var n = t.fn.collapse; t.fn.collapse = i, t.fn.collapse.Constructor = o, t.fn.collapse.noConflict = function () { return t.fn.collapse = n, this }, t(document).on("click.bs.collapse.data-api", '[data-toggle="collapse"]', function (o) { var n = t(this); n.attr("data-target") || o.preventDefault(); var s = e(n), a = s.data("bs.collapse"), r = a ? "toggle" : n.data(); i.call(s, r) }) }(jQuery), +function (t) { "use strict"; function e(i, o) { this.$body = t(document.body), this.$scrollElement = t(t(i).is(document.body) ? window : i), this.options = t.extend({}, e.DEFAULTS, o), this.selector = (this.options.target || "") + " .nav li > a", this.offsets = [], this.targets = [], this.activeTarget = null, this.scrollHeight = 0, this.$scrollElement.on("scroll.bs.scrollspy", t.proxy(this.process, this)), this.refresh(), this.process() } function i(i) { return this.each(function () { var o = t(this), n = o.data("bs.scrollspy"), s = "object" == typeof i && i; n || o.data("bs.scrollspy", n = new e(this, s)), "string" == typeof i && n[i]() }) } e.VERSION = "3.3.5", e.DEFAULTS = {offset: 10}, e.prototype.getScrollHeight = function () { return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) }, e.prototype.refresh = function () { var e = this, i = "offset", o = 0; this.offsets = [], this.targets = [], this.scrollHeight = this.getScrollHeight(), t.isWindow(this.$scrollElement[0]) || (i = "position", o = this.$scrollElement.scrollTop()), this.$body.find(this.selector).map(function () { var e = t(this), n = e.data("target") || e.attr("href"), s = /^#./.test(n) && t(n); return s && s.length && s.is(":visible") && [[s[i]().top + o, n]] || null }).sort(function (t, e) { return t[0] - e[0] }).each(function () { e.offsets.push(this[0]), e.targets.push(this[1]) }) }, e.prototype.process = function () { var t, e = this.$scrollElement.scrollTop() + this.options.offset, i = this.getScrollHeight(), o = this.options.offset + i - this.$scrollElement.height(), n = this.offsets, s = this.targets, a = this.activeTarget; if (this.scrollHeight != i && this.refresh(), e >= o)return a != (t = s[s.length - 1]) && this.activate(t); if (a && e < n[0])return this.activeTarget = null, this.clear(); for (t = n.length; t--;)a != s[t] && e >= n[t] && (void 0 === n[t + 1] || e < n[t + 1]) && this.activate(s[t]) }, e.prototype.activate = function (e) { this.activeTarget = e, this.clear(); var i = this.selector + '[data-target="' + e + '"],' + this.selector + '[href="' + e + '"]', o = t(i).parents("li").addClass("active"); o.parent(".dropdown-menu").length && (o = o.closest("li.dropdown").addClass("active")), o.trigger("activate.bs.scrollspy") }, e.prototype.clear = function () { t(this.selector).parentsUntil(this.options.target, ".active").removeClass("active") }; var o = t.fn.scrollspy; t.fn.scrollspy = i, t.fn.scrollspy.Constructor = e, t.fn.scrollspy.noConflict = function () { return t.fn.scrollspy = o, this }, t(window).on("load.bs.scrollspy.data-api", function () { t('[data-spy="scroll"]').each(function () { var e = t(this); i.call(e, e.data()) }) }) }(jQuery), +function (t) { "use strict"; function e() { var t = document.createElement("bootstrap"), e = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd otransitionend", transition: "transitionend" }; for (var i in e)if (void 0 !== t.style[i])return {end: e[i]}; return !1 } t.fn.emulateTransitionEnd = function (e) { var i = !1, o = this; t(this).one("bsTransitionEnd", function () { i = !0 }); var n = function () { i || t(o).trigger(t.support.transition.end) }; return setTimeout(n, e), this }, t(function () { t.support.transition = e(), t.support.transition && (t.event.special.bsTransitionEnd = { bindType: t.support.transition.end, delegateType: t.support.transition.end, handle: function (e) { return t(e.target).is(this) ? e.handleObj.handler.apply(this, arguments) : void 0 } }) }) }(jQuery);
-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_export.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="config_export"> <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>{{'ConfigExport.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid"> <div class="col-md-8 col-md-offset-2 panel"> <section class="panel-body"> <div class="row"> <header class="panel-heading"> {{'ConfigExport.Title' | translate }} <small> {{'ConfigExport.TitleTips' | translate}} </small> </header> <div class="col-sm-offset-2 col-sm-9"> <a href="export" target="_blank"> <button class="btn btn-block btn-lg btn-primary"> {{'ConfigExport.Download' | translate }} </button> </a> </div> </div> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-route.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!--valdr--> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/lodash.min.js"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/ClusterService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/services/SystemInfoService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/PageCommon.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/valdr.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/services/OrganizationService.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="config_export"> <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>{{'ConfigExport.Title' | translate }}</title> </head> <body> <apollonav></apollonav> <div class="container-fluid"> <div class="col-md-8 col-md-offset-2 panel"> <section class="panel-body"> <div class="row"> <header class="panel-heading"> {{'ConfigExport.Title' | translate }} <small> {{'ConfigExport.TitleTips' | translate}} </small> </header> <div class="col-sm-offset-2 col-sm-9"> <a href="export" target="_blank"> <button class="btn btn-block btn-lg btn-primary"> {{'ConfigExport.Download' | translate }} </button> </a> </div> </div> </section> </div> </div> <div ng-include="'views/common/footer.html'"></div> <!-- jquery.js --> <script src="vendor/jquery.min.js" type="text/javascript"></script> <!--angular--> <script src="vendor/angular/angular.min.js"></script> <script src="vendor/angular/angular-route.min.js"></script> <script src="vendor/angular/angular-resource.min.js"></script> <script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script> <script src="vendor/angular/loading-bar.min.js"></script> <script src="vendor/angular/angular-cookies.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script> <script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script> <!--valdr--> <script src="vendor/valdr/valdr.min.js" type="text/javascript"></script> <script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script> <!-- bootstrap.js --> <script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script> <script src="vendor/lodash.min.js"></script> <script src="vendor/select2/select2.min.js" type="text/javascript"></script> <!--biz--> <!--must import--> <script type="application/javascript" src="scripts/app.js"></script> <script type="application/javascript" src="scripts/services/AppService.js"></script> <script type="application/javascript" src="scripts/services/EnvService.js"></script> <script type="application/javascript" src="scripts/services/UserService.js"></script> <script type="application/javascript" src="scripts/services/CommonService.js"></script> <script type="application/javascript" src="scripts/services/PermissionService.js"></script> <script type="application/javascript" src="scripts/services/ClusterService.js"></script> <script type="application/javascript" src="scripts/services/NamespaceService.js"></script> <script type="application/javascript" src="scripts/services/SystemInfoService.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/PageCommon.js"></script> <script type="application/javascript" src="scripts/directive/directive.js"></script> <script type="application/javascript" src="scripts/valdr.js"></script> <script type="application/javascript" src="scripts/AppUtils.js"></script> <script type="application/javascript" src="scripts/services/OrganizationService.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/vendor/angular/ui-bootstrap-tpls-0.13.0.min.js
/* * angular-ui-bootstrap * http://angular-ui.github.io/bootstrap/ * Version: 0.13.0 - 2015-05-02 * License: MIT */ angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) { return { link: function (b, c, d) { function e() { c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f) } function f() { c.removeClass("collapsing"), c.css({height: "auto"}) } function g() { c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h) } function h() { c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse") } b.$watch(d.collapse, function (a) { a ? g() : e() }) } } }]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) { this.groups = [], this.closeOthers = function (d) { var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers; e && angular.forEach(this.groups, function (a) { a !== d && (a.isOpen = !1) }) }, this.addGroup = function (a) { var b = this; this.groups.push(a), a.$on("$destroy", function () { b.removeGroup(a) }) }, this.removeGroup = function (a) { var b = this.groups.indexOf(a); -1 !== b && this.groups.splice(b, 1) } }]).directive("accordion", function () { return { restrict: "EA", controller: "AccordionController", transclude: !0, replace: !1, templateUrl: "template/accordion/accordion.html" } }).directive("accordionGroup", function () { return { require: "^accordion", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/accordion/accordion-group.html", scope: {heading: "@", isOpen: "=?", isDisabled: "=?"}, controller: function () { this.setHeading = function (a) { this.heading = a } }, link: function (a, b, c, d) { d.addGroup(a), a.$watch("isOpen", function (b) { b && d.closeOthers(a) }), a.toggleOpen = function () { a.isDisabled || (a.isOpen = !a.isOpen) } } } }).directive("accordionHeading", function () { return { restrict: "EA", transclude: !0, template: "", replace: !0, require: "^accordionGroup", link: function (a, b, c, d, e) { d.setHeading(e(a, angular.noop)) } } }).directive("accordionTransclude", function () { return { require: "^accordionGroup", link: function (a, b, c, d) { a.$watch(function () { return d[c.accordionTransclude] }, function (a) { a && (b.html(""), b.append(a)) }) } } }), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) { a.closeable = "close" in b, this.close = a.close }]).directive("alert", function () { return { restrict: "EA", controller: "AlertController", templateUrl: "template/alert/alert.html", transclude: !0, replace: !0, scope: {type: "@", close: "&"} } }).directive("dismissOnTimeout", ["$timeout", function (a) { return { require: "alert", link: function (b, c, d, e) { a(function () { e.close() }, parseInt(d.dismissOnTimeout, 10)) } } }]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () { return function (a, b, c) { b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) { b.html(a || "") }) } }), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", { activeClass: "active", toggleEvent: "click" }).controller("ButtonsController", ["buttonConfig", function (a) { this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click" }]).directive("btnRadio", function () { return { require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f.$render = function () { b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio))) }, b.bind(e.toggleEvent, function () { var d = b.hasClass(e.activeClass); (!d || angular.isDefined(c.uncheckable)) && a.$apply(function () { f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render() }) }) } } }).directive("btnCheckbox", function () { return { require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { function e() { return g(c.btnCheckboxTrue, !0) } function f() { return g(c.btnCheckboxFalse, !1) } function g(b, c) { var d = a.$eval(b); return angular.isDefined(d) ? d : c } var h = d[0], i = d[1]; i.$render = function () { b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e())) }, b.bind(h.toggleEvent, function () { a.$apply(function () { i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render() }) }) } } }), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) { function d(a) { if (angular.isUndefined(k[a].index))return k[a]; { var b; k.length } for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b] } function e() { f(); var c = +a.interval; !isNaN(c) && c > 0 && (h = b(g, c)) } function f() { h && (b.cancel(h), h = null) } function g() { var b = +a.interval; i && !isNaN(b) && b > 0 ? a.next() : a.pause() } var h, i, j = this, k = j.slides = a.slides = [], l = -1; j.currentSlide = null; var m = !1; j.select = a.select = function (b, d) { function f() { m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, { direction: d, active: !1 }), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () { a.$currentTransition = null })), j.currentSlide = b, l = g, e()) } var g = j.indexOfSlide(b); void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f() }, a.$on("$destroy", function () { m = !0 }), j.getCurrentIndex = function () { return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l }, j.indexOfSlide = function (a) { return angular.isDefined(a.index) ? +a.index : k.indexOf(a) }, a.next = function () { var b = (j.getCurrentIndex() + 1) % k.length; return a.$currentTransition ? void 0 : j.select(d(b), "next") }, a.prev = function () { var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1; return a.$currentTransition ? void 0 : j.select(d(b), "prev") }, a.isActive = function (a) { return j.currentSlide === a }, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () { i || (i = !0, e()) }, a.pause = function () { a.noPause || (i = !1, f()) }, j.addSlide = function (b, c) { b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1 }, j.removeSlide = function (a) { angular.isDefined(a.index) && k.sort(function (a, b) { return +a.index > +b.index }); var b = k.indexOf(a); k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l-- } }]).directive("carousel", [function () { return { restrict: "EA", transclude: !0, replace: !0, controller: "CarouselController", require: "carousel", templateUrl: "template/carousel/carousel.html", scope: {interval: "=", noTransition: "=", noPause: "="} } }]).directive("slide", function () { return { require: "^carousel", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/carousel/slide.html", scope: {active: "=?", index: "=?"}, link: function (a, b, c, d) { d.addSlide(a, b), a.$on("$destroy", function () { d.removeSlide(a) }), a.$watch("active", function (b) { b && d.select(a) }) } } }).animation(".item", ["$animate", function (a) { return { beforeAddClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return b.addClass(f), a.addClass(b, g).then(function () { e || b.removeClass(g + " " + f), d() }), function () { e = !0 } } d() }, beforeRemoveClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return a.addClass(b, g).then(function () { e || b.removeClass(g), d() }), function () { e = !0 } } d() } } }]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) { function c(a) { var c = [], d = a.split(""); return angular.forEach(f, function (b, e) { var f = a.indexOf(e); if (f > -1) { a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$"; for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$"; a = a.join(""), c.push({index: f, apply: b.apply}) } }), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")} } function d(a, b, c) { return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0 } var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g; this.parsers = {}; var f = { yyyy: { regex: "\\d{4}", apply: function (a) { this.year = +a } }, yy: { regex: "\\d{2}", apply: function (a) { this.year = +a + 2e3 } }, y: { regex: "\\d{1,4}", apply: function (a) { this.year = +a } }, MMMM: { regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.MONTH.indexOf(b) } }, MMM: { regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b) } }, MM: { regex: "0[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, M: { regex: "[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, dd: { regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, d: { regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")}, EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")}, HH: { regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, H: { regex: "1?[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, mm: { regex: "[0-5][0-9]", apply: function (a) { this.minutes = +a } }, m: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.minutes = +a } }, sss: { regex: "[0-9][0-9][0-9]", apply: function (a) { this.milliseconds = +a } }, ss: { regex: "[0-5][0-9]", apply: function (a) { this.seconds = +a } }, s: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.seconds = +a } } }; this.parse = function (b, f, g) { if (!angular.isString(b) || !f)return b; f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f)); var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i); if (k && k.length) { var l, m; l = g ? { year: g.getFullYear(), month: g.getMonth(), date: g.getDate(), hours: g.getHours(), minutes: g.getMinutes(), seconds: g.getSeconds(), milliseconds: g.getMilliseconds() } : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0}; for (var n = 1, o = k.length; o > n; n++) { var p = j[n - 1]; p.apply && p.apply.call(l, k[n]) } return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m } } }]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) { function c(a, c) { return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c] } function d(a) { return "static" === (c(a, "position") || "static") } var e = function (b) { for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent; return e || c }; return { position: function (b) { var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]); f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft); var g = b[0].getBoundingClientRect(); return { width: g.width || b.prop("offsetWidth"), height: g.height || b.prop("offsetHeight"), top: c.top - d.top, left: c.left - d.left } }, offset: function (c) { var d = c[0].getBoundingClientRect(); return { width: d.width || c.prop("offsetWidth"), height: d.height || c.prop("offsetHeight"), top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop), left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft) } }, positionElements: function (a, b, c, d) { var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center"; e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight"); var l = { center: function () { return e.left + e.width / 2 - f / 2 }, left: function () { return e.left }, right: function () { return e.left + e.width } }, m = { center: function () { return e.top + e.height / 2 - g / 2 }, top: function () { return e.top }, bottom: function () { return e.top + e.height } }; switch (j) { case"right": h = {top: m[k](), left: l[j]()}; break; case"left": h = {top: m[k](), left: e.left - f}; break; case"bottom": h = {top: m[j](), left: l[k]()}; break; default: h = {top: e.top - g, left: l[k]()} } return h } } }]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", { formatDay: "dd", formatMonth: "MMMM", formatYear: "yyyy", formatDayHeader: "EEE", formatDayTitle: "MMMM yyyy", formatMonthTitle: "yyyy", datepickerMode: "day", minMode: "day", maxMode: "year", showWeeks: !0, startingDay: 0, yearRange: 20, minDate: null, maxDate: null, shortcutPropagation: !1 }).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) { var i = this, j = {$setViewValue: angular.noop}; this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) { i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c] }), angular.forEach(["minDate", "maxDate"], function (d) { b[d] ? a.$parent.$watch(c(b[d]), function (a) { i[d] = a ? new Date(a) : null, i.refreshView() }) : i[d] = h[d] ? new Date(h[d]) : null }), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) { a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView()) })) : this.activeDate = new Date, a.isActive = function (b) { return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1 }, this.init = function (a) { j = a, j.$render = function () { i.render() } }, this.render = function () { if (j.$viewValue) { var a = new Date(j.$viewValue), b = !isNaN(a); b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b) } this.refreshView() }, this.refreshView = function () { if (this.element) { this._refreshView(); var a = j.$viewValue ? new Date(j.$viewValue) : null; j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a)) } }, this.createDateObject = function (a, b) { var c = j.$viewValue ? new Date(j.$viewValue) : null; return { date: a, label: g(a, b), selected: c && 0 === this.compare(a, c), disabled: this.isDisabled(a), current: 0 === this.compare(a, new Date), customClass: this.customClass(a) } }, this.isDisabled = function (c) { return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({ date: c, mode: a.datepickerMode }) }, this.customClass = function (b) { return a.customClass({date: b, mode: a.datepickerMode}) }, this.split = function (a, b) { for (var c = []; a.length > 0;)c.push(a.splice(0, b)); return c }, a.select = function (b) { if (a.datepickerMode === i.minMode) { var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0); c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render() } else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1] }, a.move = function (a) { var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0); i.activeDate.setFullYear(b, c, 1), i.refreshView() }, a.toggleMode = function (b) { b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b]) }, a.keys = { 13: "enter", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 37: "left", 38: "up", 39: "right", 40: "down" }; var k = function () { e(function () { i.element[0].focus() }, 0, !1) }; a.$on("datepicker.focus", k), a.keydown = function (b) { var c = a.keys[b.which]; if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) { if (i.isDisabled(i.activeDate))return; a.select(i.activeDate), k() } else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k()) } }]).directive("datepicker", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/datepicker.html", scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"}, require: ["datepicker", "?^ngModel"], controller: "DatepickerController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f) } } }).directive("daypicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/day.html", require: "^datepicker", link: function (b, c, d, e) { function f(a, b) { return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29 } function g(a, b) { var c = new Array(b), d = new Date(a), e = 0; for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1); return c } function h(a) { var b = new Date(a); b.setDate(b.getDate() + 4 - (b.getDay() || 7)); var c = b.getTime(); return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1 } b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c; var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; e._refreshView = function () { var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f); j > 0 && k.setDate(-j + 1); for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), { secondary: l[m].getMonth() !== d, uid: b.uniqueId + "-" + m }); b.labels = new Array(7); for (var n = 0; 7 > n; n++)b.labels[n] = { abbr: a(l[n].date, e.formatDayHeader), full: a(l[n].date, "EEEE") }; if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) { b.weekNumbers = []; for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date)) } }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getDate(); if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1); e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b) } else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth())); e.activeDate.setDate(b) }, e.refreshView() } } }]).directive("monthpicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/month.html", require: "^datepicker", link: function (b, c, d, e) { e.step = {years: 1}, e.element = c, e._refreshView = function () { for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f}); b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3) }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getMonth(); if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1); e.activeDate.setFullYear(c) } else"home" === a ? b = 0 : "end" === a && (b = 11); e.activeDate.setMonth(b) }, e.refreshView() } } }]).directive("yearpicker", ["dateFilter", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/year.html", require: "^datepicker", link: function (a, b, c, d) { function e(a) { return parseInt((a - 1) / f, 10) * f + 1 } var f = d.yearRange; d.step = {years: f}, d.element = b, d._refreshView = function () { for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c}); a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5) }, d.compare = function (a, b) { return a.getFullYear() - b.getFullYear() }, d.handleKeyDown = function (a) { var b = d.activeDate.getFullYear(); "left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b) }, d.refreshView() } } }]).constant("datepickerPopupConfig", { datepickerPopup: "yyyy-MM-dd", html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"}, currentText: "Today", clearText: "Clear", closeText: "Done", closeOnDateSelection: !0, appendToBody: !1, showButtonBar: !0 }).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) { return { restrict: "EA", require: "ngModel", scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"}, link: function (h, i, j, k) { function l(a) { return a.replace(/([A-Z])/g, function (a) { return "-" + a.toLowerCase() }) } function m(a) { if (angular.isNumber(a) && (a = new Date(a)), a) { if (angular.isDate(a) && !isNaN(a))return a; if (angular.isString(a)) { var b = f.parse(a, o, h.date) || new Date(a); return isNaN(b) ? void 0 : b } return void 0 } return null } function n(a, b) { var c = a || b; if (angular.isNumber(c) && (c = new Date(c)), c) { if (angular.isDate(c) && !isNaN(c))return !0; if (angular.isString(c)) { var d = f.parse(c, o) || new Date(c); return !isNaN(d) } return !1 } return !0 } var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody; h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) { return h[a + "Text"] || g[a + "Text"] }; var r = !1; if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) { var b = a || g.datepickerPopup; if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.") })), !o)throw new Error("datepickerPopup must have a date format specified."); if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats."); var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>"); s.attr({"ng-model": "date", "ng-change": "dateSelection()"}); var t = angular.element(s.children()[0]); if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) { var u = h.$parent.$eval(j.datepickerOptions); u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) { t.attr(l(b), a) }) } h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) { if (j[a]) { var c = b(j[a]); if (h.$parent.$watch(c, function (b) { h.watchData[a] = b }), t.attr(l(a), "watchData." + a), "datepickerMode" === a) { var d = c.assign; h.$watch("watchData." + a, function (a, b) { a !== b && d(h.$parent, a) }) } } }), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) { return h.date = a, a }) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) { return h.date = a, k.$isEmpty(a) ? a : e(a, o) })), h.dateSelection = function (a) { angular.isDefined(a) && (h.date = a); var b = h.date ? e(h.date, o) : ""; i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus()) }, k.$viewChangeListeners.push(function () { h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue) }); var v = function (a) { h.isOpen && a.target !== i[0] && h.$apply(function () { h.isOpen = !1 }) }, w = function (a) { h.keydown(a) }; i.bind("keydown", w), h.keydown = function (a) { 27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0) }, h.$watch("isOpen", function (a) { a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v) }), h.select = function (a) { if ("today" === a) { var b = new Date; angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0)) } h.dateSelection(a) }, h.close = function () { h.isOpen = !1, i[0].focus() }; var x = a(s)(h); s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () { x.remove(), i.unbind("keydown", w), c.unbind("click", v) }) } } }]).directive("datepickerPopupWrap", function () { return { restrict: "EA", replace: !0, transclude: !0, templateUrl: "template/datepicker/popup.html", link: function (a, b) { b.bind("click", function (a) { a.preventDefault(), a.stopPropagation() }) } } }), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) { var c = null; this.open = function (b) { c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b }, this.close = function (b) { c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e)) }; var d = function (a) { if (c && (!a || "disabled" !== c.getAutoClose())) { var d = c.getToggleElement(); if (!(a && d && d[0].contains(a.target))) { var e = c.getElement(); a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply()) } } }, e = function (a) { 27 === a.which && (c.focusToggleElement(), d()) } }]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) { var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1; this.init = function (d) { j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) { k.isOpen = !!a })), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () { j.dropdownMenu.remove() })) }, this.toggle = function (a) { return k.isOpen = arguments.length ? !!a : !k.isOpen }, this.isOpen = function () { return k.isOpen }, k.getToggleElement = function () { return j.toggleElement }, k.getAutoClose = function () { return b.autoClose || "always" }, k.getElement = function () { return j.$element }, k.focusToggleElement = function () { j.toggleElement && j.toggleElement[0].focus() }, k.$watch("isOpen", function (b, c) { if (o && j.dropdownMenu) { var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0); j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"}) } f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b}) }), a.$on("$locationChangeSuccess", function () { k.isOpen = !1 }), a.$on("$destroy", function () { k.$destroy() }) }]).directive("dropdown", function () { return { controller: "DropdownController", link: function (a, b, c, d) { d.init(b) } } }).directive("dropdownMenu", function () { return { restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) { d && (d.dropdownMenu = b) } } }).directive("dropdownToggle", function () { return { require: "?^dropdown", link: function (a, b, c, d) { if (d) { d.toggleElement = b; var e = function (e) { e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () { d.toggle() }) }; b.bind("click", e), b.attr({ "aria-haspopup": !0, "aria-expanded": !1 }), a.$watch(d.isOpen, function (a) { b.attr("aria-expanded", !!a) }), a.$on("$destroy", function () { b.unbind("click", e) }) } } } }), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () { return { createNew: function () { var a = []; return { add: function (b, c) { a.push({key: b, value: c}) }, get: function (b) { for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c] }, keys: function () { for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key); return b }, top: function () { return a[a.length - 1] }, remove: function (b) { for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) { c = d; break } return a.splice(c, 1)[0] }, removeTop: function () { return a.splice(a.length - 1, 1)[0] }, length: function () { return a.length } } } } }).directive("modalBackdrop", ["$timeout", function (a) { function b(b) { b.animate = !1, a(function () { b.animate = !0 }) } return { restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) { return a.addClass(c.backdropClass), b } } }]).directive("modalWindow", ["$modalStack", "$q", function (a, b) { return { restrict: "EA", scope: {index: "@", animate: "="}, replace: !0, transclude: !0, templateUrl: function (a, b) { return b.templateUrl || "template/modal/window.html" }, link: function (c, d, e) { d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) { var c = a.getTop(); c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click")) }, c.$isRendered = !0; var f = b.defer(); e.$observe("modalRender", function (a) { "true" == a && f.resolve() }), f.promise.then(function () { c.animate = !0; var b = d[0].querySelectorAll("[autofocus]"); b.length ? b[0].focus() : d[0].focus(); var e = a.getTop(); e && a.modalRendered(e.key) }) } } }]).directive("modalAnimationClass", [function () { return { compile: function (a, b) { b.modalAnimation && a.addClass(b.modalAnimationClass) } } }]).directive("modalTransclude", function () { return { link: function (a, b, c, d, e) { e(a.$parent, function (a) { b.empty(), b.append(a) }) } } }).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) { function g() { for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c); return a } function h(a) { var b = c.find("body").eq(0), d = o.get(a).value; o.remove(a), j(d.modalDomEl, d.modalScope, function () { b.toggleClass(n, o.length() > 0), i() }) } function i() { if (l && -1 == g()) { var a = m; j(l, m, function () { a = null }), l = void 0, m = void 0 } } function j(c, d, f) { function g() { g.done || (g.done = !0, c.remove(), d.$destroy(), f && f()) } d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () { e.$evalAsync(g) }) : b(g) } function k(a, b, c) { return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented } var l, m, n = "modal-open", o = f.createNew(), p = {}; return e.$watch(g, function (a) { m && (m.index = a) }), c.bind("keydown", function (a) { var b; 27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () { p.dismiss(b.key, "escape key press") }))) }), p.open = function (a, b) { var f = c[0].activeElement; o.add(a, { deferred: b.deferred, renderDeferred: b.renderDeferred, modalScope: b.scope, backdrop: b.backdrop, keyboard: b.keyboard }); var h = c.find("body").eq(0), i = g(); if (i >= 0 && !l) { m = e.$new(!0), m.index = i; var j = angular.element('<div modal-backdrop="modal-backdrop"></div>'); j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l) } var k = angular.element('<div modal-window="modal-window"></div>'); k.attr({ "template-url": b.windowTemplateUrl, "window-class": b.windowClass, size: b.size, index: o.length() - 1, animate: "animate" }).html(b.content), b.animation && k.attr("modal-animation", "true"); var p = d(k)(b.scope); o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n) }, p.close = function (a, b) { var c = o.get(a); return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismiss = function (a, b) { var c = o.get(a); return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismissAll = function (a) { for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop() }, p.getTop = function () { return o.top() }, p.modalRendered = function (a) { var b = o.get(a); b && b.value.renderDeferred.resolve() }, p }]).provider("$modal", function () { var a = { options: {animation: !0, backdrop: !0, keyboard: !0}, $get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) { function h(a) { return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl) } function i(a) { var c = []; return angular.forEach(a, function (a) { (angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a))) }), c } var j = {}; return j.open = function (b) { var e = d.defer(), j = d.defer(), k = d.defer(), l = { result: e.promise, opened: j.promise, rendered: k.promise, close: function (a) { return g.close(l, a) }, dismiss: function (a) { return g.dismiss(l, a) } }; if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required."); var m = d.all([h(b)].concat(i(b.resolve))); return m.then(function (a) { var d = (b.scope || c).$new(); d.$close = l.close, d.$dismiss = l.dismiss; var h, i = {}, j = 1; b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) { i[c] = a[j++] }), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, { scope: d, deferred: e, renderDeferred: k, content: a[0], animation: b.animation, backdrop: b.backdrop, keyboard: b.keyboard, backdropClass: b.backdropClass, windowClass: b.windowClass, windowTemplateUrl: b.windowTemplateUrl, size: b.size }) }, function (a) { e.reject(a) }), m.then(function () { j.resolve(!0) }, function (a) { j.reject(a) }), l }, j }] }; return a }), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) { var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop; this.init = function (g, h) { e = g, this.config = h, e.$render = function () { d.render() }, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) { d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages() }) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () { a.totalPages = d.calculateTotalPages() }), a.$watch("totalPages", function (b) { f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render() }) }, this.calculateTotalPages = function () { var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage); return Math.max(b || 0, 1) }, this.render = function () { a.page = parseInt(e.$viewValue, 10) || 1 }, a.selectPage = function (b, c) { a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render()) }, a.getText = function (b) { return a[b + "Text"] || d.config[b + "Text"] }, a.noPrevious = function () { return 1 === a.page }, a.noNext = function () { return a.page === a.totalPages } }]).constant("paginationConfig", { itemsPerPage: 10, boundaryLinks: !1, directionLinks: !0, firstText: "First", previousText: "Previous", nextText: "Next", lastText: "Last", rotate: !0 }).directive("pagination", ["$parse", "paginationConfig", function (a, b) { return { restrict: "EA", scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"}, require: ["pagination", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pagination.html", replace: !0, link: function (c, d, e, f) { function g(a, b, c) { return {number: a, text: b, active: c} } function h(a, b) { var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k; f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b))); for (var h = d; e >= h; h++) { var i = g(h, h, h === a); c.push(i) } if (f && !l) { if (d > 1) { var j = g(d - 1, "...", !1); c.unshift(j) } if (b > e) { var m = g(e + 1, "...", !1); c.push(m) } } return c } var i = f[0], j = f[1]; if (j) { var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate; c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) { k = parseInt(a, 10), i.render() }); var m = i.render; i.render = function () { m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages)) } } } } }]).constant("pagerConfig", { itemsPerPage: 10, previousText: "« Previous", nextText: "Next »", align: !0 }).directive("pager", ["pagerConfig", function (a) { return { restrict: "EA", scope: {totalItems: "=", previousText: "@", nextText: "@"}, require: ["pager", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pager.html", replace: !0, link: function (b, c, d, e) { var f = e[0], g = e[1]; g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a)) } } }]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () { function a(a) { var b = /[A-Z]/g, c = "-"; return a.replace(b, function (a, b) { return (b ? c : "") + a.toLowerCase() }) } var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = { mouseenter: "mouseleave", click: "click", focus: "blur" }, d = {}; this.options = function (a) { angular.extend(d, a) }, this.setTriggers = function (a) { angular.extend(c, a) }, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) { return function (e, k, l, m) { function n(a) { var b = a || m.trigger || l, d = c[b] || b; return {show: b, hide: d} } m = angular.extend({}, b, d, m); var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>'; return { restrict: "EA", compile: function () { var a = f(r); return function (b, c, d) { function f() { E.isOpen ? l() : j() } function j() { (!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) { a() })) : o()()) } function l() { b.$apply(function () { p() }) } function o() { return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({ top: 0, left: 0, display: "block" }), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop } function p() { E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r() } function q() { x && r(), y = E.$new(), x = a(y, function (a) { B ? h.find("body").append(a) : c.after(a) }), y.$watch(function () { g(F, 0, !1) }), m.useContentExp && y.$watch("contentExp()", function (a) { !a && E.isOpen && p() }) } function r() { z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null) } function s() { t(), u(), v() } function t() { E.popupClass = d[k + "Class"] } function u() { var a = d[k + "Placement"]; E.placement = angular.isDefined(a) ? a : m.placement } function v() { var a = d[k + "PopupDelay"], b = parseInt(a, 10); E.popupDelay = isNaN(b) ? m.popupDelay : b } function w() { var a = d[k + "Trigger"]; G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l)) } var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () { if (x) { var a = i.positionElements(c, x, E.placement, B); a.top += "px", a.left += "px", x.css(a) } }; E.origScope = b, E.isOpen = !1, E.contentExp = function () { return b.$eval(d[e]) }, m.useContentExp || d.$observe(e, function (a) { E.content = a, !a && E.isOpen && p() }), d.$observe("disabled", function (a) { a && E.isOpen && p() }), d.$observe(k + "Title", function (a) { E.title = a }); var G = function () { c.unbind(C.show, j), c.unbind(C.hide, l) }; w(); var H = b.$eval(d[k + "Animation"]); E.animation = angular.isDefined(H) ? !!H : m.animation; var I = b.$eval(d[k + "AppendToBody"]); B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () { E.isOpen && p() }), b.$on("$destroy", function () { g.cancel(z), g.cancel(A), G(), r(), E = null }) } } } } }] }).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) { return { link: function (e, f, g) { var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () { i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () { i = null }), i = j, j = null) }; e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) { var g = ++l; b ? (d(b, !0).then(function (d) { if (g === l) { var e = k.$new(), i = d, n = c(i)(e, function (b) { m(), a.enter(b, f) }); h = e, j = n, h.$emit("$includeContentLoaded", b) } }, function () { g === l && (m(), e.$emit("$includeContentError", b)) }), e.$emit("$includeContentRequested", b)) : m() }), e.$on("$destroy", m) } } }]).directive("tooltipClasses", function () { return { restrict: "A", link: function (a, b, c) { a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass) } } }).directive("tooltipPopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-popup.html" } }).directive("tooltip", ["$tooltip", function (a) { return a("tooltip", "tooltip", "mouseenter") }]).directive("tooltipTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"}, templateUrl: "template/tooltip/tooltip-template-popup.html" } }).directive("tooltipTemplate", ["$tooltip", function (a) { return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlPopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-popup.html" } }).directive("tooltipHtml", ["$tooltip", function (a) { return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlUnsafePopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html" } }).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) { return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter") }]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: { title: "@", contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&" }, templateUrl: "template/popover/popover-template.html" } }).directive("popoverTemplate", ["$tooltip", function (a) { return a("popoverTemplate", "popover", "click", {useContentExp: !0}) }]).directive("popoverPopup", function () { return { restrict: "EA", replace: !0, scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/popover/popover.html" } }).directive("popover", ["$tooltip", function (a) { return a("popover", "popover", "click") }]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", { animate: !0, max: 100 }).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) { var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate; this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) { e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) { b.percent = +(100 * c / a.max).toFixed(2) }), b.$on("$destroy", function () { c = null, d.removeBar(b) }) }, this.removeBar = function (a) { this.bars.splice(this.bars.indexOf(a), 1) } }]).directive("progress", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", require: "progress", scope: {}, templateUrl: "template/progressbar/progress.html" } }).directive("bar", function () { return { restrict: "EA", replace: !0, transclude: !0, require: "^progress", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/bar.html", link: function (a, b, c, d) { d.addBar(a, b) } } }).directive("progressbar", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/progressbar.html", link: function (a, b, c, d) { d.addBar(a, angular.element(b.children()[0])) } } }), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", { max: 5, stateOn: null, stateOff: null }).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) { var d = {$setViewValue: angular.noop}; this.init = function (e) { d = e, d.$render = this.render, d.$formatters.push(function (a) { return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a }), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff; var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max); a.range = this.buildTemplateObjects(f) }, this.buildTemplateObjects = function (a) { for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, { stateOn: this.stateOn, stateOff: this.stateOff }, a[b]); return a }, a.rate = function (b) { !a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render()) }, a.enter = function (b) { a.readonly || (a.value = b), a.onHover({value: b}) }, a.reset = function () { a.value = d.$viewValue, a.onLeave() }, a.onKeydown = function (b) { /(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1))) }, this.render = function () { a.value = d.$viewValue } }]).directive("rating", function () { return { restrict: "EA", require: ["rating", "ngModel"], scope: {readonly: "=?", onHover: "&", onLeave: "&"}, controller: "RatingController", templateUrl: "template/rating/rating.html", replace: !0, link: function (a, b, c, d) { var e = d[0], f = d[1]; e.init(f) } } }), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) { var b = this, c = b.tabs = a.tabs = []; b.select = function (a) { angular.forEach(c, function (b) { b.active && b !== a && (b.active = !1, b.onDeselect()) }), a.active = !0, a.onSelect() }, b.addTab = function (a) { c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1 }, b.removeTab = function (a) { var e = c.indexOf(a); if (a.active && c.length > 1 && !d) { var f = e == c.length - 1 ? e - 1 : e + 1; b.select(c[f]) } c.splice(e, 1) }; var d; a.$on("$destroy", function () { d = !0 }) }]).directive("tabset", function () { return { restrict: "EA", transclude: !0, replace: !0, scope: {type: "@"}, controller: "TabsetController", templateUrl: "template/tabs/tabset.html", link: function (a, b, c) { a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1 } } }).directive("tab", ["$parse", "$log", function (a, b) { return { require: "^tabset", restrict: "EA", replace: !0, templateUrl: "template/tabs/tab.html", transclude: !0, scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"}, controller: function () { }, compile: function (c, d, e) { return function (c, d, f, g) { c.$watch("active", function (a) { a && g.select(c) }), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) { c.disabled = !!a }), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) { c.disabled = !!a })), c.select = function () { c.disabled || (c.active = !0) }, g.addTab(c), c.$on("$destroy", function () { g.removeTab(c) }), c.$transcludeFn = e } } } }]).directive("tabHeadingTransclude", [function () { return { restrict: "A", require: "^tab", link: function (a, b) { a.$watch("headingElement", function (a) { a && (b.html(""), b.append(a)) }) } } }]).directive("tabContentTransclude", function () { function a(a) { return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase()) } return { restrict: "A", require: "^tabset", link: function (b, c, d) { var e = b.$eval(d.tabContentTransclude); e.$transcludeFn(e.$parent, function (b) { angular.forEach(b, function (b) { a(b) ? e.headingElement = b : c.append(b) }) }) } } }), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", { hourStep: 1, minuteStep: 1, showMeridian: !0, meridians: null, readonlyInput: !1, mousewheel: !0, arrowkeys: !0 }).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) { function g() { var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b; return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0 } function h() { var b = parseInt(a.minutes, 10); return b >= 0 && 60 > b ? b : void 0 } function i(a) { return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString() } function j(a) { k(), o.$setViewValue(new Date(n)), l(a) } function k() { o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1 } function l(b) { var c = n.getHours(), d = n.getMinutes(); a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1] } function m(a) { var b = new Date(n.getTime() + 6e4 * a); n.setHours(b.getHours(), b.getMinutes()), j() } var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS; this.init = function (c, d) { o = c, o.$render = this.render, o.$formatters.unshift(function (a) { return a ? new Date(a) : null }); var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel; h && this.setupMousewheelEvents(e, g); var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys; i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g) }; var q = f.hourStep; b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) { q = parseInt(a, 10) }); var r = f.minuteStep; b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) { r = parseInt(a, 10) }), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) { if (a.showMeridian = !!b, o.$error.time) { var c = g(), d = h(); angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j()) } else l() }), this.setupMousewheelEvents = function (b, c) { var d = function (a) { a.originalEvent && (a = a.originalEvent); var b = a.wheelDelta ? a.wheelDelta : -a.deltaY; return a.detail || b > 0 }; b.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault() }), c.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault() }) }, this.setupArrowkeyEvents = function (b, c) { b.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply()) }), c.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply()) }) }, this.setupInputEvents = function (b, c) { if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop); var d = function (b, c) { o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c) }; a.updateHours = function () { var a = g(); angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0) }, b.bind("blur", function () { !a.invalidHours && a.hours < 10 && a.$apply(function () { a.hours = i(a.hours) }) }), a.updateMinutes = function () { var a = h(); angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0) }, c.bind("blur", function () { !a.invalidMinutes && a.minutes < 10 && a.$apply(function () { a.minutes = i(a.minutes) }) }) }, this.render = function () { var a = o.$viewValue; isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l()) }, a.incrementHours = function () { m(60 * q) }, a.decrementHours = function () { m(60 * -q) }, a.incrementMinutes = function () { m(r) }, a.decrementMinutes = function () { m(-r) }, a.toggleMeridian = function () { m(720 * (n.getHours() < 12 ? 1 : -1)) } }]).directive("timepicker", function () { return { restrict: "EA", require: ["timepicker", "?^ngModel"], controller: "TimepickerController", replace: !0, scope: {}, templateUrl: "template/timepicker/timepicker.html", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f, b.find("input")) } } }), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) { function f(a) { for (var b in a)if (void 0 !== h.style[b])return a[b] } e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead."); var g = function (d, e, f) { f = f || {}; var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () { c.$apply(function () { d.unbind(i, j), h.resolve(d) }) }; return i && d.bind(i, j), b(function () { angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d) }), h.promise.cancel = function () { i && d.unbind(i, j), h.reject("Transition cancelled") }, h.promise }, h = document.createElement("trans"), i = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd", transition: "transitionend" }, j = { WebkitTransition: "webkitAnimationEnd", MozTransition: "animationend", OTransition: "oAnimationEnd", transition: "animationend" }; return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g }]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) { var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/; return { parse: function (c) { var d = c.match(b); if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".'); return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])} } } }]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) { var h = [9, 13, 27, 38, 40]; return { require: "ngModel", link: function (i, j, k, l) { var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new(); i.$on("$destroy", function () { x.$destroy() }); var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random()); j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y}); var z = angular.element("<div typeahead-popup></div>"); z.attr({ id: y, matches: "matches", active: "activeIdx", select: "select(activeIdx)", query: "query", position: "position" }), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl); var A = function () { x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1) }, B = function (a) { return y + "-option-" + a }; x.$watch("activeIdx", function (a) { 0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a)) }); var C = function (a) { var b = {$viewValue: a}; q(i, !0), c.when(w.source(i, b)).then(function (c) { var d = a === l.$viewValue; if (d && m)if (c && c.length > 0) { x.activeIdx = u ? 0 : -1, x.matches.length = 0; for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({ id: B(e), label: w.viewMapper(x, b), model: c[e] }); x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0) } else A(); d && q(i, !1) }, function () { A(), q(i, !1) }) }; A(), x.query = void 0; var D, E = function (a) { D = d(function () { C(a) }, o) }, F = function () { D && d.cancel(D) }; l.$parsers.unshift(function (a) { return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a) }), l.$formatters.push(function (a) { var b, c, d = {}; return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a) }), x.select = function (a) { var b, c, e = {}; e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, { $item: c, $model: b, $label: w.viewMapper(i, e) }), A(), d(function () { j[0].focus() }, 0, !1) }, j.bind("keydown", function (a) { 0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () { x.select(x.activeIdx) }) : 27 === a.which && (a.stopPropagation(), A(), x.$digest())) }), j.bind("blur", function () { m = !1 }); var G = function (a) { j[0] !== a.target && (A(), x.$digest()) }; e.bind("click", G), i.$on("$destroy", function () { e.unbind("click", G), t && H.remove(), z.remove() }); var H = a(z)(x); t ? e.find("body").append(H) : j.after(H) } } }]).directive("typeaheadPopup", function () { return { restrict: "EA", scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"}, replace: !0, templateUrl: "template/typeahead/typeahead-popup.html", link: function (a, b, c) { a.templateUrl = c.templateUrl, a.isOpen = function () { return a.matches.length > 0 }, a.isActive = function (b) { return a.active == b }, a.selectActive = function (b) { a.active = b }, a.selectMatch = function (b) { a.select({activeIdx: b}) } } } }).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) { return { restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) { var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html"; a(g).then(function (a) { b(a.trim())(d, function (a) { e.replaceWith(a) }) }) } } }]).filter("typeaheadHighlight", function () { function a(a) { return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") } return function (b, c) { return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b } }), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>') }]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) { a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">&times;</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n') }]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) { a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n') }]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) { a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n') }]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>') }]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n') }]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) { a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n') }]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) { a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n') }]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>') }]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>') }]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n') }]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n') }]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n') }]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>') }]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n') }]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) { a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>') }]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n') }]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n') }]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) { a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>') }]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n') }]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
/* * angular-ui-bootstrap * http://angular-ui.github.io/bootstrap/ * Version: 0.13.0 - 2015-05-02 * License: MIT */ angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse", "ui.bootstrap.accordion", "ui.bootstrap.alert", "ui.bootstrap.bindHtml", "ui.bootstrap.buttons", "ui.bootstrap.carousel", "ui.bootstrap.dateparser", "ui.bootstrap.position", "ui.bootstrap.datepicker", "ui.bootstrap.dropdown", "ui.bootstrap.modal", "ui.bootstrap.pagination", "ui.bootstrap.tooltip", "ui.bootstrap.popover", "ui.bootstrap.progressbar", "ui.bootstrap.rating", "ui.bootstrap.tabs", "ui.bootstrap.timepicker", "ui.bootstrap.transition", "ui.bootstrap.typeahead"]), angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html", "template/accordion/accordion.html", "template/alert/alert.html", "template/carousel/carousel.html", "template/carousel/slide.html", "template/datepicker/datepicker.html", "template/datepicker/day.html", "template/datepicker/month.html", "template/datepicker/popup.html", "template/datepicker/year.html", "template/modal/backdrop.html", "template/modal/window.html", "template/pagination/pager.html", "template/pagination/pagination.html", "template/tooltip/tooltip-html-popup.html", "template/tooltip/tooltip-html-unsafe-popup.html", "template/tooltip/tooltip-popup.html", "template/tooltip/tooltip-template-popup.html", "template/popover/popover-template.html", "template/popover/popover.html", "template/progressbar/bar.html", "template/progressbar/progress.html", "template/progressbar/progressbar.html", "template/rating/rating.html", "template/tabs/tab.html", "template/tabs/tabset.html", "template/timepicker/timepicker.html", "template/typeahead/typeahead-match.html", "template/typeahead/typeahead-popup.html"]), angular.module("ui.bootstrap.collapse", []).directive("collapse", ["$animate", function (a) { return { link: function (b, c, d) { function e() { c.removeClass("collapse").addClass("collapsing"), a.addClass(c, "in", {to: {height: c[0].scrollHeight + "px"}}).then(f) } function f() { c.removeClass("collapsing"), c.css({height: "auto"}) } function g() { c.css({height: c[0].scrollHeight + "px"}).removeClass("collapse").addClass("collapsing"), a.removeClass(c, "in", {to: {height: "0"}}).then(h) } function h() { c.css({height: "0"}), c.removeClass("collapsing"), c.addClass("collapse") } b.$watch(d.collapse, function (a) { a ? g() : e() }) } } }]), angular.module("ui.bootstrap.accordion", ["ui.bootstrap.collapse"]).constant("accordionConfig", {closeOthers: !0}).controller("AccordionController", ["$scope", "$attrs", "accordionConfig", function (a, b, c) { this.groups = [], this.closeOthers = function (d) { var e = angular.isDefined(b.closeOthers) ? a.$eval(b.closeOthers) : c.closeOthers; e && angular.forEach(this.groups, function (a) { a !== d && (a.isOpen = !1) }) }, this.addGroup = function (a) { var b = this; this.groups.push(a), a.$on("$destroy", function () { b.removeGroup(a) }) }, this.removeGroup = function (a) { var b = this.groups.indexOf(a); -1 !== b && this.groups.splice(b, 1) } }]).directive("accordion", function () { return { restrict: "EA", controller: "AccordionController", transclude: !0, replace: !1, templateUrl: "template/accordion/accordion.html" } }).directive("accordionGroup", function () { return { require: "^accordion", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/accordion/accordion-group.html", scope: {heading: "@", isOpen: "=?", isDisabled: "=?"}, controller: function () { this.setHeading = function (a) { this.heading = a } }, link: function (a, b, c, d) { d.addGroup(a), a.$watch("isOpen", function (b) { b && d.closeOthers(a) }), a.toggleOpen = function () { a.isDisabled || (a.isOpen = !a.isOpen) } } } }).directive("accordionHeading", function () { return { restrict: "EA", transclude: !0, template: "", replace: !0, require: "^accordionGroup", link: function (a, b, c, d, e) { d.setHeading(e(a, angular.noop)) } } }).directive("accordionTransclude", function () { return { require: "^accordionGroup", link: function (a, b, c, d) { a.$watch(function () { return d[c.accordionTransclude] }, function (a) { a && (b.html(""), b.append(a)) }) } } }), angular.module("ui.bootstrap.alert", []).controller("AlertController", ["$scope", "$attrs", function (a, b) { a.closeable = "close" in b, this.close = a.close }]).directive("alert", function () { return { restrict: "EA", controller: "AlertController", templateUrl: "template/alert/alert.html", transclude: !0, replace: !0, scope: {type: "@", close: "&"} } }).directive("dismissOnTimeout", ["$timeout", function (a) { return { require: "alert", link: function (b, c, d, e) { a(function () { e.close() }, parseInt(d.dismissOnTimeout, 10)) } } }]), angular.module("ui.bootstrap.bindHtml", []).directive("bindHtmlUnsafe", function () { return function (a, b, c) { b.addClass("ng-binding").data("$binding", c.bindHtmlUnsafe), a.$watch(c.bindHtmlUnsafe, function (a) { b.html(a || "") }) } }), angular.module("ui.bootstrap.buttons", []).constant("buttonConfig", { activeClass: "active", toggleEvent: "click" }).controller("ButtonsController", ["buttonConfig", function (a) { this.activeClass = a.activeClass || "active", this.toggleEvent = a.toggleEvent || "click" }]).directive("btnRadio", function () { return { require: ["btnRadio", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f.$render = function () { b.toggleClass(e.activeClass, angular.equals(f.$modelValue, a.$eval(c.btnRadio))) }, b.bind(e.toggleEvent, function () { var d = b.hasClass(e.activeClass); (!d || angular.isDefined(c.uncheckable)) && a.$apply(function () { f.$setViewValue(d ? null : a.$eval(c.btnRadio)), f.$render() }) }) } } }).directive("btnCheckbox", function () { return { require: ["btnCheckbox", "ngModel"], controller: "ButtonsController", link: function (a, b, c, d) { function e() { return g(c.btnCheckboxTrue, !0) } function f() { return g(c.btnCheckboxFalse, !1) } function g(b, c) { var d = a.$eval(b); return angular.isDefined(d) ? d : c } var h = d[0], i = d[1]; i.$render = function () { b.toggleClass(h.activeClass, angular.equals(i.$modelValue, e())) }, b.bind(h.toggleEvent, function () { a.$apply(function () { i.$setViewValue(b.hasClass(h.activeClass) ? f() : e()), i.$render() }) }) } } }), angular.module("ui.bootstrap.carousel", []).controller("CarouselController", ["$scope", "$interval", "$animate", function (a, b, c) { function d(a) { if (angular.isUndefined(k[a].index))return k[a]; { var b; k.length } for (b = 0; b < k.length; ++b)if (k[b].index == a)return k[b] } function e() { f(); var c = +a.interval; !isNaN(c) && c > 0 && (h = b(g, c)) } function f() { h && (b.cancel(h), h = null) } function g() { var b = +a.interval; i && !isNaN(b) && b > 0 ? a.next() : a.pause() } var h, i, j = this, k = j.slides = a.slides = [], l = -1; j.currentSlide = null; var m = !1; j.select = a.select = function (b, d) { function f() { m || (angular.extend(b, {direction: d, active: !0}), angular.extend(j.currentSlide || {}, { direction: d, active: !1 }), c.enabled() && !a.noTransition && b.$element && (a.$currentTransition = !0, b.$element.one("$animate:close", function () { a.$currentTransition = null })), j.currentSlide = b, l = g, e()) } var g = j.indexOfSlide(b); void 0 === d && (d = g > j.getCurrentIndex() ? "next" : "prev"), b && b !== j.currentSlide && f() }, a.$on("$destroy", function () { m = !0 }), j.getCurrentIndex = function () { return j.currentSlide && angular.isDefined(j.currentSlide.index) ? +j.currentSlide.index : l }, j.indexOfSlide = function (a) { return angular.isDefined(a.index) ? +a.index : k.indexOf(a) }, a.next = function () { var b = (j.getCurrentIndex() + 1) % k.length; return a.$currentTransition ? void 0 : j.select(d(b), "next") }, a.prev = function () { var b = j.getCurrentIndex() - 1 < 0 ? k.length - 1 : j.getCurrentIndex() - 1; return a.$currentTransition ? void 0 : j.select(d(b), "prev") }, a.isActive = function (a) { return j.currentSlide === a }, a.$watch("interval", e), a.$on("$destroy", f), a.play = function () { i || (i = !0, e()) }, a.pause = function () { a.noPause || (i = !1, f()) }, j.addSlide = function (b, c) { b.$element = c, k.push(b), 1 === k.length || b.active ? (j.select(k[k.length - 1]), 1 == k.length && a.play()) : b.active = !1 }, j.removeSlide = function (a) { angular.isDefined(a.index) && k.sort(function (a, b) { return +a.index > +b.index }); var b = k.indexOf(a); k.splice(b, 1), k.length > 0 && a.active ? j.select(b >= k.length ? k[b - 1] : k[b]) : l > b && l-- } }]).directive("carousel", [function () { return { restrict: "EA", transclude: !0, replace: !0, controller: "CarouselController", require: "carousel", templateUrl: "template/carousel/carousel.html", scope: {interval: "=", noTransition: "=", noPause: "="} } }]).directive("slide", function () { return { require: "^carousel", restrict: "EA", transclude: !0, replace: !0, templateUrl: "template/carousel/slide.html", scope: {active: "=?", index: "=?"}, link: function (a, b, c, d) { d.addSlide(a, b), a.$on("$destroy", function () { d.removeSlide(a) }), a.$watch("active", function (b) { b && d.select(a) }) } } }).animation(".item", ["$animate", function (a) { return { beforeAddClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return b.addClass(f), a.addClass(b, g).then(function () { e || b.removeClass(g + " " + f), d() }), function () { e = !0 } } d() }, beforeRemoveClass: function (b, c, d) { if ("active" == c && b.parent() && !b.parent().scope().noTransition) { var e = !1, f = b.isolateScope().direction, g = "next" == f ? "left" : "right"; return a.addClass(b, g).then(function () { e || b.removeClass(g), d() }), function () { e = !0 } } d() } } }]), angular.module("ui.bootstrap.dateparser", []).service("dateParser", ["$locale", "orderByFilter", function (a, b) { function c(a) { var c = [], d = a.split(""); return angular.forEach(f, function (b, e) { var f = a.indexOf(e); if (f > -1) { a = a.split(""), d[f] = "(" + b.regex + ")", a[f] = "$"; for (var g = f + 1, h = f + e.length; h > g; g++)d[g] = "", a[g] = "$"; a = a.join(""), c.push({index: f, apply: b.apply}) } }), {regex: new RegExp("^" + d.join("") + "$"), map: b(c, "index")} } function d(a, b, c) { return 1 > c ? !1 : 1 === b && c > 28 ? 29 === c && (a % 4 === 0 && a % 100 !== 0 || a % 400 === 0) : 3 === b || 5 === b || 8 === b || 10 === b ? 31 > c : !0 } var e = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g; this.parsers = {}; var f = { yyyy: { regex: "\\d{4}", apply: function (a) { this.year = +a } }, yy: { regex: "\\d{2}", apply: function (a) { this.year = +a + 2e3 } }, y: { regex: "\\d{1,4}", apply: function (a) { this.year = +a } }, MMMM: { regex: a.DATETIME_FORMATS.MONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.MONTH.indexOf(b) } }, MMM: { regex: a.DATETIME_FORMATS.SHORTMONTH.join("|"), apply: function (b) { this.month = a.DATETIME_FORMATS.SHORTMONTH.indexOf(b) } }, MM: { regex: "0[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, M: { regex: "[1-9]|1[0-2]", apply: function (a) { this.month = a - 1 } }, dd: { regex: "[0-2][0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, d: { regex: "[1-2]?[0-9]{1}|3[0-1]{1}", apply: function (a) { this.date = +a } }, EEEE: {regex: a.DATETIME_FORMATS.DAY.join("|")}, EEE: {regex: a.DATETIME_FORMATS.SHORTDAY.join("|")}, HH: { regex: "(?:0|1)[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, H: { regex: "1?[0-9]|2[0-3]", apply: function (a) { this.hours = +a } }, mm: { regex: "[0-5][0-9]", apply: function (a) { this.minutes = +a } }, m: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.minutes = +a } }, sss: { regex: "[0-9][0-9][0-9]", apply: function (a) { this.milliseconds = +a } }, ss: { regex: "[0-5][0-9]", apply: function (a) { this.seconds = +a } }, s: { regex: "[0-9]|[1-5][0-9]", apply: function (a) { this.seconds = +a } } }; this.parse = function (b, f, g) { if (!angular.isString(b) || !f)return b; f = a.DATETIME_FORMATS[f] || f, f = f.replace(e, "\\$&"), this.parsers[f] || (this.parsers[f] = c(f)); var h = this.parsers[f], i = h.regex, j = h.map, k = b.match(i); if (k && k.length) { var l, m; l = g ? { year: g.getFullYear(), month: g.getMonth(), date: g.getDate(), hours: g.getHours(), minutes: g.getMinutes(), seconds: g.getSeconds(), milliseconds: g.getMilliseconds() } : {year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0}; for (var n = 1, o = k.length; o > n; n++) { var p = j[n - 1]; p.apply && p.apply.call(l, k[n]) } return d(l.year, l.month, l.date) && (m = new Date(l.year, l.month, l.date, l.hours, l.minutes, l.seconds, l.milliseconds || 0)), m } } }]), angular.module("ui.bootstrap.position", []).factory("$position", ["$document", "$window", function (a, b) { function c(a, c) { return a.currentStyle ? a.currentStyle[c] : b.getComputedStyle ? b.getComputedStyle(a)[c] : a.style[c] } function d(a) { return "static" === (c(a, "position") || "static") } var e = function (b) { for (var c = a[0], e = b.offsetParent || c; e && e !== c && d(e);)e = e.offsetParent; return e || c }; return { position: function (b) { var c = this.offset(b), d = {top: 0, left: 0}, f = e(b[0]); f != a[0] && (d = this.offset(angular.element(f)), d.top += f.clientTop - f.scrollTop, d.left += f.clientLeft - f.scrollLeft); var g = b[0].getBoundingClientRect(); return { width: g.width || b.prop("offsetWidth"), height: g.height || b.prop("offsetHeight"), top: c.top - d.top, left: c.left - d.left } }, offset: function (c) { var d = c[0].getBoundingClientRect(); return { width: d.width || c.prop("offsetWidth"), height: d.height || c.prop("offsetHeight"), top: d.top + (b.pageYOffset || a[0].documentElement.scrollTop), left: d.left + (b.pageXOffset || a[0].documentElement.scrollLeft) } }, positionElements: function (a, b, c, d) { var e, f, g, h, i = c.split("-"), j = i[0], k = i[1] || "center"; e = d ? this.offset(a) : this.position(a), f = b.prop("offsetWidth"), g = b.prop("offsetHeight"); var l = { center: function () { return e.left + e.width / 2 - f / 2 }, left: function () { return e.left }, right: function () { return e.left + e.width } }, m = { center: function () { return e.top + e.height / 2 - g / 2 }, top: function () { return e.top }, bottom: function () { return e.top + e.height } }; switch (j) { case"right": h = {top: m[k](), left: l[j]()}; break; case"left": h = {top: m[k](), left: e.left - f}; break; case"bottom": h = {top: m[j](), left: l[k]()}; break; default: h = {top: e.top - g, left: l[k]()} } return h } } }]), angular.module("ui.bootstrap.datepicker", ["ui.bootstrap.dateparser", "ui.bootstrap.position"]).constant("datepickerConfig", { formatDay: "dd", formatMonth: "MMMM", formatYear: "yyyy", formatDayHeader: "EEE", formatDayTitle: "MMMM yyyy", formatMonthTitle: "yyyy", datepickerMode: "day", minMode: "day", maxMode: "year", showWeeks: !0, startingDay: 0, yearRange: 20, minDate: null, maxDate: null, shortcutPropagation: !1 }).controller("DatepickerController", ["$scope", "$attrs", "$parse", "$interpolate", "$timeout", "$log", "dateFilter", "datepickerConfig", function (a, b, c, d, e, f, g, h) { var i = this, j = {$setViewValue: angular.noop}; this.modes = ["day", "month", "year"], angular.forEach(["formatDay", "formatMonth", "formatYear", "formatDayHeader", "formatDayTitle", "formatMonthTitle", "minMode", "maxMode", "showWeeks", "startingDay", "yearRange", "shortcutPropagation"], function (c, e) { i[c] = angular.isDefined(b[c]) ? 8 > e ? d(b[c])(a.$parent) : a.$parent.$eval(b[c]) : h[c] }), angular.forEach(["minDate", "maxDate"], function (d) { b[d] ? a.$parent.$watch(c(b[d]), function (a) { i[d] = a ? new Date(a) : null, i.refreshView() }) : i[d] = h[d] ? new Date(h[d]) : null }), a.datepickerMode = a.datepickerMode || h.datepickerMode, a.maxMode = i.maxMode, a.uniqueId = "datepicker-" + a.$id + "-" + Math.floor(1e4 * Math.random()), angular.isDefined(b.initDate) ? (this.activeDate = a.$parent.$eval(b.initDate) || new Date, a.$parent.$watch(b.initDate, function (a) { a && (j.$isEmpty(j.$modelValue) || j.$invalid) && (i.activeDate = a, i.refreshView()) })) : this.activeDate = new Date, a.isActive = function (b) { return 0 === i.compare(b.date, i.activeDate) ? (a.activeDateId = b.uid, !0) : !1 }, this.init = function (a) { j = a, j.$render = function () { i.render() } }, this.render = function () { if (j.$viewValue) { var a = new Date(j.$viewValue), b = !isNaN(a); b ? this.activeDate = a : f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'), j.$setValidity("date", b) } this.refreshView() }, this.refreshView = function () { if (this.element) { this._refreshView(); var a = j.$viewValue ? new Date(j.$viewValue) : null; j.$setValidity("date-disabled", !a || this.element && !this.isDisabled(a)) } }, this.createDateObject = function (a, b) { var c = j.$viewValue ? new Date(j.$viewValue) : null; return { date: a, label: g(a, b), selected: c && 0 === this.compare(a, c), disabled: this.isDisabled(a), current: 0 === this.compare(a, new Date), customClass: this.customClass(a) } }, this.isDisabled = function (c) { return this.minDate && this.compare(c, this.minDate) < 0 || this.maxDate && this.compare(c, this.maxDate) > 0 || b.dateDisabled && a.dateDisabled({ date: c, mode: a.datepickerMode }) }, this.customClass = function (b) { return a.customClass({date: b, mode: a.datepickerMode}) }, this.split = function (a, b) { for (var c = []; a.length > 0;)c.push(a.splice(0, b)); return c }, a.select = function (b) { if (a.datepickerMode === i.minMode) { var c = j.$viewValue ? new Date(j.$viewValue) : new Date(0, 0, 0, 0, 0, 0, 0); c.setFullYear(b.getFullYear(), b.getMonth(), b.getDate()), j.$setViewValue(c), j.$render() } else i.activeDate = b, a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) - 1] }, a.move = function (a) { var b = i.activeDate.getFullYear() + a * (i.step.years || 0), c = i.activeDate.getMonth() + a * (i.step.months || 0); i.activeDate.setFullYear(b, c, 1), i.refreshView() }, a.toggleMode = function (b) { b = b || 1, a.datepickerMode === i.maxMode && 1 === b || a.datepickerMode === i.minMode && -1 === b || (a.datepickerMode = i.modes[i.modes.indexOf(a.datepickerMode) + b]) }, a.keys = { 13: "enter", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", 37: "left", 38: "up", 39: "right", 40: "down" }; var k = function () { e(function () { i.element[0].focus() }, 0, !1) }; a.$on("datepicker.focus", k), a.keydown = function (b) { var c = a.keys[b.which]; if (c && !b.shiftKey && !b.altKey)if (b.preventDefault(), i.shortcutPropagation || b.stopPropagation(), "enter" === c || "space" === c) { if (i.isDisabled(i.activeDate))return; a.select(i.activeDate), k() } else!b.ctrlKey || "up" !== c && "down" !== c ? (i.handleKeyDown(c, b), i.refreshView()) : (a.toggleMode("up" === c ? 1 : -1), k()) } }]).directive("datepicker", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/datepicker.html", scope: {datepickerMode: "=?", dateDisabled: "&", customClass: "&", shortcutPropagation: "&?"}, require: ["datepicker", "?^ngModel"], controller: "DatepickerController", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f) } } }).directive("daypicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/day.html", require: "^datepicker", link: function (b, c, d, e) { function f(a, b) { return 1 !== b || a % 4 !== 0 || a % 100 === 0 && a % 400 !== 0 ? i[b] : 29 } function g(a, b) { var c = new Array(b), d = new Date(a), e = 0; for (d.setHours(12); b > e;)c[e++] = new Date(d), d.setDate(d.getDate() + 1); return c } function h(a) { var b = new Date(a); b.setDate(b.getDate() + 4 - (b.getDay() || 7)); var c = b.getTime(); return b.setMonth(0), b.setDate(1), Math.floor(Math.round((c - b) / 864e5) / 7) + 1 } b.showWeeks = e.showWeeks, e.step = {months: 1}, e.element = c; var i = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; e._refreshView = function () { var c = e.activeDate.getFullYear(), d = e.activeDate.getMonth(), f = new Date(c, d, 1), i = e.startingDay - f.getDay(), j = i > 0 ? 7 - i : -i, k = new Date(f); j > 0 && k.setDate(-j + 1); for (var l = g(k, 42), m = 0; 42 > m; m++)l[m] = angular.extend(e.createDateObject(l[m], e.formatDay), { secondary: l[m].getMonth() !== d, uid: b.uniqueId + "-" + m }); b.labels = new Array(7); for (var n = 0; 7 > n; n++)b.labels[n] = { abbr: a(l[n].date, e.formatDayHeader), full: a(l[n].date, "EEEE") }; if (b.title = a(e.activeDate, e.formatDayTitle), b.rows = e.split(l, 7), b.showWeeks) { b.weekNumbers = []; for (var o = (11 - e.startingDay) % 7, p = b.rows.length, q = 0; p > q; q++)b.weekNumbers.push(h(b.rows[q][o].date)) } }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth(), a.getDate()) - new Date(b.getFullYear(), b.getMonth(), b.getDate()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getDate(); if ("left" === a)b -= 1; else if ("up" === a)b -= 7; else if ("right" === a)b += 1; else if ("down" === a)b += 7; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getMonth() + ("pageup" === a ? -1 : 1); e.activeDate.setMonth(c, 1), b = Math.min(f(e.activeDate.getFullYear(), e.activeDate.getMonth()), b) } else"home" === a ? b = 1 : "end" === a && (b = f(e.activeDate.getFullYear(), e.activeDate.getMonth())); e.activeDate.setDate(b) }, e.refreshView() } } }]).directive("monthpicker", ["dateFilter", function (a) { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/month.html", require: "^datepicker", link: function (b, c, d, e) { e.step = {years: 1}, e.element = c, e._refreshView = function () { for (var c = new Array(12), d = e.activeDate.getFullYear(), f = 0; 12 > f; f++)c[f] = angular.extend(e.createDateObject(new Date(d, f, 1), e.formatMonth), {uid: b.uniqueId + "-" + f}); b.title = a(e.activeDate, e.formatMonthTitle), b.rows = e.split(c, 3) }, e.compare = function (a, b) { return new Date(a.getFullYear(), a.getMonth()) - new Date(b.getFullYear(), b.getMonth()) }, e.handleKeyDown = function (a) { var b = e.activeDate.getMonth(); if ("left" === a)b -= 1; else if ("up" === a)b -= 3; else if ("right" === a)b += 1; else if ("down" === a)b += 3; else if ("pageup" === a || "pagedown" === a) { var c = e.activeDate.getFullYear() + ("pageup" === a ? -1 : 1); e.activeDate.setFullYear(c) } else"home" === a ? b = 0 : "end" === a && (b = 11); e.activeDate.setMonth(b) }, e.refreshView() } } }]).directive("yearpicker", ["dateFilter", function () { return { restrict: "EA", replace: !0, templateUrl: "template/datepicker/year.html", require: "^datepicker", link: function (a, b, c, d) { function e(a) { return parseInt((a - 1) / f, 10) * f + 1 } var f = d.yearRange; d.step = {years: f}, d.element = b, d._refreshView = function () { for (var b = new Array(f), c = 0, g = e(d.activeDate.getFullYear()); f > c; c++)b[c] = angular.extend(d.createDateObject(new Date(g + c, 0, 1), d.formatYear), {uid: a.uniqueId + "-" + c}); a.title = [b[0].label, b[f - 1].label].join(" - "), a.rows = d.split(b, 5) }, d.compare = function (a, b) { return a.getFullYear() - b.getFullYear() }, d.handleKeyDown = function (a) { var b = d.activeDate.getFullYear(); "left" === a ? b -= 1 : "up" === a ? b -= 5 : "right" === a ? b += 1 : "down" === a ? b += 5 : "pageup" === a || "pagedown" === a ? b += ("pageup" === a ? -1 : 1) * d.step.years : "home" === a ? b = e(d.activeDate.getFullYear()) : "end" === a && (b = e(d.activeDate.getFullYear()) + f - 1), d.activeDate.setFullYear(b) }, d.refreshView() } } }]).constant("datepickerPopupConfig", { datepickerPopup: "yyyy-MM-dd", html5Types: {date: "yyyy-MM-dd", "datetime-local": "yyyy-MM-ddTHH:mm:ss.sss", month: "yyyy-MM"}, currentText: "Today", clearText: "Clear", closeText: "Done", closeOnDateSelection: !0, appendToBody: !1, showButtonBar: !0 }).directive("datepickerPopup", ["$compile", "$parse", "$document", "$position", "dateFilter", "dateParser", "datepickerPopupConfig", function (a, b, c, d, e, f, g) { return { restrict: "EA", require: "ngModel", scope: {isOpen: "=?", currentText: "@", clearText: "@", closeText: "@", dateDisabled: "&", customClass: "&"}, link: function (h, i, j, k) { function l(a) { return a.replace(/([A-Z])/g, function (a) { return "-" + a.toLowerCase() }) } function m(a) { if (angular.isNumber(a) && (a = new Date(a)), a) { if (angular.isDate(a) && !isNaN(a))return a; if (angular.isString(a)) { var b = f.parse(a, o, h.date) || new Date(a); return isNaN(b) ? void 0 : b } return void 0 } return null } function n(a, b) { var c = a || b; if (angular.isNumber(c) && (c = new Date(c)), c) { if (angular.isDate(c) && !isNaN(c))return !0; if (angular.isString(c)) { var d = f.parse(c, o) || new Date(c); return !isNaN(d) } return !1 } return !0 } var o, p = angular.isDefined(j.closeOnDateSelection) ? h.$parent.$eval(j.closeOnDateSelection) : g.closeOnDateSelection, q = angular.isDefined(j.datepickerAppendToBody) ? h.$parent.$eval(j.datepickerAppendToBody) : g.appendToBody; h.showButtonBar = angular.isDefined(j.showButtonBar) ? h.$parent.$eval(j.showButtonBar) : g.showButtonBar, h.getText = function (a) { return h[a + "Text"] || g[a + "Text"] }; var r = !1; if (g.html5Types[j.type] ? (o = g.html5Types[j.type], r = !0) : (o = j.datepickerPopup || g.datepickerPopup, j.$observe("datepickerPopup", function (a) { var b = a || g.datepickerPopup; if (b !== o && (o = b, k.$modelValue = null, !o))throw new Error("datepickerPopup must have a date format specified.") })), !o)throw new Error("datepickerPopup must have a date format specified."); if (r && j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats."); var s = angular.element("<div datepicker-popup-wrap><div datepicker></div></div>"); s.attr({"ng-model": "date", "ng-change": "dateSelection()"}); var t = angular.element(s.children()[0]); if (r && "month" == j.type && (t.attr("datepicker-mode", '"month"'), t.attr("min-mode", "month")), j.datepickerOptions) { var u = h.$parent.$eval(j.datepickerOptions); u.initDate && (h.initDate = u.initDate, t.attr("init-date", "initDate"), delete u.initDate), angular.forEach(u, function (a, b) { t.attr(l(b), a) }) } h.watchData = {}, angular.forEach(["minDate", "maxDate", "datepickerMode", "initDate", "shortcutPropagation"], function (a) { if (j[a]) { var c = b(j[a]); if (h.$parent.$watch(c, function (b) { h.watchData[a] = b }), t.attr(l(a), "watchData." + a), "datepickerMode" === a) { var d = c.assign; h.$watch("watchData." + a, function (a, b) { a !== b && d(h.$parent, a) }) } } }), j.dateDisabled && t.attr("date-disabled", "dateDisabled({ date: date, mode: mode })"), j.showWeeks && t.attr("show-weeks", j.showWeeks), j.customClass && t.attr("custom-class", "customClass({ date: date, mode: mode })"), r ? k.$formatters.push(function (a) { return h.date = a, a }) : (k.$$parserName = "date", k.$validators.date = n, k.$parsers.unshift(m), k.$formatters.push(function (a) { return h.date = a, k.$isEmpty(a) ? a : e(a, o) })), h.dateSelection = function (a) { angular.isDefined(a) && (h.date = a); var b = h.date ? e(h.date, o) : ""; i.val(b), k.$setViewValue(b), p && (h.isOpen = !1, i[0].focus()) }, k.$viewChangeListeners.push(function () { h.date = f.parse(k.$viewValue, o, h.date) || new Date(k.$viewValue) }); var v = function (a) { h.isOpen && a.target !== i[0] && h.$apply(function () { h.isOpen = !1 }) }, w = function (a) { h.keydown(a) }; i.bind("keydown", w), h.keydown = function (a) { 27 === a.which ? (a.preventDefault(), h.isOpen && a.stopPropagation(), h.close()) : 40 !== a.which || h.isOpen || (h.isOpen = !0) }, h.$watch("isOpen", function (a) { a ? (h.$broadcast("datepicker.focus"), h.position = q ? d.offset(i) : d.position(i), h.position.top = h.position.top + i.prop("offsetHeight"), c.bind("click", v)) : c.unbind("click", v) }), h.select = function (a) { if ("today" === a) { var b = new Date; angular.isDate(h.date) ? (a = new Date(h.date), a.setFullYear(b.getFullYear(), b.getMonth(), b.getDate())) : a = new Date(b.setHours(0, 0, 0, 0)) } h.dateSelection(a) }, h.close = function () { h.isOpen = !1, i[0].focus() }; var x = a(s)(h); s.remove(), q ? c.find("body").append(x) : i.after(x), h.$on("$destroy", function () { x.remove(), i.unbind("keydown", w), c.unbind("click", v) }) } } }]).directive("datepickerPopupWrap", function () { return { restrict: "EA", replace: !0, transclude: !0, templateUrl: "template/datepicker/popup.html", link: function (a, b) { b.bind("click", function (a) { a.preventDefault(), a.stopPropagation() }) } } }), angular.module("ui.bootstrap.dropdown", ["ui.bootstrap.position"]).constant("dropdownConfig", {openClass: "open"}).service("dropdownService", ["$document", "$rootScope", function (a, b) { var c = null; this.open = function (b) { c || (a.bind("click", d), a.bind("keydown", e)), c && c !== b && (c.isOpen = !1), c = b }, this.close = function (b) { c === b && (c = null, a.unbind("click", d), a.unbind("keydown", e)) }; var d = function (a) { if (c && (!a || "disabled" !== c.getAutoClose())) { var d = c.getToggleElement(); if (!(a && d && d[0].contains(a.target))) { var e = c.getElement(); a && "outsideClick" === c.getAutoClose() && e && e[0].contains(a.target) || (c.isOpen = !1, b.$$phase || c.$apply()) } } }, e = function (a) { 27 === a.which && (c.focusToggleElement(), d()) } }]).controller("DropdownController", ["$scope", "$attrs", "$parse", "dropdownConfig", "dropdownService", "$animate", "$position", "$document", function (a, b, c, d, e, f, g, h) { var i, j = this, k = a.$new(), l = d.openClass, m = angular.noop, n = b.onToggle ? c(b.onToggle) : angular.noop, o = !1; this.init = function (d) { j.$element = d, b.isOpen && (i = c(b.isOpen), m = i.assign, a.$watch(i, function (a) { k.isOpen = !!a })), o = angular.isDefined(b.dropdownAppendToBody), o && j.dropdownMenu && (h.find("body").append(j.dropdownMenu), d.on("$destroy", function () { j.dropdownMenu.remove() })) }, this.toggle = function (a) { return k.isOpen = arguments.length ? !!a : !k.isOpen }, this.isOpen = function () { return k.isOpen }, k.getToggleElement = function () { return j.toggleElement }, k.getAutoClose = function () { return b.autoClose || "always" }, k.getElement = function () { return j.$element }, k.focusToggleElement = function () { j.toggleElement && j.toggleElement[0].focus() }, k.$watch("isOpen", function (b, c) { if (o && j.dropdownMenu) { var d = g.positionElements(j.$element, j.dropdownMenu, "bottom-left", !0); j.dropdownMenu.css({top: d.top + "px", left: d.left + "px", display: b ? "block" : "none"}) } f[b ? "addClass" : "removeClass"](j.$element, l), b ? (k.focusToggleElement(), e.open(k)) : e.close(k), m(a, b), angular.isDefined(b) && b !== c && n(a, {open: !!b}) }), a.$on("$locationChangeSuccess", function () { k.isOpen = !1 }), a.$on("$destroy", function () { k.$destroy() }) }]).directive("dropdown", function () { return { controller: "DropdownController", link: function (a, b, c, d) { d.init(b) } } }).directive("dropdownMenu", function () { return { restrict: "AC", require: "?^dropdown", link: function (a, b, c, d) { d && (d.dropdownMenu = b) } } }).directive("dropdownToggle", function () { return { require: "?^dropdown", link: function (a, b, c, d) { if (d) { d.toggleElement = b; var e = function (e) { e.preventDefault(), b.hasClass("disabled") || c.disabled || a.$apply(function () { d.toggle() }) }; b.bind("click", e), b.attr({ "aria-haspopup": !0, "aria-expanded": !1 }), a.$watch(d.isOpen, function (a) { b.attr("aria-expanded", !!a) }), a.$on("$destroy", function () { b.unbind("click", e) }) } } } }), angular.module("ui.bootstrap.modal", []).factory("$$stackedMap", function () { return { createNew: function () { var a = []; return { add: function (b, c) { a.push({key: b, value: c}) }, get: function (b) { for (var c = 0; c < a.length; c++)if (b == a[c].key)return a[c] }, keys: function () { for (var b = [], c = 0; c < a.length; c++)b.push(a[c].key); return b }, top: function () { return a[a.length - 1] }, remove: function (b) { for (var c = -1, d = 0; d < a.length; d++)if (b == a[d].key) { c = d; break } return a.splice(c, 1)[0] }, removeTop: function () { return a.splice(a.length - 1, 1)[0] }, length: function () { return a.length } } } } }).directive("modalBackdrop", ["$timeout", function (a) { function b(b) { b.animate = !1, a(function () { b.animate = !0 }) } return { restrict: "EA", replace: !0, templateUrl: "template/modal/backdrop.html", compile: function (a, c) { return a.addClass(c.backdropClass), b } } }]).directive("modalWindow", ["$modalStack", "$q", function (a, b) { return { restrict: "EA", scope: {index: "@", animate: "="}, replace: !0, transclude: !0, templateUrl: function (a, b) { return b.templateUrl || "template/modal/window.html" }, link: function (c, d, e) { d.addClass(e.windowClass || ""), c.size = e.size, c.close = function (b) { var c = a.getTop(); c && c.value.backdrop && "static" != c.value.backdrop && b.target === b.currentTarget && (b.preventDefault(), b.stopPropagation(), a.dismiss(c.key, "backdrop click")) }, c.$isRendered = !0; var f = b.defer(); e.$observe("modalRender", function (a) { "true" == a && f.resolve() }), f.promise.then(function () { c.animate = !0; var b = d[0].querySelectorAll("[autofocus]"); b.length ? b[0].focus() : d[0].focus(); var e = a.getTop(); e && a.modalRendered(e.key) }) } } }]).directive("modalAnimationClass", [function () { return { compile: function (a, b) { b.modalAnimation && a.addClass(b.modalAnimationClass) } } }]).directive("modalTransclude", function () { return { link: function (a, b, c, d, e) { e(a.$parent, function (a) { b.empty(), b.append(a) }) } } }).factory("$modalStack", ["$animate", "$timeout", "$document", "$compile", "$rootScope", "$$stackedMap", function (a, b, c, d, e, f) { function g() { for (var a = -1, b = o.keys(), c = 0; c < b.length; c++)o.get(b[c]).value.backdrop && (a = c); return a } function h(a) { var b = c.find("body").eq(0), d = o.get(a).value; o.remove(a), j(d.modalDomEl, d.modalScope, function () { b.toggleClass(n, o.length() > 0), i() }) } function i() { if (l && -1 == g()) { var a = m; j(l, m, function () { a = null }), l = void 0, m = void 0 } } function j(c, d, f) { function g() { g.done || (g.done = !0, c.remove(), d.$destroy(), f && f()) } d.animate = !1, c.attr("modal-animation") && a.enabled() ? c.one("$animate:close", function () { e.$evalAsync(g) }) : b(g) } function k(a, b, c) { return !a.value.modalScope.$broadcast("modal.closing", b, c).defaultPrevented } var l, m, n = "modal-open", o = f.createNew(), p = {}; return e.$watch(g, function (a) { m && (m.index = a) }), c.bind("keydown", function (a) { var b; 27 === a.which && (b = o.top(), b && b.value.keyboard && (a.preventDefault(), e.$apply(function () { p.dismiss(b.key, "escape key press") }))) }), p.open = function (a, b) { var f = c[0].activeElement; o.add(a, { deferred: b.deferred, renderDeferred: b.renderDeferred, modalScope: b.scope, backdrop: b.backdrop, keyboard: b.keyboard }); var h = c.find("body").eq(0), i = g(); if (i >= 0 && !l) { m = e.$new(!0), m.index = i; var j = angular.element('<div modal-backdrop="modal-backdrop"></div>'); j.attr("backdrop-class", b.backdropClass), b.animation && j.attr("modal-animation", "true"), l = d(j)(m), h.append(l) } var k = angular.element('<div modal-window="modal-window"></div>'); k.attr({ "template-url": b.windowTemplateUrl, "window-class": b.windowClass, size: b.size, index: o.length() - 1, animate: "animate" }).html(b.content), b.animation && k.attr("modal-animation", "true"); var p = d(k)(b.scope); o.top().value.modalDomEl = p, o.top().value.modalOpener = f, h.append(p), h.addClass(n) }, p.close = function (a, b) { var c = o.get(a); return c && k(c, b, !0) ? (c.value.deferred.resolve(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismiss = function (a, b) { var c = o.get(a); return c && k(c, b, !1) ? (c.value.deferred.reject(b), h(a), c.value.modalOpener.focus(), !0) : !c }, p.dismissAll = function (a) { for (var b = this.getTop(); b && this.dismiss(b.key, a);)b = this.getTop() }, p.getTop = function () { return o.top() }, p.modalRendered = function (a) { var b = o.get(a); b && b.value.renderDeferred.resolve() }, p }]).provider("$modal", function () { var a = { options: {animation: !0, backdrop: !0, keyboard: !0}, $get: ["$injector", "$rootScope", "$q", "$templateRequest", "$controller", "$modalStack", function (b, c, d, e, f, g) { function h(a) { return a.template ? d.when(a.template) : e(angular.isFunction(a.templateUrl) ? a.templateUrl() : a.templateUrl) } function i(a) { var c = []; return angular.forEach(a, function (a) { (angular.isFunction(a) || angular.isArray(a)) && c.push(d.when(b.invoke(a))) }), c } var j = {}; return j.open = function (b) { var e = d.defer(), j = d.defer(), k = d.defer(), l = { result: e.promise, opened: j.promise, rendered: k.promise, close: function (a) { return g.close(l, a) }, dismiss: function (a) { return g.dismiss(l, a) } }; if (b = angular.extend({}, a.options, b), b.resolve = b.resolve || {}, !b.template && !b.templateUrl)throw new Error("One of template or templateUrl options is required."); var m = d.all([h(b)].concat(i(b.resolve))); return m.then(function (a) { var d = (b.scope || c).$new(); d.$close = l.close, d.$dismiss = l.dismiss; var h, i = {}, j = 1; b.controller && (i.$scope = d, i.$modalInstance = l, angular.forEach(b.resolve, function (b, c) { i[c] = a[j++] }), h = f(b.controller, i), b.controllerAs && (d[b.controllerAs] = h)), g.open(l, { scope: d, deferred: e, renderDeferred: k, content: a[0], animation: b.animation, backdrop: b.backdrop, keyboard: b.keyboard, backdropClass: b.backdropClass, windowClass: b.windowClass, windowTemplateUrl: b.windowTemplateUrl, size: b.size }) }, function (a) { e.reject(a) }), m.then(function () { j.resolve(!0) }, function (a) { j.reject(a) }), l }, j }] }; return a }), angular.module("ui.bootstrap.pagination", []).controller("PaginationController", ["$scope", "$attrs", "$parse", function (a, b, c) { var d = this, e = {$setViewValue: angular.noop}, f = b.numPages ? c(b.numPages).assign : angular.noop; this.init = function (g, h) { e = g, this.config = h, e.$render = function () { d.render() }, b.itemsPerPage ? a.$parent.$watch(c(b.itemsPerPage), function (b) { d.itemsPerPage = parseInt(b, 10), a.totalPages = d.calculateTotalPages() }) : this.itemsPerPage = h.itemsPerPage, a.$watch("totalItems", function () { a.totalPages = d.calculateTotalPages() }), a.$watch("totalPages", function (b) { f(a.$parent, b), a.page > b ? a.selectPage(b) : e.$render() }) }, this.calculateTotalPages = function () { var b = this.itemsPerPage < 1 ? 1 : Math.ceil(a.totalItems / this.itemsPerPage); return Math.max(b || 0, 1) }, this.render = function () { a.page = parseInt(e.$viewValue, 10) || 1 }, a.selectPage = function (b, c) { a.page !== b && b > 0 && b <= a.totalPages && (c && c.target && c.target.blur(), e.$setViewValue(b), e.$render()) }, a.getText = function (b) { return a[b + "Text"] || d.config[b + "Text"] }, a.noPrevious = function () { return 1 === a.page }, a.noNext = function () { return a.page === a.totalPages } }]).constant("paginationConfig", { itemsPerPage: 10, boundaryLinks: !1, directionLinks: !0, firstText: "First", previousText: "Previous", nextText: "Next", lastText: "Last", rotate: !0 }).directive("pagination", ["$parse", "paginationConfig", function (a, b) { return { restrict: "EA", scope: {totalItems: "=", firstText: "@", previousText: "@", nextText: "@", lastText: "@"}, require: ["pagination", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pagination.html", replace: !0, link: function (c, d, e, f) { function g(a, b, c) { return {number: a, text: b, active: c} } function h(a, b) { var c = [], d = 1, e = b, f = angular.isDefined(k) && b > k; f && (l ? (d = Math.max(a - Math.floor(k / 2), 1), e = d + k - 1, e > b && (e = b, d = e - k + 1)) : (d = (Math.ceil(a / k) - 1) * k + 1, e = Math.min(d + k - 1, b))); for (var h = d; e >= h; h++) { var i = g(h, h, h === a); c.push(i) } if (f && !l) { if (d > 1) { var j = g(d - 1, "...", !1); c.unshift(j) } if (b > e) { var m = g(e + 1, "...", !1); c.push(m) } } return c } var i = f[0], j = f[1]; if (j) { var k = angular.isDefined(e.maxSize) ? c.$parent.$eval(e.maxSize) : b.maxSize, l = angular.isDefined(e.rotate) ? c.$parent.$eval(e.rotate) : b.rotate; c.boundaryLinks = angular.isDefined(e.boundaryLinks) ? c.$parent.$eval(e.boundaryLinks) : b.boundaryLinks, c.directionLinks = angular.isDefined(e.directionLinks) ? c.$parent.$eval(e.directionLinks) : b.directionLinks, i.init(j, b), e.maxSize && c.$parent.$watch(a(e.maxSize), function (a) { k = parseInt(a, 10), i.render() }); var m = i.render; i.render = function () { m(), c.page > 0 && c.page <= c.totalPages && (c.pages = h(c.page, c.totalPages)) } } } } }]).constant("pagerConfig", { itemsPerPage: 10, previousText: "« Previous", nextText: "Next »", align: !0 }).directive("pager", ["pagerConfig", function (a) { return { restrict: "EA", scope: {totalItems: "=", previousText: "@", nextText: "@"}, require: ["pager", "?ngModel"], controller: "PaginationController", templateUrl: "template/pagination/pager.html", replace: !0, link: function (b, c, d, e) { var f = e[0], g = e[1]; g && (b.align = angular.isDefined(d.align) ? b.$parent.$eval(d.align) : a.align, f.init(g, a)) } } }]), angular.module("ui.bootstrap.tooltip", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).provider("$tooltip", function () { function a(a) { var b = /[A-Z]/g, c = "-"; return a.replace(b, function (a, b) { return (b ? c : "") + a.toLowerCase() }) } var b = {placement: "top", animation: !0, popupDelay: 0, useContentExp: !1}, c = { mouseenter: "mouseleave", click: "click", focus: "blur" }, d = {}; this.options = function (a) { angular.extend(d, a) }, this.setTriggers = function (a) { angular.extend(c, a) }, this.$get = ["$window", "$compile", "$timeout", "$document", "$position", "$interpolate", function (e, f, g, h, i, j) { return function (e, k, l, m) { function n(a) { var b = a || m.trigger || l, d = c[b] || b; return {show: b, hide: d} } m = angular.extend({}, b, d, m); var o = a(e), p = j.startSymbol(), q = j.endSymbol(), r = "<div " + o + '-popup title="' + p + "title" + q + '" ' + (m.useContentExp ? 'content-exp="contentExp()" ' : 'content="' + p + "content" + q + '" ') + 'placement="' + p + "placement" + q + '" popup-class="' + p + "popupClass" + q + '" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>'; return { restrict: "EA", compile: function () { var a = f(r); return function (b, c, d) { function f() { E.isOpen ? l() : j() } function j() { (!D || b.$eval(d[k + "Enable"])) && (s(), E.popupDelay ? A || (A = g(o, E.popupDelay, !1), A.then(function (a) { a() })) : o()()) } function l() { b.$apply(function () { p() }) } function o() { return A = null, z && (g.cancel(z), z = null), (m.useContentExp ? E.contentExp() : E.content) ? (q(), x.css({ top: 0, left: 0, display: "block" }), E.$digest(), F(), E.isOpen = !0, E.$apply(), F) : angular.noop } function p() { E.isOpen = !1, g.cancel(A), A = null, E.animation ? z || (z = g(r, 500)) : r() } function q() { x && r(), y = E.$new(), x = a(y, function (a) { B ? h.find("body").append(a) : c.after(a) }), y.$watch(function () { g(F, 0, !1) }), m.useContentExp && y.$watch("contentExp()", function (a) { !a && E.isOpen && p() }) } function r() { z = null, x && (x.remove(), x = null), y && (y.$destroy(), y = null) } function s() { t(), u(), v() } function t() { E.popupClass = d[k + "Class"] } function u() { var a = d[k + "Placement"]; E.placement = angular.isDefined(a) ? a : m.placement } function v() { var a = d[k + "PopupDelay"], b = parseInt(a, 10); E.popupDelay = isNaN(b) ? m.popupDelay : b } function w() { var a = d[k + "Trigger"]; G(), C = n(a), C.show === C.hide ? c.bind(C.show, f) : (c.bind(C.show, j), c.bind(C.hide, l)) } var x, y, z, A, B = angular.isDefined(m.appendToBody) ? m.appendToBody : !1, C = n(void 0), D = angular.isDefined(d[k + "Enable"]), E = b.$new(!0), F = function () { if (x) { var a = i.positionElements(c, x, E.placement, B); a.top += "px", a.left += "px", x.css(a) } }; E.origScope = b, E.isOpen = !1, E.contentExp = function () { return b.$eval(d[e]) }, m.useContentExp || d.$observe(e, function (a) { E.content = a, !a && E.isOpen && p() }), d.$observe("disabled", function (a) { a && E.isOpen && p() }), d.$observe(k + "Title", function (a) { E.title = a }); var G = function () { c.unbind(C.show, j), c.unbind(C.hide, l) }; w(); var H = b.$eval(d[k + "Animation"]); E.animation = angular.isDefined(H) ? !!H : m.animation; var I = b.$eval(d[k + "AppendToBody"]); B = angular.isDefined(I) ? I : B, B && b.$on("$locationChangeSuccess", function () { E.isOpen && p() }), b.$on("$destroy", function () { g.cancel(z), g.cancel(A), G(), r(), E = null }) } } } } }] }).directive("tooltipTemplateTransclude", ["$animate", "$sce", "$compile", "$templateRequest", function (a, b, c, d) { return { link: function (e, f, g) { var h, i, j, k = e.$eval(g.tooltipTemplateTranscludeScope), l = 0, m = function () { i && (i.remove(), i = null), h && (h.$destroy(), h = null), j && (a.leave(j).then(function () { i = null }), i = j, j = null) }; e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude), function (b) { var g = ++l; b ? (d(b, !0).then(function (d) { if (g === l) { var e = k.$new(), i = d, n = c(i)(e, function (b) { m(), a.enter(b, f) }); h = e, j = n, h.$emit("$includeContentLoaded", b) } }, function () { g === l && (m(), e.$emit("$includeContentError", b)) }), e.$emit("$includeContentRequested", b)) : m() }), e.$on("$destroy", m) } } }]).directive("tooltipClasses", function () { return { restrict: "A", link: function (a, b, c) { a.placement && b.addClass(a.placement), a.popupClass && b.addClass(a.popupClass), a.animation() && b.addClass(c.tooltipAnimationClass) } } }).directive("tooltipPopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-popup.html" } }).directive("tooltip", ["$tooltip", function (a) { return a("tooltip", "tooltip", "mouseenter") }]).directive("tooltipTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&"}, templateUrl: "template/tooltip/tooltip-template-popup.html" } }).directive("tooltipTemplate", ["$tooltip", function (a) { return a("tooltipTemplate", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlPopup", function () { return { restrict: "EA", replace: !0, scope: {contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-popup.html" } }).directive("tooltipHtml", ["$tooltip", function (a) { return a("tooltipHtml", "tooltip", "mouseenter", {useContentExp: !0}) }]).directive("tooltipHtmlUnsafePopup", function () { return { restrict: "EA", replace: !0, scope: {content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/tooltip/tooltip-html-unsafe-popup.html" } }).value("tooltipHtmlUnsafeSuppressDeprecated", !1).directive("tooltipHtmlUnsafe", ["$tooltip", "tooltipHtmlUnsafeSuppressDeprecated", "$log", function (a, b, c) { return b || c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."), a("tooltipHtmlUnsafe", "tooltip", "mouseenter") }]), angular.module("ui.bootstrap.popover", ["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup", function () { return { restrict: "EA", replace: !0, scope: { title: "@", contentExp: "&", placement: "@", popupClass: "@", animation: "&", isOpen: "&", originScope: "&" }, templateUrl: "template/popover/popover-template.html" } }).directive("popoverTemplate", ["$tooltip", function (a) { return a("popoverTemplate", "popover", "click", {useContentExp: !0}) }]).directive("popoverPopup", function () { return { restrict: "EA", replace: !0, scope: {title: "@", content: "@", placement: "@", popupClass: "@", animation: "&", isOpen: "&"}, templateUrl: "template/popover/popover.html" } }).directive("popover", ["$tooltip", function (a) { return a("popover", "popover", "click") }]), angular.module("ui.bootstrap.progressbar", []).constant("progressConfig", { animate: !0, max: 100 }).controller("ProgressController", ["$scope", "$attrs", "progressConfig", function (a, b, c) { var d = this, e = angular.isDefined(b.animate) ? a.$parent.$eval(b.animate) : c.animate; this.bars = [], a.max = angular.isDefined(a.max) ? a.max : c.max, this.addBar = function (b, c) { e || c.css({transition: "none"}), this.bars.push(b), b.$watch("value", function (c) { b.percent = +(100 * c / a.max).toFixed(2) }), b.$on("$destroy", function () { c = null, d.removeBar(b) }) }, this.removeBar = function (a) { this.bars.splice(this.bars.indexOf(a), 1) } }]).directive("progress", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", require: "progress", scope: {}, templateUrl: "template/progressbar/progress.html" } }).directive("bar", function () { return { restrict: "EA", replace: !0, transclude: !0, require: "^progress", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/bar.html", link: function (a, b, c, d) { d.addBar(a, b) } } }).directive("progressbar", function () { return { restrict: "EA", replace: !0, transclude: !0, controller: "ProgressController", scope: {value: "=", max: "=?", type: "@"}, templateUrl: "template/progressbar/progressbar.html", link: function (a, b, c, d) { d.addBar(a, angular.element(b.children()[0])) } } }), angular.module("ui.bootstrap.rating", []).constant("ratingConfig", { max: 5, stateOn: null, stateOff: null }).controller("RatingController", ["$scope", "$attrs", "ratingConfig", function (a, b, c) { var d = {$setViewValue: angular.noop}; this.init = function (e) { d = e, d.$render = this.render, d.$formatters.push(function (a) { return angular.isNumber(a) && a << 0 !== a && (a = Math.round(a)), a }), this.stateOn = angular.isDefined(b.stateOn) ? a.$parent.$eval(b.stateOn) : c.stateOn, this.stateOff = angular.isDefined(b.stateOff) ? a.$parent.$eval(b.stateOff) : c.stateOff; var f = angular.isDefined(b.ratingStates) ? a.$parent.$eval(b.ratingStates) : new Array(angular.isDefined(b.max) ? a.$parent.$eval(b.max) : c.max); a.range = this.buildTemplateObjects(f) }, this.buildTemplateObjects = function (a) { for (var b = 0, c = a.length; c > b; b++)a[b] = angular.extend({index: b}, { stateOn: this.stateOn, stateOff: this.stateOff }, a[b]); return a }, a.rate = function (b) { !a.readonly && b >= 0 && b <= a.range.length && (d.$setViewValue(b), d.$render()) }, a.enter = function (b) { a.readonly || (a.value = b), a.onHover({value: b}) }, a.reset = function () { a.value = d.$viewValue, a.onLeave() }, a.onKeydown = function (b) { /(37|38|39|40)/.test(b.which) && (b.preventDefault(), b.stopPropagation(), a.rate(a.value + (38 === b.which || 39 === b.which ? 1 : -1))) }, this.render = function () { a.value = d.$viewValue } }]).directive("rating", function () { return { restrict: "EA", require: ["rating", "ngModel"], scope: {readonly: "=?", onHover: "&", onLeave: "&"}, controller: "RatingController", templateUrl: "template/rating/rating.html", replace: !0, link: function (a, b, c, d) { var e = d[0], f = d[1]; e.init(f) } } }), angular.module("ui.bootstrap.tabs", []).controller("TabsetController", ["$scope", function (a) { var b = this, c = b.tabs = a.tabs = []; b.select = function (a) { angular.forEach(c, function (b) { b.active && b !== a && (b.active = !1, b.onDeselect()) }), a.active = !0, a.onSelect() }, b.addTab = function (a) { c.push(a), 1 === c.length && a.active !== !1 ? a.active = !0 : a.active ? b.select(a) : a.active = !1 }, b.removeTab = function (a) { var e = c.indexOf(a); if (a.active && c.length > 1 && !d) { var f = e == c.length - 1 ? e - 1 : e + 1; b.select(c[f]) } c.splice(e, 1) }; var d; a.$on("$destroy", function () { d = !0 }) }]).directive("tabset", function () { return { restrict: "EA", transclude: !0, replace: !0, scope: {type: "@"}, controller: "TabsetController", templateUrl: "template/tabs/tabset.html", link: function (a, b, c) { a.vertical = angular.isDefined(c.vertical) ? a.$parent.$eval(c.vertical) : !1, a.justified = angular.isDefined(c.justified) ? a.$parent.$eval(c.justified) : !1 } } }).directive("tab", ["$parse", "$log", function (a, b) { return { require: "^tabset", restrict: "EA", replace: !0, templateUrl: "template/tabs/tab.html", transclude: !0, scope: {active: "=?", heading: "@", onSelect: "&select", onDeselect: "&deselect"}, controller: function () { }, compile: function (c, d, e) { return function (c, d, f, g) { c.$watch("active", function (a) { a && g.select(c) }), c.disabled = !1, f.disable && c.$parent.$watch(a(f.disable), function (a) { c.disabled = !!a }), f.disabled && (b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'), c.$parent.$watch(a(f.disabled), function (a) { c.disabled = !!a })), c.select = function () { c.disabled || (c.active = !0) }, g.addTab(c), c.$on("$destroy", function () { g.removeTab(c) }), c.$transcludeFn = e } } } }]).directive("tabHeadingTransclude", [function () { return { restrict: "A", require: "^tab", link: function (a, b) { a.$watch("headingElement", function (a) { a && (b.html(""), b.append(a)) }) } } }]).directive("tabContentTransclude", function () { function a(a) { return a.tagName && (a.hasAttribute("tab-heading") || a.hasAttribute("data-tab-heading") || "tab-heading" === a.tagName.toLowerCase() || "data-tab-heading" === a.tagName.toLowerCase()) } return { restrict: "A", require: "^tabset", link: function (b, c, d) { var e = b.$eval(d.tabContentTransclude); e.$transcludeFn(e.$parent, function (b) { angular.forEach(b, function (b) { a(b) ? e.headingElement = b : c.append(b) }) }) } } }), angular.module("ui.bootstrap.timepicker", []).constant("timepickerConfig", { hourStep: 1, minuteStep: 1, showMeridian: !0, meridians: null, readonlyInput: !1, mousewheel: !0, arrowkeys: !0 }).controller("TimepickerController", ["$scope", "$attrs", "$parse", "$log", "$locale", "timepickerConfig", function (a, b, c, d, e, f) { function g() { var b = parseInt(a.hours, 10), c = a.showMeridian ? b > 0 && 13 > b : b >= 0 && 24 > b; return c ? (a.showMeridian && (12 === b && (b = 0), a.meridian === p[1] && (b += 12)), b) : void 0 } function h() { var b = parseInt(a.minutes, 10); return b >= 0 && 60 > b ? b : void 0 } function i(a) { return angular.isDefined(a) && a.toString().length < 2 ? "0" + a : a.toString() } function j(a) { k(), o.$setViewValue(new Date(n)), l(a) } function k() { o.$setValidity("time", !0), a.invalidHours = !1, a.invalidMinutes = !1 } function l(b) { var c = n.getHours(), d = n.getMinutes(); a.showMeridian && (c = 0 === c || 12 === c ? 12 : c % 12), a.hours = "h" === b ? c : i(c), "m" !== b && (a.minutes = i(d)), a.meridian = n.getHours() < 12 ? p[0] : p[1] } function m(a) { var b = new Date(n.getTime() + 6e4 * a); n.setHours(b.getHours(), b.getMinutes()), j() } var n = new Date, o = {$setViewValue: angular.noop}, p = angular.isDefined(b.meridians) ? a.$parent.$eval(b.meridians) : f.meridians || e.DATETIME_FORMATS.AMPMS; this.init = function (c, d) { o = c, o.$render = this.render, o.$formatters.unshift(function (a) { return a ? new Date(a) : null }); var e = d.eq(0), g = d.eq(1), h = angular.isDefined(b.mousewheel) ? a.$parent.$eval(b.mousewheel) : f.mousewheel; h && this.setupMousewheelEvents(e, g); var i = angular.isDefined(b.arrowkeys) ? a.$parent.$eval(b.arrowkeys) : f.arrowkeys; i && this.setupArrowkeyEvents(e, g), a.readonlyInput = angular.isDefined(b.readonlyInput) ? a.$parent.$eval(b.readonlyInput) : f.readonlyInput, this.setupInputEvents(e, g) }; var q = f.hourStep; b.hourStep && a.$parent.$watch(c(b.hourStep), function (a) { q = parseInt(a, 10) }); var r = f.minuteStep; b.minuteStep && a.$parent.$watch(c(b.minuteStep), function (a) { r = parseInt(a, 10) }), a.showMeridian = f.showMeridian, b.showMeridian && a.$parent.$watch(c(b.showMeridian), function (b) { if (a.showMeridian = !!b, o.$error.time) { var c = g(), d = h(); angular.isDefined(c) && angular.isDefined(d) && (n.setHours(c), j()) } else l() }), this.setupMousewheelEvents = function (b, c) { var d = function (a) { a.originalEvent && (a = a.originalEvent); var b = a.wheelDelta ? a.wheelDelta : -a.deltaY; return a.detail || b > 0 }; b.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementHours() : a.decrementHours()), b.preventDefault() }), c.bind("mousewheel wheel", function (b) { a.$apply(d(b) ? a.incrementMinutes() : a.decrementMinutes()), b.preventDefault() }) }, this.setupArrowkeyEvents = function (b, c) { b.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementHours(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementHours(), a.$apply()) }), c.bind("keydown", function (b) { 38 === b.which ? (b.preventDefault(), a.incrementMinutes(), a.$apply()) : 40 === b.which && (b.preventDefault(), a.decrementMinutes(), a.$apply()) }) }, this.setupInputEvents = function (b, c) { if (a.readonlyInput)return a.updateHours = angular.noop, void(a.updateMinutes = angular.noop); var d = function (b, c) { o.$setViewValue(null), o.$setValidity("time", !1), angular.isDefined(b) && (a.invalidHours = b), angular.isDefined(c) && (a.invalidMinutes = c) }; a.updateHours = function () { var a = g(); angular.isDefined(a) ? (n.setHours(a), j("h")) : d(!0) }, b.bind("blur", function () { !a.invalidHours && a.hours < 10 && a.$apply(function () { a.hours = i(a.hours) }) }), a.updateMinutes = function () { var a = h(); angular.isDefined(a) ? (n.setMinutes(a), j("m")) : d(void 0, !0) }, c.bind("blur", function () { !a.invalidMinutes && a.minutes < 10 && a.$apply(function () { a.minutes = i(a.minutes) }) }) }, this.render = function () { var a = o.$viewValue; isNaN(a) ? (o.$setValidity("time", !1), d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')) : (a && (n = a), k(), l()) }, a.incrementHours = function () { m(60 * q) }, a.decrementHours = function () { m(60 * -q) }, a.incrementMinutes = function () { m(r) }, a.decrementMinutes = function () { m(-r) }, a.toggleMeridian = function () { m(720 * (n.getHours() < 12 ? 1 : -1)) } }]).directive("timepicker", function () { return { restrict: "EA", require: ["timepicker", "?^ngModel"], controller: "TimepickerController", replace: !0, scope: {}, templateUrl: "template/timepicker/timepicker.html", link: function (a, b, c, d) { var e = d[0], f = d[1]; f && e.init(f, b.find("input")) } } }), angular.module("ui.bootstrap.transition", []).value("$transitionSuppressDeprecated", !1).factory("$transition", ["$q", "$timeout", "$rootScope", "$log", "$transitionSuppressDeprecated", function (a, b, c, d, e) { function f(a) { for (var b in a)if (void 0 !== h.style[b])return a[b] } e || d.warn("$transition is now deprecated. Use $animate from ngAnimate instead."); var g = function (d, e, f) { f = f || {}; var h = a.defer(), i = g[f.animation ? "animationEndEventName" : "transitionEndEventName"], j = function () { c.$apply(function () { d.unbind(i, j), h.resolve(d) }) }; return i && d.bind(i, j), b(function () { angular.isString(e) ? d.addClass(e) : angular.isFunction(e) ? e(d) : angular.isObject(e) && d.css(e), i || h.resolve(d) }), h.promise.cancel = function () { i && d.unbind(i, j), h.reject("Transition cancelled") }, h.promise }, h = document.createElement("trans"), i = { WebkitTransition: "webkitTransitionEnd", MozTransition: "transitionend", OTransition: "oTransitionEnd", transition: "transitionend" }, j = { WebkitTransition: "webkitAnimationEnd", MozTransition: "animationend", OTransition: "oAnimationEnd", transition: "animationend" }; return g.transitionEndEventName = f(i), g.animationEndEventName = f(j), g }]), angular.module("ui.bootstrap.typeahead", ["ui.bootstrap.position", "ui.bootstrap.bindHtml"]).factory("typeaheadParser", ["$parse", function (a) { var b = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/; return { parse: function (c) { var d = c.match(b); if (!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "' + c + '".'); return {itemName: d[3], source: a(d[4]), viewMapper: a(d[2] || d[1]), modelMapper: a(d[1])} } } }]).directive("typeahead", ["$compile", "$parse", "$q", "$timeout", "$document", "$position", "typeaheadParser", function (a, b, c, d, e, f, g) { var h = [9, 13, 27, 38, 40]; return { require: "ngModel", link: function (i, j, k, l) { var m, n = i.$eval(k.typeaheadMinLength) || 1, o = i.$eval(k.typeaheadWaitMs) || 0, p = i.$eval(k.typeaheadEditable) !== !1, q = b(k.typeaheadLoading).assign || angular.noop, r = b(k.typeaheadOnSelect), s = k.typeaheadInputFormatter ? b(k.typeaheadInputFormatter) : void 0, t = k.typeaheadAppendToBody ? i.$eval(k.typeaheadAppendToBody) : !1, u = i.$eval(k.typeaheadFocusFirst) !== !1, v = b(k.ngModel).assign, w = g.parse(k.typeahead), x = i.$new(); i.$on("$destroy", function () { x.$destroy() }); var y = "typeahead-" + x.$id + "-" + Math.floor(1e4 * Math.random()); j.attr({"aria-autocomplete": "list", "aria-expanded": !1, "aria-owns": y}); var z = angular.element("<div typeahead-popup></div>"); z.attr({ id: y, matches: "matches", active: "activeIdx", select: "select(activeIdx)", query: "query", position: "position" }), angular.isDefined(k.typeaheadTemplateUrl) && z.attr("template-url", k.typeaheadTemplateUrl); var A = function () { x.matches = [], x.activeIdx = -1, j.attr("aria-expanded", !1) }, B = function (a) { return y + "-option-" + a }; x.$watch("activeIdx", function (a) { 0 > a ? j.removeAttr("aria-activedescendant") : j.attr("aria-activedescendant", B(a)) }); var C = function (a) { var b = {$viewValue: a}; q(i, !0), c.when(w.source(i, b)).then(function (c) { var d = a === l.$viewValue; if (d && m)if (c && c.length > 0) { x.activeIdx = u ? 0 : -1, x.matches.length = 0; for (var e = 0; e < c.length; e++)b[w.itemName] = c[e], x.matches.push({ id: B(e), label: w.viewMapper(x, b), model: c[e] }); x.query = a, x.position = t ? f.offset(j) : f.position(j), x.position.top = x.position.top + j.prop("offsetHeight"), j.attr("aria-expanded", !0) } else A(); d && q(i, !1) }, function () { A(), q(i, !1) }) }; A(), x.query = void 0; var D, E = function (a) { D = d(function () { C(a) }, o) }, F = function () { D && d.cancel(D) }; l.$parsers.unshift(function (a) { return m = !0, a && a.length >= n ? o > 0 ? (F(), E(a)) : C(a) : (q(i, !1), F(), A()), p ? a : a ? void l.$setValidity("editable", !1) : (l.$setValidity("editable", !0), a) }), l.$formatters.push(function (a) { var b, c, d = {}; return p || l.$setValidity("editable", !0), s ? (d.$model = a, s(i, d)) : (d[w.itemName] = a, b = w.viewMapper(i, d), d[w.itemName] = void 0, c = w.viewMapper(i, d), b !== c ? b : a) }), x.select = function (a) { var b, c, e = {}; e[w.itemName] = c = x.matches[a].model, b = w.modelMapper(i, e), v(i, b), l.$setValidity("editable", !0), l.$setValidity("parse", !0), r(i, { $item: c, $model: b, $label: w.viewMapper(i, e) }), A(), d(function () { j[0].focus() }, 0, !1) }, j.bind("keydown", function (a) { 0 !== x.matches.length && -1 !== h.indexOf(a.which) && (-1 != x.activeIdx || 13 !== a.which && 9 !== a.which) && (a.preventDefault(), 40 === a.which ? (x.activeIdx = (x.activeIdx + 1) % x.matches.length, x.$digest()) : 38 === a.which ? (x.activeIdx = (x.activeIdx > 0 ? x.activeIdx : x.matches.length) - 1, x.$digest()) : 13 === a.which || 9 === a.which ? x.$apply(function () { x.select(x.activeIdx) }) : 27 === a.which && (a.stopPropagation(), A(), x.$digest())) }), j.bind("blur", function () { m = !1 }); var G = function (a) { j[0] !== a.target && (A(), x.$digest()) }; e.bind("click", G), i.$on("$destroy", function () { e.unbind("click", G), t && H.remove(), z.remove() }); var H = a(z)(x); t ? e.find("body").append(H) : j.after(H) } } }]).directive("typeaheadPopup", function () { return { restrict: "EA", scope: {matches: "=", query: "=", active: "=", position: "=", select: "&"}, replace: !0, templateUrl: "template/typeahead/typeahead-popup.html", link: function (a, b, c) { a.templateUrl = c.templateUrl, a.isOpen = function () { return a.matches.length > 0 }, a.isActive = function (b) { return a.active == b }, a.selectActive = function (b) { a.active = b }, a.selectMatch = function (b) { a.select({activeIdx: b}) } } } }).directive("typeaheadMatch", ["$templateRequest", "$compile", "$parse", function (a, b, c) { return { restrict: "EA", scope: {index: "=", match: "=", query: "="}, link: function (d, e, f) { var g = c(f.templateUrl)(d.$parent) || "template/typeahead/typeahead-match.html"; a(g).then(function (a) { b(a.trim())(d, function (a) { e.replaceWith(a) }) }) } } }]).filter("typeaheadHighlight", function () { function a(a) { return a.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1") } return function (b, c) { return c ? ("" + b).replace(new RegExp(a(c), "gi"), "<strong>$&</strong>") : b } }), angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion-group.html", '<div class="panel panel-default">\n <div class="panel-heading">\n <h4 class="panel-title">\n <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n </h4>\n </div>\n <div class="panel-collapse collapse" collapse="!isOpen">\n <div class="panel-body" ng-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/accordion/accordion.html", []).run(["$templateCache", function (a) { a.put("template/accordion/accordion.html", '<div class="panel-group" ng-transclude></div>') }]), angular.module("template/alert/alert.html", []).run(["$templateCache", function (a) { a.put("template/alert/alert.html", '<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n <button ng-show="closeable" type="button" class="close" ng-click="close()">\n <span aria-hidden="true">&times;</span>\n <span class="sr-only">Close</span>\n </button>\n <div ng-transclude></div>\n</div>\n') }]), angular.module("template/carousel/carousel.html", []).run(["$templateCache", function (a) { a.put("template/carousel/carousel.html", '<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n <ol class="carousel-indicators" ng-show="slides.length > 1">\n <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n </ol>\n <div class="carousel-inner" ng-transclude></div>\n <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n') }]), angular.module("template/carousel/slide.html", []).run(["$templateCache", function (a) { a.put("template/carousel/slide.html", '<div ng-class="{\n \'active\': active\n }" class="item text-center" ng-transclude></div>\n') }]), angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/datepicker.html", '<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>') }]), angular.module("template/datepicker/day.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/day.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n <tr>\n <th ng-show="showWeeks" class="text-center"></th>\n <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/month.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/month.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/datepicker/popup.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/popup.html", '<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n <li ng-transclude></li>\n <li ng-if="showButtonBar" style="padding:10px 9px 2px">\n <span class="btn-group pull-left">\n <button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n <button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n </span>\n <button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n </li>\n</ul>\n') }]), angular.module("template/datepicker/year.html", []).run(["$templateCache", function (a) { a.put("template/datepicker/year.html", '<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n <thead>\n <tr>\n <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n </tr>\n </thead>\n <tbody>\n <tr ng-repeat="row in rows track by $index">\n <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n </td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/modal/backdrop.html", []).run(["$templateCache", function (a) { a.put("template/modal/backdrop.html", '<div class="modal-backdrop"\n modal-animation-class="fade"\n ng-class="{in: animate}"\n ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n') }]), angular.module("template/modal/window.html", []).run(["$templateCache", function (a) { a.put("template/modal/window.html", '<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n modal-animation-class="fade"\n ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n') }]), angular.module("template/pagination/pager.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pager.html", '<ul class="pager">\n <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>') }]), angular.module("template/pagination/pagination.html", []).run(["$templateCache", function (a) { a.put("template/pagination/pagination.html", '<ul class="pagination">\n <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>') }]), angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-html-unsafe-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n') }]), angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function (a) { a.put("template/tooltip/tooltip-template-popup.html", '<div class="tooltip"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="tooltip-arrow"></div>\n <div class="tooltip-inner"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n</div>\n') }]), angular.module("template/popover/popover-template.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-template.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content"\n tooltip-template-transclude="contentExp()"\n tooltip-template-transclude-scope="originScope()"></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover-window.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover-window.html", '<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n <div class="popover-content" tooltip-template-transclude></div>\n </div>\n</div>\n') }]), angular.module("template/popover/popover.html", []).run(["$templateCache", function (a) { a.put("template/popover/popover.html", '<div class="popover"\n tooltip-animation-class="fade"\n tooltip-classes\n ng-class="{ in: isOpen() }">\n <div class="arrow"></div>\n\n <div class="popover-inner">\n <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n <div class="popover-content" ng-bind="content"></div>\n </div>\n</div>\n') }]), angular.module("template/progressbar/bar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/bar.html", '<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n') }]), angular.module("template/progressbar/progress.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progress.html", '<div class="progress" ng-transclude></div>') }]), angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function (a) { a.put("template/progressbar/progressbar.html", '<div class="progress">\n <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n') }]), angular.module("template/rating/rating.html", []).run(["$templateCache", function (a) { a.put("template/rating/rating.html", '<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n </i>\n</span>') }]), angular.module("template/tabs/tab.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tab.html", '<li ng-class="{active: active, disabled: disabled}">\n <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n') }]), angular.module("template/tabs/tabset.html", []).run(["$templateCache", function (a) { a.put("template/tabs/tabset.html", '<div>\n <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n <div class="tab-content">\n <div class="tab-pane" \n ng-repeat="tab in tabs" \n ng-class="{active: tab.active}"\n tab-content-transclude="tab">\n </div>\n </div>\n</div>\n') }]), angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function (a) { a.put("template/timepicker/timepicker.html", '<table>\n <tbody>\n <tr class="text-center">\n <td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n <tr>\n <td class="form-group" ng-class="{\'has-error\': invalidHours}">\n <input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td>:</td>\n <td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n <input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n </td>\n <td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n </tr>\n <tr class="text-center">\n <td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td>&nbsp;</td>\n <td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n <td ng-show="showMeridian"></td>\n </tr>\n </tbody>\n</table>\n') }]), angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-match.html", '<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>') }]), angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function (a) { a.put("template/typeahead/typeahead-popup.html", '<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n </li>\n</ul>\n') }]), !angular.$$csp() && angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
-1
apolloconfig/apollo
3,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/mode-json.js
define("ace/mode/json_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"variable",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]\\s*(?=:)'},{token:"string",regex:'"',next:"string"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"text",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"comment",regex:"\\/\\/.*$"},{token:"comment.start",regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],string:[{token:"constant.language.escape",regex:/\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|["\\\/bfnrt])/},{token:"string",regex:'"|$',next:"start"},{defaultToken:"string"}],comment:[{token:"comment.end",regex:"\\*\\/",next:"start"},{defaultToken:"comment"}]}};r.inherits(s,i),t.JsonHighlightRules=s}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),define("ace/mode/json",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/json_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./json_highlight_rules").JsonHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./behaviour/cstyle").CstyleBehaviour,a=e("./folding/cstyle").FoldMode,f=e("../worker/worker_client").WorkerClient,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new u,this.foldingRules=new a};r.inherits(l,i),function(){this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new f(["ace"],"ace/mode/json_worker","JsonWorker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/json"}.call(l.prototype),t.Mode=l})
define("ace/mode/json_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"variable",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]\\s*(?=:)'},{token:"string",regex:'"',next:"string"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"text",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"comment",regex:"\\/\\/.*$"},{token:"comment.start",regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],string:[{token:"constant.language.escape",regex:/\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|["\\\/bfnrt])/},{token:"string",regex:'"|$',next:"start"},{defaultToken:"string"}],comment:[{token:"comment.end",regex:"\\*\\/",next:"start"},{defaultToken:"comment"}]}};r.inherits(s,i),t.JsonHighlightRules=s}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),define("ace/mode/json",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/json_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./json_highlight_rules").JsonHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./behaviour/cstyle").CstyleBehaviour,a=e("./folding/cstyle").FoldMode,f=e("../worker/worker_client").WorkerClient,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new u,this.foldingRules=new a};r.inherits(l,i),function(){this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new f(["ace"],"ace/mode/json_worker","JsonWorker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/json"}.call(l.prototype),t.Mode=l})
-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/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,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/zh/development/portal-how-to-enable-email-service.md
在配置发布时候,我们希望发布信息邮件通知到相关的负责人。现支持发送邮件的动作有:普通发布、灰度发布、全量发布、回滚,通知对象包括:具有namespace编辑和发布权限的人员以及App负责人。 由于各公司的邮件服务往往有不同的实现,所以Apollo定义了一些SPI用来解耦,Apollo接入邮件服务的关键就是实现这些SPI。 ## 一、实现方式一:使用Apollo提供的smtp邮件服务 ### 1.1 接入步骤 在ApolloPortalDB.ServerConfig表配置以下参数,也可以通过管理员工具 - 系统参数页面进行配置,修改完一分钟实时生效。如下: * **email.enabled** 设置为true即可启用默认的smtp邮件服务 * **email.config.host** smtp的服务地址,如`smtp.163.com` * **email.config.user** smtp帐号用户名 * **email.config.password** smtp帐号密码 * **email.supported.envs** 支持发送邮件的环境列表,英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件,只有某些环境下的发布动作才会发送邮件。 * **email.sender** 邮件的发送人,可以不配置,默认为`email.config.user`。 * **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。 * **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化,方便管理和变更邮件内容。 * **email.template.release.module.diff** 发布邮件的diff模块。 * **email.template.rollback.module.diff** 回滚邮件的diff模块。 * **email.template.release.module.rules** 灰度发布的灰度规则模块。 我们提供了[邮件模板样例](#三、邮件模板样例),方便大家使用。 ## 二、实现方式二:接入公司的统一邮件服务 和SSO类似,每个公司也有自己的邮件服务实现,所以我们相应的定义了[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)接口,现有两个实现类: 1. CtripEmailService:携程实现的EmailService 2. DefaultEmailService:smtp实现 ### 2.1 接入步骤 1. 提供自己公司的[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)实现,并在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中注册。 2. 在ApolloPortalDB.ServerConfig表配置以下参数,也可以通过管理员工具 - 系统参数页面进行配置,修改完一分钟实时生效。如下: * **email.supported.envs** 支持发送邮件的环境列表,英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件,只有某些环境下的发布动作才会发送邮件。 * **email.sender** 邮件的发送人。 * **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。 * **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化,方便管理和变更邮件内容。 * **email.template.release.module.diff** 发布邮件的diff模块。 * **email.template.rollback.module.diff** 回滚邮件的diff模块。 * **email.template.release.module.rules** 灰度发布的灰度规则模块。 我们提供了[邮件模板样例](#三、邮件模板样例),方便大家使用。 >注:运行时使用不同的实现是通过[Profiles](http://docs.spring.io/autorepo/docs/spring-boot/current/reference/html/boot-features-profiles.html)实现的,比如你自己的Email实现是在`custom` profile中的话,在打包脚本中可以指定-Dapollo_profile=github,custom。其中`github`是Apollo必须的一个profile,用于数据库的配置,`custom`是你自己实现的profile。同时需要注意在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中修改默认实现的条件`@Profile({"!custom"})`。 ### 2.2 相关代码 1. [ConfigPublishListener](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/ConfigPublishListener.java)监听发布事件,调用emailbuilder构建邮件内容,然后调用EmailService发送邮件 2. [emailbuilder](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/components/emailbuilder)包是构建邮件内容的实现 3. [EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java) 邮件发送服务 4. [EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java) 邮件服务注册类 ## 三、邮件模板样例 以下为发布邮件和回滚邮件的模板内容样式,邮件模板为html格式,发送html格式的邮件时,可能需要做一些额外的处理,取决于每个公司的邮件服务实现。为了减少字符数,模板经过了压缩处理,可自行格式化提高可读性。 ### 3.1 email.template.framework ```html <html><head><style type="text/css">.table{width:100%;max-width:100%;margin-bottom:20px;border-collapse:collapse;background-color:transparent}td{padding:8px;line-height:1.42857143;vertical-align:top;border:1px solid #ddd;border-top:1px solid #ddd}.table-bordered{border:1px solid #ddd}</style></head><body><h3>发布基本信息</h3><table class="table table-bordered"><tr><td width="10%"><b>AppId</b></td><td width="15%">#{appId}</td><td width="10%"><b>环境</b></td><td width="15%">#{env}</td><td width="10%"><b>集群</b></td><td width="15%">#{clusterName}</td><td width="10%"><b>Namespace</b></td><td width="15%">#{namespaceName}</td></tr><tr><td><b>发布者</b></td><td>#{operator}</td><td><b>发布时间</b></td><td>#{releaseTime}</td><td><b>发布标题</b></td><td>#{releaseTitle}</td><td><b>备注</b></td><td>#{releaseComment}</td></tr></table>#{diffModule}#{rulesModule}<br><a href="#{apollo.portal.address}/config/history.html?#/appid=#{appId}&env=#{env}&clusterName=#{clusterName}&namespaceName=#{namespaceName}&releaseHistoryId=#{releaseHistoryId}">点击查看详细的发布信息</a><br><br>如有Apollo使用问题请先查阅<a href="http://conf.ctripcorp.com/display/FRAM/Apollo">文档</a>,或直接回复本邮件咨询。</body></html> ``` > 注:使用此模板需要在 portal 的系统参数中配置 apollo.portal.address,指向 apollo portal 的地址 ### 3.2 email.template.release.module.diff ```html <h3>变更的配置</h3> <table class="table table-bordered"> <tr> <td width="10%"><b>Type</b></td> <td width="20%"><b>Key</b></td> <td width="35%"><b>Old Value</b></td> <td width="35%"><b>New Value</b></td> </tr> #{diffContent} </table> ``` ### 3.3 email.template.rollback.module.diff ```html <div> <br><br> <h3>变更的配置</h3> <table class="table table-bordered"> <tr> <td width="10%"><b>Type</b></td> <td width="20%"><b>Key</b></td> <td width="35%"><b>回滚前</b></td> <td width="35%"><b>回滚后</b></td> </tr> #{diffContent} </table> <br> </div> ``` ### 3.4 email.template.release.module.rules ```html <div> <br> <h3>灰度规则</h3> #{rulesContent} <br> </div> ``` ### 3.5 发布邮件样例 ![发布邮件模板](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/email-template-release.png) ### 3.6 回滚邮件样例 ![回滚邮件模板](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/email-template-rollback.png)
在配置发布时候,我们希望发布信息邮件通知到相关的负责人。现支持发送邮件的动作有:普通发布、灰度发布、全量发布、回滚,通知对象包括:具有namespace编辑和发布权限的人员以及App负责人。 由于各公司的邮件服务往往有不同的实现,所以Apollo定义了一些SPI用来解耦,Apollo接入邮件服务的关键就是实现这些SPI。 ## 一、实现方式一:使用Apollo提供的smtp邮件服务 ### 1.1 接入步骤 在ApolloPortalDB.ServerConfig表配置以下参数,也可以通过管理员工具 - 系统参数页面进行配置,修改完一分钟实时生效。如下: * **email.enabled** 设置为true即可启用默认的smtp邮件服务 * **email.config.host** smtp的服务地址,如`smtp.163.com` * **email.config.user** smtp帐号用户名 * **email.config.password** smtp帐号密码 * **email.supported.envs** 支持发送邮件的环境列表,英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件,只有某些环境下的发布动作才会发送邮件。 * **email.sender** 邮件的发送人,可以不配置,默认为`email.config.user`。 * **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。 * **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化,方便管理和变更邮件内容。 * **email.template.release.module.diff** 发布邮件的diff模块。 * **email.template.rollback.module.diff** 回滚邮件的diff模块。 * **email.template.release.module.rules** 灰度发布的灰度规则模块。 我们提供了[邮件模板样例](#三、邮件模板样例),方便大家使用。 ## 二、实现方式二:接入公司的统一邮件服务 和SSO类似,每个公司也有自己的邮件服务实现,所以我们相应的定义了[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)接口,现有两个实现类: 1. CtripEmailService:携程实现的EmailService 2. DefaultEmailService:smtp实现 ### 2.1 接入步骤 1. 提供自己公司的[EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java)实现,并在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中注册。 2. 在ApolloPortalDB.ServerConfig表配置以下参数,也可以通过管理员工具 - 系统参数页面进行配置,修改完一分钟实时生效。如下: * **email.supported.envs** 支持发送邮件的环境列表,英文逗号隔开。我们不希望发布邮件变成用户的垃圾邮件,只有某些环境下的发布动作才会发送邮件。 * **email.sender** 邮件的发送人。 * **apollo.portal.address** Apollo Portal的地址。方便用户从邮件点击跳转到Apollo Portal查看详细的发布信息。 * **email.template.framework** 邮件内容模板框架。将邮件内容模板化、可配置化,方便管理和变更邮件内容。 * **email.template.release.module.diff** 发布邮件的diff模块。 * **email.template.rollback.module.diff** 回滚邮件的diff模块。 * **email.template.release.module.rules** 灰度发布的灰度规则模块。 我们提供了[邮件模板样例](#三、邮件模板样例),方便大家使用。 >注:运行时使用不同的实现是通过[Profiles](http://docs.spring.io/autorepo/docs/spring-boot/current/reference/html/boot-features-profiles.html)实现的,比如你自己的Email实现是在`custom` profile中的话,在打包脚本中可以指定-Dapollo_profile=github,custom。其中`github`是Apollo必须的一个profile,用于数据库的配置,`custom`是你自己实现的profile。同时需要注意在[EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java)中修改默认实现的条件`@Profile({"!custom"})`。 ### 2.2 相关代码 1. [ConfigPublishListener](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/ConfigPublishListener.java)监听发布事件,调用emailbuilder构建邮件内容,然后调用EmailService发送邮件 2. [emailbuilder](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/components/emailbuilder)包是构建邮件内容的实现 3. [EmailService](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java) 邮件发送服务 4. [EmailConfiguration](https://github.com/ctripcorp/apollo/blob/master/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/EmailConfiguration.java) 邮件服务注册类 ## 三、邮件模板样例 以下为发布邮件和回滚邮件的模板内容样式,邮件模板为html格式,发送html格式的邮件时,可能需要做一些额外的处理,取决于每个公司的邮件服务实现。为了减少字符数,模板经过了压缩处理,可自行格式化提高可读性。 ### 3.1 email.template.framework ```html <html><head><style type="text/css">.table{width:100%;max-width:100%;margin-bottom:20px;border-collapse:collapse;background-color:transparent}td{padding:8px;line-height:1.42857143;vertical-align:top;border:1px solid #ddd;border-top:1px solid #ddd}.table-bordered{border:1px solid #ddd}</style></head><body><h3>发布基本信息</h3><table class="table table-bordered"><tr><td width="10%"><b>AppId</b></td><td width="15%">#{appId}</td><td width="10%"><b>环境</b></td><td width="15%">#{env}</td><td width="10%"><b>集群</b></td><td width="15%">#{clusterName}</td><td width="10%"><b>Namespace</b></td><td width="15%">#{namespaceName}</td></tr><tr><td><b>发布者</b></td><td>#{operator}</td><td><b>发布时间</b></td><td>#{releaseTime}</td><td><b>发布标题</b></td><td>#{releaseTitle}</td><td><b>备注</b></td><td>#{releaseComment}</td></tr></table>#{diffModule}#{rulesModule}<br><a href="#{apollo.portal.address}/config/history.html?#/appid=#{appId}&env=#{env}&clusterName=#{clusterName}&namespaceName=#{namespaceName}&releaseHistoryId=#{releaseHistoryId}">点击查看详细的发布信息</a><br><br>如有Apollo使用问题请先查阅<a href="http://conf.ctripcorp.com/display/FRAM/Apollo">文档</a>,或直接回复本邮件咨询。</body></html> ``` > 注:使用此模板需要在 portal 的系统参数中配置 apollo.portal.address,指向 apollo portal 的地址 ### 3.2 email.template.release.module.diff ```html <h3>变更的配置</h3> <table class="table table-bordered"> <tr> <td width="10%"><b>Type</b></td> <td width="20%"><b>Key</b></td> <td width="35%"><b>Old Value</b></td> <td width="35%"><b>New Value</b></td> </tr> #{diffContent} </table> ``` ### 3.3 email.template.rollback.module.diff ```html <div> <br><br> <h3>变更的配置</h3> <table class="table table-bordered"> <tr> <td width="10%"><b>Type</b></td> <td width="20%"><b>Key</b></td> <td width="35%"><b>回滚前</b></td> <td width="35%"><b>回滚后</b></td> </tr> #{diffContent} </table> <br> </div> ``` ### 3.4 email.template.release.module.rules ```html <div> <br> <h3>灰度规则</h3> #{rulesContent} <br> </div> ``` ### 3.5 发布邮件样例 ![发布邮件模板](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/email-template-release.png) ### 3.6 回滚邮件样例 ![回滚邮件模板](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/email-template-rollback.png)
-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/css/fonts.css
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ /* roboto-mono-regular */ @font-face { font-family: 'Roboto Mono'; font-style: normal; font-weight: regular; src: url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.eot'); /* IE9 Compat Modes */ src: local('Roboto Mono'), local('RobotoMono-Normal'), url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */ } /* source-sans-pro-300 */ @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; src: url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.eot'); /* IE9 Compat Modes */ src: local('Source Sans Pro'), local('SourceSans Pro-Normal'), url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.svg#SourceSans Pro') format('svg'); /* Legacy iOS */ } /* source-sans-pro-regular */ @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: regular; src: url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.eot'); /* IE9 Compat Modes */ src: local('Source Sans Pro'), local('SourceSans Pro-Normal'), url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.svg#SourceSans Pro') format('svg'); /* Legacy iOS */ } /* source-sans-pro-600 */ @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; src: url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.eot'); /* IE9 Compat Modes */ src: local('Source Sans Pro'), local('SourceSans Pro-Normal'), url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.svg#SourceSans Pro') format('svg'); /* Legacy iOS */ }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ /* roboto-mono-regular */ @font-face { font-family: 'Roboto Mono'; font-style: normal; font-weight: regular; src: url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.eot'); /* IE9 Compat Modes */ src: local('Roboto Mono'), local('RobotoMono-Normal'), url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/roboto-mono/roboto-mono-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */ } /* source-sans-pro-300 */ @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 300; src: url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.eot'); /* IE9 Compat Modes */ src: local('Source Sans Pro'), local('SourceSans Pro-Normal'), url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-300.svg#SourceSans Pro') format('svg'); /* Legacy iOS */ } /* source-sans-pro-regular */ @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: regular; src: url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.eot'); /* IE9 Compat Modes */ src: local('Source Sans Pro'), local('SourceSans Pro-Normal'), url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-regular.svg#SourceSans Pro') format('svg'); /* Legacy iOS */ } /* source-sans-pro-600 */ @font-face { font-family: 'Source Sans Pro'; font-style: normal; font-weight: 600; src: url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.eot'); /* IE9 Compat Modes */ src: local('Source Sans Pro'), local('SourceSans Pro-Normal'), url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.woff2') format('woff2'), /* Super Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.woff') format('woff'), /* Modern Browsers */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.ttf') format('truetype'), /* Safari, Android, iOS */ url('//lib.baomitu.com/fonts/source-sans-pro/source-sans-pro-600.svg#SourceSans Pro') format('svg'); /* Legacy iOS */ }
-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/zh/usage/apollo-user-guide.md
# &nbsp; # 名词解释 * 普通应用 * 普通应用指的是独立运行的程序,如 * Web应用程序 * 带有main函数的程序 * 公共组件 * 公共组件指的是发布的类库、客户端程序,不会自己独立运行,如 * Java的jar包 * .Net的dll文件 # 一、普通应用接入指南 ## 1.1 创建项目 要使用Apollo,第一步需要创建项目。 1. 打开apollo-portal主页 2. 点击“创建项目” ![create-app-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app-entry.png) 3. 输入项目信息 * 部门:选择应用所在的部门 * 应用AppId:用来标识应用身份的唯一id,格式为string,需要和客户端app.properties中配置的app.id对应 * 应用名称:应用名,仅用于界面展示 * 应用负责人:选择的人默认会成为该项目的管理员,具备项目权限管理、集群创建、Namespace创建等权限 ![create-app](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app.png) 4. 点击提交 创建成功后,会自动跳转到项目首页 ![app-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-created.png) ## 1.2 项目权限分配 ### 1.2.1 项目管理员权限 项目管理员拥有以下权限: 1. 可以管理项目的权限分配 2. 可以创建集群 3. 可以创建Namespace 创建项目时填写的应用负责人默认会成为项目的管理员之一,如果还需要其他人也成为项目管理员,可以按照下面步骤操作: 1. 点击页面左侧的“管理项目” * ![app-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-entry.png) 2. 搜索需要添加的成员并点击添加 * ![app-permission-search-user](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-search-user.png) * ![app-permission-user-added](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-user-added.png) ### 1.2.2 配置编辑、发布权限 配置权限分为编辑和发布: * 编辑权限允许用户在Apollo界面上创建、修改、删除配置 * 配置修改后只在Apollo界面上变化,不会影响到应用实际使用的配置 * 发布权限允许用户在Apollo界面上发布、回滚配置 * 配置只有在发布、回滚动作后才会被应用实际使用到 * Apollo在用户操作发布、回滚动作后实时通知到应用,并使最新配置生效 项目创建完,默认没有分配配置的编辑和发布权限,需要项目管理员进行授权。 1. 点击application这个namespace的授权按钮 * ![namespace-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-entry.png) 2. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 3. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) ## 1.3 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 ### 1.3.1 通过表格模式添加配置 1. 点击新增配置 * ![create-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-entry.png) 2. 输入配置项 * ![create-item-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-detail.png) 3. 点击提交 * ![item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/item-created.png) ### 1.3.2 通过文本模式编辑 Apollo除了支持表格模式,逐个添加、修改配置外,还提供文本模式批量添加、修改。 这个对于从已有的properties文件迁移尤其有用。 1. 切换到文本编辑模式 ![text-mode-config-overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-overview.png) 2. 点击右侧的修改配置按钮 ![text-mode-config-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-entry.png) 3. 输入配置项,并点击提交修改 ![text-mode-config-submit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-submit.png) ## 1.4 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-entry.png) 2. 填写发布相关信息,点击发布 ![publish-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-detail.png) ## 1.5 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) ## 1.6 回滚已发布配置 如果发现已发布的配置有问题,可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。 这里的回滚机制类似于发布系统,发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本,但代码仓库中的代码是不会回滚的,从而开发可以在修复代码后重新发布。 Apollo中的回滚也是类似的机制,点击回滚后是将发布到客户端的配置回滚到上一个已发布版本,也就是说客户端读取到的配置会恢复到上一个版本,但页面上编辑状态的配置是不会回滚的,从而开发可以在修复配置后重新发布。 # 二、公共组件接入指南 ## 2.1 公共组件和普通应用的区别 公共组件是指那些发布给其它应用使用的客户端代码,比如CAT客户端、Hermes Producer客户端等。 虽然这类组件是由其他团队开发、维护,但是运行时是在业务实际应用内的,所以本质上可以认为是应用的一部分。 通常情况下,这类组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 ## 2.2 公共组件接入步骤 公共组件的接入步骤,和普通应用几乎一致,唯一的区别是公共组件需要创建自己唯一的Namespace。 所以,首先执行普通应用接入文档中的以下几个步骤,然后再按照本章节后面的步骤操作。 1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE) 2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90) ### 2.2.1 创建Namespace 创建Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权。 1. 点击页面左侧的添加Namespace * ![create-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace.png) 2. 点击“创建新的Namespace” * ![create-namespace-select-type](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-select-type.png) 3. 输入公共组件的Namespace名称,需要注意的是Namespace名称全局唯一 * Apollo会默认把部门代号添加在最前面 * ![create-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-detail.png) 4. 点击提交后,页面会自动跳转到关联Namespace页面 * 首先,选中所有需要有这个Namespace的环境和集群,一般建议全选 * 其次,选中刚刚创建的namespace * 最后,点击提交 * ![link-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-namespace-detail.png) 5. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 6. 点击“返回”回到项目页面 ### 2.2.2 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 #### 2.2.2.1 通过表格模式添加配置 1. 点击新增配置 ![public-namespace-edit-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item-entry.png) 2. 输入配置项 ![public-namespace-edit-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item.png) 3. 点击提交 ![public-namespace-item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-item-created.png) #### 2.2.2.2 通过文本模式编辑 这部分和普通应用一致,具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。 ### 2.2.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![public-namespace-publish-items-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items-entry.png) 2. 填写发布相关信息,点击发布 ![public-namespace-publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items.png) ### 2.2.4 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) 对于公共组件的配置读取,可以参考上述文档中的“获取公共Namespace的配置”部分。 ## 2.3 应用覆盖公用组件配置步骤 前面提到,通常情况下,公共组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 这里就讲一下应用如何覆盖公用组件的配置,简单起见,假设apollo-portal应用使用了hermes producer客户端,并且希望调整hermes的批量发送大小。 ### 2.3.1 关联公共组件Namespace 1. 进入使用公共组件的应用项目首页,点击左侧的添加Namespace按钮 * 所以,在这个例子中,我们需要进入apollo-portal的首页。 * (添加Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权) * ![link-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace-entry.png) 2. 找到hermes producer的namespace,并选择需要关联到哪些环境和集群 ![link-public-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace.png) 3. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 4. 点击“返回”回到项目页面 ### 2.3.2 覆盖公用组件配置 1. 点击新增配置 ![override-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-entry.png) 2. 输入要覆盖的配置项 ![override-public-namespace-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item.png) 3. 点击提交 ![override-public-namespace-item-done](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-done.png) ### 2.3.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![override-public-namespace-item-publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish-entry.png) 2. 填写发布相关信息,点击发布 ![override-public-namespace-item-publish](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish.png) 3. 配置发布成功后,hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。 # 三、集群独立配置说明 在有些特殊情况下,应用有需求对不同的集群做不同的配置,比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。 在这种情况下,可以通过在Apollo创建不同的集群来解决。 ## 3.1 创建集群 创建集群需要项目管理员权限,如果发现没有添加集群按钮,可以找项目管理员授权。 1. 点击页面左侧的“添加集群”按钮 * ![create-cluster](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster.png) 2. 输入集群名称,选择环境并提交 * ![create-cluster-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster-detail.png) 3. 切换到对应的集群,修改配置并发布即可 * ![config-in-cluster-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/cluster-created.png) 4. 通过上述配置,部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置 5. 如果应用还在其它机房部署了应用,那么在上述的配置下,会读到default集群下的配置。 # 四、多个AppId使用同一份配置 在一些情况下,尽管应用本身不是公共组件,但还是需要在多个AppId之间共用同一份配置,比如同一个产品的不同项目:XX-Web, XX-Service, XX-Job等。 这种情况下如果希望实现多个AppId使用同一份配置的话,基本概念和公共组件的配置是一致的。 具体来说,就是在其中一个AppId下创建一个namespace,写入公共的配置信息,然后在各个项目中读取该namespace的配置即可。 如果某个AppId需要覆盖公共的配置信息,那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。 具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。 # 五、灰度发布使用指南 通过灰度发布功能,可以实现: 1. 对于一些对程序有比较大影响的配置,可以先在一个或者多个实例生效,观察一段时间没问题后再全量发布配置。 2. 对于一些需要调优的配置参数,可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置,不断调整、测评一段时间后找出较优的配置再全量发布配置。 下面将结合一个实际例子来描述如何使用灰度发布功能。 ## 5.1 场景介绍 100004458(apollo-demo)项目有两个客户端: 1. 10.32.21.19 2. 10.32.21.22 ![initial-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-instance-list.png) **灰度目标:** * 当前有一个配置timeout=2000,我们希望对10.32.21.22灰度发布timeout=3000,对10.32.21.19仍然是timeout=2000。 ![initial-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-config.png) ## 5.2 创建灰度 首先点击application namespace右上角的`创建灰度`按钮。 ![create-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/create-gray-release.png) 点击确定后,灰度版本就创建成功了,页面会自动切换到`灰度版本`Tab。 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-gray-release-tab.png) ## 5.3 灰度配置 点击`主版本的配置`中,timeout配置最右侧的`对此配置灰度`按钮 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/edit-gray-release-config.png) 在弹出框中填入要灰度的值:3000,点击提交。 ![submit-gray-release-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/submit-gray-release-config.png) ![gray-release-config-submitted](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-config-submitted.png) ## 5.4 配置灰度规则 切换到`灰度规则`Tab,点击`新增规则`按钮 ![new-gray-release-rule](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/new-gray-release-rule.png) 在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表,选择我们要灰度的IP,点击完成。 ![select-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/select-gray-release-ip.png) ![gray-release-ip-selected](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-ip-selected.png) ![gray-release-rule-saved](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-rule-saved.png) 如果下拉框中没找到需要的IP,说明机器还没从Apollo取过配置,可以点击手动输入IP来输入,输入完后点击添加按钮 ![manual-input-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip.png) ![manual-input-gray-release-ip-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip-2.png) >注:对于公共Namespace的灰度规则,需要先指定要灰度的appId,然后再选择IP。 ## 5.5 灰度发布 配置规则已经生效,不过灰度配置还没有发布。切换到`配置`Tab。 再次检查灰度的配置部分,如果没有问题,点击`灰度发布`。 ![prepare-to-do-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-do-gray-release.png) 在弹出框中可以看到主版本的值是2000,灰度版本即将发布的值是3000。填入其它信息后,点击发布。 ![gray-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-confirm-dialog.png) 发布后,切换到`灰度实例列表`Tab,就能看到10.32.21.22已经使用了灰度发布的值。 ![gray-release-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-instance-list.png) 切换到`主版本`的`实例列表`,会看到主版本配置只有10.32.21.19在使用了。 ![master-branch-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list.png) 后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效,规则的修改在规则点击完成后就会实时生效。 ## 5.6 全量发布 如果灰度的配置测试下来比较理想,符合预期,那么就可以操作`全量发布`。 全量发布的效果是: 1. 灰度版本的配置会合并回主版本,在这个例子中,就是主版本的timeout会被更新成3000 2. 主版本的配置会自动进行一次发布 3. 在全量发布页面,可以选择是否保留当前灰度版本,默认为不保留。 ![prepare-to-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-full-release.png) ![full-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog.png) ![full-release-confirm-dialog-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog-2.png) 我选择了不保留灰度版本,所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表,可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。 ![master-branch-instance-list-after-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list-after-full-release.png) ## 5.7 放弃灰度 如果灰度版本不理想或者不需要了,可以点击`放弃灰度`。 ![abandon-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/abandon-gray-release.png) ## 5.8 发布历史 点击主版本的`发布历史`按钮,可以看到当前namespace的主版本以及灰度版本的发布历史。 ![view-release-history](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history.png) ![view-release-history-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history-detail.png) # 六、其它功能配置 ## 6.1 配置查看权限 从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) ## 6.2 配置访问密钥 Apollo从1.6.0版本开始增加访问密钥机制,从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥,客户端需要配置密钥,否则无法获取配置。 1. 项目管理员打开管理密钥页面 ![管理密钥入口](https://user-images.githubusercontent.com/837658/94990081-f4d3cd80-05ab-11eb-9470-fed5ec6de92e.png) 2. 为项目的每个环境生成访问密钥,注意默认是禁用的,建议在客户端都配置完成后再开启 ![密钥配置页面](https://user-images.githubusercontent.com/837658/94990150-788dba00-05ac-11eb-9a12-727fdb872e42.png) 3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥) # 七、最佳实践 ## 7.1 安全相关 配置中心作为基础服务,存储着公司非常重要的配置信息,所以安全因素需要大家重点关注,下面列举了一些注意事项供大家参考,也欢迎大家分享自己的实践案例。 ### 7.1.1 认证 建议接入公司统一的身份认证系统,如 SSO、LDAP 等,接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function) > 如果使用Apollo提供的Spring Security简单认证,务必记得要修改超级管理员apollo的密码 ### 7.1.2 授权 Apollo 支持细粒度的权限控制,请务必根据实际情况做好权限控制: 1. [项目管理员权限](#_121-项目管理员权限) * Apollo 默认允许所有登录用户创建项目,如果只允许部分用户创建项目,可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制) 2. [配置编辑、发布权限](#_122-配置编辑、发布权限) * 配置编辑、发布权限支持按环境配置,比如开发环境开发人员可以自行完成配置编辑和发布的过程,但是生产环境发布权限交由测试或运维人员 * 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关,用于发布审核),从而控制一次配置发布只能由一个人修改,另一个人发布,确保配置修改得到充分检查 3. [配置查看权限](#_61-配置查看权限) * 可以指定某个环境只允许项目成员查看私有Namespace的配置,从而避免敏感配置泄露,如生产环境 ### 7.1.3 系统访问 除了用户权限,在系统访问上也需要加以考虑: 1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的,所以出于安全考虑,禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网 2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5),从而只有经过身份验证的客户端才能访问敏感配置 3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制),从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口,增强安全性
# &nbsp; # 名词解释 * 普通应用 * 普通应用指的是独立运行的程序,如 * Web应用程序 * 带有main函数的程序 * 公共组件 * 公共组件指的是发布的类库、客户端程序,不会自己独立运行,如 * Java的jar包 * .Net的dll文件 # 一、普通应用接入指南 ## 1.1 创建项目 要使用Apollo,第一步需要创建项目。 1. 打开apollo-portal主页 2. 点击“创建项目” ![create-app-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app-entry.png) 3. 输入项目信息 * 部门:选择应用所在的部门 * 应用AppId:用来标识应用身份的唯一id,格式为string,需要和客户端app.properties中配置的app.id对应 * 应用名称:应用名,仅用于界面展示 * 应用负责人:选择的人默认会成为该项目的管理员,具备项目权限管理、集群创建、Namespace创建等权限 ![create-app](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-app.png) 4. 点击提交 创建成功后,会自动跳转到项目首页 ![app-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-created.png) ## 1.2 项目权限分配 ### 1.2.1 项目管理员权限 项目管理员拥有以下权限: 1. 可以管理项目的权限分配 2. 可以创建集群 3. 可以创建Namespace 创建项目时填写的应用负责人默认会成为项目的管理员之一,如果还需要其他人也成为项目管理员,可以按照下面步骤操作: 1. 点击页面左侧的“管理项目” * ![app-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-entry.png) 2. 搜索需要添加的成员并点击添加 * ![app-permission-search-user](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-search-user.png) * ![app-permission-user-added](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/app-permission-user-added.png) ### 1.2.2 配置编辑、发布权限 配置权限分为编辑和发布: * 编辑权限允许用户在Apollo界面上创建、修改、删除配置 * 配置修改后只在Apollo界面上变化,不会影响到应用实际使用的配置 * 发布权限允许用户在Apollo界面上发布、回滚配置 * 配置只有在发布、回滚动作后才会被应用实际使用到 * Apollo在用户操作发布、回滚动作后实时通知到应用,并使最新配置生效 项目创建完,默认没有分配配置的编辑和发布权限,需要项目管理员进行授权。 1. 点击application这个namespace的授权按钮 * ![namespace-permission-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-entry.png) 2. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 3. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) ## 1.3 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 ### 1.3.1 通过表格模式添加配置 1. 点击新增配置 * ![create-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-entry.png) 2. 输入配置项 * ![create-item-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-item-detail.png) 3. 点击提交 * ![item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/item-created.png) ### 1.3.2 通过文本模式编辑 Apollo除了支持表格模式,逐个添加、修改配置外,还提供文本模式批量添加、修改。 这个对于从已有的properties文件迁移尤其有用。 1. 切换到文本编辑模式 ![text-mode-config-overview](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-overview.png) 2. 点击右侧的修改配置按钮 ![text-mode-config-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-entry.png) 3. 输入配置项,并点击提交修改 ![text-mode-config-submit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/text-mode-config-submit.png) ## 1.4 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-entry.png) 2. 填写发布相关信息,点击发布 ![publish-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/hermes-portal-publish-detail.png) ## 1.5 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) ## 1.6 回滚已发布配置 如果发现已发布的配置有问题,可以通过点击『回滚』按钮来将客户端读取到的配置回滚到上一个发布版本。 这里的回滚机制类似于发布系统,发布系统中的回滚操作是将部署到机器上的安装包回滚到上一个部署的版本,但代码仓库中的代码是不会回滚的,从而开发可以在修复代码后重新发布。 Apollo中的回滚也是类似的机制,点击回滚后是将发布到客户端的配置回滚到上一个已发布版本,也就是说客户端读取到的配置会恢复到上一个版本,但页面上编辑状态的配置是不会回滚的,从而开发可以在修复配置后重新发布。 # 二、公共组件接入指南 ## 2.1 公共组件和普通应用的区别 公共组件是指那些发布给其它应用使用的客户端代码,比如CAT客户端、Hermes Producer客户端等。 虽然这类组件是由其他团队开发、维护,但是运行时是在业务实际应用内的,所以本质上可以认为是应用的一部分。 通常情况下,这类组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 ## 2.2 公共组件接入步骤 公共组件的接入步骤,和普通应用几乎一致,唯一的区别是公共组件需要创建自己唯一的Namespace。 所以,首先执行普通应用接入文档中的以下几个步骤,然后再按照本章节后面的步骤操作。 1. [创建项目](#_11-%E5%88%9B%E5%BB%BA%E9%A1%B9%E7%9B%AE) 2. [项目管理员权限](#_121-%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E5%91%98%E6%9D%83%E9%99%90) ### 2.2.1 创建Namespace 创建Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权。 1. 点击页面左侧的添加Namespace * ![create-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace.png) 2. 点击“创建新的Namespace” * ![create-namespace-select-type](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-select-type.png) 3. 输入公共组件的Namespace名称,需要注意的是Namespace名称全局唯一 * Apollo会默认把部门代号添加在最前面 * ![create-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-namespace-detail.png) 4. 点击提交后,页面会自动跳转到关联Namespace页面 * 首先,选中所有需要有这个Namespace的环境和集群,一般建议全选 * 其次,选中刚刚创建的namespace * 最后,点击提交 * ![link-namespace-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-namespace-detail.png) 5. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 * ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 * ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 6. 点击“返回”回到项目页面 ### 2.2.2 添加配置项 编辑配置需要拥有这个Namespace的编辑权限,如果发现没有新增配置按钮,可以找项目管理员授权。 #### 2.2.2.1 通过表格模式添加配置 1. 点击新增配置 ![public-namespace-edit-item-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item-entry.png) 2. 输入配置项 ![public-namespace-edit-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-edit-item.png) 3. 点击提交 ![public-namespace-item-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-item-created.png) #### 2.2.2.2 通过文本模式编辑 这部分和普通应用一致,具体步骤请参见[1.3.2 通过文本模式编辑](#_132-%E9%80%9A%E8%BF%87%E6%96%87%E6%9C%AC%E6%A8%A1%E5%BC%8F%E7%BC%96%E8%BE%91)。 ### 2.2.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![public-namespace-publish-items-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items-entry.png) 2. 填写发布相关信息,点击发布 ![public-namespace-publish-items](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/public-namespace-publish-items.png) ### 2.2.4 应用读取配置 配置发布成功后,应用就可以通过Apollo客户端读取到配置了。 Apollo目前提供Java客户端,具体信息请点击[Java客户端使用文档](zh/usage/java-sdk-user-guide): 如果应用使用了其它语言,也可以通过直接访问Http接口获取配置,具体可以参考[其它语言客户端接入指南](zh/usage/other-language-client-user-guide) 对于公共组件的配置读取,可以参考上述文档中的“获取公共Namespace的配置”部分。 ## 2.3 应用覆盖公用组件配置步骤 前面提到,通常情况下,公共组件所用到的配置由原始开发团队维护,不过由于实际应用的运行时、环境各不一样,所以我们也允许应用在实际使用时能够覆盖公共组件的部分配置。 这里就讲一下应用如何覆盖公用组件的配置,简单起见,假设apollo-portal应用使用了hermes producer客户端,并且希望调整hermes的批量发送大小。 ### 2.3.1 关联公共组件Namespace 1. 进入使用公共组件的应用项目首页,点击左侧的添加Namespace按钮 * 所以,在这个例子中,我们需要进入apollo-portal的首页。 * (添加Namespace需要项目管理员权限,如果发现没有添加Namespace按钮,可以找项目管理员授权) * ![link-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace-entry.png) 2. 找到hermes producer的namespace,并选择需要关联到哪些环境和集群 ![link-public-namespace](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/link-public-namespace.png) 3. 关联成功后,页面会自动跳转到Namespace权限管理页面 1. 分配修改权限 ![namespace-permission-edit](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-permission-edit.png) 2. 分配发布权限 ![namespace-publish-permission](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/namespace-publish-permission.png) 4. 点击“返回”回到项目页面 ### 2.3.2 覆盖公用组件配置 1. 点击新增配置 ![override-public-namespace-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-entry.png) 2. 输入要覆盖的配置项 ![override-public-namespace-item](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item.png) 3. 点击提交 ![override-public-namespace-item-done](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-done.png) ### 2.3.3 发布配置 配置只有在发布后才会真的被应用使用到,所以在编辑完配置后,需要发布配置。 发布配置需要拥有这个Namespace的发布权限,如果发现没有发布按钮,可以找项目管理员授权。 1. 点击“发布按钮” ![override-public-namespace-item-publish-entry](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish-entry.png) 2. 填写发布相关信息,点击发布 ![override-public-namespace-item-publish](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/override-public-namespace-item-publish.png) 3. 配置发布成功后,hermes producer客户端在apollo-portal应用里面运行时读取到的sender.batchSize的值就是1000。 # 三、集群独立配置说明 在有些特殊情况下,应用有需求对不同的集群做不同的配置,比如部署在A机房的应用连接的es服务器地址和部署在B机房的应用连接的es服务器地址不一样。 在这种情况下,可以通过在Apollo创建不同的集群来解决。 ## 3.1 创建集群 创建集群需要项目管理员权限,如果发现没有添加集群按钮,可以找项目管理员授权。 1. 点击页面左侧的“添加集群”按钮 * ![create-cluster](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster.png) 2. 输入集群名称,选择环境并提交 * ![create-cluster-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/create-cluster-detail.png) 3. 切换到对应的集群,修改配置并发布即可 * ![config-in-cluster-created](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/cluster-created.png) 4. 通过上述配置,部署在SHAJQ机房的应用就会读到SHAJQ集群下的配置 5. 如果应用还在其它机房部署了应用,那么在上述的配置下,会读到default集群下的配置。 # 四、多个AppId使用同一份配置 在一些情况下,尽管应用本身不是公共组件,但还是需要在多个AppId之间共用同一份配置,比如同一个产品的不同项目:XX-Web, XX-Service, XX-Job等。 这种情况下如果希望实现多个AppId使用同一份配置的话,基本概念和公共组件的配置是一致的。 具体来说,就是在其中一个AppId下创建一个namespace,写入公共的配置信息,然后在各个项目中读取该namespace的配置即可。 如果某个AppId需要覆盖公共的配置信息,那么在该AppId下关联公共的namespace并写入需要覆盖的配置即可。 具体步骤可以参考[公共组件接入指南](#%e4%ba%8c%e3%80%81%e5%85%ac%e5%85%b1%e7%bb%84%e4%bb%b6%e6%8e%a5%e5%85%a5%e6%8c%87%e5%8d%97)。 # 五、灰度发布使用指南 通过灰度发布功能,可以实现: 1. 对于一些对程序有比较大影响的配置,可以先在一个或者多个实例生效,观察一段时间没问题后再全量发布配置。 2. 对于一些需要调优的配置参数,可以通过灰度发布功能来实现A/B测试。可以在不同的机器上应用不同的配置,不断调整、测评一段时间后找出较优的配置再全量发布配置。 下面将结合一个实际例子来描述如何使用灰度发布功能。 ## 5.1 场景介绍 100004458(apollo-demo)项目有两个客户端: 1. 10.32.21.19 2. 10.32.21.22 ![initial-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-instance-list.png) **灰度目标:** * 当前有一个配置timeout=2000,我们希望对10.32.21.22灰度发布timeout=3000,对10.32.21.19仍然是timeout=2000。 ![initial-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-config.png) ## 5.2 创建灰度 首先点击application namespace右上角的`创建灰度`按钮。 ![create-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/create-gray-release.png) 点击确定后,灰度版本就创建成功了,页面会自动切换到`灰度版本`Tab。 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/initial-gray-release-tab.png) ## 5.3 灰度配置 点击`主版本的配置`中,timeout配置最右侧的`对此配置灰度`按钮 ![initial-gray-release-tab](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/edit-gray-release-config.png) 在弹出框中填入要灰度的值:3000,点击提交。 ![submit-gray-release-config](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/submit-gray-release-config.png) ![gray-release-config-submitted](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-config-submitted.png) ## 5.4 配置灰度规则 切换到`灰度规则`Tab,点击`新增规则`按钮 ![new-gray-release-rule](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/new-gray-release-rule.png) 在弹出框中`灰度的IP`下拉框会默认展示当前使用配置的机器列表,选择我们要灰度的IP,点击完成。 ![select-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/select-gray-release-ip.png) ![gray-release-ip-selected](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-ip-selected.png) ![gray-release-rule-saved](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-rule-saved.png) 如果下拉框中没找到需要的IP,说明机器还没从Apollo取过配置,可以点击手动输入IP来输入,输入完后点击添加按钮 ![manual-input-gray-release-ip](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip.png) ![manual-input-gray-release-ip-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/manual-input-gray-release-ip-2.png) >注:对于公共Namespace的灰度规则,需要先指定要灰度的appId,然后再选择IP。 ## 5.5 灰度发布 配置规则已经生效,不过灰度配置还没有发布。切换到`配置`Tab。 再次检查灰度的配置部分,如果没有问题,点击`灰度发布`。 ![prepare-to-do-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-do-gray-release.png) 在弹出框中可以看到主版本的值是2000,灰度版本即将发布的值是3000。填入其它信息后,点击发布。 ![gray-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-confirm-dialog.png) 发布后,切换到`灰度实例列表`Tab,就能看到10.32.21.22已经使用了灰度发布的值。 ![gray-release-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/gray-release-instance-list.png) 切换到`主版本`的`实例列表`,会看到主版本配置只有10.32.21.19在使用了。 ![master-branch-instance-list](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list.png) 后面可以继续配置的修改或规则的更改。配置的修改需要点击灰度发布后才会生效,规则的修改在规则点击完成后就会实时生效。 ## 5.6 全量发布 如果灰度的配置测试下来比较理想,符合预期,那么就可以操作`全量发布`。 全量发布的效果是: 1. 灰度版本的配置会合并回主版本,在这个例子中,就是主版本的timeout会被更新成3000 2. 主版本的配置会自动进行一次发布 3. 在全量发布页面,可以选择是否保留当前灰度版本,默认为不保留。 ![prepare-to-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/prepare-to-full-release.png) ![full-release-confirm-dialog](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog.png) ![full-release-confirm-dialog-2](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/full-release-confirm-dialog-2.png) 我选择了不保留灰度版本,所以发布完的效果就是主版本的配置更新、灰度版本删除。点击主版本的实例列表,可以看到10.32.21.22和10.32.21.19都使用了主版本最新的配置。 ![master-branch-instance-list-after-full-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/master-branch-instance-list-after-full-release.png) ## 5.7 放弃灰度 如果灰度版本不理想或者不需要了,可以点击`放弃灰度`。 ![abandon-gray-release](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/abandon-gray-release.png) ## 5.8 发布历史 点击主版本的`发布历史`按钮,可以看到当前namespace的主版本以及灰度版本的发布历史。 ![view-release-history](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history.png) ![view-release-history-detail](https://raw.githubusercontent.com/ctripcorp/apollo/master/doc/images/gray-release/view-release-history-detail.png) # 六、其它功能配置 ## 6.1 配置查看权限 从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) ## 6.2 配置访问密钥 Apollo从1.6.0版本开始增加访问密钥机制,从而只有经过身份验证的客户端才能访问敏感配置。如果应用开启了访问密钥,客户端需要配置密钥,否则无法获取配置。 1. 项目管理员打开管理密钥页面 ![管理密钥入口](https://user-images.githubusercontent.com/837658/94990081-f4d3cd80-05ab-11eb-9470-fed5ec6de92e.png) 2. 为项目的每个环境生成访问密钥,注意默认是禁用的,建议在客户端都配置完成后再开启 ![密钥配置页面](https://user-images.githubusercontent.com/837658/94990150-788dba00-05ac-11eb-9a12-727fdb872e42.png) 3. 客户端侧[配置访问密钥](zh/usage/java-sdk-user-guide#_1244-配置访问密钥) # 七、最佳实践 ## 7.1 安全相关 配置中心作为基础服务,存储着公司非常重要的配置信息,所以安全因素需要大家重点关注,下面列举了一些注意事项供大家参考,也欢迎大家分享自己的实践案例。 ### 7.1.1 认证 建议接入公司统一的身份认证系统,如 SSO、LDAP 等,接入方式可以参考[Portal 实现用户登录功能](zh/development/portal-how-to-implement-user-login-function) > 如果使用Apollo提供的Spring Security简单认证,务必记得要修改超级管理员apollo的密码 ### 7.1.2 授权 Apollo 支持细粒度的权限控制,请务必根据实际情况做好权限控制: 1. [项目管理员权限](#_121-项目管理员权限) * Apollo 默认允许所有登录用户创建项目,如果只允许部分用户创建项目,可以开启[创建项目权限控制](zh/deployment/distributed-deployment-guide?id=_3110-rolecreate-applicationenabled-是否开启创建项目权限控制) 2. [配置编辑、发布权限](#_122-配置编辑、发布权限) * 配置编辑、发布权限支持按环境配置,比如开发环境开发人员可以自行完成配置编辑和发布的过程,但是生产环境发布权限交由测试或运维人员 * 生产环境建议同时开启[发布审核](zh/deployment/distributed-deployment-guide?id=_322-namespacelockswitch-一次发布只能有一个人修改开关,用于发布审核),从而控制一次配置发布只能由一个人修改,另一个人发布,确保配置修改得到充分检查 3. [配置查看权限](#_61-配置查看权限) * 可以指定某个环境只允许项目成员查看私有Namespace的配置,从而避免敏感配置泄露,如生产环境 ### 7.1.3 系统访问 除了用户权限,在系统访问上也需要加以考虑: 1. `apollo-configservice`和`apollo-adminservice`是基于内网可信网络设计的,所以出于安全考虑,禁止`apollo-configservice`和`apollo-adminservice`直接暴露在公网 2. 对敏感配置可以考虑开启[访问秘钥](#_62-%e9%85%8d%e7%bd%ae%e8%ae%bf%e9%97%ae%e5%af%86%e9%92%a5),从而只有经过身份验证的客户端才能访问敏感配置 3. 1.7.1及以上版本可以考虑为`apollo-adminservice`开启[访问控制](zh/deployment/distributed-deployment-guide?id=_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制),从而只有[受控的](zh/deployment/distributed-deployment-guide?id=_3112-admin-serviceaccesstokens-设置apollo-portal访问各环境apollo-adminservice所需的access-token)`apollo-portal`才能访问对应接口,增强安全性
-1
apolloconfig/apollo
3,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/namespace-panel-directive.js
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ directive_module.directive('apollonspanel', directive); function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService, UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html', transclude: true, replace: true, scope: { namespace: '=', appId: '=', env: '=', cluster: '=', user: '=', lockCheck: '=', createItem: '=', editItem: '=', preDeleteItem: '=', preRevokeItem: '=', showText: '=', showNoModifyPermissionDialog: '=', preCreateBranch: '=', preDeleteBranch: '=', showMergeAndPublishGrayTips: '=', showBody: "=?", lazyLoad: "=?" }, link: function (scope) { //constants var namespace_view_type = { TEXT: 'text', TABLE: 'table', HISTORY: 'history', INSTANCE: 'instance', RULE: 'rule' }; var namespace_instance_view_type = { LATEST_RELEASE: 'latest_release', NOT_LATEST_RELEASE: 'not_latest_release', ALL: 'all' }; var operate_branch_storage_key = 'OperateBranch'; scope.refreshNamespace = refreshNamespace; scope.switchView = switchView; scope.toggleItemSearchInput = toggleItemSearchInput; scope.toggleHistorySearchInput = toggleHistorySearchInput; scope.searchItems = searchItems; scope.resetSearchItems = resetSearchItems; scope.searchHistory = searchHistory; scope.loadCommitHistory = loadCommitHistory; scope.toggleTextEditStatus = toggleTextEditStatus; scope.goToSyncPage = goToSyncPage; scope.goToDiffPage = goToDiffPage; scope.modifyByText = modifyByText; scope.syntaxCheck = syntaxCheck; scope.goToParentAppConfigPage = goToParentAppConfigPage; scope.switchInstanceViewType = switchInstanceViewType; scope.switchBranch = switchBranch; scope.loadInstanceInfo = loadInstanceInfo; scope.refreshInstancesInfo = refreshInstancesInfo; scope.deleteRuleItem = deleteRuleItem; scope.rollback = rollback; scope.publish = publish; scope.mergeAndPublish = mergeAndPublish; scope.addRuleItem = addRuleItem; scope.editRuleItem = editRuleItem; scope.deleteNamespace = deleteNamespace; var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, function (context) { useRules(context.branch); }, scope.namespace.baseInfo.namespaceName); scope.$on('$destroy', function () { EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, subscriberId, scope.namespace.baseInfo.namespaceName); }); preInit(scope.namespace); if (!scope.lazyLoad || scope.namespace.initialized) { init(); } function preInit(namespace) { scope.showNamespaceBody = false; namespace.isLinkedNamespace = namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false; //namespace view name hide suffix namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace( ".properties", "").replace(".json", "").replace(".yml", "") .replace(".yaml", "").replace(".txt", ""); } function init() { initNamespace(scope.namespace); initOther(); scope.namespace.initialized = true; } function refreshNamespace() { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.namespace }); } function initNamespace(namespace, viewType) { namespace.hasBranch = false; namespace.isBranch = false; namespace.displayControl = { currentOperateBranch: 'master', showSearchInput: namespace.showSearchItemInput, searchItemKey: namespace.searchItemKey, showHistorySearchInput: false, show: scope.showBody }; scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody; namespace.viewItems = namespace.items; namespace.isPropertiesFormat = namespace.format == 'properties'; namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml'; namespace.isTextEditing = false; namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.allInstances = []; namespace.allInstancesPage = 0; namespace.commitChangeBtnDisabled = false; generateNamespaceId(namespace); initNamespaceBranch(namespace); initNamespaceViewName(namespace); initNamespaceLock(namespace); initNamespaceInstancesCount(namespace); initPermission(namespace); initLinkedNamespace(namespace); loadInstanceInfo(namespace); initSearchItemInput(namespace); function initNamespaceBranch(namespace) { NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.baseInfo) { return; } //namespace has branch namespace.hasBranch = true; namespace.branchName = result.baseInfo.clusterName; //init branch namespace.branch = result; namespace.branch.isBranch = true; namespace.branch.parentNamespace = namespace; namespace.branch.viewType = namespace_view_type.TABLE; namespace.branch.isPropertiesFormat = namespace.format == 'properties'; namespace.branch.allInstances = [];//master namespace all instances namespace.branch.latestReleaseInstances = []; namespace.branch.latestReleaseInstancesPage = 0; namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.branch.hasLoadInstances = false; namespace.branch.displayControl = { show: true }; generateNamespaceId(namespace.branch); initBranchItems(namespace.branch); initRules(namespace.branch); loadInstanceInfo(namespace.branch); initNamespaceLock(namespace.branch); initPermission(namespace); initUserOperateBranchScene(namespace); }); function initBranchItems(branch) { branch.masterItems = []; branch.branchItems = []; var masterItemsMap = {}; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { masterItemsMap[item.item.key] = item; } }); var branchItemsMap = {}; var itemModifiedCnt = 0; branch.items.forEach(function (item) { var key = item.item.key; var masterItem = masterItemsMap[key]; //modify master item and set item's masterReleaseValue if (masterItem) { item.masterItemExists = true; if (masterItem.isModified) { item.masterReleaseValue = masterItem.oldValue; } else { item.masterReleaseValue = masterItem.item.value; } } else {//delete branch item item.masterItemExists = false; } //delete master item. ignore if (item.isDeleted && masterItem) { if (item.masterReleaseValue != item.oldValue) { itemModifiedCnt++; branch.branchItems.push(item); } } else {//branch's item branchItemsMap[key] = item; if (item.isModified) { itemModifiedCnt++; } branch.branchItems.push(item); } }); branch.itemModifiedCnt = itemModifiedCnt; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { if (!branchItemsMap[item.item.key]) { branch.masterItems.push(item); } else { item.hasBranchValue = true; } } }) } } function generateNamespaceId(namespace) { namespace.id = Math.random().toString(36).substr(2); } function initPermission(namespace) { PermissionService.has_modify_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_modify_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } } }); PermissionService.has_release_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_release_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } } }); } function initLinkedNamespace(namespace) { if (!namespace.isPublic || !namespace.isLinkedNamespace) { return; } //load public namespace ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { var publicNamespace = result; namespace.publicNamespace = publicNamespace; var linkNamespaceItemKeys = []; namespace.items.forEach(function (item) { var key = item.item.key; linkNamespaceItemKeys.push(key); }); publicNamespace.viewItems = []; publicNamespace.items.forEach(function (item) { var key = item.item.key; if (key) { publicNamespace.viewItems.push(item); } item.covered = linkNamespaceItemKeys.indexOf(key) >= 0; if (item.isModified || item.isDeleted) { publicNamespace.isModified = true; } else if (key) { publicNamespace.hasPublishedItem = true; } }); loadParentNamespaceText(namespace); }); } function loadParentNamespaceText(namespace){ namespace.publicNamespaceText = ""; if(namespace.isLinkedNamespace) { namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace) } } function initNamespaceViewName(namespace) { if (!viewType) { if (namespace.isPropertiesFormat) { switchView(namespace, namespace_view_type.TABLE); } else { switchView(namespace, namespace_view_type.TEXT); } } else if (viewType == namespace_view_type.TABLE) { namespace.viewType = namespace_view_type.TABLE; } } function initNamespaceLock(namespace) { NamespaceLockService.get_namespace_lock(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.lockOwner = result.lockOwner; namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed; }); } function initUserOperateBranchScene(namespace) { var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join( "+"); if (!operateBranchStorage) { operateBranchStorage = {}; } if (!operateBranchStorage[namespaceId]) { operateBranchStorage[namespaceId] = namespace.branchName; } localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); switchBranch(operateBranchStorage[namespaceId], false); } function initSearchItemInput(namespace) { if (namespace.displayControl.searchItemKey) { namespace.searchKey = namespace.displayControl.searchItemKey; searchItems(namespace); } } } function initNamespaceInstancesCount(namespace) { InstanceService.getInstanceCountByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { namespace.instancesCount = result.num; }) } function initOther() { UserService.load_user().then(function (result) { scope.currentUser = result.userId; }); PermissionService.has_assign_user_permission(scope.appId) .then(function (result) { scope.hasAssignUserPermission = result.hasPermission; }, function (result) { }); } function switchBranch(branchName, forceShowBody) { if (branchName != 'master') { initRules(scope.namespace.branch); } if (forceShowBody) { scope.showNamespaceBody = true; } scope.namespace.displayControl.currentOperateBranch = branchName; //save to local storage var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); if (!operateBranchStorage) { return; } var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join( "+"); operateBranchStorage[namespaceId] = branchName; localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); } function switchView(namespace, viewType) { namespace.viewType = viewType; if (namespace_view_type.TEXT == viewType) { namespace.text = parseModel2Text(namespace); } else if (namespace_view_type.TABLE == viewType) { } else if (namespace_view_type.HISTORY == viewType) { loadCommitHistory(namespace); } else if (namespace_view_type.INSTANCE == viewType) { refreshInstancesInfo(namespace); } } function switchInstanceViewType(namespace, type) { namespace.instanceViewType = type; loadInstanceInfo(namespace); } function loadCommitHistory(namespace) { if (!namespace.commits) { namespace.commits = []; namespace.commitPage = 0; } var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.HistorySearchKey, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } namespace.commitPage += 1; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } function loadInstanceInfo(namespace) { var size = 20; if (namespace.isBranch) { size = 2000; } var type = namespace.instanceViewType; if (namespace_instance_view_type.LATEST_RELEASE == type) { if (!namespace.latestRelease) { ReleaseService.findLatestActiveRelease(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.isLatestReleaseLoaded = true; if (!result) { namespace.latestReleaseInstances = {}; namespace.latestReleaseInstances.total = 0; return; } namespace.latestRelease = result; InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { namespace.latestReleaseInstances = result; namespace.latestReleaseInstancesPage++; }) }); } else { InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { if (result && result.content.length) { namespace.latestReleaseInstancesPage++; result.content.forEach(function (instance) { namespace.latestReleaseInstances.content.push( instance); }) } }) } } else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) { if (!namespace.latestRelease) { return; } InstanceService.findByReleasesNotIn(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, namespace.latestRelease.id) .then(function (result) { if (!result || result.length == 0) { return } var groupedInstances = {}, notLatestReleases = []; result.forEach(function (instance) { var configs = instance.configs; if (configs && configs.length > 0) { configs.forEach(function (instanceConfig) { var release = instanceConfig.release; //filter dirty data if (!release) { return; } if (!groupedInstances[release.id]) { groupedInstances[release.id] = []; notLatestReleases.push(release); } groupedInstances[release.id].push(instance); }) } }); namespace.notLatestReleases = notLatestReleases; namespace.notLatestReleaseInstances = groupedInstances; }) } else { InstanceService.findInstancesByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, '', namespace.allInstancesPage) .then(function (result) { if (result && result.content.length) { namespace.allInstancesPage++; result.content.forEach(function (instance) { namespace.allInstances.push(instance); }) } }); } } function refreshInstancesInfo(namespace) { namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.latestReleaseInstances = []; namespace.latestRelease = undefined; if (!namespace.isBranch) { namespace.notLatestReleaseNames = []; namespace.notLatestReleaseInstances = {}; namespace.allInstancesPage = 0; namespace.allInstances = []; } initNamespaceInstancesCount(namespace); loadInstanceInfo(namespace); } function initRules(branch) { NamespaceBranchService.findBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName) .then(function (result) { if (result.appId) { branch.rules = result; } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError')); }); } function addRuleItem(branch) { var newRuleItem = { clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '', clientIpList: [], draftIpList: [], isNew: true }; branch.editingRuleItem = newRuleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function editRuleItem(branch, ruleItem) { ruleItem.isNew = false; ruleItem.draftIpList = _.clone(ruleItem.clientIpList); branch.editingRuleItem = ruleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function deleteRuleItem(branch, ruleItem) { branch.rules.ruleItems.forEach(function (item, index) { if (item.clientAppId == ruleItem.clientAppId) { branch.rules.ruleItems.splice(index, 1); toastr.success($translate.instant('ApolloNsPanel.Deleted')); } }); useRules(branch); } function useRules(branch) { NamespaceBranchService.updateBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName, branch.rules ) .then(function (result) { toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified')); //show tips if branch has not release configs if (branch.itemModifiedCnt) { AppUtil.showModal("#updateRuleTips"); } setTimeout(function () { refreshInstancesInfo(branch); }, 1500); }, function (result) { AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed')); }) } function toggleTextEditStatus(namespace) { if (!scope.lockCheck(namespace)) { return; } namespace.isTextEditing = !namespace.isTextEditing; if (namespace.isTextEditing) {//切换为编辑状态 namespace.commited = false; namespace.backupText = namespace.text; namespace.editText = parseModel2Text(namespace); } else { if (!namespace.commited) {//取消编辑,则复原 namespace.text = namespace.backupText; } } } function goToSyncPage(namespace) { if (!scope.lockCheck(namespace)) { return false; } $window.location.href = AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function goToDiffPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function modifyByText(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; //prevent repeat submit if (namespace.commitChangeBtnDisabled) { return; } namespace.commitChangeBtnDisabled = true; ConfigService.modify_items(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.ModifiedTips')); //refresh all namespace items EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: namespace }); return true; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed')); namespace.commitChangeBtnDisabled = false; return false; } ); namespace.commited = true; } function syntaxCheck(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; ConfigService.syntax_check_text(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight')); }, function (result) { EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, { syntaxCheckMessage: AppUtil.pureErrorMsg(result) }); } ); } function goToParentAppConfigPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId; $window.location.reload(); } function parseModel2Text(namespace) { if (namespace.items.length == 0) { namespace.itemCnt = 0; return ""; } //文件模式 if (!namespace.isPropertiesFormat) { return parseNotPropertiesText(namespace); } else { return parsePropertiesText(namespace); } } function parseNotPropertiesText(namespace) { var text = namespace.items[0].item.value; var lineNum = text.split("\n").length; namespace.itemCnt = lineNum; return text; } function parsePropertiesText(namespace) { var result = ""; var itemCnt = 0; namespace.items.forEach(function (item) { //deleted key if (!item.item.dataChangeLastModifiedBy) { return; } if (item.item.key) { //use string \n to display as new line var itemValue = item.item.value.replace(/\n/g, "\\n"); result += item.item.key + " = " + itemValue + "\n"; } else { result += item.item.comment + "\n"; } itemCnt++; }); namespace.itemCnt = itemCnt; return result; } function toggleItemSearchInput(namespace) { namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput; } function searchItems(namespace) { var searchKey = namespace.searchKey.toLowerCase(); var items = []; namespace.items.forEach(function (item) { var key = item.item.key; if (key && key.toLowerCase().indexOf(searchKey) >= 0) { items.push(item); } }); namespace.viewItems = items; } function resetSearchItems(namespace) { namespace.searchKey = ''; searchItems(namespace); } function toggleHistorySearchInput(namespace) { namespace.displayControl.showHistorySearchInput = !namespace.displayControl.showHistorySearchInput; } function searchHistory(namespace) { namespace.commits = []; namespace.commitPage = 0; namespace.hasLoadAllCommit = false; var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.HistorySearchKey, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } namespace.commitPage++ }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } //normal release and gray release function publish(namespace) { if (!namespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); return; } else if (namespace.lockOwner && scope.user == namespace.lockOwner) { //can not publish if config modified by himself EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: namespace, mergeAndPublish: false }); return; } if (namespace.isBranch) { namespace.mergeAndPublish = false; } EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: namespace }); } function mergeAndPublish(branch) { var parentNamespace = branch.parentNamespace; if (!parentNamespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); } else if (parentNamespace.itemModifiedCnt > 0) { AppUtil.showModal('#mergeAndReleaseDenyDialog'); } else if (branch.lockOwner && scope.user == branch.lockOwner) { EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: branch, mergeAndPublish: true }); } else { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch }); } } function rollback(namespace) { EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace }); } function deleteNamespace(namespace) { EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace }); } //theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min scope.aceConfig = { $blockScrolling: Infinity, showPrintMargin: false, theme: 'eclipse', mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format), onLoad: function (_editor) { _editor.$blockScrolling = Infinity; _editor.setOptions({ fontSize: 13, minLines: 10, maxLines: 20 }) } }; setTimeout(function () { scope.namespace.show = true; }, 70); } } }
/* * Copyright 2021 Apollo Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ directive_module.directive('apollonspanel', directive); function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService, UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) { return { restrict: 'E', templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html', transclude: true, replace: true, scope: { namespace: '=', appId: '=', env: '=', cluster: '=', user: '=', lockCheck: '=', createItem: '=', editItem: '=', preDeleteItem: '=', preRevokeItem: '=', showText: '=', showNoModifyPermissionDialog: '=', preCreateBranch: '=', preDeleteBranch: '=', showMergeAndPublishGrayTips: '=', showBody: "=?", lazyLoad: "=?" }, link: function (scope) { //constants var namespace_view_type = { TEXT: 'text', TABLE: 'table', HISTORY: 'history', INSTANCE: 'instance', RULE: 'rule' }; var namespace_instance_view_type = { LATEST_RELEASE: 'latest_release', NOT_LATEST_RELEASE: 'not_latest_release', ALL: 'all' }; var operate_branch_storage_key = 'OperateBranch'; scope.refreshNamespace = refreshNamespace; scope.switchView = switchView; scope.toggleItemSearchInput = toggleItemSearchInput; scope.toggleHistorySearchInput = toggleHistorySearchInput; scope.searchItems = searchItems; scope.resetSearchItems = resetSearchItems; scope.searchHistory = searchHistory; scope.loadCommitHistory = loadCommitHistory; scope.toggleTextEditStatus = toggleTextEditStatus; scope.goToSyncPage = goToSyncPage; scope.goToDiffPage = goToDiffPage; scope.modifyByText = modifyByText; scope.syntaxCheck = syntaxCheck; scope.goToParentAppConfigPage = goToParentAppConfigPage; scope.switchInstanceViewType = switchInstanceViewType; scope.switchBranch = switchBranch; scope.loadInstanceInfo = loadInstanceInfo; scope.refreshInstancesInfo = refreshInstancesInfo; scope.deleteRuleItem = deleteRuleItem; scope.rollback = rollback; scope.publish = publish; scope.mergeAndPublish = mergeAndPublish; scope.addRuleItem = addRuleItem; scope.editRuleItem = editRuleItem; scope.deleteNamespace = deleteNamespace; var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, function (context) { useRules(context.branch); }, scope.namespace.baseInfo.namespaceName); scope.$on('$destroy', function () { EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES, subscriberId, scope.namespace.baseInfo.namespaceName); }); preInit(scope.namespace); if (!scope.lazyLoad || scope.namespace.initialized) { init(); } function preInit(namespace) { scope.showNamespaceBody = false; namespace.isLinkedNamespace = namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false; //namespace view name hide suffix namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace( ".properties", "").replace(".json", "").replace(".yml", "") .replace(".yaml", "").replace(".txt", ""); } function init() { initNamespace(scope.namespace); initOther(); scope.namespace.initialized = true; } function refreshNamespace() { EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: scope.namespace }); } function initNamespace(namespace, viewType) { namespace.hasBranch = false; namespace.isBranch = false; namespace.displayControl = { currentOperateBranch: 'master', showSearchInput: namespace.showSearchItemInput, searchItemKey: namespace.searchItemKey, showHistorySearchInput: false, show: scope.showBody }; scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody; namespace.viewItems = namespace.items; namespace.isPropertiesFormat = namespace.format == 'properties'; namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml'; namespace.isTextEditing = false; namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.allInstances = []; namespace.allInstancesPage = 0; namespace.commitChangeBtnDisabled = false; generateNamespaceId(namespace); initNamespaceBranch(namespace); initNamespaceViewName(namespace); initNamespaceLock(namespace); initNamespaceInstancesCount(namespace); initPermission(namespace); initLinkedNamespace(namespace); loadInstanceInfo(namespace); initSearchItemInput(namespace); function initNamespaceBranch(namespace) { NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.baseInfo) { return; } //namespace has branch namespace.hasBranch = true; namespace.branchName = result.baseInfo.clusterName; //init branch namespace.branch = result; namespace.branch.isBranch = true; namespace.branch.parentNamespace = namespace; namespace.branch.viewType = namespace_view_type.TABLE; namespace.branch.isPropertiesFormat = namespace.format == 'properties'; namespace.branch.allInstances = [];//master namespace all instances namespace.branch.latestReleaseInstances = []; namespace.branch.latestReleaseInstancesPage = 0; namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.branch.hasLoadInstances = false; namespace.branch.displayControl = { show: true }; generateNamespaceId(namespace.branch); initBranchItems(namespace.branch); initRules(namespace.branch); loadInstanceInfo(namespace.branch); initNamespaceLock(namespace.branch); initPermission(namespace); initUserOperateBranchScene(namespace); }); function initBranchItems(branch) { branch.masterItems = []; branch.branchItems = []; var masterItemsMap = {}; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { masterItemsMap[item.item.key] = item; } }); var branchItemsMap = {}; var itemModifiedCnt = 0; branch.items.forEach(function (item) { var key = item.item.key; var masterItem = masterItemsMap[key]; //modify master item and set item's masterReleaseValue if (masterItem) { item.masterItemExists = true; if (masterItem.isModified) { item.masterReleaseValue = masterItem.oldValue; } else { item.masterReleaseValue = masterItem.item.value; } } else {//delete branch item item.masterItemExists = false; } //delete master item. ignore if (item.isDeleted && masterItem) { if (item.masterReleaseValue != item.oldValue) { itemModifiedCnt++; branch.branchItems.push(item); } } else {//branch's item branchItemsMap[key] = item; if (item.isModified) { itemModifiedCnt++; } branch.branchItems.push(item); } }); branch.itemModifiedCnt = itemModifiedCnt; branch.parentNamespace.items.forEach(function (item) { if (item.item.key) { if (!branchItemsMap[item.item.key]) { branch.masterItems.push(item); } else { item.hasBranchValue = true; } } }) } } function generateNamespaceId(namespace) { namespace.id = Math.random().toString(36).substr(2); } function initPermission(namespace) { PermissionService.has_modify_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_modify_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasModifyPermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasModifyPermission = result.hasPermission; } } }); PermissionService.has_release_namespace_permission( scope.appId, namespace.baseInfo.namespaceName) .then(function (result) { if (!result.hasPermission) { PermissionService.has_release_namespace_env_permission( scope.appId, scope.env, namespace.baseInfo.namespaceName ) .then(function (result) { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } }); } else { //branch has same permission namespace.hasReleasePermission = result.hasPermission; if (namespace.branch) { namespace.branch.hasReleasePermission = result.hasPermission; } } }); } function initLinkedNamespace(namespace) { if (!namespace.isPublic || !namespace.isLinkedNamespace) { return; } //load public namespace ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { var publicNamespace = result; namespace.publicNamespace = publicNamespace; var linkNamespaceItemKeys = []; namespace.items.forEach(function (item) { var key = item.item.key; linkNamespaceItemKeys.push(key); }); publicNamespace.viewItems = []; publicNamespace.items.forEach(function (item) { var key = item.item.key; if (key) { publicNamespace.viewItems.push(item); } item.covered = linkNamespaceItemKeys.indexOf(key) >= 0; if (item.isModified || item.isDeleted) { publicNamespace.isModified = true; } else if (key) { publicNamespace.hasPublishedItem = true; } }); loadParentNamespaceText(namespace); }); } function loadParentNamespaceText(namespace){ namespace.publicNamespaceText = ""; if(namespace.isLinkedNamespace) { namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace) } } function initNamespaceViewName(namespace) { if (!viewType) { if (namespace.isPropertiesFormat) { switchView(namespace, namespace_view_type.TABLE); } else { switchView(namespace, namespace_view_type.TEXT); } } else if (viewType == namespace_view_type.TABLE) { namespace.viewType = namespace_view_type.TABLE; } } function initNamespaceLock(namespace) { NamespaceLockService.get_namespace_lock(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.lockOwner = result.lockOwner; namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed; }); } function initUserOperateBranchScene(namespace) { var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join( "+"); if (!operateBranchStorage) { operateBranchStorage = {}; } if (!operateBranchStorage[namespaceId]) { operateBranchStorage[namespaceId] = namespace.branchName; } localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); switchBranch(operateBranchStorage[namespaceId], false); } function initSearchItemInput(namespace) { if (namespace.displayControl.searchItemKey) { namespace.searchKey = namespace.displayControl.searchItemKey; searchItems(namespace); } } } function initNamespaceInstancesCount(namespace) { InstanceService.getInstanceCountByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName) .then(function (result) { namespace.instancesCount = result.num; }) } function initOther() { UserService.load_user().then(function (result) { scope.currentUser = result.userId; }); PermissionService.has_assign_user_permission(scope.appId) .then(function (result) { scope.hasAssignUserPermission = result.hasPermission; }, function (result) { }); } function switchBranch(branchName, forceShowBody) { if (branchName != 'master') { initRules(scope.namespace.branch); } if (forceShowBody) { scope.showNamespaceBody = true; } scope.namespace.displayControl.currentOperateBranch = branchName; //save to local storage var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key)); if (!operateBranchStorage) { return; } var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join( "+"); operateBranchStorage[namespaceId] = branchName; localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage)); } function switchView(namespace, viewType) { namespace.viewType = viewType; if (namespace_view_type.TEXT == viewType) { namespace.text = parseModel2Text(namespace); } else if (namespace_view_type.TABLE == viewType) { } else if (namespace_view_type.HISTORY == viewType) { loadCommitHistory(namespace); } else if (namespace_view_type.INSTANCE == viewType) { refreshInstancesInfo(namespace); } } function switchInstanceViewType(namespace, type) { namespace.instanceViewType = type; loadInstanceInfo(namespace); } function loadCommitHistory(namespace) { if (!namespace.commits) { namespace.commits = []; namespace.commitPage = 0; } var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.HistorySearchKey, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } namespace.commitPage += 1; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } function loadInstanceInfo(namespace) { var size = 20; if (namespace.isBranch) { size = 2000; } var type = namespace.instanceViewType; if (namespace_instance_view_type.LATEST_RELEASE == type) { if (!namespace.latestRelease) { ReleaseService.findLatestActiveRelease(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName) .then(function (result) { namespace.isLatestReleaseLoaded = true; if (!result) { namespace.latestReleaseInstances = {}; namespace.latestReleaseInstances.total = 0; return; } namespace.latestRelease = result; InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { namespace.latestReleaseInstances = result; namespace.latestReleaseInstancesPage++; }) }); } else { InstanceService.findInstancesByRelease(scope.env, namespace.latestRelease.id, namespace.latestReleaseInstancesPage, size) .then(function (result) { if (result && result.content.length) { namespace.latestReleaseInstancesPage++; result.content.forEach(function (instance) { namespace.latestReleaseInstances.content.push( instance); }) } }) } } else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) { if (!namespace.latestRelease) { return; } InstanceService.findByReleasesNotIn(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, namespace.latestRelease.id) .then(function (result) { if (!result || result.length == 0) { return } var groupedInstances = {}, notLatestReleases = []; result.forEach(function (instance) { var configs = instance.configs; if (configs && configs.length > 0) { configs.forEach(function (instanceConfig) { var release = instanceConfig.release; //filter dirty data if (!release) { return; } if (!groupedInstances[release.id]) { groupedInstances[release.id] = []; notLatestReleases.push(release); } groupedInstances[release.id].push(instance); }) } }); namespace.notLatestReleases = notLatestReleases; namespace.notLatestReleaseInstances = groupedInstances; }) } else { InstanceService.findInstancesByNamespace(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, '', namespace.allInstancesPage) .then(function (result) { if (result && result.content.length) { namespace.allInstancesPage++; result.content.forEach(function (instance) { namespace.allInstances.push(instance); }) } }); } } function refreshInstancesInfo(namespace) { namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE; namespace.latestReleaseInstancesPage = 0; namespace.latestReleaseInstances = []; namespace.latestRelease = undefined; if (!namespace.isBranch) { namespace.notLatestReleaseNames = []; namespace.notLatestReleaseInstances = {}; namespace.allInstancesPage = 0; namespace.allInstances = []; } initNamespaceInstancesCount(namespace); loadInstanceInfo(namespace); } function initRules(branch) { NamespaceBranchService.findBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName) .then(function (result) { if (result.appId) { branch.rules = result; } }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError')); }); } function addRuleItem(branch) { var newRuleItem = { clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '', clientIpList: [], draftIpList: [], isNew: true }; branch.editingRuleItem = newRuleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function editRuleItem(branch, ruleItem) { ruleItem.isNew = false; ruleItem.draftIpList = _.clone(ruleItem.clientIpList); branch.editingRuleItem = ruleItem; EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, { branch: branch }); } function deleteRuleItem(branch, ruleItem) { branch.rules.ruleItems.forEach(function (item, index) { if (item.clientAppId == ruleItem.clientAppId) { branch.rules.ruleItems.splice(index, 1); toastr.success($translate.instant('ApolloNsPanel.Deleted')); } }); useRules(branch); } function useRules(branch) { NamespaceBranchService.updateBranchGrayRules(scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName, branch.baseInfo.clusterName, branch.rules ) .then(function (result) { toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified')); //show tips if branch has not release configs if (branch.itemModifiedCnt) { AppUtil.showModal("#updateRuleTips"); } setTimeout(function () { refreshInstancesInfo(branch); }, 1500); }, function (result) { AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed')); }) } function toggleTextEditStatus(namespace) { if (!scope.lockCheck(namespace)) { return; } namespace.isTextEditing = !namespace.isTextEditing; if (namespace.isTextEditing) {//切换为编辑状态 namespace.commited = false; namespace.backupText = namespace.text; namespace.editText = parseModel2Text(namespace); } else { if (!namespace.commited) {//取消编辑,则复原 namespace.text = namespace.backupText; } } } function goToSyncPage(namespace) { if (!scope.lockCheck(namespace)) { return false; } $window.location.href = AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function goToDiffPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env=" + scope.env + "&clusterName=" + scope.cluster + "&namespaceName=" + namespace.baseInfo.namespaceName; } function modifyByText(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; //prevent repeat submit if (namespace.commitChangeBtnDisabled) { return; } namespace.commitChangeBtnDisabled = true; ConfigService.modify_items(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.ModifiedTips')); //refresh all namespace items EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE, { namespace: namespace }); return true; }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed')); namespace.commitChangeBtnDisabled = false; return false; } ); namespace.commited = true; } function syntaxCheck(namespace) { var model = { configText: namespace.editText, namespaceId: namespace.baseInfo.id, format: namespace.format }; ConfigService.syntax_check_text(scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName, model).then( function (result) { toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight')); }, function (result) { EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, { syntaxCheckMessage: AppUtil.pureErrorMsg(result) }); } ); } function goToParentAppConfigPage(namespace) { $window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId; $window.location.reload(); } function parseModel2Text(namespace) { if (namespace.items.length == 0) { namespace.itemCnt = 0; return ""; } //文件模式 if (!namespace.isPropertiesFormat) { return parseNotPropertiesText(namespace); } else { return parsePropertiesText(namespace); } } function parseNotPropertiesText(namespace) { var text = namespace.items[0].item.value; var lineNum = text.split("\n").length; namespace.itemCnt = lineNum; return text; } function parsePropertiesText(namespace) { var result = ""; var itemCnt = 0; namespace.items.forEach(function (item) { //deleted key if (!item.item.dataChangeLastModifiedBy) { return; } if (item.item.key) { //use string \n to display as new line var itemValue = item.item.value.replace(/\n/g, "\\n"); result += item.item.key + " = " + itemValue + "\n"; } else { result += item.item.comment + "\n"; } itemCnt++; }); namespace.itemCnt = itemCnt; return result; } function toggleItemSearchInput(namespace) { namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput; } function searchItems(namespace) { var searchKey = namespace.searchKey.toLowerCase(); var items = []; namespace.items.forEach(function (item) { var key = item.item.key; if (key && key.toLowerCase().indexOf(searchKey) >= 0) { items.push(item); } }); namespace.viewItems = items; } function resetSearchItems(namespace) { namespace.searchKey = ''; searchItems(namespace); } function toggleHistorySearchInput(namespace) { namespace.displayControl.showHistorySearchInput = !namespace.displayControl.showHistorySearchInput; } function searchHistory(namespace) { namespace.commits = []; namespace.commitPage = 0; namespace.hasLoadAllCommit = false; var size = 10; CommitService.find_commits(scope.appId, scope.env, namespace.baseInfo.clusterName, namespace.baseInfo.namespaceName, namespace.HistorySearchKey, namespace.commitPage, size) .then(function (result) { if (result.length < size) { namespace.hasLoadAllCommit = true; } for (var i = 0; i < result.length; i++) { //to json result[i].changeSets = JSON.parse(result[i].changeSets); namespace.commits.push(result[i]); } namespace.commitPage++ }, function (result) { toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError')); }); } //normal release and gray release function publish(namespace) { if (!namespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); return; } else if (namespace.lockOwner && scope.user == namespace.lockOwner) { //can not publish if config modified by himself EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: namespace, mergeAndPublish: false }); return; } if (namespace.isBranch) { namespace.mergeAndPublish = false; } EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE, { namespace: namespace }); } function mergeAndPublish(branch) { var parentNamespace = branch.parentNamespace; if (!parentNamespace.hasReleasePermission) { AppUtil.showModal('#releaseNoPermissionDialog'); } else if (parentNamespace.itemModifiedCnt > 0) { AppUtil.showModal('#mergeAndReleaseDenyDialog'); } else if (branch.lockOwner && scope.user == branch.lockOwner) { EventManager.emit(EventManager.EventType.PUBLISH_DENY, { namespace: branch, mergeAndPublish: true }); } else { EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch }); } } function rollback(namespace) { EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace }); } function deleteNamespace(namespace) { EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace }); } //theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min scope.aceConfig = { $blockScrolling: Infinity, showPrintMargin: false, theme: 'eclipse', mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format), onLoad: function (_editor) { _editor.$blockScrolling = Infinity; _editor.setOptions({ fontSize: 13, minLines: 10, maxLines: 20 }) } }; setTimeout(function () { scope.namespace.show = true; }, 70); } } }
-1
apolloconfig/apollo
3,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/development/apollo-development-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.
./apollo-portal/src/main/resources/static/scripts/services/ClusterService.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('ClusterService', ['$resource', '$q', function ($resource, $q) { var cluster_resource = $resource('', {}, { create_cluster: { method: 'POST', url: 'apps/:appId/envs/:env/clusters' }, load_cluster: { method: 'GET', url: 'apps/:appId/envs/:env/clusters/:clusterName' }, delete_cluster: { method: 'DELETE', url: 'apps/:appId/envs/:env/clusters/:clusterName' } }); return { create_cluster: function (appId, env, cluster) { var d = $q.defer(); cluster_resource.create_cluster({ appId: appId, env: env }, cluster, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, load_cluster: function (appId, env, clusterName) { var d = $q.defer(); cluster_resource.load_cluster({ appId: appId, env: env, clusterName: clusterName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, delete_cluster: function (appId, env, clusterName) { var d = $q.defer(); cluster_resource.delete_cluster({ appId: appId, env: env, clusterName: clusterName }, 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('ClusterService', ['$resource', '$q', function ($resource, $q) { var cluster_resource = $resource('', {}, { create_cluster: { method: 'POST', url: 'apps/:appId/envs/:env/clusters' }, load_cluster: { method: 'GET', url: 'apps/:appId/envs/:env/clusters/:clusterName' }, delete_cluster: { method: 'DELETE', url: 'apps/:appId/envs/:env/clusters/:clusterName' } }); return { create_cluster: function (appId, env, cluster) { var d = $q.defer(); cluster_resource.create_cluster({ appId: appId, env: env }, cluster, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, load_cluster: function (appId, env, clusterName) { var d = $q.defer(); cluster_resource.load_cluster({ appId: appId, env: env, clusterName: clusterName }, function (result) { d.resolve(result); }, function (result) { d.reject(result); }); return d.promise; }, delete_cluster: function (appId, env, clusterName) { var d = $q.defer(); cluster_resource.delete_cluster({ appId: appId, env: env, clusterName: clusterName }, 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/views/component/confirm-dialog.html
<div class="modal fade" id="{{dialogId}}" tabindex="-1" role="dialog"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title">{{title}}</h4> </div> <div class="modal-body {{extraClass}}" ng-bind-html="detailAsHtml"> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="showCancelBtn" ng-click="cancel()">{{'Common.Cancel' | translate }}</button> <button type="button" class="btn btn-danger" data-dismiss="modal" ng-click="confirm()"> {{confirmBtnText}} </button> </div> </div> </div> </div>
<div class="modal fade" id="{{dialogId}}" tabindex="-1" role="dialog"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header panel-primary"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <h4 class="modal-title">{{title}}</h4> </div> <div class="modal-body {{extraClass}}" ng-bind-html="detailAsHtml"> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="showCancelBtn" ng-click="cancel()">{{'Common.Cancel' | translate }}</button> <button type="button" class="btn btn-danger" data-dismiss="modal" ng-click="confirm()"> {{confirmBtnText}} </button> </div> </div> </div> </div>
-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/namespace-panel.html
<section class="panel namespace-panel" ng-class="{'hidden': !namespace.show}"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!--public or link label--> <ng-include src="'views/component/namespace-panel-header.html'"></ng-include> <ng-include src="'views/component/namespace-panel-master-tab.html'"></ng-include> <!--branch panel body--> <ng-include src="'views/component/namespace-panel-branch-tab.html'"></ng-include> </section>
<section class="panel namespace-panel" ng-class="{'hidden': !namespace.show}"> <!-- ~ Copyright 2021 Apollo Authors ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. ~ --> <!--public or link label--> <ng-include src="'views/component/namespace-panel-header.html'"></ng-include> <ng-include src="'views/component/namespace-panel-master-tab.html'"></ng-include> <!--branch panel body--> <ng-include src="'views/component/namespace-panel-branch-tab.html'"></ng-include> </section>
-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.
./.github/ISSUE_TEMPLATE/bug_report_en.md
--- name: Bug report about: Create a report to help us improve title: '' labels: '' assignees: '' --- <!-- The content in here will not be show。To forbid duplication,easier search in the feature,before you create an issue,please check the following. If your question is a newer/beginner's,recommand to https://github.com/ctripcorp/apollo/discussions to ask it. --> - [ ] I have checked the [discussions](https://github.com/ctripcorp/apollo/discussions) - [ ] I have searched the [issues](https://github.com/ctripcorp/apollo/issues) of this repository and believe that this is not a duplicate. - [ ] I have checked the [FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) of this repository and believe that this is not a duplicate. **Describe the bug** A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: 1. 2. 3. 4. **Expected behavior** A clear and concise description of what you expected to happen. **Screenshots** If applicable, add screenshots to help explain your problem. ### Additional Details & Logs - Version - Error logs - Configuration - Platform and Operating System
--- name: Bug report about: Create a report to help us improve title: '' labels: '' assignees: '' --- <!-- The content in here will not be show。To forbid duplication,easier search in the feature,before you create an issue,please check the following. If your question is a newer/beginner's,recommand to https://github.com/ctripcorp/apollo/discussions to ask it. --> - [ ] I have checked the [discussions](https://github.com/ctripcorp/apollo/discussions) - [ ] I have searched the [issues](https://github.com/ctripcorp/apollo/issues) of this repository and believe that this is not a duplicate. - [ ] I have checked the [FAQ](https://www.apolloconfig.com/#/zh/faq/common-issues-in-deployment-and-development-phase) of this repository and believe that this is not a duplicate. **Describe the bug** A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: 1. 2. 3. 4. **Expected behavior** A clear and concise description of what you expected to happen. **Screenshots** If applicable, add screenshots to help explain your problem. ### Additional Details & Logs - Version - Error logs - Configuration - Platform and Operating System
-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/quick-start.md
# Prepare Wait for content... ```bash content for copy ```
# Prepare Wait for content... ```bash content for copy ```
-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.
./CONTRIBUTING.md
## Contributing to apollo Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. ### Sign the Contributor License Agreement Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. ### Code Conventions Our code style is in line with [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). We provide template files [intellij-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) for IntelliJ IDEA and [eclipse-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) for Eclipse. If you use other IDEs, then you may config manually by referencing the template files. * Make sure all new .java files have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. * Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests should be added for a new feature or an important bug fix. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). * Normally, we would squash commits for one feature into one commit. There are 2 ways to do this: 1. To rebase and squash based on the remote branch * `git rebase -i <remote>/master` * merge commits via `fixup`, etc 2. Create a new branch and merge these commits into one * `git checkout -b <some-branch-name> <remote>/master` * `git merge --squash <current-feature-branch>` * When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
## Contributing to apollo Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below. ### Sign the Contributor License Agreement Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests. ### Code Conventions Our code style is in line with [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). We provide template files [intellij-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/intellij-java-google-style.xml) for IntelliJ IDEA and [eclipse-java-google-style.xml](https://github.com/ctripcorp/apollo/blob/master/apollo-buildtools/style/eclipse-java-google-style.xml) for Eclipse. If you use other IDEs, then you may config manually by referencing the template files. * Make sure all new .java files have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. * Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes). * Add some Javadocs and, if you change the namespace, some XSD doc elements. * A few unit tests should be added for a new feature or an important bug fix. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). * Normally, we would squash commits for one feature into one commit. There are 2 ways to do this: 1. To rebase and squash based on the remote branch * `git rebase -i <remote>/master` * merge commits via `fixup`, etc 2. Create a new branch and merge these commits into one * `git checkout -b <some-branch-name> <remote>/master` * `git merge --squash <current-feature-branch>` * When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
-1