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,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapExtendProperties.java | /*
* Copyright (c) 2019 www.ceair.com Inc. All rights reserved.
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the LdapExtendProperties description.
*
* @author wuzishu
*/
@ConfigurationProperties(prefix = "ldap"... | /*
* Copyright (c) 2019 www.ceair.com Inc. All rights reserved.
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the LdapExtendProperties description.
*
* @author wuzishu
*/
@ConfigurationProperties(prefix = "ldap"... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetControllerTest.java | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo... | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AccessKeyServiceTest.java | package com.ctrip.framework.apollo.biz.service;
import static org.junit.Assert.assertNotNull;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import org.junit.Test;
import org... | package com.ctrip.framework.apollo.biz.service;
import static org.junit.Assert.assertNotNull;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import org.junit.Test;
import org... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/EnvironmentInfo.java | package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
public class EnvironmentInfo {
private String env;
private boolean active;
private String metaServerAddress;
private ServiceDTO[] configServic... | package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
public class EnvironmentInfo {
private String env;
private boolean active;
private String metaServerAddress;
private ServiceDTO[] configServic... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/SystemInfo.java | package com.ctrip.framework.apollo.portal.entity.vo;
import com.google.common.collect.Lists;
import java.util.List;
public class SystemInfo {
private String version;
private List<EnvironmentInfo> environments = Lists.newLinkedList();
public String getVersion() {
return version;
}
public void setVers... | package com.ctrip.framework.apollo.portal.entity.vo;
import com.google.common.collect.Lists;
import java.util.List;
public class SystemInfo {
private String version;
private List<EnvironmentInfo> environments = Lists.newLinkedList();
public String getVersion() {
return version;
}
public void setVers... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/ItemsComparator.java | package com.ctrip.framework.apollo.portal.component;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.stereot... | package com.ctrip.framework.apollo.portal.component;
import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
import com.ctrip.framework.apollo.common.dto.ItemDTO;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.stereot... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/boot/ApolloApplicationContextInitializerTest.java | package com.ctrip.framework.apollo.spring.boot;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core... | package com.ctrip.framework.apollo.spring.boot;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/parser/Parsers.java | package com.ctrip.framework.apollo.util.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTAN... | package com.ctrip.framework.apollo.util.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Parsers {
public static DateParser forDate() {
return DateParser.INSTAN... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RelativeDateFormat.java | package com.ctrip.framework.apollo.portal.util;
import org.apache.commons.lang.time.FastDateFormat;
import java.util.Calendar;
import java.util.Date;
public class RelativeDateFormat {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
private static final long ONE_M... | package com.ctrip.framework.apollo.portal.util;
import org.apache.commons.lang.time.FastDateFormat;
import java.util.Calendar;
import java.util.Date;
public class RelativeDateFormat {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
private static final long ONE_M... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/BaseDTO.java | package com.ctrip.framework.apollo.openapi.dto;
import java.util.Date;
public class BaseDTO {
protected String dataChangeCreatedBy;
protected String dataChangeLastModifiedBy;
protected Date dataChangeCreatedTime;
protected Date dataChangeLastModifiedTime;
public String getDataChangeCreatedBy() {
re... | package com.ctrip.framework.apollo.openapi.dto;
import java.util.Date;
public class BaseDTO {
protected String dataChangeCreatedBy;
protected String dataChangeLastModifiedBy;
protected Date dataChangeCreatedTime;
protected Date dataChangeLastModifiedTime;
public String getDataChangeCreatedBy() {
re... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/FavoriteService.java | package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Favorite;
import com.ctrip.framework.apollo.portal.repository.FavoriteRepository;
im... | package com.ctrip.framework.apollo.portal.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.Favorite;
import com.ctrip.framework.apollo.portal.repository.FavoriteRepository;
im... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/NamespaceLockDTO.java | package com.ctrip.framework.apollo.common.dto;
public class NamespaceLockDTO extends BaseDTO{
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| package com.ctrip.framework.apollo.common.dto;
public class NamespaceLockDTO extends BaseDTO{
private long namespaceId;
public long getNamespaceId() {
return namespaceId;
}
public void setNamespaceId(long namespaceId) {
this.namespaceId = namespaceId;
}
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-core/src/main/java/com/ctrip/framework/apollo/tracer/internals/NullTransaction.java | package com.ctrip.framework.apollo.tracer.internals;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class NullTransaction implements Transaction {
@Override
public void setStatus(String status) {
}
@Override
public void setStatus(Throwable e... | package com.ctrip.framework.apollo.tracer.internals;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class NullTransaction implements Transaction {
@Override
public void setStatus(String status) {
}
@Override
public void setStatus(Throwable e... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/TxtConfigFile.java | package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
public class TxtConfigFile extends PlainTextConfigFile {
public TxtConfigFile(String namespace, ConfigRepository configRepository) {
super(namespace, configRepository);
}
@Override
public ConfigF... | package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
public class TxtConfigFile extends PlainTextConfigFile {
public TxtConfigFile(String namespace, ConfigRepository configRepository) {
super(namespace, configRepository);
}
@Override
public ConfigF... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/KubernetesDiscoveryService.java | package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.goog... | package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.goog... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java | package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table... | package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/ConfigReleaseWebhookNotifier.java | package com.ctrip.framework.apollo.portal.component;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype... | package com.ctrip.framework.apollo.portal.component;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java | package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boo... | package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boo... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/YamlConfigFileTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo... | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/GlobalDefaultExceptionHandler.java | package com.ctrip.framework.apollo.common.controller;
import com.ctrip.framework.apollo.common.exception.AbstractApolloHttpException;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import com.google.gson.reflect.Type... | package com.ctrip.framework.apollo.common.controller;
import com.ctrip.framework.apollo.common.exception.AbstractApolloHttpException;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.google.gson.Gson;
import com.google.gson.reflect.Type... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/SpringValueProcessor.java | package com.ctrip.framework.apollo.spring.annotation;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.spring.property.PlaceholderHelper;
import com.ctrip.framework.apollo.spring.property.SpringValue;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinition;
impo... | package com.ctrip.framework.apollo.spring.annotation;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.spring.property.PlaceholderHelper;
import com.ctrip.framework.apollo.spring.property.SpringValue;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinition;
impo... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-core/src/main/java/com/ctrip/framework/apollo/Apollo.java | package com.ctrip.framework.apollo;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class Apollo {
public final static String VERSION =
"java-" + Apollo.class.getPackage().getImplementationVersion();
}
| package com.ctrip.framework.apollo;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class Apollo {
public final static String VERSION =
"java-" + Apollo.class.getPackage().getImplementationVersion();
}
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./docs/zh/usage/apollo-user-guide.md | #
# 名词解释
* 普通应用
* 普通应用指的是独立运行的程序，如
* Web应用程序
* 带有main函数的程序
* 公共组件
* 公共组件指的是发布的类库、客户端程序，不会自己独立运行，如
* Java的jar包
* .Net的dll文件
# 一、普通应用接入指南
## 1.1 创建项目
要使用Apollo，第一步需要创建项目。
1. 打开apollo-portal主页
2. 点击“创建项目”
 before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/util/yaml/YamlParserTest.java | package com.ctrip.framework.apollo.util.yaml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.util.OrderedProp... | package com.ctrip.framework.apollo.util.yaml;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.util.OrderedProp... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/MQConfiguration.java | package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.portal.spi.ctrip.CtripMQService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultMQService;
import org.springframework.context.... | package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.portal.spi.ctrip.CtripMQService;
import com.ctrip.framework.apollo.portal.spi.defaultimpl.DefaultMQService;
import org.springframework.context.... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-core/src/main/java/com/ctrip/framework/foundation/internals/provider/DefaultNetworkProvider.java | package com.ctrip.framework.foundation.internals.provider;
import com.ctrip.framework.foundation.internals.NetworkInterfaceManager;
import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
import com.ctrip.framework.foundation.spi.provider.Provider;
public class DefaultNetworkProvider implements NetworkPro... | package com.ctrip.framework.foundation.internals.provider;
import com.ctrip.framework.foundation.internals.NetworkInterfaceManager;
import com.ctrip.framework.foundation.spi.provider.NetworkProvider;
import com.ctrip.framework.foundation.spi.provider.Provider;
public class DefaultNetworkProvider implements NetworkPro... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/util/parser/DurationParserTest.java | package com.ctrip.framework.apollo.util.parser;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public class DurationParserTest {
private Parsers.DurationParser durationParser = Parsers.forDuration();
@Test
public void testParseMilliSeconds() throws Exception {
String text = "345MS";
... | package com.ctrip.framework.apollo.util.parser;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public class DurationParserTest {
private Parsers.DurationParser durationParser = Parsers.forDuration();
@Test
public void testParseMilliSeconds() throws Exception {
String text = "345MS";
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/GrayReleaseRuleItemTransformer.java | package com.ctrip.framework.apollo.common.utils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.lang.reflect.Type;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRu... | package com.ctrip.framework.apollo.common.utils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.lang.reflect.Type;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRu... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java | package com.ctrip.framework.apollo.internals;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static or... | package com.ctrip.framework.apollo.internals;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static or... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/ConfigServiceLocatorTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import java.util.List;
import org.junit.After;
import org.junit.Test;
public class ConfigServiceLocatorTest {
@After
public void tearDown() throws Exception {
Sys... | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import java.util.List;
import org.junit.After;
import org.junit.Test;
public class ConfigServiceLocatorTest {
@After
public void tearDown() throws Exception {
Sys... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapMappingProperties.java |
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rd... |
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rd... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/package-info.java | /**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.common.customize;
| /**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.common.customize;
| -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/service/ConsumerService.java | package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import co... | package com.ctrip.framework.apollo.openapi.service;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.openapi.entity.Consumer;
import com.ctrip.framework.apollo.openapi.entity.ConsumerAudit;
import com.ctrip.framework.apollo.openapi.entity.ConsumerRole;
import co... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ConfigsImportController.java | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.service.ConfigsImportService;
import com.ctrip.framework.apollo.portal.util.ConfigFileUtils;
import java.io.IOException;
import org.springframework.security.acce... | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.portal.service.ConfigsImportService;
import com.ctrip.framework.apollo.portal.util.ConfigFileUtils;
import java.io.IOException;
import org.springframework.security.acce... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-configservice/src/main/resources/application-kubernetes.properties | apollo.eureka.server.enabled=false
eureka.client.enabled=false
spring.cloud.discovery.enabled=false | apollo.eureka.server.enabled=false
eureka.client.enabled=false
spring.cloud.discovery.enabled=false | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-buildtools/src/main/resources/LICENSE-2.0.txt |
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
... |
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/resources/static/img/secret.png | PNG
IHDR X IDATx^
\eyϹ$#4Q$u
ݳ$Bɘ={A\
II퐀ɞ
4ZHm) S"c ɞ!`͞s38{?Ϟ{%KI B`r:~H@@dǭ],khʱk:!f J :DA_K=D0퐃p}ƞ H@zFmI]6W~k?IDǂ :&]<Š,lQ}/
T='3@O^ YC { HGO8<g |(\BAbܾ H H m`ylΤ5 ߗ"\̢^ v Y|1'5emZ!?⻧MA 8*.D6l*LҥR@4^{27Rp $P3% *_x釬߯L \lRx... | PNG
IHDR X IDATx^
\eyϹ$#4Q$u
ݳ$Bɘ={A\
II퐀ɞ
4ZHm) S"c ɞ!`͞s38{?Ϟ{%KI B`r:~H@@dǭ],khʱk:!f J :DA_K=D0퐃p}ƞ H@zFmI]6W~k?IDǂ :&]<Š,lQ}/
T='3@O^ YC { HGO8<g |(\BAbܾ H H m`ylΤ5 ߗ"\̢^ v Y|1'5emZ!?⻧MA 8*.D6l*LҥR@4^{27Rp $P3% *_x釬߯L \lRx... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/XmlConfigFileTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.ConfigFileChangeListene... | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.ConfigFileChangeListene... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/resources/spring/XmlConfigPlaceholderTest2.xml | <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/sc... | <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/sc... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java | package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.foundation.Foundation;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorServi... | package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.ServiceNameConsts;
import com.ctrip.framework.foundation.Foundation;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorServi... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/config/apollo-portal.conf | MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/100003173/
# console appender log file name
LOG_FILENAME=console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE | MODE=service
PID_FOLDER=.
# console appender log file folder
LOG_FOLDER=/opt/logs/100003173/
# console appender log file name
LOG_FILENAME=console.log
# write application logs only to file appender
export LOG_APPENDERS=FILE | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-adminservice/src/test/resources/data.sql | INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','liuym@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','song_s@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','a... | INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','liuym@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','song_s@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','a... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerExceptionTest.java | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.c... | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.c... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/main/resources/META-INF/spring.handlers | http\://www.ctrip.com/schema/apollo=com.ctrip.framework.apollo.spring.config.NamespaceHandler | http\://www.ctrip.com/schema/apollo=com.ctrip.framework.apollo.spring.config.NamespaceHandler | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.yaml | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
labels:
app: service-mysql-for-apollo-test-alpha-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
... | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
labels:
app: service-mysql-for-apollo-test-alpha-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./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 be... | ## 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 be... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/resources/static/i18n/zh-CN.json | {
"Common.Title": "Apollo配置中心",
"Common.Ctrip": "携程",
"Common.CtripDepartment": "框架研发部",
"Common.Nav.ShowNavBar": "显示导航栏",
"Common.Nav.HideNavBar": "隐藏导航栏",
"Common.Nav.Help": "帮助",
"Common.Nav.AdminTools": "管理员工具",
"Common.Nav.NonAdminTools": "工具",
"Common.Nav.UserManage": "用户管理",
"Common.Nav.Syste... | {
"Common.Title": "Apollo配置中心",
"Common.Ctrip": "携程",
"Common.CtripDepartment": "框架研发部",
"Common.Nav.ShowNavBar": "显示导航栏",
"Common.Nav.HideNavBar": "隐藏导航栏",
"Common.Nav.Help": "帮助",
"Common.Nav.AdminTools": "管理员工具",
"Common.Nav.NonAdminTools": "工具",
"Common.Nav.UserManage": "用户管理",
"Common.Nav.Syste... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/SimpleConfigTest.java | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.u... | package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.u... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/config/ConfigPropertySourceTest.java | package com.ctrip.framework.apollo.spring.config;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import ... | package com.ctrip.framework.apollo.spring.config;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import ... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./scripts/build.sh | #!/bin/sh
# apollo config db info
apollo_config_db_url='jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8'
apollo_config_db_username='FillInCorrectUser'
apollo_config_db_password='FillInCorrectPassword'
# apollo portal db info
apollo_portal_db_url='jdbc:mysql://fill-in-the-correct-ser... | #!/bin/sh
# apollo config db info
apollo_config_db_url='jdbc:mysql://fill-in-the-correct-server:3306/ApolloConfigDB?characterEncoding=utf8'
apollo_config_db_username='FillInCorrectUser'
apollo_config_db_password='FillInCorrectPassword'
# apollo portal db info
apollo_portal_db_url='jdbc:mysql://fill-in-the-correct-ser... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./.git/packed-refs | # pack-refs with: peeled fully-peeled sorted
be40a4bc28db310eb2a7d670e55337b5c2eedc1a refs/remotes/origin/0.x
3a8e92c9c2d0abefa89a8e693c0bfa58ccf2d675 refs/remotes/origin/1.1.2
c9eae5410524957ebca97d85eb00eb38fa266125 refs/remotes/origin/1.5.1
f28d0d5a300070795fba5b61f0bee624ab6f814d refs/remotes/origin/1.7.1
204a4377... | # pack-refs with: peeled fully-peeled sorted
be40a4bc28db310eb2a7d670e55337b5c2eedc1a refs/remotes/origin/0.x
3a8e92c9c2d0abefa89a8e693c0bfa58ccf2d675 refs/remotes/origin/1.1.2
c9eae5410524957ebca97d85eb00eb38fa266125 refs/remotes/origin/1.5.1
f28d0d5a300070795fba5b61f0bee624ab6f814d refs/remotes/origin/1.7.1
204a4377... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./doc/images/local-development/PortalApplication-Home.png | PNG
IHDR * n G
iCCPICC Profile HT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&6 2z,@LGhh@53U hrm:Y߯Ws29 @('r39(B#es\2]6ININ;Ss"¼P @aE) ?yf6'Cl!({ᱹ(ltlOuRR3QZNL.y? դ-
q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,, ܃ӟ1 C9^7 g:... | PNG
IHDR * n G
iCCPICC Profile HT[̤ZB{5A:JHc Pೠ"6!ERDEĂ PPׇ*;=o|͝g ,Q'3&6 2z,@LGhh@53U hrm:Y߯Ws29 @('r39(B#es\2]6ININ;Ss"¼P @aE) ?yf6'Cl!({ᱹ(ltlOuRR3QZNL.y? դ-
q~ S'aNW sށ3,Nah^~+bEKäXRN d/kx3͏?Ùiၳsy8LsWqسE#퇛# "YҚpY6é:+`,@JʝRr?@wM%0,, ܃ӟ1 C9^7 g:... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.yaml | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
labels:
app: service-mysql-for-apollo-test-beta-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
me... | ---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
labels:
app: service-mysql-for-apollo-test-beta-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
me... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/OpenEnvClusterDTO.java | package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenEnvClusterDTO {
private String env;
private Set<String> clusters;
public String getEnv() {
return env;
}
public void setEnv(String env) {
this.env = env;
}
public Set<String> getClusters() {
return clu... | package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenEnvClusterDTO {
private String env;
private Set<String> clusters;
public String getEnv() {
return env;
}
public void setEnv(String env) {
this.env = env;
}
public Set<String> getClusters() {
return clu... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/XmlConfigPlaceholderAutoUpdateTest.java | package com.ctrip.framework.apollo.spring;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctri... | package com.ctrip.framework.apollo.spring;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.internals.SimpleConfig;
import com.ctri... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/client/service/AbstractOpenApiService.java | package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.openapi.client.exception.ApolloOpenApiException;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com... | package com.ctrip.framework.apollo.openapi.client.service;
import com.ctrip.framework.apollo.openapi.client.exception.ApolloOpenApiException;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.escape.Escaper;
import com.google.common.net.UrlEscapers;
import com... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apoll... | <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apoll... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/MetaDomainConsts.java | package com.ctrip.framework.apollo.core;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
impo... | package com.ctrip.framework.apollo.core;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
impo... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./docs/zh/development/apollo-development-guide.md | 本文档介绍了如何在本地使用IDE编译、运行Apollo，从而可以帮助大家了解Apollo的内在运行机制，同时也为自定义开发做好准备。
#
# 一、准备工作
## 1.1 本地运行时环境
Apollo本地开发需要以下组件：
1. Java: 1.8+
2. MySQL: 5.6.5+
3. IDE: 没有特殊要求
其中MySQL需要创建Apollo数据库并导入基础数据。
具体步骤请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)中的以下部分：
1. [一、准备工作](zh/deployment/distributed-deployment-guide#... | 本文档介绍了如何在本地使用IDE编译、运行Apollo，从而可以帮助大家了解Apollo的内在运行机制，同时也为自定义开发做好准备。
#
# 一、准备工作
## 1.1 本地运行时环境
Apollo本地开发需要以下组件：
1. Java: 1.8+
2. MySQL: 5.6.5+
3. IDE: 没有特殊要求
其中MySQL需要创建Apollo数据库并导入基础数据。
具体步骤请参考[分布式部署指南](zh/deployment/distributed-deployment-guide)中的以下部分：
1. [一、准备工作](zh/deployment/distributed-deployment-guide#... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js | directive_module.directive('apollodiff',
function ($compile, $window, AppUtil) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/diff.html',
transclude: true,
replace: true,
scope: {
oldStr: '=',
... | directive_module.directive('apollodiff',
function ($compile, $window, AppUtil) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/diff.html',
transclude: true,
replace: true,
scope: {
oldStr: '=',
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./scripts/apollo-on-kubernetes/apollo-portal-server/Dockerfile | # Dockerfile for apollo-portal-server
# Build with:
# docker build -t apollo-portal-server:v1.0.0 .
FROM openjdk:8-jre-alpine3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk u... | # Dockerfile for apollo-portal-server
# Build with:
# docker build -t apollo-portal-server:v1.0.0 .
FROM openjdk:8-jre-alpine3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk u... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/resources/static/scripts/services/FavoriteService.js | appService.service('FavoriteService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
find_favorites: {
method: 'GET',
url: AppUtil.prefixPath() + '/favorites',
isArray: true
},
add_favorite: {
... | appService.service('FavoriteService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var resource = $resource('', {}, {
find_favorites: {
method: 'GET',
url: AppUtil.prefixPath() + '/favorites',
isArray: true
},
add_favorite: {
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/springsecurity/SpringSecurityUserInfoHolder.java | package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetai... | package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetai... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfigManager.java | package com.ctrip.framework.apollo.internals;
import java.util.Map;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.spi.Confi... | package com.ctrip.framework.apollo.internals;
import java.util.Map;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.spi.Confi... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/NamespaceIdentifier.java | package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.model.Verifiable;
public class NamespaceIdentifier implements Verifiable {
private String appId;
... | package com.ctrip.framework.apollo.portal.entity.vo;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.model.Verifiable;
public class NamespaceIdentifier implements Verifiable {
private String appId;
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/condition/ConditionalOnMissingProfile.java | package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
... | package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./scripts/apollo-on-kubernetes/alpine-bash-3.8-image/Dockerfile | # Build with:
# docker build -t alpine-bash:3.8 .
FROM alpine:3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash && \
... | # Build with:
# docker build -t alpine-bash:3.8 .
FROM alpine:3.8
RUN \
echo "http://mirrors.aliyun.com/alpine/v3.8/main" > /etc/apk/repositories && \
echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
apk update upgrade && \
apk add --no-cache procps curl bash && \
... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/NamespaceReleaseDTO.java | package com.ctrip.framework.apollo.openapi.dto;
public class NamespaceReleaseDTO {
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
public String getReleaseTitle() {
return releaseTitle;
}
public void setReleaseTitle(String... | package com.ctrip.framework.apollo.openapi.dto;
public class NamespaceReleaseDTO {
private String releaseTitle;
private String releaseComment;
private String releasedBy;
private boolean isEmergencyPublish;
public String getReleaseTitle() {
return releaseTitle;
}
public void setReleaseTitle(String... | -1 |
apolloconfig/apollo | 3,563 | update wiki url and refine documentation | ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull ... | nobodyiam | 2021-02-21T12:19:55Z | 2021-02-21T12:25:34Z | 2fdca1f79afb12c1ed8064bb94da7bd4155545ef | c7da6409ca9f0fd8204a16831dff5149a1d2bb91 | update wiki url and refine documentation. ## What's the purpose of this PR
update wiki url and refine documentation
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before maki... | ./doc/images/publish-items.png | PNG
IHDR h s sRGB pHYs gR @ IDATxi%yfwd˲,Y
# ?t8Bve9n[@;zק)9}tO/\YUyU뺿-N̙3[Q?B B B`5vڵdN;Ѫ&Q@L!ߋ)abN>ݝ:u;ym1n@@0>ݻwiG]#I`{ /b݊5C`{v{gJ!!!!!!C \Ocǎ
5Cq!!!0>2<^p_<"gAWRG }t]E?.ٳg3 BbBUC B B B B B B`... | PNG
IHDR h s sRGB pHYs gR @ IDATxi%yfwd˲,Y
# ?t8Bve9n[@;zק)9}tO/\YUyU뺿-N̙3[Q?B B B`5vڵdN;Ѫ&Q@L!ߋ)abN>ݝ:u;ym1n@@0>ݻwiG]#I`{ /b݊5C`{v{gJ!!!!!!C \Ocǎ
5Cq!!!0>2<^p_<"gAWRG }t]E?.ٳg3 BbBUC B B B B B B`... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/config/application-ldap-activedirectory-sample.yml | # ldap sample for active directory, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "admin" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(sAMAccountName={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://1.1.1.1:38... | # ldap sample for active directory, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "admin" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(sAMAccountName={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://1.1.1.1:38... | 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/config/application-ldap-apacheds-sample.yml | # ldap sample for apache ds, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "uid=admin,ou=system" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localhost:1038... | # ldap sample for apache ds, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "uid=admin,ou=system" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localhost:1038... | 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/config/application-ldap-openldap-sample.yml | # ldap sample for open ldap, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=org"
username: "cn=admin,dc=example,dc=org" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localho... | # ldap sample for open ldap, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=org"
username: "cn=admin,dc=example,dc=org" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(uid={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://localho... | 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/PortalApplication.java | package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.openapi.PortalOpenApiConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.con... | package com.ctrip.framework.apollo.portal;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.openapi.PortalOpenApiConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boo... | 1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ServiceDTO.java | package com.ctrip.framework.apollo.core.dto;
public class ServiceDTO {
private String appName;
private String instanceId;
private String homepageUrl;
public String getAppName() {
return appName;
}
public String getHomepageUrl() {
return homepageUrl;
}
public String getInstanceId() {
r... | package com.ctrip.framework.apollo.core.dto;
public class ServiceDTO {
private String appName;
private String instanceId;
private String homepageUrl;
public String getAppName() {
return appName;
}
public String getHomepageUrl() {
return homepageUrl;
}
public String getInstanceId() {
r... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/NamespaceHandler.java | package com.ctrip.framework.apollo.spring.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.core.Ordered;
impor... | package com.ctrip.framework.apollo.spring.config;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.core.Ordered;
impor... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/emailbuilder/ConfigPublishEmailBuilder.java | package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import com.ctrip.framework.apollo.common.constants.ReleaseOperationContext;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import co... | package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.common.constants.ReleaseOperation;
import com.ctrip.framework.apollo.common.constants.ReleaseOperationContext;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import co... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/config/PropertySourcesConstants.java | package com.ctrip.framework.apollo.spring.config;
public interface PropertySourcesConstants {
String APOLLO_PROPERTY_SOURCE_NAME = "ApolloPropertySources";
String APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME = "ApolloBootstrapPropertySources";
String APOLLO_BOOTSTRAP_ENABLED = "apollo.bootstrap.enabled";
String APOLL... | package com.ctrip.framework.apollo.spring.config;
public interface PropertySourcesConstants {
String APOLLO_PROPERTY_SOURCE_NAME = "ApolloPropertySources";
String APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME = "ApolloBootstrapPropertySources";
String APOLLO_BOOTSTRAP_ENABLED = "apollo.bootstrap.enabled";
String APOLL... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-core/src/main/java/com/ctrip/framework/foundation/spi/provider/NetworkProvider.java | package com.ctrip.framework.foundation.spi.provider;
/**
* Provider for network related properties
*/
public interface NetworkProvider extends Provider {
/**
* @return the host address, i.e. ip
*/
String getHostAddress();
/**
* @return the host name
*/
String getHostName();
}
| package com.ctrip.framework.foundation.spi.provider;
/**
* Provider for network related properties
*/
public interface NetworkProvider extends Provider {
/**
* @return the host address, i.e. ip
*/
String getHostAddress();
/**
* @return the host name
*/
String getHostName();
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/DefaultConfigPropertySourcesProcessorHelper.java | package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefini... | package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefini... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppNamespaceRepository.java | package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import java.util.List;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepositor... | package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import java.util.List;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepositor... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValue.java | package com.ctrip.framework.apollo.spring.property;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import org.springframework.core.MethodParameter;
/**
* Spring @Value method info
... | package com.ctrip.framework.apollo.spring.property;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import org.springframework.core.MethodParameter;
/**
* Spring @Value method info
... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/Env.java | package com.ctrip.framework.apollo.portal.environment;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
* ... | package com.ctrip.framework.apollo.portal.environment;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
* ... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseController.java | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.portal.environment.Env;
import c... | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.portal.environment.Env;
import c... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppInfoChangedEvent.java | package com.ctrip.framework.apollo.portal.listener;
import com.google.common.base.Preconditions;
import com.ctrip.framework.apollo.common.entity.App;
import org.springframework.context.ApplicationEvent;
public class AppInfoChangedEvent extends ApplicationEvent{
public AppInfoChangedEvent(Object source) {
sup... | package com.ctrip.framework.apollo.portal.listener;
import com.google.common.base.Preconditions;
import com.ctrip.framework.apollo.common.entity.App;
import org.springframework.context.ApplicationEvent;
public class AppInfoChangedEvent extends ApplicationEvent{
public AppInfoChangedEvent(Object source) {
sup... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java | package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.internals.PropertiesCompatibleFileConfigRepository;
import com.ctrip.framework.apollo.internals.TxtConfigFile;
import org.slf4j.Lo... | package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.internals.PropertiesCompatibleFileConfigRepository;
import com.ctrip.framework.apollo.internals.TxtConfigFile;
import org.slf4j.Lo... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-configservice/src/main/resources/application.yml | spring:
application:
name: apollo-configservice
profiles:
active: ${apollo_profile}
ctrip:
appid: 100003171
server:
port: 8080
logging:
file:
name: /opt/logs/100003171/apollo-configservice.log
eureka:
instance:
hostname: ${hostname:localhost}
preferIpAddress: true
status-page-url... | spring:
application:
name: apollo-configservice
profiles:
active: ${apollo_profile}
ctrip:
appid: 100003171
server:
port: 8080
logging:
file:
name: /opt/logs/100003171/apollo-configservice.log
eureka:
instance:
hostname: ${hostname:localhost}
preferIpAddress: true
status-page-url... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AccessKeyDTO.java | package com.ctrip.framework.apollo.common.dto;
public class AccessKeyDTO extends BaseDTO {
private Long id;
private String secret;
private String appId;
private Boolean enabled;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSecret() {
... | package com.ctrip.framework.apollo.common.dto;
public class AccessKeyDTO extends BaseDTO {
private Long id;
private String secret;
private String appId;
private Boolean enabled;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getSecret() {
... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/AutoUpdateConfigChangeListener.java | package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.gson.Gson;
import java.lang.reflect.Field;
import java.lang.reflect.Type... | package com.ctrip.framework.apollo.spring.property;
import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import com.google.gson.Gson;
import java.lang.reflect.Field;
import java.lang.reflect.Type... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripMQService.java | package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.Re... | package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
import com.ctrip.framework.apollo.portal.entity.bo.Re... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/LdapMappingProperties.java |
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rd... |
package com.ctrip.framework.apollo.portal.spi.configuration;
/**
* the LdapMappingProperties description.
*
* @author wuzishu
*/
public class LdapMappingProperties {
/**
* user ldap objectClass
*/
private String objectClass;
/**
* user login Id
*/
private String loginId;
/**
* user rd... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/EntityManagerUtil.java | package com.ctrip.framework.apollo.biz.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
import org.springframework.orm.jpa.EntityManagerHolder;
import org.springframework.stereo... | package com.ctrip.framework.apollo.biz.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
import org.springframework.orm.jpa.EntityManagerHolder;
import org.springframework.stereo... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetControllerTest.java | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo... | package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/NamespaceLock.java | package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "NamespaceLock")
@Where(clause = "isDeleted = 0")... | package com.ctrip.framework.apollo.biz.entity;
import com.ctrip.framework.apollo.common.entity.BaseEntity;
import org.hibernate.annotations.Where;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "NamespaceLock")
@Where(clause = "isDeleted = 0")... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/EmailService.java | package com.ctrip.framework.apollo.portal.spi;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
public interface EmailService {
void send(Email email);
}
| package com.ctrip.framework.apollo.portal.spi;
import com.ctrip.framework.apollo.portal.entity.bo.Email;
public interface EmailService {
void send(Email email);
}
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/AppOpenApiServiceTest.java | package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.StringEntity;
... | package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.entity.StringEntity;
... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java | package com.ctrip.framework.apollo.model;
import java.util.Map;
import java.util.Set;
/**
* A change event when a namespace's config is changed.
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigChangeEvent {
private final String m_namespace;
private final Map<String, ConfigChange> m_changes;
/**... | package com.ctrip.framework.apollo.model;
import java.util.Map;
import java.util.Set;
/**
* A change event when a namespace's config is changed.
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigChangeEvent {
private final String m_namespace;
private final Map<String, ConfigChange> m_changes;
/**... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AccessKeyController.java | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.AccessKeyDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.service.AccessKeyService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springfra... | package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.AccessKeyDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.service.AccessKeyService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springfra... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/ConfigFactory.java | package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigFactory {
/**
* Create the config instance for the ... | package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConfigFactory {
/**
* Create the config instance for the ... | -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-client/src/test/resources/spring/yaml/case7.yml | apollo.test.testBean:false
| apollo.test.testBean:false
| -1 |
apolloconfig/apollo | 3,561 | fix #3551 and optimize ldap samples | ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Follow this checklist to help us incorpor... | nobodyiam | 2021-02-21T09:26:33Z | 2021-02-21T09:32:26Z | 8285504336733f96ffff77f0b89ff69ff899fb41 | 00776a2a44f716a58a416a965a199842fbaae67b | fix #3551 and optimize ldap samples. ## What's the purpose of this PR
Fix the issue that apollo portal won't start when ldap is enabled and optimize ldap samples.
## Which issue(s) this PR fixes:
Fixes #3551
## Brief changelog
1. Exclude LdapAutoConfiguration
2. Simplify ldap configuration samples
Foll... | ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScannerTest.java | package com.ctrip.framework.apollo.biz.message;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;
import com.ctrip.framework.apollo.biz.AbstractUnitTest;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
... | package com.ctrip.framework.apollo.biz.message;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;
import com.ctrip.framework.apollo.biz.AbstractUnitTest;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
... | -1 |