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,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class SimpleConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = LoggerFactory.getLogger(SimpleConfig.class);
private final String m_namespace;
private final ConfigRepository m_configRepository;
private volatile Properties m_configProperties;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace for this config instance
* @param configRepository the config repository for this config instance
*/
public SimpleConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_configRepository = configRepository;
this.initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Simple Config failed - namespace: {}, reason: {}", m_namespace,
ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
if (m_configProperties == null) {
logger.warn("Could not load config from Apollo, always return default value!");
return defaultValue;
}
return this.m_configProperties.getProperty(key, defaultValue);
}
@Override
public Set<String> getPropertyNames() {
if (m_configProperties == null) {
return Collections.emptySet();
}
return m_configProperties.stringPropertyNames();
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties)) {
return;
}
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
List<ConfigChange> changes = calcPropertyChanges(namespace, m_configProperties, newConfigProperties);
Map<String, ConfigChange> changeMap = Maps.uniqueIndex(changes,
new Function<ConfigChange, String>() {
@Override
public String apply(ConfigChange input) {
return input.getPropertyName();
}
});
updateConfig(newConfigProperties, m_configRepository.getSourceType());
clearConfigCache();
this.fireConfigChange(new ConfigChangeEvent(m_namespace, changeMap));
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties = newConfigProperties;
m_sourceType = sourceType;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class SimpleConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = LoggerFactory.getLogger(SimpleConfig.class);
private final String m_namespace;
private final ConfigRepository m_configRepository;
private volatile Properties m_configProperties;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace for this config instance
* @param configRepository the config repository for this config instance
*/
public SimpleConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_configRepository = configRepository;
this.initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Simple Config failed - namespace: {}, reason: {}", m_namespace,
ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
if (m_configProperties == null) {
logger.warn("Could not load config from Apollo, always return default value!");
return defaultValue;
}
return this.m_configProperties.getProperty(key, defaultValue);
}
@Override
public Set<String> getPropertyNames() {
if (m_configProperties == null) {
return Collections.emptySet();
}
return m_configProperties.stringPropertyNames();
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties)) {
return;
}
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
List<ConfigChange> changes = calcPropertyChanges(namespace, m_configProperties, newConfigProperties);
Map<String, ConfigChange> changeMap = Maps.uniqueIndex(changes,
new Function<ConfigChange, String>() {
@Override
public String apply(ConfigChange input) {
return input.getPropertyName();
}
});
updateConfig(newConfigProperties, m_configRepository.getSourceType());
clearConfigCache();
this.fireConfigChange(new ConfigChangeEvent(m_namespace, changeMap));
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties = newConfigProperties;
m_sourceType = sourceType;
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-assembly/src/main/resources/logback.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-assembly.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<property name="LOG_FILE"
value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}apollo-assembly.log}" />
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
<root level="INFO">
<if condition='isDefined("LOG_APPENDERS")'>
<then>
<if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
<then>
<appender-ref ref="CONSOLE"/>
</then>
</if>
<if condition='property("LOG_APPENDERS").contains("FILE")'>
<then>
<appender-ref ref="FILE"/>
</then>
</if>
</then>
<else>
<appender-ref ref="FILE" />
<appender-ref ref="CONSOLE" />
</else>
</if>
</root>
</configuration>
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./docs/css/vue.css | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
@import url("fonts.css");*{-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-text-size-adjust:none;-webkit-touch-callout:none;box-sizing:border-box}body:not(.ready){overflow:hidden}body:not(.ready) .app-nav,body:not(.ready)>nav,body:not(.ready) [data-cloak]{display:none}div#app{font-size:30px;font-weight:lighter;margin:40vh auto;text-align:center}div#app:empty:before{content:"Loading..."}.emoji{height:1.2rem;vertical-align:middle}.progress{background-color:var(--theme-color,#42b983);height:2px;left:0;position:fixed;right:0;top:0;transition:width .2s,opacity .4s;width:0;z-index:999999}.search .search-keyword,.search a:hover{color:var(--theme-color,#42b983)}.search .search-keyword{font-style:normal;font-weight:700}body,html{height:100%}body{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;color:#34495e;font-family:Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:15px;letter-spacing:0;margin:0;overflow-x:hidden}img{max-width:100%}a[disabled]{cursor:not-allowed;opacity:.6}kbd{border:1px solid #ccc;border-radius:3px;display:inline-block;font-size:12px!important;line-height:12px;margin-bottom:3px;padding:3px 5px;vertical-align:middle}li input[type=checkbox]{margin:0 .2em .25em 0;vertical-align:middle}.app-nav{margin:25px 60px 0 0;position:absolute;right:0;text-align:right;z-index:10}.app-nav.no-badge{margin-right:25px}.app-nav p{margin:0}.app-nav>a{margin:0 1rem;padding:5px 0}.app-nav li,.app-nav ul{display:inline-block;list-style:none;margin:0}.app-nav a{color:inherit;font-size:16px;text-decoration:none;transition:color .3s}.app-nav a.active,.app-nav a:hover{color:var(--theme-color,#42b983)}.app-nav a.active{border-bottom:2px solid var(--theme-color,#42b983)}.app-nav li{display:inline-block;margin:0 1rem;padding:5px 0;position:relative;cursor:pointer}.app-nav li ul{background-color:#fff;border:1px solid;border-color:#ddd #ddd #ccc;border-radius:4px;box-sizing:border-box;display:none;max-height:calc(100vh - 61px);overflow-y:auto;padding:10px 0;position:absolute;right:-15px;text-align:left;top:100%;white-space:nowrap}.app-nav li ul li{display:block;font-size:14px;line-height:1rem;margin:8px 14px;white-space:nowrap}.app-nav li ul a{display:block;font-size:inherit;margin:0;padding:0}.app-nav li ul a.active{border-bottom:0}.app-nav li:hover ul{display:block}.github-corner{border-bottom:0;position:fixed;right:0;text-decoration:none;top:0;z-index:1}.github-corner:hover .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}.github-corner svg{color:#fff;fill:var(--theme-color,#42b983);height:80px;width:80px}main{display:block;position:relative;width:100vw;height:100%;z-index:0}main.hidden{display:none}.anchor{display:inline-block;text-decoration:none;transition:all .3s}.anchor span{color:#34495e}.anchor:hover{text-decoration:underline}.sidebar{border-right:1px solid rgba(0,0,0,.07);overflow-y:auto;padding:40px 0 0;position:absolute;top:0;bottom:0;left:0;transition:transform .25s ease-out;width:300px;z-index:20}.sidebar>h1{margin:0 auto 1rem;font-size:1.5rem;font-weight:300;text-align:center}.sidebar>h1 a{color:inherit;text-decoration:none}.sidebar>h1 .app-nav{display:block;position:static}.sidebar .sidebar-nav{line-height:2em;padding-bottom:40px}.sidebar li.collapse .app-sub-sidebar{display:none}.sidebar ul{margin:0 0 0 15px;padding:0}.sidebar li>p{font-weight:700;margin:0}.sidebar ul,.sidebar ul li{list-style:none}.sidebar ul li a{border-bottom:none;display:block}.sidebar ul li ul{padding-left:20px}.sidebar::-webkit-scrollbar{width:4px}.sidebar::-webkit-scrollbar-thumb{background:transparent;border-radius:4px}.sidebar:hover::-webkit-scrollbar-thumb{background:hsla(0,0%,53.3%,.4)}.sidebar:hover::-webkit-scrollbar-track{background:hsla(0,0%,53.3%,.1)}.sidebar-toggle{background-color:transparent;background-color:hsla(0,0%,100%,.8);border:0;outline:none;padding:10px;position:absolute;bottom:0;left:0;text-align:center;transition:opacity .3s;width:284px;z-index:30;cursor:pointer}.sidebar-toggle:hover .sidebar-toggle-button{opacity:.4}.sidebar-toggle span{background-color:var(--theme-color,#42b983);display:block;margin-bottom:4px;width:16px;height:2px}body.sticky .sidebar,body.sticky .sidebar-toggle{position:fixed}.content{padding-top:60px;position:absolute;top:0;right:0;bottom:0;left:300px;transition:left .25s ease}.markdown-section{margin:0 auto;max-width:80%;padding:30px 15px 40px;position:relative}.markdown-section>*{box-sizing:border-box;font-size:inherit}.markdown-section>:first-child{margin-top:0!important}.markdown-section hr{border:none;border-bottom:1px solid #eee;margin:2em 0}.markdown-section iframe{border:1px solid #eee;width:1px;min-width:100%}.markdown-section table{border-collapse:collapse;border-spacing:0;display:block;margin-bottom:1rem;overflow:auto;width:100%}.markdown-section th{font-weight:700}.markdown-section td,.markdown-section th{border:1px solid #ddd;padding:6px 13px}.markdown-section tr{border-top:1px solid #ccc}.markdown-section p.tip,.markdown-section tr:nth-child(2n){background-color:#f8f8f8}.markdown-section p.tip{border-bottom-right-radius:2px;border-left:4px solid #f66;border-top-right-radius:2px;margin:2em 0;padding:12px 24px 12px 30px;position:relative}.markdown-section p.tip:before{background-color:#f66;border-radius:100%;color:#fff;content:"!";font-family:Dosis,Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:14px;font-weight:700;left:-12px;line-height:20px;position:absolute;height:20px;width:20px;text-align:center;top:14px}.markdown-section p.tip code{background-color:#efefef}.markdown-section p.tip em{color:#34495e}.markdown-section p.warn{background:rgba(66,185,131,.1);border-radius:2px;padding:1rem}.markdown-section ul.task-list>li{list-style-type:none}body.close .sidebar{transform:translateX(-300px)}body.close .sidebar-toggle{width:auto}body.close .content{left:0}@media print{.app-nav,.github-corner,.sidebar,.sidebar-toggle{display:none}}@media screen and (max-width:768px){.github-corner,.sidebar,.sidebar-toggle{position:fixed}.app-nav{margin-top:16px}.app-nav li ul{top:30px}main{height:auto;overflow-x:hidden}.sidebar{left:-300px;transition:transform .25s ease-out}.content{left:0;max-width:100vw;position:static;padding-top:20px;transition:transform .25s ease}.app-nav,.github-corner{transition:transform .25s ease-out}.sidebar-toggle{background-color:transparent;width:auto;padding:30px 30px 10px 10px}body.close .sidebar{transform:translateX(300px)}body.close .sidebar-toggle{background-color:hsla(0,0%,100%,.8);transition:background-color 1s;width:284px;padding:10px}body.close .content{transform:translateX(300px)}body.close .app-nav,body.close .github-corner{display:none}.github-corner:hover .octo-arm{-webkit-animation:none;animation:none}.github-corner .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}}@-webkit-keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}section.cover{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:cover;height:100vh;width:100vw;display:none}section.cover.show{display:flex}section.cover.has-mask .mask{background-color:#fff;opacity:.8;position:absolute;top:0;height:100%;width:100%}section.cover .cover-main{flex:1;margin:-20px 16px 0;text-align:center;position:relative}section.cover a{color:inherit}section.cover a,section.cover a:hover{text-decoration:none}section.cover p{line-height:1.5rem;margin:1em 0}section.cover h1{color:inherit;font-size:2.5rem;font-weight:300;margin:.625rem 0 2.5rem;position:relative;text-align:center}section.cover h1 a{display:block}section.cover h1 small{bottom:-.4375rem;font-size:1rem;position:absolute}section.cover blockquote{font-size:1.5rem;text-align:center}section.cover ul{line-height:1.8;list-style-type:none;margin:1em auto;max-width:500px;padding:0}section.cover .cover-main>p:last-child a{border-radius:2rem;border:1px solid var(--theme-color,#42b983);box-sizing:border-box;color:var(--theme-color,#42b983);display:inline-block;font-size:1.05rem;letter-spacing:.1rem;margin:.5rem 1rem;padding:.75em 2rem;text-decoration:none;transition:all .15s ease}section.cover .cover-main>p:last-child a:last-child{background-color:var(--theme-color,#42b983);color:#fff}section.cover .cover-main>p:last-child a:last-child:hover{color:inherit;opacity:.8}section.cover .cover-main>p:last-child a:hover{color:inherit}section.cover blockquote>p>a{border-bottom:2px solid var(--theme-color,#42b983);transition:color .3s}section.cover blockquote>p>a:hover{color:var(--theme-color,#42b983)}.sidebar,body{background-color:#fff}.sidebar{color:#364149}.sidebar li{margin:6px 0}.sidebar ul li a{color:#505d6b;font-size:14px;font-weight:400;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}.sidebar ul li a:hover{text-decoration:underline}.sidebar ul li ul{padding:0}.sidebar ul li.active>a{border-right:2px solid;color:var(--theme-color,#42b983);font-weight:600}.app-sub-sidebar li:before{content:"-";padding-right:4px;float:left}.markdown-section h1,.markdown-section h2,.markdown-section h3,.markdown-section h4,.markdown-section strong{color:#2c3e50;font-weight:600}.markdown-section a{color:var(--theme-color,#42b983);font-weight:600}.markdown-section h1{font-size:2rem;margin:0 0 1rem}.markdown-section h2{font-size:1.75rem;margin:45px 0 .8rem}.markdown-section h3{font-size:1.5rem;margin:40px 0 .6rem}.markdown-section h4{font-size:1.25rem}.markdown-section h5{font-size:1rem}.markdown-section h6{color:#777;font-size:1rem}.markdown-section figure,.markdown-section p{margin:1.2em 0}.markdown-section ol,.markdown-section p,.markdown-section ul{line-height:1.6rem;word-spacing:.05rem}.markdown-section ol,.markdown-section ul{padding-left:1.5rem}.markdown-section blockquote{border-left:4px solid var(--theme-color,#42b983);color:#858585;margin:2em 0;padding-left:20px}.markdown-section blockquote p{font-weight:600;margin-left:0}.markdown-section iframe{margin:1em 0}.markdown-section em{color:#7f8c8d}.markdown-section code,.markdown-section output:after,.markdown-section pre{font-family:Roboto Mono,Monaco,courier,monospace}.markdown-section code,.markdown-section pre{background-color:#f8f8f8}.markdown-section output,.markdown-section pre{margin:1.2em 0;position:relative}.markdown-section output,.markdown-section pre>code{border-radius:2px;display:block}.markdown-section output:after,.markdown-section pre>code{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial}.markdown-section code{border-radius:2px;color:#e96900;margin:0 2px;padding:3px 5px;white-space:pre-wrap}.markdown-section>:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6) code{font-size:.8rem}.markdown-section pre{padding:0 1.4rem;line-height:1.5rem;overflow:auto;word-wrap:normal}.markdown-section pre>code{color:#525252;font-size:.8rem;padding:2.2em 5px;line-height:inherit;margin:0 2px;max-width:inherit;overflow:inherit;white-space:inherit}.markdown-section output{padding:1.7rem 1.4rem;border:1px dotted #ccc}.markdown-section output>:first-child{margin-top:0}.markdown-section output>:last-child{margin-bottom:0}.markdown-section code:after,.markdown-section code:before,.markdown-section output:after,.markdown-section output:before{letter-spacing:.05rem}.markdown-section output:after,.markdown-section pre:after{color:#ccc;font-size:.6rem;font-weight:600;height:15px;line-height:15px;padding:5px 10px 0;position:absolute;right:0;text-align:right;top:0;content:attr(data-lang)}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#8e908c}.token.namespace{opacity:.7}.token.boolean,.token.number{color:#c76b29}.token.punctuation{color:#525252}.token.property{color:#c08b30}.token.tag{color:#2973b7}.token.string{color:var(--theme-color,#42b983)}.token.selector{color:#6679cc}.token.attr-name{color:#2973b7}.language-css .token.string,.style .token.string,.token.entity,.token.url{color:#22a2c9}.token.attr-value,.token.control,.token.directive,.token.unit{color:var(--theme-color,#42b983)}.token.function,.token.keyword{color:#e96900}.token.atrule,.token.regex,.token.statement{color:#22a2c9}.token.placeholder,.token.variable{color:#3d8fd1}.token.deleted{text-decoration:line-through}.token.inserted{border-bottom:1px dotted #202746;text-decoration:none}.token.italic{font-style:italic}.token.bold,.token.important{font-weight:700}.token.important{color:#c94922}.token.entity{cursor:help}code .token{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial;min-height:1.5rem;position:relative;left:auto} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
@import url("fonts.css");*{-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-text-size-adjust:none;-webkit-touch-callout:none;box-sizing:border-box}body:not(.ready){overflow:hidden}body:not(.ready) .app-nav,body:not(.ready)>nav,body:not(.ready) [data-cloak]{display:none}div#app{font-size:30px;font-weight:lighter;margin:40vh auto;text-align:center}div#app:empty:before{content:"Loading..."}.emoji{height:1.2rem;vertical-align:middle}.progress{background-color:var(--theme-color,#42b983);height:2px;left:0;position:fixed;right:0;top:0;transition:width .2s,opacity .4s;width:0;z-index:999999}.search .search-keyword,.search a:hover{color:var(--theme-color,#42b983)}.search .search-keyword{font-style:normal;font-weight:700}body,html{height:100%}body{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;color:#34495e;font-family:Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:15px;letter-spacing:0;margin:0;overflow-x:hidden}img{max-width:100%}a[disabled]{cursor:not-allowed;opacity:.6}kbd{border:1px solid #ccc;border-radius:3px;display:inline-block;font-size:12px!important;line-height:12px;margin-bottom:3px;padding:3px 5px;vertical-align:middle}li input[type=checkbox]{margin:0 .2em .25em 0;vertical-align:middle}.app-nav{margin:25px 60px 0 0;position:absolute;right:0;text-align:right;z-index:10}.app-nav.no-badge{margin-right:25px}.app-nav p{margin:0}.app-nav>a{margin:0 1rem;padding:5px 0}.app-nav li,.app-nav ul{display:inline-block;list-style:none;margin:0}.app-nav a{color:inherit;font-size:16px;text-decoration:none;transition:color .3s}.app-nav a.active,.app-nav a:hover{color:var(--theme-color,#42b983)}.app-nav a.active{border-bottom:2px solid var(--theme-color,#42b983)}.app-nav li{display:inline-block;margin:0 1rem;padding:5px 0;position:relative;cursor:pointer}.app-nav li ul{background-color:#fff;border:1px solid;border-color:#ddd #ddd #ccc;border-radius:4px;box-sizing:border-box;display:none;max-height:calc(100vh - 61px);overflow-y:auto;padding:10px 0;position:absolute;right:-15px;text-align:left;top:100%;white-space:nowrap}.app-nav li ul li{display:block;font-size:14px;line-height:1rem;margin:8px 14px;white-space:nowrap}.app-nav li ul a{display:block;font-size:inherit;margin:0;padding:0}.app-nav li ul a.active{border-bottom:0}.app-nav li:hover ul{display:block}.github-corner{border-bottom:0;position:fixed;right:0;text-decoration:none;top:0;z-index:1}.github-corner:hover .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}.github-corner svg{color:#fff;fill:var(--theme-color,#42b983);height:80px;width:80px}main{display:block;position:relative;width:100vw;height:100%;z-index:0}main.hidden{display:none}.anchor{display:inline-block;text-decoration:none;transition:all .3s}.anchor span{color:#34495e}.anchor:hover{text-decoration:underline}.sidebar{border-right:1px solid rgba(0,0,0,.07);overflow-y:auto;padding:40px 0 0;position:absolute;top:0;bottom:0;left:0;transition:transform .25s ease-out;width:300px;z-index:20}.sidebar>h1{margin:0 auto 1rem;font-size:1.5rem;font-weight:300;text-align:center}.sidebar>h1 a{color:inherit;text-decoration:none}.sidebar>h1 .app-nav{display:block;position:static}.sidebar .sidebar-nav{line-height:2em;padding-bottom:40px}.sidebar li.collapse .app-sub-sidebar{display:none}.sidebar ul{margin:0 0 0 15px;padding:0}.sidebar li>p{font-weight:700;margin:0}.sidebar ul,.sidebar ul li{list-style:none}.sidebar ul li a{border-bottom:none;display:block}.sidebar ul li ul{padding-left:20px}.sidebar::-webkit-scrollbar{width:4px}.sidebar::-webkit-scrollbar-thumb{background:transparent;border-radius:4px}.sidebar:hover::-webkit-scrollbar-thumb{background:hsla(0,0%,53.3%,.4)}.sidebar:hover::-webkit-scrollbar-track{background:hsla(0,0%,53.3%,.1)}.sidebar-toggle{background-color:transparent;background-color:hsla(0,0%,100%,.8);border:0;outline:none;padding:10px;position:absolute;bottom:0;left:0;text-align:center;transition:opacity .3s;width:284px;z-index:30;cursor:pointer}.sidebar-toggle:hover .sidebar-toggle-button{opacity:.4}.sidebar-toggle span{background-color:var(--theme-color,#42b983);display:block;margin-bottom:4px;width:16px;height:2px}body.sticky .sidebar,body.sticky .sidebar-toggle{position:fixed}.content{padding-top:60px;position:absolute;top:0;right:0;bottom:0;left:300px;transition:left .25s ease}.markdown-section{margin:0 auto;max-width:80%;padding:30px 15px 40px;position:relative}.markdown-section>*{box-sizing:border-box;font-size:inherit}.markdown-section>:first-child{margin-top:0!important}.markdown-section hr{border:none;border-bottom:1px solid #eee;margin:2em 0}.markdown-section iframe{border:1px solid #eee;width:1px;min-width:100%}.markdown-section table{border-collapse:collapse;border-spacing:0;display:block;margin-bottom:1rem;overflow:auto;width:100%}.markdown-section th{font-weight:700}.markdown-section td,.markdown-section th{border:1px solid #ddd;padding:6px 13px}.markdown-section tr{border-top:1px solid #ccc}.markdown-section p.tip,.markdown-section tr:nth-child(2n){background-color:#f8f8f8}.markdown-section p.tip{border-bottom-right-radius:2px;border-left:4px solid #f66;border-top-right-radius:2px;margin:2em 0;padding:12px 24px 12px 30px;position:relative}.markdown-section p.tip:before{background-color:#f66;border-radius:100%;color:#fff;content:"!";font-family:Dosis,Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:14px;font-weight:700;left:-12px;line-height:20px;position:absolute;height:20px;width:20px;text-align:center;top:14px}.markdown-section p.tip code{background-color:#efefef}.markdown-section p.tip em{color:#34495e}.markdown-section p.warn{background:rgba(66,185,131,.1);border-radius:2px;padding:1rem}.markdown-section ul.task-list>li{list-style-type:none}body.close .sidebar{transform:translateX(-300px)}body.close .sidebar-toggle{width:auto}body.close .content{left:0}@media print{.app-nav,.github-corner,.sidebar,.sidebar-toggle{display:none}}@media screen and (max-width:768px){.github-corner,.sidebar,.sidebar-toggle{position:fixed}.app-nav{margin-top:16px}.app-nav li ul{top:30px}main{height:auto;overflow-x:hidden}.sidebar{left:-300px;transition:transform .25s ease-out}.content{left:0;max-width:100vw;position:static;padding-top:20px;transition:transform .25s ease}.app-nav,.github-corner{transition:transform .25s ease-out}.sidebar-toggle{background-color:transparent;width:auto;padding:30px 30px 10px 10px}body.close .sidebar{transform:translateX(300px)}body.close .sidebar-toggle{background-color:hsla(0,0%,100%,.8);transition:background-color 1s;width:284px;padding:10px}body.close .content{transform:translateX(300px)}body.close .app-nav,body.close .github-corner{display:none}.github-corner:hover .octo-arm{-webkit-animation:none;animation:none}.github-corner .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}}@-webkit-keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}section.cover{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:cover;height:100vh;width:100vw;display:none}section.cover.show{display:flex}section.cover.has-mask .mask{background-color:#fff;opacity:.8;position:absolute;top:0;height:100%;width:100%}section.cover .cover-main{flex:1;margin:-20px 16px 0;text-align:center;position:relative}section.cover a{color:inherit}section.cover a,section.cover a:hover{text-decoration:none}section.cover p{line-height:1.5rem;margin:1em 0}section.cover h1{color:inherit;font-size:2.5rem;font-weight:300;margin:.625rem 0 2.5rem;position:relative;text-align:center}section.cover h1 a{display:block}section.cover h1 small{bottom:-.4375rem;font-size:1rem;position:absolute}section.cover blockquote{font-size:1.5rem;text-align:center}section.cover ul{line-height:1.8;list-style-type:none;margin:1em auto;max-width:500px;padding:0}section.cover .cover-main>p:last-child a{border-radius:2rem;border:1px solid var(--theme-color,#42b983);box-sizing:border-box;color:var(--theme-color,#42b983);display:inline-block;font-size:1.05rem;letter-spacing:.1rem;margin:.5rem 1rem;padding:.75em 2rem;text-decoration:none;transition:all .15s ease}section.cover .cover-main>p:last-child a:last-child{background-color:var(--theme-color,#42b983);color:#fff}section.cover .cover-main>p:last-child a:last-child:hover{color:inherit;opacity:.8}section.cover .cover-main>p:last-child a:hover{color:inherit}section.cover blockquote>p>a{border-bottom:2px solid var(--theme-color,#42b983);transition:color .3s}section.cover blockquote>p>a:hover{color:var(--theme-color,#42b983)}.sidebar,body{background-color:#fff}.sidebar{color:#364149}.sidebar li{margin:6px 0}.sidebar ul li a{color:#505d6b;font-size:14px;font-weight:400;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}.sidebar ul li a:hover{text-decoration:underline}.sidebar ul li ul{padding:0}.sidebar ul li.active>a{border-right:2px solid;color:var(--theme-color,#42b983);font-weight:600}.app-sub-sidebar li:before{content:"-";padding-right:4px;float:left}.markdown-section h1,.markdown-section h2,.markdown-section h3,.markdown-section h4,.markdown-section strong{color:#2c3e50;font-weight:600}.markdown-section a{color:var(--theme-color,#42b983);font-weight:600}.markdown-section h1{font-size:2rem;margin:0 0 1rem}.markdown-section h2{font-size:1.75rem;margin:45px 0 .8rem}.markdown-section h3{font-size:1.5rem;margin:40px 0 .6rem}.markdown-section h4{font-size:1.25rem}.markdown-section h5{font-size:1rem}.markdown-section h6{color:#777;font-size:1rem}.markdown-section figure,.markdown-section p{margin:1.2em 0}.markdown-section ol,.markdown-section p,.markdown-section ul{line-height:1.6rem;word-spacing:.05rem}.markdown-section ol,.markdown-section ul{padding-left:1.5rem}.markdown-section blockquote{border-left:4px solid var(--theme-color,#42b983);color:#858585;margin:2em 0;padding-left:20px}.markdown-section blockquote p{font-weight:600;margin-left:0}.markdown-section iframe{margin:1em 0}.markdown-section em{color:#7f8c8d}.markdown-section code,.markdown-section output:after,.markdown-section pre{font-family:Roboto Mono,Monaco,courier,monospace}.markdown-section code,.markdown-section pre{background-color:#f8f8f8}.markdown-section output,.markdown-section pre{margin:1.2em 0;position:relative}.markdown-section output,.markdown-section pre>code{border-radius:2px;display:block}.markdown-section output:after,.markdown-section pre>code{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial}.markdown-section code{border-radius:2px;color:#e96900;margin:0 2px;padding:3px 5px;white-space:pre-wrap}.markdown-section>:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6) code{font-size:.8rem}.markdown-section pre{padding:0 1.4rem;line-height:1.5rem;overflow:auto;word-wrap:normal}.markdown-section pre>code{color:#525252;font-size:.8rem;padding:2.2em 5px;line-height:inherit;margin:0 2px;max-width:inherit;overflow:inherit;white-space:inherit}.markdown-section output{padding:1.7rem 1.4rem;border:1px dotted #ccc}.markdown-section output>:first-child{margin-top:0}.markdown-section output>:last-child{margin-bottom:0}.markdown-section code:after,.markdown-section code:before,.markdown-section output:after,.markdown-section output:before{letter-spacing:.05rem}.markdown-section output:after,.markdown-section pre:after{color:#ccc;font-size:.6rem;font-weight:600;height:15px;line-height:15px;padding:5px 10px 0;position:absolute;right:0;text-align:right;top:0;content:attr(data-lang)}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#8e908c}.token.namespace{opacity:.7}.token.boolean,.token.number{color:#c76b29}.token.punctuation{color:#525252}.token.property{color:#c08b30}.token.tag{color:#2973b7}.token.string{color:var(--theme-color,#42b983)}.token.selector{color:#6679cc}.token.attr-name{color:#2973b7}.language-css .token.string,.style .token.string,.token.entity,.token.url{color:#22a2c9}.token.attr-value,.token.control,.token.directive,.token.unit{color:var(--theme-color,#42b983)}.token.function,.token.keyword{color:#e96900}.token.atrule,.token.regex,.token.statement{color:#22a2c9}.token.placeholder,.token.variable{color:#3d8fd1}.token.deleted{text-decoration:line-through}.token.inserted{border-bottom:1px dotted #202746;text-decoration:none}.token.italic{font-style:italic}.token.bold,.token.important{font-weight:700}.token.important{color:#c94922}.token.entity{cursor:help}code .token{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial;min-height:1.5rem;position:relative;left:auto} | -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseMessageRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Collection;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ReleaseMessageRepository extends PagingAndSortingRepository<ReleaseMessage, Long> {
List<ReleaseMessage> findFirst500ByIdGreaterThanOrderByIdAsc(Long id);
ReleaseMessage findTopByOrderByIdDesc();
ReleaseMessage findTopByMessageInOrderByIdDesc(Collection<String> messages);
List<ReleaseMessage> findFirst100ByMessageAndIdLessThanOrderByIdAsc(String message, Long id);
@Query("select message, max(id) as id from ReleaseMessage where message in :messages group by message")
List<Object[]> findLatestReleaseMessagesGroupByMessages(@Param("messages") Collection<String> messages);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.Collection;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ReleaseMessageRepository extends PagingAndSortingRepository<ReleaseMessage, Long> {
List<ReleaseMessage> findFirst500ByIdGreaterThanOrderByIdAsc(Long id);
ReleaseMessage findTopByOrderByIdDesc();
ReleaseMessage findTopByMessageInOrderByIdDesc(Collection<String> messages);
List<ReleaseMessage> findFirst100ByMessageAndIdLessThanOrderByIdAsc(String message, Long id);
@Query("select message, max(id) as id from ReleaseMessage where message in :messages group by message")
List<Object[]> findLatestReleaseMessagesGroupByMessages(@Param("messages") Collection<String> messages);
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/util/ConsumerAuthUtilTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.util;
import com.ctrip.framework.apollo.openapi.service.ConsumerService;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.servlet.http.HttpServletRequest;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConsumerAuthUtilTest {
private ConsumerAuthUtil consumerAuthUtil;
@Mock
private ConsumerService consumerService;
@Mock
private HttpServletRequest request;
@Before
public void setUp() throws Exception {
consumerAuthUtil = new ConsumerAuthUtil(consumerService);
}
@Test
public void testGetConsumerId() throws Exception {
String someToken = "someToken";
Long someConsumerId = 1L;
when(consumerService.getConsumerIdByToken(someToken)).thenReturn(someConsumerId);
assertEquals(someConsumerId, consumerAuthUtil.getConsumerId(someToken));
verify(consumerService, times(1)).getConsumerIdByToken(someToken);
}
@Test
public void testStoreConsumerId() throws Exception {
long someConsumerId = 1L;
consumerAuthUtil.storeConsumerId(request, someConsumerId);
verify(request, times(1)).setAttribute(ConsumerAuthUtil.CONSUMER_ID, someConsumerId);
}
@Test
public void testRetrieveConsumerId() throws Exception {
long someConsumerId = 1;
when(request.getAttribute(ConsumerAuthUtil.CONSUMER_ID)).thenReturn(someConsumerId);
assertEquals(someConsumerId, consumerAuthUtil.retrieveConsumerId(request));
verify(request, times(1)).getAttribute(ConsumerAuthUtil.CONSUMER_ID);
}
@Test(expected = IllegalStateException.class)
public void testRetrieveConsumerIdWithConsumerIdNotSet() throws Exception {
consumerAuthUtil.retrieveConsumerId(request);
}
@Test(expected = IllegalStateException.class)
public void testRetrieveConsumerIdWithConsumerIdInvalid() throws Exception {
String someInvalidConsumerId = "abc";
when(request.getAttribute(ConsumerAuthUtil.CONSUMER_ID)).thenReturn(someInvalidConsumerId);
consumerAuthUtil.retrieveConsumerId(request);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.util;
import com.ctrip.framework.apollo.openapi.service.ConsumerService;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.servlet.http.HttpServletRequest;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConsumerAuthUtilTest {
private ConsumerAuthUtil consumerAuthUtil;
@Mock
private ConsumerService consumerService;
@Mock
private HttpServletRequest request;
@Before
public void setUp() throws Exception {
consumerAuthUtil = new ConsumerAuthUtil(consumerService);
}
@Test
public void testGetConsumerId() throws Exception {
String someToken = "someToken";
Long someConsumerId = 1L;
when(consumerService.getConsumerIdByToken(someToken)).thenReturn(someConsumerId);
assertEquals(someConsumerId, consumerAuthUtil.getConsumerId(someToken));
verify(consumerService, times(1)).getConsumerIdByToken(someToken);
}
@Test
public void testStoreConsumerId() throws Exception {
long someConsumerId = 1L;
consumerAuthUtil.storeConsumerId(request, someConsumerId);
verify(request, times(1)).setAttribute(ConsumerAuthUtil.CONSUMER_ID, someConsumerId);
}
@Test
public void testRetrieveConsumerId() throws Exception {
long someConsumerId = 1;
when(request.getAttribute(ConsumerAuthUtil.CONSUMER_ID)).thenReturn(someConsumerId);
assertEquals(someConsumerId, consumerAuthUtil.retrieveConsumerId(request));
verify(request, times(1)).getAttribute(ConsumerAuthUtil.CONSUMER_ID);
}
@Test(expected = IllegalStateException.class)
public void testRetrieveConsumerIdWithConsumerIdNotSet() throws Exception {
consumerAuthUtil.retrieveConsumerId(request);
}
@Test(expected = IllegalStateException.class)
public void testRetrieveConsumerIdWithConsumerIdInvalid() throws Exception {
String someInvalidConsumerId = "abc";
when(request.getAttribute(ConsumerAuthUtil.CONSUMER_ID)).thenReturn(someInvalidConsumerId);
consumerAuthUtil.retrieveConsumerId(request);
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./scripts/apollo-on-kubernetes/db/config-db-test-alpha/apolloconfigdb.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
# Create Database
# ------------------------------------------------------------
CREATE DATABASE IF NOT EXISTS TestAlphaApolloConfigDB DEFAULT CHARACTER SET = utf8mb4;
Use TestAlphaApolloConfigDB;
# Dump of table app
# ------------------------------------------------------------
DROP TABLE IF EXISTS `App`;
CREATE TABLE `App` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
`OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Name` (`Name`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
# Dump of table appnamespace
# ------------------------------------------------------------
DROP TABLE IF EXISTS `AppNamespace`;
CREATE TABLE `AppNamespace` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
`AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
`Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
`IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
`Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_AppId` (`AppId`),
KEY `Name_AppId` (`Name`,`AppId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
# Dump of table audit
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Audit`;
CREATE TABLE `Audit` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`EntityName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '表名',
`EntityId` int(10) unsigned DEFAULT NULL COMMENT '记录ID',
`OpName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '操作类型',
`Comment` varchar(500) DEFAULT NULL COMMENT '备注',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='日志审计表';
# Dump of table cluster
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Cluster`;
CREATE TABLE `Cluster` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT '集群名字',
`AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'App id',
`ParentClusterId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父cluster',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_AppId_Name` (`AppId`,`Name`),
KEY `IX_ParentClusterId` (`ParentClusterId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集群';
# Dump of table commit
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Commit`;
CREATE TABLE `Commit` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`ChangeSets` longtext NOT NULL COMMENT '修改变更集',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`Comment` varchar(500) DEFAULT NULL COMMENT '备注',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `AppId` (`AppId`(191)),
KEY `ClusterName` (`ClusterName`(191)),
KEY `NamespaceName` (`NamespaceName`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
# Dump of table grayreleaserule
# ------------------------------------------------------------
DROP TABLE IF EXISTS `GrayReleaseRule`;
CREATE TABLE `GrayReleaseRule` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
`NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
`BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'branch name',
`Rules` varchar(16000) DEFAULT '[]' COMMENT '灰度规则',
`ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '灰度对应的release',
`BranchStatus` tinyint(2) DEFAULT '1' COMMENT '灰度分支状态: 0:删除分支,1:正在使用的规则 2：全量发布',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='灰度规则表';
# Dump of table instance
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Instance`;
CREATE TABLE `Instance` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`DataCenter` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Data Center Name',
`Ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'instance ip',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_UNIQUE_KEY` (`AppId`,`ClusterName`,`Ip`,`DataCenter`),
KEY `IX_IP` (`Ip`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='使用配置的应用实例';
# Dump of table instanceconfig
# ------------------------------------------------------------
DROP TABLE IF EXISTS `InstanceConfig`;
CREATE TABLE `InstanceConfig` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`InstanceId` int(11) unsigned DEFAULT NULL COMMENT 'Instance Id',
`ConfigAppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Config App Id',
`ConfigClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Cluster Name',
`ConfigNamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Namespace Name',
`ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
`ReleaseDeliveryTime` timestamp NULL DEFAULT NULL COMMENT '配置获取时间',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_UNIQUE_KEY` (`InstanceId`,`ConfigAppId`,`ConfigNamespaceName`),
KEY `IX_ReleaseKey` (`ReleaseKey`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Valid_Namespace` (`ConfigAppId`,`ConfigClusterName`,`ConfigNamespaceName`,`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用实例的配置信息';
# Dump of table item
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Item`;
CREATE TABLE `Item` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
`Key` varchar(128) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Value` longtext NOT NULL COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
`LineNum` int(10) unsigned DEFAULT '0' COMMENT '行号',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_GroupId` (`NamespaceId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置项目';
# Dump of table namespace
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Namespace`;
CREATE TABLE `Namespace` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId_ClusterName_NamespaceName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_NamespaceName` (`NamespaceName`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
# Dump of table namespacelock
# ------------------------------------------------------------
DROP TABLE IF EXISTS `NamespaceLock`;
CREATE TABLE `NamespaceLock` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
`NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
`IsDeleted` bit(1) DEFAULT b'0' COMMENT '软删除',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_NamespaceId` (`NamespaceId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='namespace的编辑锁';
# Dump of table release
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Release`;
CREATE TABLE `Release` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
`Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
`Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`Configurations` longtext NOT NULL COMMENT '发布配置',
`IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId_ClusterName_GroupName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_ReleaseKey` (`ReleaseKey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
# Dump of table releasehistory
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ReleaseHistory`;
CREATE TABLE `ReleaseHistory` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT '发布分支名',
`ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '关联的Release Id',
`PreviousReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '前一次发布的ReleaseId',
`Operation` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '发布类型，0: 普通发布，1: 回滚，2: 灰度发布，3: 灰度规则更新，4: 灰度合并回主分支发布，5: 主分支发布灰度自动发布，6: 主分支回滚灰度自动发布，7: 放弃灰度',
`OperationContext` longtext NOT NULL COMMENT '发布上下文信息',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`,`BranchName`),
KEY `IX_ReleaseId` (`ReleaseId`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布历史';
# Dump of table releasemessage
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ReleaseMessage`;
CREATE TABLE `ReleaseMessage` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Message` varchar(1024) NOT NULL DEFAULT '' COMMENT '发布的消息内容',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Message` (`Message`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布消息';
# Dump of table serverconfig
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ServerConfig`;
CREATE TABLE `ServerConfig` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Cluster` varchar(32) NOT NULL DEFAULT 'default' COMMENT '配置对应的集群，default为不针对特定的集群',
`Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_Key` (`Key`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
# Dump of table accesskey
# ------------------------------------------------------------
DROP TABLE IF EXISTS `AccessKey`;
CREATE TABLE `AccessKey` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
`IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问密钥';
# Config
# ------------------------------------------------------------
INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`, `Comment`)
VALUES
('eureka.service.url', 'default', 'http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔'),
('namespace.lock.switch', 'default', 'false', '一次发布只能有一个人修改开关'),
('item.key.length.limit', 'default', '128', 'item key 最大长度限制'),
('item.value.length.limit', 'default', '20000', 'item value最大长度限制'),
('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存，开启后能提高性能，但是会增大内存消耗！');
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
# Create Database
# ------------------------------------------------------------
CREATE DATABASE IF NOT EXISTS TestAlphaApolloConfigDB DEFAULT CHARACTER SET = utf8mb4;
Use TestAlphaApolloConfigDB;
# Dump of table app
# ------------------------------------------------------------
DROP TABLE IF EXISTS `App`;
CREATE TABLE `App` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
`OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
`OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
`OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
`OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Name` (`Name`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用表';
# Dump of table appnamespace
# ------------------------------------------------------------
DROP TABLE IF EXISTS `AppNamespace`;
CREATE TABLE `AppNamespace` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
`AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
`Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT 'namespace的format类型',
`IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
`Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_AppId` (`AppId`),
KEY `Name_AppId` (`Name`,`AppId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用namespace定义';
# Dump of table audit
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Audit`;
CREATE TABLE `Audit` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`EntityName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '表名',
`EntityId` int(10) unsigned DEFAULT NULL COMMENT '记录ID',
`OpName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '操作类型',
`Comment` varchar(500) DEFAULT NULL COMMENT '备注',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='日志审计表';
# Dump of table cluster
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Cluster`;
CREATE TABLE `Cluster` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Name` varchar(32) NOT NULL DEFAULT '' COMMENT '集群名字',
`AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'App id',
`ParentClusterId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父cluster',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_AppId_Name` (`AppId`,`Name`),
KEY `IX_ParentClusterId` (`ParentClusterId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集群';
# Dump of table commit
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Commit`;
CREATE TABLE `Commit` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`ChangeSets` longtext NOT NULL COMMENT '修改变更集',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`Comment` varchar(500) DEFAULT NULL COMMENT '备注',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `AppId` (`AppId`(191)),
KEY `ClusterName` (`ClusterName`(191)),
KEY `NamespaceName` (`NamespaceName`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='commit 历史表';
# Dump of table grayreleaserule
# ------------------------------------------------------------
DROP TABLE IF EXISTS `GrayReleaseRule`;
CREATE TABLE `GrayReleaseRule` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
`AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
`NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
`BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'branch name',
`Rules` varchar(16000) DEFAULT '[]' COMMENT '灰度规则',
`ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '灰度对应的release',
`BranchStatus` tinyint(2) DEFAULT '1' COMMENT '灰度分支状态: 0:删除分支,1:正在使用的规则 2：全量发布',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='灰度规则表';
# Dump of table instance
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Instance`;
CREATE TABLE `Instance` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`DataCenter` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Data Center Name',
`Ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'instance ip',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_UNIQUE_KEY` (`AppId`,`ClusterName`,`Ip`,`DataCenter`),
KEY `IX_IP` (`Ip`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='使用配置的应用实例';
# Dump of table instanceconfig
# ------------------------------------------------------------
DROP TABLE IF EXISTS `InstanceConfig`;
CREATE TABLE `InstanceConfig` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`InstanceId` int(11) unsigned DEFAULT NULL COMMENT 'Instance Id',
`ConfigAppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Config App Id',
`ConfigClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Cluster Name',
`ConfigNamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config Namespace Name',
`ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
`ReleaseDeliveryTime` timestamp NULL DEFAULT NULL COMMENT '配置获取时间',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_UNIQUE_KEY` (`InstanceId`,`ConfigAppId`,`ConfigNamespaceName`),
KEY `IX_ReleaseKey` (`ReleaseKey`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Valid_Namespace` (`ConfigAppId`,`ConfigClusterName`,`ConfigNamespaceName`,`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用实例的配置信息';
# Dump of table item
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Item`;
CREATE TABLE `Item` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
`Key` varchar(128) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Value` longtext NOT NULL COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
`LineNum` int(10) unsigned DEFAULT '0' COMMENT '行号',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_GroupId` (`NamespaceId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置项目';
# Dump of table namespace
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Namespace`;
CREATE TABLE `Namespace` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace Name',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId_ClusterName_NamespaceName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_NamespaceName` (`NamespaceName`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='命名空间';
# Dump of table namespacelock
# ------------------------------------------------------------
DROP TABLE IF EXISTS `NamespaceLock`;
CREATE TABLE `NamespaceLock` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
`NamespaceId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
`IsDeleted` bit(1) DEFAULT b'0' COMMENT '软删除',
PRIMARY KEY (`Id`),
UNIQUE KEY `IX_NamespaceId` (`NamespaceId`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='namespace的编辑锁';
# Dump of table release
# ------------------------------------------------------------
DROP TABLE IF EXISTS `Release`;
CREATE TABLE `Release` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
`Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
`Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`Configurations` longtext NOT NULL COMMENT '发布配置',
`IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId_ClusterName_GroupName` (`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_ReleaseKey` (`ReleaseKey`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布';
# Dump of table releasehistory
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ReleaseHistory`;
CREATE TABLE `ReleaseHistory` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
`NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'namespaceName',
`BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT '发布分支名',
`ReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '关联的Release Id',
`PreviousReleaseId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '前一次发布的ReleaseId',
`Operation` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '发布类型，0: 普通发布，1: 回滚，2: 灰度发布，3: 灰度规则更新，4: 灰度合并回主分支发布，5: 主分支发布灰度自动发布，6: 主分支回滚灰度自动发布，7: 放弃灰度',
`OperationContext` longtext NOT NULL COMMENT '发布上下文信息',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`,`BranchName`),
KEY `IX_ReleaseId` (`ReleaseId`),
KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布历史';
# Dump of table releasemessage
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ReleaseMessage`;
CREATE TABLE `ReleaseMessage` (
`Id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`Message` varchar(1024) NOT NULL DEFAULT '' COMMENT '发布的消息内容',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `DataChange_LastTime` (`DataChange_LastTime`),
KEY `IX_Message` (`Message`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='发布消息';
# Dump of table serverconfig
# ------------------------------------------------------------
DROP TABLE IF EXISTS `ServerConfig`;
CREATE TABLE `ServerConfig` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
`Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
`Cluster` varchar(32) NOT NULL DEFAULT 'default' COMMENT '配置对应的集群，default为不针对特定的集群',
`Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
`Comment` varchar(1024) DEFAULT '' COMMENT '注释',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `IX_Key` (`Key`),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配置服务自身配置';
# Dump of table accesskey
# ------------------------------------------------------------
DROP TABLE IF EXISTS `AccessKey`;
CREATE TABLE `AccessKey` (
`Id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
`AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
`Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
`IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
`IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
`DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT '创建人邮箱前缀',
`DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
`DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`Id`),
KEY `AppId` (`AppId`(191)),
KEY `DataChange_LastTime` (`DataChange_LastTime`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='访问密钥';
# Config
# ------------------------------------------------------------
INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`, `Comment`)
VALUES
('eureka.service.url', 'default', 'http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/', 'Eureka服务Url，多个service以英文逗号分隔'),
('namespace.lock.switch', 'default', 'false', '一次发布只能有一个人修改开关'),
('item.key.length.limit', 'default', '128', 'item key 最大长度限制'),
('item.value.length.limit', 'default', '20000', 'item value最大长度限制'),
('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存，开启后能提高性能，但是会增大内存消耗！');
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/test/resources/spring/XmlConfigAnnotationTest6.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigChangeListenerWithInterestedKeysBean"/>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigChangeListenerWithInterestedKeysBean"/>
</beans>
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spi;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigRegistry implements ConfigRegistry {
private static final Logger s_logger = LoggerFactory.getLogger(DefaultConfigRegistry.class);
private Map<String, ConfigFactory> m_instances = Maps.newConcurrentMap();
@Override
public void register(String namespace, ConfigFactory factory) {
if (m_instances.containsKey(namespace)) {
s_logger.warn("ConfigFactory({}) is overridden by {}!", namespace, factory.getClass());
}
m_instances.put(namespace, factory);
}
@Override
public ConfigFactory getFactory(String namespace) {
ConfigFactory config = m_instances.get(namespace);
return config;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spi;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigRegistry implements ConfigRegistry {
private static final Logger s_logger = LoggerFactory.getLogger(DefaultConfigRegistry.class);
private Map<String, ConfigFactory> m_instances = Maps.newConcurrentMap();
@Override
public void register(String namespace, ConfigFactory factory) {
if (m_instances.containsKey(namespace)) {
s_logger.warn("ConfigFactory({}) is overridden by {}!", namespace, factory.getClass());
}
m_instances.put(namespace, factory);
}
@Override
public ConfigFactory getFactory(String namespace) {
ConfigFactory config = m_instances.get(namespace);
return config;
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/utils/DeferredLoggerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.test.tools.AloneRunner;
import com.ctrip.framework.test.tools.AloneWith;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/11
*/
@RunWith(AloneRunner.class)
@AloneWith(JUnit4.class)
public class DeferredLoggerTest {
private static ByteArrayOutputStream outContent;
private static Logger logger = null;
private static PrintStream printStream;
@BeforeClass
public static void init() throws NoSuchFieldException, IllegalAccessException {
DeferredLoggerTest.outContent = new ByteArrayOutputStream();
DeferredLoggerTest.printStream = new PrintStream(DeferredLoggerTest.outContent);
System.setOut(DeferredLoggerTest.printStream);
DeferredLoggerTest.logger = DeferredLoggerFactory.getLogger("DeferredLoggerTest");
}
@Test
public void testErrorLog() {
DeferredLoggerTest.logger.error("errorLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger"));
}
@Test
public void testInfoLog() {
DeferredLoggerTest.logger.info("inFoLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger"));
}
@Test
public void testWarnLog() {
DeferredLoggerTest.logger.warn("warnLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger"));
}
@Test
public void testDebugLog() {
DeferredLoggerTest.logger.warn("debugLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger"));
}
@Test
public void testDeferredLog() {
DeferredLogger.enable();
DeferredLoggerTest.logger.error("errorLogger_testDeferredLog");
DeferredLoggerTest.logger.info("inFoLogger_testDeferredLog");
DeferredLoggerTest.logger.warn("warnLogger_testDeferredLog");
DeferredLoggerTest.logger.debug("debugLogger_testDeferredLog");
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
DeferredLogCache.replayTo();
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.test.tools.AloneRunner;
import com.ctrip.framework.test.tools.AloneWith;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/11
*/
@RunWith(AloneRunner.class)
@AloneWith(JUnit4.class)
public class DeferredLoggerTest {
private static ByteArrayOutputStream outContent;
private static Logger logger = null;
private static PrintStream printStream;
@BeforeClass
public static void init() throws NoSuchFieldException, IllegalAccessException {
DeferredLoggerTest.outContent = new ByteArrayOutputStream();
DeferredLoggerTest.printStream = new PrintStream(DeferredLoggerTest.outContent);
System.setOut(DeferredLoggerTest.printStream);
DeferredLoggerTest.logger = DeferredLoggerFactory.getLogger("DeferredLoggerTest");
}
@Test
public void testErrorLog() {
DeferredLoggerTest.logger.error("errorLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger"));
}
@Test
public void testInfoLog() {
DeferredLoggerTest.logger.info("inFoLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger"));
}
@Test
public void testWarnLog() {
DeferredLoggerTest.logger.warn("warnLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger"));
}
@Test
public void testDebugLog() {
DeferredLoggerTest.logger.warn("debugLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger"));
}
@Test
public void testDeferredLog() {
DeferredLogger.enable();
DeferredLoggerTest.logger.error("errorLogger_testDeferredLog");
DeferredLoggerTest.logger.info("inFoLogger_testDeferredLog");
DeferredLoggerTest.logger.warn("warnLogger_testDeferredLog");
DeferredLoggerTest.logger.debug("debugLogger_testDeferredLog");
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
DeferredLogCache.replayTo();
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./doc/images/logo/logo-stack.svg | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 119.17383 147.65549"><defs><style>.cls-1{fill:#8fa896;}.cls-2{fill:#636060;}.cls-3{fill:#2c2929;}.cls-4{fill:#383635;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M61.83769.00028a25.77375,25.77375,0,0,1,5.74589.5201C78.61014,2.97542,86.579,12.70226,87.64871,23.87653a31.16932,31.16932,0,0,1-.31078,8.31906c-.15717.91542-.47579,1.18124-1.4402.90669C83.22,32.34,80.51842,31.65445,77.8072,31.02c-.96815-.22656-1.16623-.588-.97906-1.57887A15.92677,15.92677,0,0,0,63.1612,10.85355,16.19138,16.19138,0,0,0,46.04126,21.65232a15.80728,15.80728,0,0,0,7.207,18.77454c1.09407.64046,2.16748,1.32071,3.29054,1.90556.77278.40244.886.74854.39833,1.53627-4.115,6.647-8.17893,13.32562-12.26217,19.9923-.88293,1.44154-1.76336,2.88524-2.6805,4.305a2.47287,2.47287,0,0,0-.24315,2.46183c1.54633,4.2036.9427,8.15821-2.18877,11.40269A10.21393,10.21393,0,0,1,28.379,84.71369c-4.99169-1.64127-7.71778-6.38172-7.028-11.95955.54683-4.42225,4.84919-8.33969,9.70824-8.73781a2.056,2.056,0,0,0,1.80192-1.1076q4.74164-7.8733,9.5462-15.70846a1.32464,1.32464,0,0,0-.2285-1.92663A26.16012,26.16012,0,0,1,34.582,24.99931,25.80624,25.80624,0,0,1,43.64624,6.63293,26.39121,26.39121,0,0,1,57.87279.22206C57.973.20827,60.87391.07144,61.83769.00028Z"/><path class="cls-2" d="M87.90166,101.28077a27.05243,27.05243,0,0,1-20.1095-8.95242c-.59672-.63781-.78409-.99414.053-1.62949,2.25469-1.7114,4.4556-3.49734,6.61765-5.32491.69553-.58792,1.0237-.426,1.58481.15969,4.38881,4.58079,9.71824,6.43115,15.88862,4.75325a15.37359,15.37359,0,0,0,11.44514-11.88237A15.9665,15.9665,0,0,0,89.94749,59.08581a17.42231,17.42231,0,0,0-11.25955,2.56045c-1.01306.60027-2.21938,1.75307-3.04652,1.53752-.80252-.20914-1.25178-1.83944-1.82173-2.86477Q67.75853,49.41506,61.725,38.49585a2.10943,2.10943,0,0,0-1.802-1.26733,10.60067,10.60067,0,0,1-9.36853-11.65546,10.66286,10.66286,0,1,1,20.41106,5.26977,2.57307,2.57307,0,0,0,.17916,2.58054c2.80726,4.912,5.59611,9.83508,8.32439,14.79117a1.34292,1.34292,0,0,0,1.86973.77413A26.48383,26.48383,0,0,1,114.43508,70.3821a26.86993,26.86993,0,0,1-21.23629,30.37376A22.53272,22.53272,0,0,1,87.90166,101.28077Z"/><path class="cls-3" d="M63.28336,69.28619c4.65173,0,9.30378-.029,13.9549.0239a2.248,2.248,0,0,0,2.0839-1.05922A10.54518,10.54518,0,0,1,91.2998,64.54038a10.685,10.685,0,0,1,.1176,20.16215,10.56244,10.56244,0,0,1-11.93616-3.4917,2.87461,2.87461,0,0,0-2.6249-1.29321q-8.75276.0906-17.50674-.00424c-1.06649-.01217-1.38656.334-1.65634,1.30624C54.71475,91.95336,47.658,98.502,36.855,100.83089,22.69068,103.8844,7.94215,93.63441,5.62042,79.33222A26.73471,26.73471,0,0,1,23.89973,49.16486c1.04538-.3369,1.45384-.18041,1.70164.91427.58648,2.59084,1.22632,5.1738,1.97388,7.722.32566,1.11012.02537,1.47606-1.01147,1.85735A15.98352,15.98352,0,0,0,15.8911,74.68141C15.72627,82.14169,21.66854,89.165,29.15382,90.357A16.00639,16.00639,0,0,0,47.87028,74.45586c.02014-1.31064.06117-2.62531-.01642-3.93163-.05692-.9583.19047-1.27823,1.221-1.26494C53.81032,69.3204,58.54706,69.2862,63.28336,69.28619Z"/><path class="cls-4" d="M13.061,107.39378h3.05957l13.63476,30.18554H25.2998l-4.05273-8.89453H8.27344l-3.79981,8.89453H0Zm6.396,17.46679-4.90576-10.87109-4.54981,10.87109Z"/><path class="cls-4" d="M32.28027,147.65549V117.8137h6.93555q5.32543,0,8.29346,2.62109a9.26336,9.26336,0,0,1,2.96777,7.32617,10.01466,10.01466,0,0,1-2.793,7.30469,9.52323,9.52323,0,0,1-7.11719,2.85742,12.61666,12.61666,0,0,1-4.23828-.83789v10.57031Zm6.8501-26.18945H36.32861V133.6262a8.3495,8.3495,0,0,0,3.82276.92383,5.91983,5.91983,0,0,0,4.55029-1.91211,6.95428,6.95428,0,0,0,1.77051-4.91993,6.83155,6.83155,0,0,0-.83643-3.416,5.03764,5.03764,0,0,0-2.28027-2.15918A10.31426,10.31426,0,0,0,39.13037,121.466Z"/><path class="cls-4" d="M64.40771,117.77073a10.52024,10.52024,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06933,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52243,10.52243,0,0,1-7.53174-2.86816,10.03588,10.03588,0,0,1,.03271-14.39453A10.73491,10.73491,0,0,1,64.40771,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66579,6.66579,0,0,0,4.81055,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78435,6.78435,0,0,0,64.18994,121.29417Z"/><path class="cls-4" d="M79.51416,107.56565h3.96143v30.01367H79.51416Z"/><path class="cls-4" d="M89.2876,107.56565H93.249v30.01367H89.2876Z"/><path class="cls-4" d="M108.55127,117.77073a10.52026,10.52026,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06934,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52245,10.52245,0,0,1-7.53174-2.86816,10.03587,10.03587,0,0,1,.03272-14.39453A10.73489,10.73489,0,0,1,108.55127,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66576,6.66576,0,0,0,4.81054,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78431,6.78431,0,0,0,108.3335,121.29417Z"/></g></g></svg> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 119.17383 147.65549"><defs><style>.cls-1{fill:#8fa896;}.cls-2{fill:#636060;}.cls-3{fill:#2c2929;}.cls-4{fill:#383635;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M61.83769.00028a25.77375,25.77375,0,0,1,5.74589.5201C78.61014,2.97542,86.579,12.70226,87.64871,23.87653a31.16932,31.16932,0,0,1-.31078,8.31906c-.15717.91542-.47579,1.18124-1.4402.90669C83.22,32.34,80.51842,31.65445,77.8072,31.02c-.96815-.22656-1.16623-.588-.97906-1.57887A15.92677,15.92677,0,0,0,63.1612,10.85355,16.19138,16.19138,0,0,0,46.04126,21.65232a15.80728,15.80728,0,0,0,7.207,18.77454c1.09407.64046,2.16748,1.32071,3.29054,1.90556.77278.40244.886.74854.39833,1.53627-4.115,6.647-8.17893,13.32562-12.26217,19.9923-.88293,1.44154-1.76336,2.88524-2.6805,4.305a2.47287,2.47287,0,0,0-.24315,2.46183c1.54633,4.2036.9427,8.15821-2.18877,11.40269A10.21393,10.21393,0,0,1,28.379,84.71369c-4.99169-1.64127-7.71778-6.38172-7.028-11.95955.54683-4.42225,4.84919-8.33969,9.70824-8.73781a2.056,2.056,0,0,0,1.80192-1.1076q4.74164-7.8733,9.5462-15.70846a1.32464,1.32464,0,0,0-.2285-1.92663A26.16012,26.16012,0,0,1,34.582,24.99931,25.80624,25.80624,0,0,1,43.64624,6.63293,26.39121,26.39121,0,0,1,57.87279.22206C57.973.20827,60.87391.07144,61.83769.00028Z"/><path class="cls-2" d="M87.90166,101.28077a27.05243,27.05243,0,0,1-20.1095-8.95242c-.59672-.63781-.78409-.99414.053-1.62949,2.25469-1.7114,4.4556-3.49734,6.61765-5.32491.69553-.58792,1.0237-.426,1.58481.15969,4.38881,4.58079,9.71824,6.43115,15.88862,4.75325a15.37359,15.37359,0,0,0,11.44514-11.88237A15.9665,15.9665,0,0,0,89.94749,59.08581a17.42231,17.42231,0,0,0-11.25955,2.56045c-1.01306.60027-2.21938,1.75307-3.04652,1.53752-.80252-.20914-1.25178-1.83944-1.82173-2.86477Q67.75853,49.41506,61.725,38.49585a2.10943,2.10943,0,0,0-1.802-1.26733,10.60067,10.60067,0,0,1-9.36853-11.65546,10.66286,10.66286,0,1,1,20.41106,5.26977,2.57307,2.57307,0,0,0,.17916,2.58054c2.80726,4.912,5.59611,9.83508,8.32439,14.79117a1.34292,1.34292,0,0,0,1.86973.77413A26.48383,26.48383,0,0,1,114.43508,70.3821a26.86993,26.86993,0,0,1-21.23629,30.37376A22.53272,22.53272,0,0,1,87.90166,101.28077Z"/><path class="cls-3" d="M63.28336,69.28619c4.65173,0,9.30378-.029,13.9549.0239a2.248,2.248,0,0,0,2.0839-1.05922A10.54518,10.54518,0,0,1,91.2998,64.54038a10.685,10.685,0,0,1,.1176,20.16215,10.56244,10.56244,0,0,1-11.93616-3.4917,2.87461,2.87461,0,0,0-2.6249-1.29321q-8.75276.0906-17.50674-.00424c-1.06649-.01217-1.38656.334-1.65634,1.30624C54.71475,91.95336,47.658,98.502,36.855,100.83089,22.69068,103.8844,7.94215,93.63441,5.62042,79.33222A26.73471,26.73471,0,0,1,23.89973,49.16486c1.04538-.3369,1.45384-.18041,1.70164.91427.58648,2.59084,1.22632,5.1738,1.97388,7.722.32566,1.11012.02537,1.47606-1.01147,1.85735A15.98352,15.98352,0,0,0,15.8911,74.68141C15.72627,82.14169,21.66854,89.165,29.15382,90.357A16.00639,16.00639,0,0,0,47.87028,74.45586c.02014-1.31064.06117-2.62531-.01642-3.93163-.05692-.9583.19047-1.27823,1.221-1.26494C53.81032,69.3204,58.54706,69.2862,63.28336,69.28619Z"/><path class="cls-4" d="M13.061,107.39378h3.05957l13.63476,30.18554H25.2998l-4.05273-8.89453H8.27344l-3.79981,8.89453H0Zm6.396,17.46679-4.90576-10.87109-4.54981,10.87109Z"/><path class="cls-4" d="M32.28027,147.65549V117.8137h6.93555q5.32543,0,8.29346,2.62109a9.26336,9.26336,0,0,1,2.96777,7.32617,10.01466,10.01466,0,0,1-2.793,7.30469,9.52323,9.52323,0,0,1-7.11719,2.85742,12.61666,12.61666,0,0,1-4.23828-.83789v10.57031Zm6.8501-26.18945H36.32861V133.6262a8.3495,8.3495,0,0,0,3.82276.92383,5.91983,5.91983,0,0,0,4.55029-1.91211,6.95428,6.95428,0,0,0,1.77051-4.91993,6.83155,6.83155,0,0,0-.83643-3.416,5.03764,5.03764,0,0,0-2.28027-2.15918A10.31426,10.31426,0,0,0,39.13037,121.466Z"/><path class="cls-4" d="M64.40771,117.77073a10.52024,10.52024,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06933,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52243,10.52243,0,0,1-7.53174-2.86816,10.03588,10.03588,0,0,1,.03271-14.39453A10.73491,10.73491,0,0,1,64.40771,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66579,6.66579,0,0,0,4.81055,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78435,6.78435,0,0,0,64.18994,121.29417Z"/><path class="cls-4" d="M79.51416,107.56565h3.96143v30.01367H79.51416Z"/><path class="cls-4" d="M89.2876,107.56565H93.249v30.01367H89.2876Z"/><path class="cls-4" d="M108.55127,117.77073a10.52026,10.52026,0,0,1,7.59668,2.91113,9.72891,9.72891,0,0,1,3.02588,7.31543,9.2419,9.2419,0,0,1-3.06934,7.10059,10.96852,10.96852,0,0,1-7.727,2.82519,10.52245,10.52245,0,0,1-7.53174-2.86816,10.03587,10.03587,0,0,1,.03272-14.39453A10.73489,10.73489,0,0,1,108.55127,117.77073Zm-.21777,3.52344a6.30232,6.30232,0,0,0-4.67969,1.84765,6.41219,6.41219,0,0,0-1.82861,4.70508,6.12614,6.12614,0,0,0,1.87207,4.62988,6.66576,6.66576,0,0,0,4.81054,1.79395,6.554,6.554,0,0,0,4.77783-1.81543,6.65867,6.65867,0,0,0-.07617-9.31348A6.78431,6.78431,0,0,0,108.3335,121.29417Z"/></g></g></svg> | -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/tracer/internals/cat/CatNames.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer.internals.cat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface CatNames {
String CAT_CLASS = "com.dianping.cat.Cat";
String LOG_ERROR_METHOD = "logError";
String LOG_EVENT_METHOD = "logEvent";
String NEW_TRANSACTION_METHOD = "newTransaction";
String CAT_TRANSACTION_CLASS = "com.dianping.cat.message.Transaction";
String SET_STATUS_METHOD = "setStatus";
String ADD_DATA_METHOD = "addData";
String COMPLETE_METHOD = "complete";
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer.internals.cat;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface CatNames {
String CAT_CLASS = "com.dianping.cat.Cat";
String LOG_ERROR_METHOD = "logError";
String LOG_EVENT_METHOD = "logEvent";
String NEW_TRANSACTION_METHOD = "newTransaction";
String CAT_TRANSACTION_CLASS = "com.dianping.cat.message.Transaction";
String SET_STATUS_METHOD = "setStatus";
String ADD_DATA_METHOD = "addData";
String COMPLETE_METHOD = "complete";
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/resources/static/scripts/AppUtils.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
appUtil.service('AppUtil', ['toastr', '$window', '$q', '$translate', 'prefixLocation', function (toastr, $window, $q, $translate, prefixLocation) {
function parseErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
var msg = "Code:" + response.status;
if (response.data.message != null) {
msg += " Msg:" + response.data.message;
}
return msg;
}
function parsePureErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
if (response.data.message != null) {
return response.data.message;
}
return "";
}
function ajax(resource, requestParams, requestBody) {
var d = $q.defer();
if (requestBody) {
resource(requestParams, requestBody, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
} else {
resource(requestParams, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
}
return d.promise;
}
return {
prefixPath: function(){
return prefixLocation;
},
errorMsg: parseErrorMsg,
pureErrorMsg: parsePureErrorMsg,
ajax: ajax,
showErrorMsg: function (response, title) {
toastr.error(parseErrorMsg(response), title);
},
parseParams: function (query, notJumpToHomePage) {
if (!query) {
//如果不传这个参数或者false则返回到首页(参数出错)
if (!notJumpToHomePage) {
$window.location.href = prefixLocation + '/index.html';
} else {
return {};
}
}
if (query.indexOf('/') == 0) {
query = query.substring(1, query.length);
}
var anchorIndex = query.indexOf('#');
if (anchorIndex >= 0) {
query = query.substring(0, anchorIndex);
}
var params = query.split("&");
var result = {};
params.forEach(function (param) {
var kv = param.split("=");
result[kv[0]] = decodeURIComponent(kv[1]);
});
return result;
},
collectData: function (response) {
var data = [];
response.entities.forEach(function (entity) {
if (entity.code == 200) {
data.push(entity.body);
} else {
toastr.warning(entity.message);
}
});
return data;
},
showModal: function (modal) {
$(modal).modal("show");
},
hideModal: function (modal) {
$(modal).modal("hide");
},
checkIPV4: function (ip) {
return /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(ip);
}
}
}]);
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
appUtil.service('AppUtil', ['toastr', '$window', '$q', '$translate', 'prefixLocation', function (toastr, $window, $q, $translate, prefixLocation) {
function parseErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
var msg = "Code:" + response.status;
if (response.data.message != null) {
msg += " Msg:" + response.data.message;
}
return msg;
}
function parsePureErrorMsg(response) {
if (response.status == -1) {
return $translate.instant('Common.LoginExpiredTips');
}
if (response.data.message != null) {
return response.data.message;
}
return "";
}
function ajax(resource, requestParams, requestBody) {
var d = $q.defer();
if (requestBody) {
resource(requestParams, requestBody, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
} else {
resource(requestParams, function (result) {
d.resolve(result);
},
function (result) {
d.reject(result);
});
}
return d.promise;
}
return {
prefixPath: function(){
return prefixLocation;
},
errorMsg: parseErrorMsg,
pureErrorMsg: parsePureErrorMsg,
ajax: ajax,
showErrorMsg: function (response, title) {
toastr.error(parseErrorMsg(response), title);
},
parseParams: function (query, notJumpToHomePage) {
if (!query) {
//如果不传这个参数或者false则返回到首页(参数出错)
if (!notJumpToHomePage) {
$window.location.href = prefixLocation + '/index.html';
} else {
return {};
}
}
if (query.indexOf('/') == 0) {
query = query.substring(1, query.length);
}
var anchorIndex = query.indexOf('#');
if (anchorIndex >= 0) {
query = query.substring(0, anchorIndex);
}
var params = query.split("&");
var result = {};
params.forEach(function (param) {
var kv = param.split("=");
result[kv[0]] = decodeURIComponent(kv[1]);
});
return result;
},
collectData: function (response) {
var data = [];
response.entities.forEach(function (entity) {
if (entity.code == 200) {
data.push(entity.body);
} else {
toastr.warning(entity.message);
}
});
return data;
},
showModal: function (modal) {
$(modal).modal("show");
},
hideModal: function (modal) {
$(modal).modal("hide");
},
checkIPV4: function (ip) {
return /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(ip);
}
}
}]);
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/filter/ConsumerAuthenticationFilterTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.filter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpHeaders;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConsumerAuthenticationFilterTest {
private ConsumerAuthenticationFilter authenticationFilter;
@Mock
private ConsumerAuthUtil consumerAuthUtil;
@Mock
private ConsumerAuditUtil consumerAuditUtil;
@Mock
private HttpServletRequest request;
@Mock
private HttpServletResponse response;
@Mock
private FilterChain filterChain;
@Before
public void setUp() throws Exception {
authenticationFilter = new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil);
}
@Test
public void testAuthSuccessfully() throws Exception {
String someToken = "someToken";
Long someConsumerId = 1L;
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someToken);
when(consumerAuthUtil.getConsumerId(someToken)).thenReturn(someConsumerId);
authenticationFilter.doFilter(request, response, filterChain);
verify(consumerAuthUtil, times(1)).storeConsumerId(request, someConsumerId);
verify(consumerAuditUtil, times(1)).audit(request, someConsumerId);
verify(filterChain, times(1)).doFilter(request, response);
}
@Test
public void testAuthFailed() throws Exception {
String someInvalidToken = "someInvalidToken";
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someInvalidToken);
when(consumerAuthUtil.getConsumerId(someInvalidToken)).thenReturn(null);
authenticationFilter.doFilter(request, response, filterChain);
verify(response, times(1)).sendError(eq(HttpServletResponse.SC_UNAUTHORIZED), anyString());
verify(consumerAuthUtil, never()).storeConsumerId(eq(request), anyLong());
verify(consumerAuditUtil, never()).audit(eq(request), anyLong());
verify(filterChain, never()).doFilter(request, response);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.filter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpHeaders;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConsumerAuthenticationFilterTest {
private ConsumerAuthenticationFilter authenticationFilter;
@Mock
private ConsumerAuthUtil consumerAuthUtil;
@Mock
private ConsumerAuditUtil consumerAuditUtil;
@Mock
private HttpServletRequest request;
@Mock
private HttpServletResponse response;
@Mock
private FilterChain filterChain;
@Before
public void setUp() throws Exception {
authenticationFilter = new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil);
}
@Test
public void testAuthSuccessfully() throws Exception {
String someToken = "someToken";
Long someConsumerId = 1L;
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someToken);
when(consumerAuthUtil.getConsumerId(someToken)).thenReturn(someConsumerId);
authenticationFilter.doFilter(request, response, filterChain);
verify(consumerAuthUtil, times(1)).storeConsumerId(request, someConsumerId);
verify(consumerAuditUtil, times(1)).audit(request, someConsumerId);
verify(filterChain, times(1)).doFilter(request, response);
}
@Test
public void testAuthFailed() throws Exception {
String someInvalidToken = "someInvalidToken";
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someInvalidToken);
when(consumerAuthUtil.getConsumerId(someInvalidToken)).thenReturn(null);
authenticationFilter.doFilter(request, response, filterChain);
verify(response, times(1)).sendError(eq(HttpServletResponse.SC_UNAUTHORIZED), anyString());
verify(consumerAuthUtil, never()).storeConsumerId(eq(request), anyLong());
verify(consumerAuditUtil, never()).audit(eq(request), anyLong());
verify(filterChain, never()).doFilter(request, response);
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/customize/package-info.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.biz.customize;
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* 携程内部的日志系统,第三方公司可删除
*/
package com.ctrip.framework.apollo.biz.customize;
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/enums/EnvUtilsTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.enums;
import static org.junit.Assert.*;
import org.junit.Test;
public class EnvUtilsTest {
@Test
public void testTransformEnv() throws Exception {
assertEquals(Env.DEV, EnvUtils.transformEnv(Env.DEV.name()));
assertEquals(Env.FAT, EnvUtils.transformEnv(Env.FAT.name().toLowerCase()));
assertEquals(Env.UAT, EnvUtils.transformEnv(" " + Env.UAT.name().toUpperCase() + ""));
assertEquals(Env.UNKNOWN, EnvUtils.transformEnv("someInvalidEnv"));
}
@Test
public void testFromString() throws Exception {
assertEquals(Env.DEV, Env.fromString(Env.DEV.name()));
assertEquals(Env.FAT, Env.fromString(Env.FAT.name().toLowerCase()));
assertEquals(Env.UAT, Env.fromString(" " + Env.UAT.name().toUpperCase() + ""));
}
@Test(expected = IllegalArgumentException.class)
public void testFromInvalidString() throws Exception {
Env.fromString("someInvalidEnv");
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.enums;
import static org.junit.Assert.*;
import org.junit.Test;
public class EnvUtilsTest {
@Test
public void testTransformEnv() throws Exception {
assertEquals(Env.DEV, EnvUtils.transformEnv(Env.DEV.name()));
assertEquals(Env.FAT, EnvUtils.transformEnv(Env.FAT.name().toLowerCase()));
assertEquals(Env.UAT, EnvUtils.transformEnv(" " + Env.UAT.name().toUpperCase() + ""));
assertEquals(Env.UNKNOWN, EnvUtils.transformEnv("someInvalidEnv"));
}
@Test
public void testFromString() throws Exception {
assertEquals(Env.DEV, Env.fromString(Env.DEV.name()));
assertEquals(Env.FAT, Env.fromString(Env.FAT.name().toLowerCase()));
assertEquals(Env.UAT, Env.fromString(" " + Env.UAT.name().toUpperCase() + ""));
}
@Test(expected = IllegalArgumentException.class)
public void testFromInvalidString() throws Exception {
Env.fromString("someInvalidEnv");
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRuleCache.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.grayReleaseRule;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRuleCache implements Comparable<GrayReleaseRuleCache> {
private long ruleId;
private String branchName;
private String namespaceName;
private long releaseId;
private long loadVersion;
private int branchStatus;
private Set<GrayReleaseRuleItemDTO> ruleItems;
public GrayReleaseRuleCache(long ruleId, String branchName, String namespaceName, long
releaseId, int branchStatus, long loadVersion, Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleId = ruleId;
this.branchName = branchName;
this.namespaceName = namespaceName;
this.releaseId = releaseId;
this.branchStatus = branchStatus;
this.loadVersion = loadVersion;
this.ruleItems = ruleItems;
}
public long getRuleId() {
return ruleId;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public String getBranchName() {
return branchName;
}
public int getBranchStatus() {
return branchStatus;
}
public long getReleaseId() {
return releaseId;
}
public long getLoadVersion() {
return loadVersion;
}
public void setLoadVersion(long loadVersion) {
this.loadVersion = loadVersion;
}
public String getNamespaceName() {
return namespaceName;
}
public boolean matches(String clientAppId, String clientIp) {
for (GrayReleaseRuleItemDTO ruleItem : ruleItems) {
if (ruleItem.matches(clientAppId, clientIp)) {
return true;
}
}
return false;
}
@Override
public int compareTo(GrayReleaseRuleCache that) {
return Long.compare(this.ruleId, that.ruleId);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.grayReleaseRule;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import java.util.Set;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRuleCache implements Comparable<GrayReleaseRuleCache> {
private long ruleId;
private String branchName;
private String namespaceName;
private long releaseId;
private long loadVersion;
private int branchStatus;
private Set<GrayReleaseRuleItemDTO> ruleItems;
public GrayReleaseRuleCache(long ruleId, String branchName, String namespaceName, long
releaseId, int branchStatus, long loadVersion, Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleId = ruleId;
this.branchName = branchName;
this.namespaceName = namespaceName;
this.releaseId = releaseId;
this.branchStatus = branchStatus;
this.loadVersion = loadVersion;
this.ruleItems = ruleItems;
}
public long getRuleId() {
return ruleId;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public String getBranchName() {
return branchName;
}
public int getBranchStatus() {
return branchStatus;
}
public long getReleaseId() {
return releaseId;
}
public long getLoadVersion() {
return loadVersion;
}
public void setLoadVersion(long loadVersion) {
this.loadVersion = loadVersion;
}
public String getNamespaceName() {
return namespaceName;
}
public boolean matches(String clientAppId, String clientIp) {
for (GrayReleaseRuleItemDTO ruleItem : ruleItems) {
if (ruleItem.matches(clientAppId, clientIp)) {
return true;
}
}
return false;
}
@Override
public int compareTo(GrayReleaseRuleCache that) {
return Long.compare(this.ruleId, that.ruleId);
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthFilterConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.openapi.filter.ConsumerAuthenticationFilter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AuthFilterConfiguration {
@Bean
public FilterRegistrationBean openApiAuthenticationFilter(ConsumerAuthUtil consumerAuthUtil,
ConsumerAuditUtil consumerAuditUtil) {
FilterRegistrationBean openApiFilter = new FilterRegistrationBean();
openApiFilter.setFilter(new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil));
openApiFilter.addUrlPatterns("/openapi/*");
return openApiFilter;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.configuration;
import com.ctrip.framework.apollo.openapi.filter.ConsumerAuthenticationFilter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AuthFilterConfiguration {
@Bean
public FilterRegistrationBean openApiAuthenticationFilter(ConsumerAuthUtil consumerAuthUtil,
ConsumerAuditUtil consumerAuditUtil) {
FilterRegistrationBean openApiFilter = new FilterRegistrationBean();
openApiFilter.setFilter(new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil));
openApiFilter.addUrlPatterns("/openapi/*");
return openApiFilter;
}
}
| -1 |
apolloconfig/apollo | 3,733 | add thank you page | ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| nobodyiam | 2021-05-30T07:01:05Z | 2021-05-30T14:40:19Z | b6fa4c676677ff3c962b9e2139b594a598fd655b | 2037903b249962f029276820ab46a84f1e9153e7 | add thank you page. ## What's the purpose of this PR
add a thank you page to thank the help from other companies or projects.
## Brief changelog
* thanks JetBrains for the open source licenses
* thanks docscify for the docsify library to generate the documentation website
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/enricher/impl/UserDisplayNameEnricher.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.enricher.impl;
import com.ctrip.framework.apollo.portal.enricher.AdditionalUserInfoEnricher;
import com.ctrip.framework.apollo.portal.enricher.adapter.UserInfoEnrichedAdapter;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import java.util.Map;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
/**
* @author vdisk <vdisk@foxmail.com>
*/
@Component
public class UserDisplayNameEnricher implements AdditionalUserInfoEnricher {
@Override
public void enrichAdditionalUserInfo(UserInfoEnrichedAdapter adapter,
Map<String, UserInfo> userInfoMap) {
if (StringUtils.hasText(adapter.getFirstUserId())) {
UserInfo userInfo = userInfoMap.get(adapter.getFirstUserId());
if (userInfo != null && StringUtils.hasText(userInfo.getName())) {
adapter.setFirstUserDisplayName(userInfo.getName());
}
}
if (StringUtils.hasText(adapter.getSecondUserId())) {
UserInfo userInfo = userInfoMap.get(adapter.getSecondUserId());
if (userInfo != null && StringUtils.hasText(userInfo.getName())) {
adapter.setSecondUserDisplayName(userInfo.getName());
}
}
if (StringUtils.hasText(adapter.getThirdUserId())) {
UserInfo userInfo = userInfoMap.get(adapter.getThirdUserId());
if (userInfo != null && StringUtils.hasText(userInfo.getName())) {
adapter.setThirdUserDisplayName(userInfo.getName());
}
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.enricher.impl;
import com.ctrip.framework.apollo.portal.enricher.AdditionalUserInfoEnricher;
import com.ctrip.framework.apollo.portal.enricher.adapter.UserInfoEnrichedAdapter;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import java.util.Map;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
/**
* @author vdisk <vdisk@foxmail.com>
*/
@Component
public class UserDisplayNameEnricher implements AdditionalUserInfoEnricher {
@Override
public void enrichAdditionalUserInfo(UserInfoEnrichedAdapter adapter,
Map<String, UserInfo> userInfoMap) {
if (StringUtils.hasText(adapter.getFirstUserId())) {
UserInfo userInfo = userInfoMap.get(adapter.getFirstUserId());
if (userInfo != null && StringUtils.hasText(userInfo.getName())) {
adapter.setFirstUserDisplayName(userInfo.getName());
}
}
if (StringUtils.hasText(adapter.getSecondUserId())) {
UserInfo userInfo = userInfoMap.get(adapter.getSecondUserId());
if (userInfo != null && StringUtils.hasText(userInfo.getName())) {
adapter.setSecondUserDisplayName(userInfo.getName());
}
}
if (StringUtils.hasText(adapter.getThirdUserId())) {
UserInfo userInfo = userInfoMap.get(adapter.getThirdUserId());
if (userInfo != null && StringUtils.hasText(userInfo.getName())) {
adapter.setThirdUserDisplayName(userInfo.getName());
}
}
}
}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./.licenserc.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
header:
license:
spdx-id: Apache-2.0
copyright-owner: Apollo Authors
paths-ignore:
- '.github/ISSUE_TEMPLATE'
- '.github/PULL_REQUEST_TEMPLATE'
- '**/.gitignore'
- '**/.helmignore'
- '.gitmodules'
- '.gitattributes'
- '.mvn'
- '**/*.md'
- '**/*.json'
- '**/*.conf'
- '**/*.ftl'
- '**/*.iml'
- '**/*.tpl'
- '**/*.factories'
- '**/*.handlers'
- '**/*.schemas'
- '**/*.nojekyll'
- 'mvnw'
- 'mvnw.cmd'
- '**/target/**'
- 'LICENSE'
- 'NOTICE'
- 'CNAME'
- '**/resources/META-INF/services/**'
- '**/vendor/**'
- 'apollo-buildtools/src/main/resources/google_checks.xml'
- 'apollo-core/src/test/resources/META-INF/app-with-utf8bom.properties'
- 'apollo-core/src/test/resources/properties/server-with-utf8bom.properties'
comment: on-failure
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
header:
license:
spdx-id: Apache-2.0
copyright-owner: Apollo Authors
paths-ignore:
- '.github/ISSUE_TEMPLATE'
- '.github/PULL_REQUEST_TEMPLATE'
- '**/.gitignore'
- '**/.helmignore'
- '.gitmodules'
- '.gitattributes'
- '.mvn'
- '**/*.md'
- '**/*.json'
- '**/*.conf'
- '**/*.ftl'
- '**/*.iml'
- '**/*.tpl'
- '**/*.factories'
- '**/*.handlers'
- '**/*.schemas'
- '**/*.nojekyll'
- 'mvnw'
- 'mvnw.cmd'
- '**/target/**'
- 'LICENSE'
- 'NOTICE'
- 'CNAME'
- '**/resources/META-INF/services/**'
- '**/vendor/**'
- 'apollo-buildtools/src/main/resources/google_checks.xml'
- 'apollo-core/src/test/resources/META-INF/app-with-utf8bom.properties'
- 'apollo-core/src/test/resources/properties/server-with-utf8bom.properties'
comment: on-failure
license-location-threshold: 130
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/common/nav.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/show_sidebar.png' | prefixPath }}"
onMouseOver="this.style.background='#f1f2f7'"
onMouseOut="this.style.background='#fff'"
data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.ShowNavBar' | translate }}"
ng-show="viewMode == 2 && !showSideBar"
ng-click="showSideBar = !showSideBar">
<img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/hide_sidebar.png' | prefixPath }}"
onMouseOver="this.style.background='#f1f2f7'"
onMouseOut="this.style.background='#fff'"
data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.HideNavBar' | translate }}"
ng-show="viewMode == 2 && showSideBar"
ng-click="showSideBar = !showSideBar">
<a class="navbar-brand logo" href="{{ '/' | prefixPath }}">
<img src="{{ '/img/logo-simple.png' | prefixPath }}" style="height:45px; margin-top: -13px">
</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{{pageSetting.wikiAddress}}" target="_blank">
<span class="glyphicon glyphicon-question-sign"></span> {{'Common.Nav.Help' | translate }}
</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon .glyphicon-glyphicon-font"></span> Language<span class="caret"></span></a>
<ul class="dropdown-menu">
<li value="en"><a href="javascript:void(0)" ng-click="changeLanguage('en')">English</a></li>
<li value="zh-CN"><a href="javascript:void(0)" ng-click="changeLanguage('zh-CN')">简体中文</a></li>
</ul>
</li>
<!-- admin tool -->
<li class="dropdown" ng-if="hasRootPermission == true">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-cog"></span> {{'Common.Nav.AdminTools' | translate }}
<span class="caret"></span></a>
<ul class="dropdown-menu" >
<li><a ng-href="{{ '/user-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.UserManage' | translate }}</a></li>
<li><a href="{{ '/system-role-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemRoleManage' | translate }}</a></li>
<li><a href="{{ '/open/manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.OpenMange' | translate }}</a></li>
<li><a href="{{ '/server_config.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemConfig' | translate }}</a></li>
<li><a href="{{ '/delete_app_cluster_namespace.html' | prefixPath }}" target="_blank">{{'Common.Nav.DeleteApp-Cluster-Namespace' | translate }}</a></li>
<li><a href="{{ '/system_info.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemInfo' | translate }}</a></li>
<li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li>
</ul>
</li>
<!-- normal user tool (not admin)-->
<li class="dropdown" ng-if="hasRootPermission == false">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-cog"></span> {{'Common.Nav.NonAdminTools' | translate }}
<span class="caret"></span></a>
<ul class="dropdown-menu" >
<li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-user"></span> {{userDisplayName}}({{userName}})
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{{ '/user/logout' | prefixPath }}">{{'Common.Nav.Logout' | translate }}</a></li>
</ul>
</li>
</ul>
<div class="navbar-form navbar-right form-inline" role="search">
<div class="form-group app-search-list">
<select id="app-search-list" style="width: 350px"></select>
</div>
</div>
</div>
</div>
</nav>
| <nav class="navbar navbar-default">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="container-fluid">
<div class="navbar-header">
<img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/show_sidebar.png' | prefixPath }}"
onMouseOver="this.style.background='#f1f2f7'"
onMouseOut="this.style.background='#fff'"
data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.ShowNavBar' | translate }}"
ng-show="viewMode == 2 && !showSideBar"
ng-click="showSideBar = !showSideBar">
<img class="navbar-brand side-bar-switch cursor-pointer" src="{{ '/img/hide_sidebar.png' | prefixPath }}"
onMouseOver="this.style.background='#f1f2f7'"
onMouseOut="this.style.background='#fff'"
data-tooltip="tooltip" data-placement="bottom" title="{{'Common.Nav.HideNavBar' | translate }}"
ng-show="viewMode == 2 && showSideBar"
ng-click="showSideBar = !showSideBar">
<a class="navbar-brand logo" href="{{ '/' | prefixPath }}">
<img src="{{ '/img/logo-simple.png' | prefixPath }}" style="height:45px; margin-top: -13px">
</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{{pageSetting.wikiAddress}}" target="_blank">
<span class="glyphicon glyphicon-question-sign"></span> {{'Common.Nav.Help' | translate }}
</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon .glyphicon-glyphicon-font"></span> Language<span class="caret"></span></a>
<ul class="dropdown-menu">
<li value="en"><a href="javascript:void(0)" ng-click="changeLanguage('en')">English</a></li>
<li value="zh-CN"><a href="javascript:void(0)" ng-click="changeLanguage('zh-CN')">简体中文</a></li>
</ul>
</li>
<!-- admin tool -->
<li class="dropdown" ng-if="hasRootPermission == true">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-cog"></span> {{'Common.Nav.AdminTools' | translate }}
<span class="caret"></span></a>
<ul class="dropdown-menu" >
<li><a ng-href="{{ '/user-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.UserManage' | translate }}</a></li>
<li><a href="{{ '/system-role-manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemRoleManage' | translate }}</a></li>
<li><a href="{{ '/open/manage.html' | prefixPath }}" target="_blank">{{'Common.Nav.OpenMange' | translate }}</a></li>
<li><a href="{{ '/server_config.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemConfig' | translate }}</a></li>
<li><a href="{{ '/delete_app_cluster_namespace.html' | prefixPath }}" target="_blank">{{'Common.Nav.DeleteApp-Cluster-Namespace' | translate }}</a></li>
<li><a href="{{ '/system_info.html' | prefixPath }}" target="_blank">{{'Common.Nav.SystemInfo' | translate }}</a></li>
<li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li>
</ul>
</li>
<!-- normal user tool (not admin)-->
<li class="dropdown" ng-if="hasRootPermission == false">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-cog"></span> {{'Common.Nav.NonAdminTools' | translate }}
<span class="caret"></span></a>
<ul class="dropdown-menu" >
<li><a href="{{ '/config_export.html' | prefixPath }}" target="_blank">{{'Common.Nav.ConfigExport' | translate }}</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-user"></span> {{userDisplayName}}({{userName}})
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{{ '/user/logout' | prefixPath }}">{{'Common.Nav.Logout' | translate }}</a></li>
</ul>
</li>
</ul>
<div class="navbar-form navbar-right form-inline" role="search">
<div class="form-group app-search-list">
<select id="app-search-list" style="width: 350px"></select>
</div>
</div>
</div>
</div>
</nav>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/confirm-dialog.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal fade" id="{{dialogId}}" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{title}}</h4>
</div>
<div class="modal-body {{extraClass}}" ng-bind-html="detailAsHtml">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"
ng-show="showCancelBtn" ng-click="cancel()">{{'Common.Cancel' | translate }}</button>
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-click="confirm()">
{{confirmBtnText}}
</button>
</div>
</div>
</div>
</div>
| <div class="modal fade" id="{{dialogId}}" tabindex="-1" role="dialog">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{title}}</h4>
</div>
<div class="modal-body {{extraClass}}" ng-bind-html="detailAsHtml">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"
ng-show="showCancelBtn" ng-click="cancel()">{{'Common.Cancel' | translate }}</button>
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-click="confirm()">
{{confirmBtnText}}
</button>
</div>
</div>
</div>
</div>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/delete-namespace-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div id="deleteNamespaceModal" class="modal fade">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">
{{'Component.DeleteNamespace.Title' | translate }}
</h4>
</div>
<div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic">
{{'Component.DeleteNamespace.PublicContent' | translate }}
</div>
<div class="modal-body form-horizontal" ng-show="!toDeleteNamespace.isPublic">
{{'Component.DeleteNamespace.PrivateContent' | translate }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
{{'Common.Cancel' | translate }}
</button>
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-click="doDeleteNamespace()">
{{'Common.Ok' | translate }}
</button>
</div>
</div>
</div>
</div>
| <div id="deleteNamespaceModal" class="modal fade">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">
{{'Component.DeleteNamespace.Title' | translate }}
</h4>
</div>
<div class="modal-body form-horizontal" ng-show="toDeleteNamespace.isPublic">
{{'Component.DeleteNamespace.PublicContent' | translate }}
</div>
<div class="modal-body form-horizontal" ng-show="!toDeleteNamespace.isPublic">
{{'Component.DeleteNamespace.PrivateContent' | translate }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
{{'Common.Cancel' | translate }}
</button>
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-click="doDeleteNamespace()">
{{'Common.Ok' | translate }}
</button>
</div>
</div>
</div>
</div>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/diff.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<pre class="no-radius" id="{{apolloId}}">
</pre>
| <pre class="no-radius" id="{{apolloId}}">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
</pre>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/entrance.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<a class="list-group-item hover" href="{{href}}">
<div class="row icon-text icon-{{imgSrc}}">
<p class="btn-title">{{title}}</p>
</div>
</a>
| <a class="list-group-item hover" href="{{href}}">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="row icon-text icon-{{imgSrc}}">
<p class="btn-title">{{title}}</p>
</div>
</a>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/env-selector.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<table class="table table-hover" style="width: 300px">
<thead>
<tr>
<td><input type="checkbox" ng-checked="envAllSelected" ng-click="toggleEnvsCheckedStatus()"></td>
</td>
<td>{{'Common.Environment' | translate }}</td>
<td>{{'Common.Cluster' | translate }}</td>
</tr>
</thead>
<tbody>
<tr style="cursor: pointer" ng-repeat="cluster in clusters" ng-click="toggleClusterCheckedStatus(cluster)">
<td width="10%"><input type="checkbox" ng-checked="cluster.checked"
ng-click="switchSelect(cluster, $event)"></td>
<td width="30%" ng-bind="cluster.env"></td>
<td width="60%" ng-bind="cluster.name"></td>
</tr>
</tbody>
</table>
| <table class="table table-hover" style="width: 300px">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<thead>
<tr>
<td><input type="checkbox" ng-checked="envAllSelected" ng-click="toggleEnvsCheckedStatus()"></td>
</td>
<td>{{'Common.Environment' | translate }}</td>
<td>{{'Common.Cluster' | translate }}</td>
</tr>
</thead>
<tbody>
<tr style="cursor: pointer" ng-repeat="cluster in clusters" ng-click="toggleClusterCheckedStatus(cluster)">
<td width="10%"><input type="checkbox" ng-checked="cluster.checked"
ng-click="switchSelect(cluster, $event)"></td>
<td width="30%" ng-bind="cluster.env"></td>
<td width="60%" ng-bind="cluster.name"></td>
</tr>
</tbody>
</table>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/gray-release-rules-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<form id="rulesModal" class="modal fade" role="dialog" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span>
</button>
<h4 class="modal-title">
{{'Component.GrayscalePublishRule.Title' | translate }}
</h4>
</div>
<div class="modal-body form-horizontal">
<div class="form-group"
ng-show="branch.parentNamespace.isPublic && !branch.parentNamespace.isLinkedNamespace">
<label class="control-label col-md-3 text-right">
<apollorequiredfield></apollorequiredfield>
{{'Component.GrayscalePublishRule.AppId' | translate }}
</label>
<div class="col-md-4">
<input type="text" class="form-control" ng-model="branch.editingRuleItem.clientAppId"
ng-model-options='{ debounce: 300 }' ng-change='initSelectIps()'>
</div>
</div>
<div class="form-group"
ng-show="branch.parentNamespace.isPublic && !branch.parentNamespace.isLinkedNamespace">
<label
class="control-label col-md-3 text-right">{{'Component.GrayscalePublishRule.AcceptRule' | translate }}</label>
<div class="col-md-9">
<label class="form-control-static radio-inline">
<input type="radio" name="ApplyToAllInstances" value="false"
ng-checked="!branch.editingRuleItem.ApplyToAllInstances"
ng-click="branch.editingRuleItem.ApplyToAllInstances = false">
{{'Component.GrayscalePublishRule.AcceptPartInstance' | translate }}
</label>
<label class="form-control-static radio-inline">
<input type="radio" name="ApplyToAllInstances" value="true"
ng-checked="branch.editingRuleItem.ApplyToAllInstances"
ng-click="branch.editingRuleItem.ApplyToAllInstances = true">
{{'Component.GrayscalePublishRule.AcceptAllInstance' | translate }}
</label>
</div>
</div>
<div class="form-group" ng-show="!branch.editingRuleItem.ApplyToAllInstances">
<label class="control-label col-md-3 text-right">
<apollorequiredfield></apollorequiredfield>
{{'Component.GrayscalePublishRule.IP' | translate }}
</label>
<div class="col-md-9">
<div class="form-inline">
<div class="form-group">
<select class="rules-ip-selector" multiple="multiple">
<option ng-repeat="instance in selectIps" ng-bind="instance.ip">
</option>
</select>
<div
ng-show="branch.parentNamespace.isPublic && !branch.parentNamespace.isLinkedNamespace">
<small>{{'Component.GrayscalePublishRule.AppIdFilterTips' | translate }}</small>
</div>
<div style="margin-top: 5px">
<small>{{'Component.GrayscalePublishRule.IpTips' | translate }}<a
ng-click="manual =! manual">{{'Component.GrayscalePublishRule.EnterIp' | translate }}</a></small>
</div>
</div>
</div>
<div class="form-inline" ng-show="manual">
<div class="form-group">
<textarea class="form-control" ng-model="toAddIPs" rows="3"
placeholder="{{'Component.GrayscalePublishRule.EnterIpTips' | translate }}"></textarea>
</div>
<button class="btn-default btn add-rule" ng-click="batchAddIPs(branch, toAddIPs)">
{{'Component.GrayscalePublishRule.Add' | translate }}
</button>
</div>
</div>
</div>
<div class="form-group" ng-show="!branch.editingRuleItem.ApplyToAllInstances">
<div class="col-md-offset-1 col-md-10 item-container">
<section class="btn-group item-info" ng-repeat="ip in branch.editingRuleItem.draftIpList">
<button type="button" class="btn btn-default" ng-bind="ip"></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
ng-click="removeRule(branch.editingRuleItem, ip)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</section>
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-default"
ng-click="cancelEditItem(branch)">{{'Common.Cancel' | translate }}</button>
<button class="btn btn-primary" ng-disabled="completeEditBtnDisable"
ng-click="completeEditItem(branch)">{{'Common.Ok' | translate }}
</button>
</div>
</div>
</div>
</form> | <form id="rulesModal" class="modal fade" role="dialog" aria-hidden="true">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span>
</button>
<h4 class="modal-title">
{{'Component.GrayscalePublishRule.Title' | translate }}
</h4>
</div>
<div class="modal-body form-horizontal">
<div class="form-group"
ng-show="branch.parentNamespace.isPublic && !branch.parentNamespace.isLinkedNamespace">
<label class="control-label col-md-3 text-right">
<apollorequiredfield></apollorequiredfield>
{{'Component.GrayscalePublishRule.AppId' | translate }}
</label>
<div class="col-md-4">
<input type="text" class="form-control" ng-model="branch.editingRuleItem.clientAppId"
ng-model-options='{ debounce: 300 }' ng-change='initSelectIps()'>
</div>
</div>
<div class="form-group"
ng-show="branch.parentNamespace.isPublic && !branch.parentNamespace.isLinkedNamespace">
<label
class="control-label col-md-3 text-right">{{'Component.GrayscalePublishRule.AcceptRule' | translate }}</label>
<div class="col-md-9">
<label class="form-control-static radio-inline">
<input type="radio" name="ApplyToAllInstances" value="false"
ng-checked="!branch.editingRuleItem.ApplyToAllInstances"
ng-click="branch.editingRuleItem.ApplyToAllInstances = false">
{{'Component.GrayscalePublishRule.AcceptPartInstance' | translate }}
</label>
<label class="form-control-static radio-inline">
<input type="radio" name="ApplyToAllInstances" value="true"
ng-checked="branch.editingRuleItem.ApplyToAllInstances"
ng-click="branch.editingRuleItem.ApplyToAllInstances = true">
{{'Component.GrayscalePublishRule.AcceptAllInstance' | translate }}
</label>
</div>
</div>
<div class="form-group" ng-show="!branch.editingRuleItem.ApplyToAllInstances">
<label class="control-label col-md-3 text-right">
<apollorequiredfield></apollorequiredfield>
{{'Component.GrayscalePublishRule.IP' | translate }}
</label>
<div class="col-md-9">
<div class="form-inline">
<div class="form-group">
<select class="rules-ip-selector" multiple="multiple">
<option ng-repeat="instance in selectIps" ng-bind="instance.ip">
</option>
</select>
<div
ng-show="branch.parentNamespace.isPublic && !branch.parentNamespace.isLinkedNamespace">
<small>{{'Component.GrayscalePublishRule.AppIdFilterTips' | translate }}</small>
</div>
<div style="margin-top: 5px">
<small>{{'Component.GrayscalePublishRule.IpTips' | translate }}<a
ng-click="manual =! manual">{{'Component.GrayscalePublishRule.EnterIp' | translate }}</a></small>
</div>
</div>
</div>
<div class="form-inline" ng-show="manual">
<div class="form-group">
<textarea class="form-control" ng-model="toAddIPs" rows="3"
placeholder="{{'Component.GrayscalePublishRule.EnterIpTips' | translate }}"></textarea>
</div>
<button class="btn-default btn add-rule" ng-click="batchAddIPs(branch, toAddIPs)">
{{'Component.GrayscalePublishRule.Add' | translate }}
</button>
</div>
</div>
</div>
<div class="form-group" ng-show="!branch.editingRuleItem.ApplyToAllInstances">
<div class="col-md-offset-1 col-md-10 item-container">
<section class="btn-group item-info" ng-repeat="ip in branch.editingRuleItem.draftIpList">
<button type="button" class="btn btn-default" ng-bind="ip"></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
ng-click="removeRule(branch.editingRuleItem, ip)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</section>
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-default"
ng-click="cancelEditItem(branch)">{{'Common.Cancel' | translate }}</button>
<button class="btn btn-primary" ng-disabled="completeEditBtnDisable"
ng-click="completeEditItem(branch)">{{'Common.Ok' | translate }}
</button>
</div>
</div>
</div>
</form>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/item-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<form id="itemModal" class="modal fade" valdr-type="Item" name="itemForm" ng-submit="doItem()">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">
<span ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch">
{{'Component.ConfigItem.Title' | translate }} <small
class="text-info">{{'Component.ConfigItem.TitleTips' | translate }}</small>
</span>
<span ng-show="item.tableViewOperType == 'create' && toOperationNamespace.isBranch">
{{'Component.ConfigItem.AddGrayscaleItem' | translate }}</span>
<span ng-show="item.tableViewOperType == 'update'">
{{'Component.ConfigItem.ModifyItem' | translate }}</span>
</h4>
</div>
<div class="modal-body form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield ng-show="item.tableViewOperType == 'create'"></apollorequiredfield>
{{'Component.ConfigItem.ItemKey' | translate }}
</label>
<div class="col-sm-10" valdr-form-group>
<input type="text" name="key" class="form-control" ng-model="item.key" tabindex="1"
ng-required="true" ng-disabled="item.tableViewOperType != 'create'" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemValue' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea id="valueEditor" name="value" class="form-control" rows="6" tabindex="2"
ng-required="false" ng-model="item.value">
</textarea>
{{'Component.ConfigItem.ItemValueTips' | translate }} <a
ng-click="showHiddenChars()">{{'Component.ConfigItem.ItemValueShowDetection' | translate }}</a>
<br>
<div class="bg-info" ng-show="showHiddenCharsContext && hiddenCharCounter == 0">
{{'Component.ConfigItem.ItemValueNotHiddenChars' | translate }}</div>
<div class="bg-info" ng-bind-html="valueWithHiddenChars"
ng-show="showHiddenCharsContext && hiddenCharCounter > 0"></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemComment' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea class="form-control" name="comment" ng-model="item.comment" tabindex="3" rows="2">
</textarea>
</div>
</div>
<div class="form-group" ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Component.ConfigItem.ChooseCluster' | translate }}
</label>
<div class="col-sm-10">
<apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="false"
apollo-default-checked-env="env" apollo-default-checked-cluster="cluster"
apollo-select="collectSelectedClusters">
</apolloclusterselector>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
{{'Common.Cancel' | translate }}
</button>
<button type="submit" class="btn btn-primary"
ng-disabled="itemForm.$invalid || (item.addItemBtnDisabled && item.tableViewOperType == 'create')">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</div>
</form> | <form id="itemModal" class="modal fade" valdr-type="Item" name="itemForm" ng-submit="doItem()">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">
<span ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch">
{{'Component.ConfigItem.Title' | translate }} <small
class="text-info">{{'Component.ConfigItem.TitleTips' | translate }}</small>
</span>
<span ng-show="item.tableViewOperType == 'create' && toOperationNamespace.isBranch">
{{'Component.ConfigItem.AddGrayscaleItem' | translate }}</span>
<span ng-show="item.tableViewOperType == 'update'">
{{'Component.ConfigItem.ModifyItem' | translate }}</span>
</h4>
</div>
<div class="modal-body form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield ng-show="item.tableViewOperType == 'create'"></apollorequiredfield>
{{'Component.ConfigItem.ItemKey' | translate }}
</label>
<div class="col-sm-10" valdr-form-group>
<input type="text" name="key" class="form-control" ng-model="item.key" tabindex="1"
ng-required="true" ng-disabled="item.tableViewOperType != 'create'" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemValue' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea id="valueEditor" name="value" class="form-control" rows="6" tabindex="2"
ng-required="false" ng-model="item.value">
</textarea>
{{'Component.ConfigItem.ItemValueTips' | translate }} <a
ng-click="showHiddenChars()">{{'Component.ConfigItem.ItemValueShowDetection' | translate }}</a>
<br>
<div class="bg-info" ng-show="showHiddenCharsContext && hiddenCharCounter == 0">
{{'Component.ConfigItem.ItemValueNotHiddenChars' | translate }}</div>
<div class="bg-info" ng-bind-html="valueWithHiddenChars"
ng-show="showHiddenCharsContext && hiddenCharCounter > 0"></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.ConfigItem.ItemComment' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea class="form-control" name="comment" ng-model="item.comment" tabindex="3" rows="2">
</textarea>
</div>
</div>
<div class="form-group" ng-show="item.tableViewOperType == 'create' && !toOperationNamespace.isBranch">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Component.ConfigItem.ChooseCluster' | translate }}
</label>
<div class="col-sm-10">
<apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="false"
apollo-default-checked-env="env" apollo-default-checked-cluster="cluster"
apollo-select="collectSelectedClusters">
</apolloclusterselector>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
{{'Common.Cancel' | translate }}
</button>
<button type="submit" class="btn btn-primary"
ng-disabled="itemForm.$invalid || (item.addItemBtnDisabled && item.tableViewOperType == 'create')">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</div>
</form>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/merge-and-publish-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal fade" id="mergeAndPublishModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.MergePublish.Title' | translate }}</h4>
</div>
<div class="modal-body">
{{'Component.MergePublish.Tips' | translate }}
<br>
<h5>{{'Component.MergePublish.NextStep' | translate }}</h5>
<div class="radio">
<label ng-click="toReleaseNamespace.mergeAfterDeleteBranch = 'true'">
<input type="radio" name="deleteBranch" ng-checked="!toReleaseNamespace.mergeAfterDeleteBranch ||
toReleaseNamespace.mergeAfterDeleteBranch == 'true'">
{{'Component.MergePublish.DeleteGrayscale' | translate }}
</label>
</div>
<div class="radio">
<label ng-click="toReleaseNamespace.mergeAfterDeleteBranch = 'false'">
<input type="radio" name="deleteBranch"
ng-checked="toReleaseNamespace.mergeAfterDeleteBranch == 'false'">
{{'Component.MergePublish.ReservedGrayscale' | translate }}
</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="showReleaseModal()">
{{'Common.Ok' | translate }}
</button>
</div>
</div>
</div>
</div> | <div class="modal fade" id="mergeAndPublishModal" tabindex="-1" role="dialog">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.MergePublish.Title' | translate }}</h4>
</div>
<div class="modal-body">
{{'Component.MergePublish.Tips' | translate }}
<br>
<h5>{{'Component.MergePublish.NextStep' | translate }}</h5>
<div class="radio">
<label ng-click="toReleaseNamespace.mergeAfterDeleteBranch = 'true'">
<input type="radio" name="deleteBranch" ng-checked="!toReleaseNamespace.mergeAfterDeleteBranch ||
toReleaseNamespace.mergeAfterDeleteBranch == 'true'">
{{'Component.MergePublish.DeleteGrayscale' | translate }}
</label>
</div>
<div class="radio">
<label ng-click="toReleaseNamespace.mergeAfterDeleteBranch = 'false'">
<input type="radio" name="deleteBranch"
ng-checked="toReleaseNamespace.mergeAfterDeleteBranch == 'false'">
{{'Component.MergePublish.ReservedGrayscale' | translate }}
</label>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="showReleaseModal()">
{{'Common.Ok' | translate }}
</button>
</div>
</div>
</div>
</div>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/multiple-user-selector.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<select class="{{id}}" style="width: 450px;" multiple="multiple">
</select>
| <select class="{{id}}" style="width: 450px;" multiple="multiple">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
</select>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/namespace-panel.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<section class="panel namespace-panel" ng-class="{'hidden': !namespace.show}">
<!--public or link label-->
<ng-include src="'views/component/namespace-panel-header.html'"></ng-include>
<ng-include src="'views/component/namespace-panel-master-tab.html'"></ng-include>
<!--branch panel body-->
<ng-include src="'views/component/namespace-panel-branch-tab.html'"></ng-include>
</section>
| <section class="panel namespace-panel" ng-class="{'hidden': !namespace.show}">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!--public or link label-->
<ng-include src="'views/component/namespace-panel-header.html'"></ng-include>
<ng-include src="'views/component/namespace-panel-master-tab.html'"></ng-include>
<!--branch panel body-->
<ng-include src="'views/component/namespace-panel-branch-tab.html'"></ng-include>
</section>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/publish-deny-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal fade" id="publishDenyModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.PublishDeny.Title' | translate }}</h4>
</div>
<div class="modal-body">{{'Component.PublishDeny.Tips1' | translate:this }}
<span ng-if="toReleaseNamespace.isEmergencyPublishAllowed">
<br><br><small>{{'Component.PublishDeny.Tips2' | translate }}</small>
</span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-if="toReleaseNamespace.isEmergencyPublishAllowed" ng-click="emergencyPublish()">
{{'Component.PublishDeny.EmergencyPublish' | translate }}
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">
{{'Component.PublishDeny.Close' | translate }}
</button>
</div>
</div>
</div>
</div> | <div class="modal fade" id="publishDenyModal" tabindex="-1" role="dialog">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.PublishDeny.Title' | translate }}</h4>
</div>
<div class="modal-body">{{'Component.PublishDeny.Tips1' | translate:this }}
<span ng-if="toReleaseNamespace.isEmergencyPublishAllowed">
<br><br><small>{{'Component.PublishDeny.Tips2' | translate }}</small>
</span>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-if="toReleaseNamespace.isEmergencyPublishAllowed" ng-click="emergencyPublish()">
{{'Component.PublishDeny.EmergencyPublish' | translate }}
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">
{{'Component.PublishDeny.Close' | translate }}
</button>
</div>
</div>
</div>
</div>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/release-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<form id="releaseModal" class="modal fade form-horizontal" name="releaseForm" valdr-type="Release"
ng-submit="release()">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title" ng-show="!toReleaseNamespace.isBranch">
{{'Component.Publish.Title' | translate }}
<small>{{'Component.Publish.Tips' | translate:this }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.Grayscale' | translate }}
<small>{{'Component.Publish.GrayscaleTips' | translate }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.AllPublish' | translate }}
<small>{{'Component.Publish.AllPublishTips' | translate }}</small>
</h4>
</div>
<div class="release modal-body">
<div class="form-group">
<div class="col-sm-2 control-label" ng-if="!toReleaseNamespace.isPropertiesFormat">
<div class="row">
<div class="btn-group btn-group-xs" style="padding-right: 10px" role="group">
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='change'}"
ng-click="switchReleaseChangeViewType('change')">{{'Component.Publish.ToSeeChange' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='release'}"
ng-click="switchReleaseChangeViewType('release')">{{'Component.Publish.PublishedValue' | translate }}
</button>
</div>
</div>
</div>
<label class="col-sm-2 control-label"
ng-if="toReleaseNamespace.isPropertiesFormat">{{'Component.Publish.Changes' | translate }}</label>
<div class="col-sm-10"
ng-if="(!toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length)"
valdr-form-group>
<!--properties format-->
<!--normal release-->
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toReleaseNamespace.isPropertiesFormat && !toReleaseNamespace.isBranch">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.items"
ng-if="config.item.key && config.isModified">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.NewAddedTips' | translate }}">{{'Component.Publish.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.ModifiedTips' | translate }}">{{'Component.Publish.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Publish.DeletedTips' | translate }}">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="25%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="25%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch gray release-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.MasterValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayNoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems"
ng-if="config.isModified || config.isDeleted">
<td width="15%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-danger"
ng-show="config.isDeleted">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="20%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="20%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="20%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch updateAndPublish and publish-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch">
{{'Component.Publish.MasterValue' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.GrayValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems" ng-if="!config.isDeleted">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
</td>
<td width="25%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="25%" title="{{config.item.value}}">
<span ng-bind="config.item.value"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--file format -->
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='change'">
<apollodiff old-str="item.oldValue" new-str="item.newValue" apollo-id="'releaseStrDiff'">
</apollodiff>
</div>
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='release'">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-show="item.newValue" ng-bind="item.newValue">
</textarea>
</div>
</div>
<div class="col-sm-5"
ng-show="(!toReleaseNamespace.isBranch && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.ItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.GrayItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.NoGrayItems' | translate }}
</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Component.Publish.Release' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<input type="text" name="releaseName" class="form-control" placeholder="input release name"
ng-model="toReleaseNamespace.releaseTitle" ng-required="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.Publish.ReleaseComment' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea rows="4" name="comment" class="form-control" style="margin-top: 15px;"
ng-model="releaseComment" placeholder="Add an optional extended description..."></textarea>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-primary"
ng-disabled="releaseForm.$invalid || releaseBtnDisabled
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)">
{{'Component.Publish.OpPublish' | translate }}
</button>
</div>
</div>
</div>
</form> | <form id="releaseModal" class="modal fade form-horizontal" name="releaseForm" valdr-type="Release"
ng-submit="release()">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title" ng-show="!toReleaseNamespace.isBranch">
{{'Component.Publish.Title' | translate }}
<small>{{'Component.Publish.Tips' | translate:this }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.Grayscale' | translate }}
<small>{{'Component.Publish.GrayscaleTips' | translate }}</small>
</h4>
<h4 class="modal-title" ng-show="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.AllPublish' | translate }}
<small>{{'Component.Publish.AllPublishTips' | translate }}</small>
</h4>
</div>
<div class="release modal-body">
<div class="form-group">
<div class="col-sm-2 control-label" ng-if="!toReleaseNamespace.isPropertiesFormat">
<div class="row">
<div class="btn-group btn-group-xs" style="padding-right: 10px" role="group">
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='change'}"
ng-click="switchReleaseChangeViewType('change')">{{'Component.Publish.ToSeeChange' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{active:releaseChangeViewType=='release'}"
ng-click="switchReleaseChangeViewType('release')">{{'Component.Publish.PublishedValue' | translate }}
</button>
</div>
</div>
</div>
<label class="col-sm-2 control-label"
ng-if="toReleaseNamespace.isPropertiesFormat">{{'Component.Publish.Changes' | translate }}</label>
<div class="col-sm-10"
ng-if="(!toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.itemModifiedCnt)
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length)"
valdr-form-group>
<!--properties format-->
<!--normal release-->
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toReleaseNamespace.isPropertiesFormat && !toReleaseNamespace.isBranch">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.items"
ng-if="config.item.key && config.isModified">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.NewAddedTips' | translate }}">{{'Component.Publish.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Publish.ModifiedTips' | translate }}">{{'Component.Publish.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Publish.DeletedTips' | translate }}">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="25%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="25%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch gray release-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th>
{{'Component.Publish.MasterValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.GrayNoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems"
ng-if="config.isModified || config.isDeleted">
<td width="15%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
<span class="label label-danger"
ng-show="config.isDeleted">{{'Component.Publish.Deleted' | translate }}</span>
</td>
<td width="20%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="20%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue"></span>
</td>
<td width="20%" title="{{config.newValue}}">
<span ng-bind="config.newValue"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--branch updateAndPublish and publish-->
<table class="table table-bordered table-striped text-center table-hover" ng-if="toReleaseNamespace.isPropertiesFormat &&
toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
<thead>
<tr>
<th>
{{'Component.Publish.Key' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch">
{{'Component.Publish.MasterValue' | translate }}
</th>
<th ng-if="toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.GrayValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.PublishedValue' | translate }}
</th>
<th ng-if="!toReleaseNamespace.isBranch || !toReleaseNamespace.mergeAndPublish">
{{'Component.Publish.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Publish.ModifyUser' | translate }}
</th>
<th>
{{'Component.Publish.ModifyTime' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in toReleaseNamespace.branchItems" ng-if="!config.isDeleted">
<td width="20%" title="{{config.item.key}}">
<span ng-bind="config.item.key"></span>
</td>
<td width="25%" title="{{config.masterReleaseValue}}">
<span ng-bind="config.masterReleaseValue"></span>
</td>
<td width="25%" title="{{config.item.value}}">
<span ng-bind="config.item.value"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
</tr>
</tbody>
</table>
<!--file format -->
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='change'">
<apollodiff old-str="item.oldValue" new-str="item.newValue" apollo-id="'releaseStrDiff'">
</apollodiff>
</div>
<div ng-repeat="item in toReleaseNamespace.items" ng-if="!toReleaseNamespace.isPropertiesFormat"
ng-show="releaseChangeViewType=='release'">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-show="item.newValue" ng-bind="item.newValue">
</textarea>
</div>
</div>
<div class="col-sm-5"
ng-show="(!toReleaseNamespace.isBranch && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.ItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && !toReleaseNamespace.mergeAndPublish && !toReleaseNamespace.itemModifiedCnt)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.GrayItemNoChange' | translate }}
</label>
</div>
<div class="col-sm-5"
ng-show="(toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)"
valdr-form-group>
<label class="form-control-static">
{{'Component.Publish.NoGrayItems' | translate }}
</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Component.Publish.Release' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<input type="text" name="releaseName" class="form-control" placeholder="input release name"
ng-model="toReleaseNamespace.releaseTitle" ng-required="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'Component.Publish.ReleaseComment' | translate }}</label>
<div class="col-sm-10" valdr-form-group>
<textarea rows="4" name="comment" class="form-control" style="margin-top: 15px;"
ng-model="releaseComment" placeholder="Add an optional extended description..."></textarea>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-primary"
ng-disabled="releaseForm.$invalid || releaseBtnDisabled
|| (toReleaseNamespace.isBranch && toReleaseNamespace.mergeAndPublish && toReleaseNamespace.branchItems.length == 0)">
{{'Component.Publish.OpPublish' | translate }}
</button>
</div>
</div>
</div>
</form>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/rollback-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<div class="modal-title text-center">
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span>
<span style="font-size: 18px;"> {{'Component.Rollback.To' | translate }} </span>
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a>
</div>
<div ng-if="isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.RollbackTo.Tips' | translate }}
</div>
<div class="form-group" style="margin-top: 15px;">
<!--properties format-->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toRollbackNamespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Rollback.ItemType' | translate }}
</th>
<th>
{{'Component.Rollback.ItemKey' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackBeforeValue' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackAfterValue' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in toRollbackNamespace.releaseCompareResult">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span>
</td>
<td width="20%" ng-bind="change.entity.firstEntity.key">
</td>
<td width="35%" ng-bind="change.entity.firstEntity.value">
</td>
<td width="35%" ng-bind="change.entity.secondEntity.value">
</td>
</tr>
</tbody>
</table>
</div>
<!--file format -->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
<div ng-repeat="change in toRollbackNamespace.releaseCompareResult"
ng-if="!toRollbackNamespace.isPropertiesFormat">
<h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.firstEntity.value">
</textarea>
<hr>
<h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.secondEntity.value">
</textarea>
</div>
</div>
<div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0">
<h4>
{{'Component.Rollback.NoChange' | translate }}
</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-danger"
ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }}
</button>
</div>
</div>
</div>
</form> | <form id="rollbackModal" class="modal fade form-horizontal" ng-submit="showRollbackAlertDialog()">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<div class="modal-title text-center">
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.firstRelease.name"></span>
<span style="font-size: 18px;"> {{'Component.Rollback.To' | translate }} </span>
<span style="font-size: 18px;" ng-bind="toRollbackNamespace.secondRelease.name"></span>
</div>
</div>
<div class="modal-body">
<div ng-if="!isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.Rollback.Tips' | translate }}
<a target="_blank"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{toRollbackNamespace.baseInfo.clusterName}}&namespaceName={{toRollbackNamespace.baseInfo.namespaceName}}">{{'Component.Rollback.ClickToView' | translate }}</a>
</div>
<div ng-if="isRollbackTo" class="alert alert-warning" role="alert">
{{'Component.RollbackTo.Tips' | translate }}
</div>
<div class="form-group" style="margin-top: 15px;">
<!--properties format-->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && toRollbackNamespace.isPropertiesFormat">
<table class="table table-bordered table-striped text-center table-hover"
ng-if="toRollbackNamespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Rollback.ItemType' | translate }}
</th>
<th>
{{'Component.Rollback.ItemKey' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackBeforeValue' | translate }}
</th>
<th>
{{'Component.Rollback.RollbackAfterValue' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in toRollbackNamespace.releaseCompareResult">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Component.Rollback.Added' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Component.Rollback.Modified' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Component.Rollback.Deleted' | translate }}</span>
</td>
<td width="20%" ng-bind="change.entity.firstEntity.key">
</td>
<td width="35%" ng-bind="change.entity.firstEntity.value">
</td>
<td width="35%" ng-bind="change.entity.secondEntity.value">
</td>
</tr>
</tbody>
</table>
</div>
<!--file format -->
<div class="col-sm-12"
ng-if="toRollbackNamespace.releaseCompareResult.length > 0 && !toRollbackNamespace.isPropertiesFormat">
<div ng-repeat="change in toRollbackNamespace.releaseCompareResult"
ng-if="!toRollbackNamespace.isPropertiesFormat">
<h5>{{'Component.Rollback.RollbackBeforeValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.firstEntity.value">
</textarea>
<hr>
<h5>{{'Component.Rollback.RollbackAfterValue' | translate }}</h5>
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="change.entity.secondEntity.value">
</textarea>
</div>
</div>
<div class="col-sm-12 text-center" ng-if="toRollbackNamespace.releaseCompareResult.length == 0">
<h4>
{{'Component.Rollback.NoChange' | translate }}
</h4>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate }}</button>
<button type="submit" class="btn btn-danger"
ng-disabled="toRollbackNamespace.rollbackBtnDisabled">{{'Component.Rollback.OpRollback' | translate }}
</button>
</div>
</div>
</div>
</form>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/show-text-modal.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div id="showTextModal" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content no-radius">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.ShowText.Title' | translate }}</h4>
</div>
<pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="!jsonObject" ng-bind="text">
</pre>
<pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="jsonObject"
ng-bind="jsonObject | json:4">
</pre>
</div>
</div>
</div> | <div id="showTextModal" class="modal fade" tabindex="-1" role="dialog">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="modal-dialog">
<div class="modal-content no-radius">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Component.ShowText.Title' | translate }}</h4>
</div>
<pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="!jsonObject" ng-bind="text">
</pre>
<pre class="modal-body no-radius" style="margin-bottom: 0" ng-show="jsonObject"
ng-bind="jsonObject | json:4">
</pre>
</div>
</div>
</div>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/user-selector.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<select class="{{id}}" style="width: 450px;" ng-disabled="disabled">
</select>
| <select class="{{id}}" style="width: 450px;" ng-disabled="disabled">
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
</select>
| 1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/config.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html data-ng-app="application">
<head>
<meta charset="UTF-8">
<title>{{'Config.Title' | translate }}</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" href="vendor/jquery-plugin/textareafullscreen.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
</head>
<body>
<apollonav></apollonav>
<div id="config-info" class="apollo-container app">
<div ng-controller="ConfigBaseInfoController">
<div class="J_appNotFound hidden row text-center app-not-found" ng-show="notFoundApp">
<img src="img/404.png">
<br>
<p>
<span ng-bind="pageContext.appId"></span> {{'Config.AppIdNotFound' | translate }}<a
href="app.html">{{'Config.ClickByCreate' | translate }}</a>
</p>
</div>
<div class="side-bar" ng-class="{'position-absolute': viewMode == 1, 'position-fixed': viewMode == 2}">
<div class="J_appFound hidden"
ng-show="!notFoundApp && (viewMode == 1 || (viewMode == 2 && showSideBar))">
<!--env list-->
<section class="panel">
<header class="panel-heading">
{{'Config.EnvList' | translate }}
<span class="pull-right" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.EnvListTips' | translate }}">
<img src="img/question.png" class="i-20" />
</span>
</header>
<div id="treeview" class="no-radius"></div>
</section>
<!--app info-->
<section class="panel">
<header class="panel-heading">
{{'Config.ProjectInfo' | translate }}
<span class="pull-right">
<a href="app/setting.html?#/appid={{pageContext.appId}}"
style="margin-right: 5px;text-decoration:none;">
<img src="img/edit.png" class="i-20 cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Config.ModifyBasicProjectInfo' | translate }}" />
</a>
<img src="img/unlike.png" class="i-20 cursor-pointer" ng-if="!favoriteId"
ng-click="addFavorite()" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Favorite' | translate }}" />
<img src="img/like.png" class="i-20 cursor-pointer" ng-if="favoriteId"
ng-click="deleteFavorite()" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.CancelFavorite' | translate }}" />
</span>
</header>
<div class="panel-body">
<table class="project-info">
<tbody class="text-left">
<tr>
<th>{{'Common.AppId' | translate }}:</th>
<td ng-bind="appBaseInfo.appId"></td>
</tr>
<tr>
<th>{{'Common.AppName' | translate }}:</th>
<td>
<small ng-bind="appBaseInfo.name"></small>
</td>
</tr>
<tr>
<th>{{'Common.Department' | translate }}:</th>
<td ng-bind="appBaseInfo.orgInfo"></td>
</tr>
<tr>
<th>{{'Common.AppOwner' | translate }}:</th>
<td ng-bind="appBaseInfo.ownerInfo"></td>
</tr>
<tr>
<th>{{'Common.Email' | translate }}:</th>
<td>
<small ng-bind="appBaseInfo.ownerEmail"></small>
</td>
</tr>
<tr ng-show="missEnvs.length > 0">
<th>{{'Config.MissEnv' | translate }}:</th>
<td>
<span ng-repeat="env in missEnvs" ng-bind="env">
</span>
</td>
</tr>
<tr ng-show="missingNamespaces.length > 0">
<th>{{'Config.MissNamespace' | translate }}:</th>
<td>
<span ng-repeat="namespace in missingNamespaces" ng-bind="namespace">
</span>
</td>
</tr>
</tbody>
</table>
</div>
</section>
<!--operation entrance-->
<section>
<apolloentrance apollo-title="'Config.ProjectManage' | translate"
apollo-img-src="'project-manage'"
apollo-href="'app/setting.html?#/appid=' + pageContext.appId"></apolloentrance>
<apolloentrance apollo-title="'Config.AccessKeyManage' | translate"
apollo-img-src="'accesskey-manage'"
apollo-href="'app/access_key.html?#/appid=' + pageContext.appId"></apolloentrance>
<a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
<div class="row icon-text icon-plus-orange">
<p class="btn-title ng-binding">{{'Config.CreateAppMissEnv' | translate }}</p>
</div>
</a>
<a class="list-group-item" ng-show="missingNamespaces.length > 0"
ng-click="createMissingNamespaces()">
<div class="row icon-text icon-plus-orange">
<p class="btn-title ng-binding">{{'Config.CreateAppMissNamespace' | translate }}</p>
</div>
</a>
<apolloentrance apollo-title="'Config.AddCluster' | translate" apollo-img-src="'plus-orange'"
apollo-href="'cluster.html?#/appid=' + pageContext.appId"
ng-show="hasCreateClusterPermission"></apolloentrance>
<div class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()"
ng-show="!hasCreateClusterPermission">
<div class="row icon-text icon-plus-orange">
<p class="btn-title">{{'Config.AddCluster' | translate }}</p>
</div>
</div>
<apolloentrance apollo-title="'Config.AddNamespace' | translate" apollo-img-src="'plus-orange'"
apollo-href="'namespace.html?#/appid=' + pageContext.appId"
ng-show="hasCreateNamespacePermission"></apolloentrance>
<div class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()"
ng-show="!hasCreateNamespacePermission">
<div class="row icon-text icon-plus-orange">
<p class="btn-title">{{'Config.AddNamespace' | translate }}</p>
</div>
</div>
</section>
</div>
</div>
</div>
<!--具体配置信息-->
<!--namespaces-->
<div class="config-item-container hide" ng-class="{'view-mode-1': viewMode == 1, 'view-mode-2': viewMode == 2}"
ng-controller="ConfigNamespaceController">
<h4 class="text-center" ng-show="viewMode == 2">
{{'Config.CurrentlyOperatorEnv' | translate }}:{{pageContext.env}}，
{{'Common.Cluster' | translate }}:{{pageContext.clusterName}}
</h4>
<div class="alert alert-info alert-dismissible" role="alert"
ng-show="(!hideTip || !hideTip[pageContext.appId][pageContext.clusterName]) && envMapClusters[pageContext.env]">
<button class="btn btn-sm btn-default pull-right" style="margin-top: -7px;margin-right:-15px;"
ng-click="closeTip(pageContext.clusterName)">{{'Config.DoNotRemindAgain' | translate }}
</button>
<!--default cluster tip -->
<div ng-show="pageContext.clusterName == 'default'">
<strong>{{'Config.Note' | translate }}:</strong>
<span translate="Config.ClusterIsDefaultTipContent"
translate-value-name="{{envMapClusters[pageContext.env]}}"></span>
</div>
<!--custom cluster tip-->
<div ng-show="pageContext.clusterName != 'default'">
<strong>{{'Config.Note' | translate }}:</strong>
<span translate="Config.ClusterIsCustomTipContent"
translate-value-name="{{pageContext.clusterName}}"></span>
</div>
</div>
<div class="alert alert-info" ng-if="hasNotPublishNamespace">
<p><b>{{'Config.Note' | translate }}:</b> {{'Config.HasNotPublishNamespace' | translate }}</p>
<p>
<mark ng-bind="namespacePublishInfo.join('，')"></mark>
</p>
</div>
<apollonspanel ng-repeat="namespace in namespaces" namespace="namespace" app-id="pageContext.appId"
env="pageContext.env" lock-check="lockCheck" cluster="pageContext.clusterName" user="currentUser"
pre-release-ns="prepareReleaseNamespace" create-item="createItem" edit-item="editItem"
pre-delete-item="preDeleteItem" pre-revoke-item="preRevokeItem"
show-text="showText"
show-no-modify-permission-dialog="showNoModifyPermissionDialog" show-body="namespaces.length < 3"
lazy-load="namespaces.length > 10" pre-create-branch="preCreateBranch"
pre-delete-branch="preDeleteBranch">
</apollonspanel>
<releasemodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</releasemodal>
<itemmodal to-operation-namespace="toOperationNamespace" app-id="pageContext.appId" env="pageContext.env"
cluster="pageContext.clusterName" item="item">
</itemmodal>
<showtextmodal text="text"></showtextmodal>
<rollbackmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</rollbackmodal>
<rulesmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</rulesmodal>
<mergeandpublishmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</mergeandpublishmodal>
<publishdenymodal env="pageContext.env"></publishdenymodal>
<deletenamespacemodal env="pageContext.env"></deletenamespacemodal>
<apolloconfirmdialog apollo-dialog-id="'deleteConfirmDialog'"
apollo-title="'Config.DeleteItem.DialogTitle' | translate"
apollo-detail="'Config.DeleteItem.DialogContent' | translate:this" apollo-show-cancel-btn="true"
apollo-confirm="deleteItem"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'releaseNoPermissionDialog'"
apollo-title="'Config.PublishNoPermission.DialogTitle' | translate"
apollo-detail="'Config.PublishNoPermission.DialogContent' | translate:this"
apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'modifyNoPermissionDialog'"
apollo-title="'Config.ModifyNoPermission.DialogTitle' | translate"
apollo-detail="'Config.ModifyNoPermission.DialogContent' | translate:this"
apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'masterNoPermissionDialog'"
apollo-title="'Config.MasterNoPermission.DialogTitle' | translate"
apollo-detail="'Config.MasterNoPermission.DialogContent' | translate:this"
apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'namespaceLockedDialog'"
apollo-title="'Config.NamespaceLocked.DialogTitle' | translate"
apollo-detail="'Config.NamespaceLocked.DialogContent' | translate:this" apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'"
apollo-title="'Config.RollbackAlert.DialogTitle' | translate"
apollo-detail="'Config.RollbackAlert.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="rollback"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'emergencyPublishAlertDialog'"
apollo-title="'Config.EmergencyPublishAlert.DialogTitle' | translate"
apollo-detail="'Config.EmergencyPublishAlert.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="emergencyPublish">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteBranchDialog'"
apollo-title="'Config.DeleteBranch.DialogTitle' | translate"
apollo-detail="'Config.DeleteBranch.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="deleteBranch">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'updateRuleTips'"
apollo-title="'Config.UpdateRuleTips.DialogTitle' | translate"
apollo-detail="'Config.UpdateRuleTips.DialogContent' | translate"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'mergeAndReleaseDenyDialog'"
apollo-title="'Config.MergeAndReleaseDeny.DialogTitle' | translate"
apollo-detail="'Config.MergeAndReleaseDeny.DialogContent' | translate"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'grayReleaseWithoutRulesTips'"
apollo-title="'Config.GrayReleaseWithoutRulesTips.DialogTitle' | translate"
apollo-detail="'Config.GrayReleaseWithoutRulesTips.DialogContent' | translate">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteNamespaceDenyForMasterInstanceDialog'"
apollo-title="'Config.DeleteNamespaceDenyForMasterInstance.DialogTitle' | translate"
apollo-detail="'Config.DeleteNamespaceDenyForMasterInstance.DialogContent' | translate:this"
apollo-confirm="continueDeleteNamespace">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteNamespaceDenyForBranchInstanceDialog'"
apollo-title="'Config.DeleteNamespaceDenyForBranchInstance.DialogTitle' | translate"
apollo-detail="'Config.DeleteNamespaceDenyForBranchInstance.DialogContent' | translate:this"
apollo-confirm="continueDeleteNamespace">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteNamespaceDenyForPublicNamespaceDialog'"
apollo-title="'Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle' | translate"
apollo-detail="deleteNamespaceContext.detailReason">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'syntaxCheckFailedDialog'"
apollo-title="'Config.SyntaxCheckFailed.DialogTitle' | translate"
apollo-detail="syntaxCheckContext.syntaxCheckMessage" apollo-extra-class="'pre'">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'revokeItemConfirmDialog'"
apollo-title="'Config.RevokeItem.DialogTitle' | translate"
apollo-detail="'Config.RevokeItem.DialogContent' | translate:this" apollo-show-cancel-btn="true"
apollo-confirm="revokeItem">
</apolloconfirmdialog>
<div class="modal fade" id="createBranchTips" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Config.CreateBranchTips.DialogTitle' | translate}}</h4>
</div>
<div class="modal-body" ng-bind-html="'Config.CreateBranchTips.DialogContent' | translate">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate}}</button>
<button type="button" class="btn btn-primary" data-dismiss="modal"
ng-click="createBranch()">{{'Common.Ok' | translate}}</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<script src="vendor/jquery-plugin/jquery.textareafullscreen.js" type="text/javascript"></script>
<!--lodash.js-->
<script src="vendor/lodash.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-sanitize.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/bootstrap/js/bootstrap-treeview.min.js" type="text/javascript"></script>
<script src="vendor/diff.min.js" type="text/javascript"></script>
<script src="vendor/clipboard.min.js" type="text/javascript"></script>
<script src="vendor/ui-ace/ace.js" type="text/javascript"></script>
<script src="vendor/ui-ace/ui-ace.min.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-properties.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-xml.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-yaml.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-json.js" type="text/javascript"></script>
<script src="vendor/ui-ace/worker-json.js" type="text/javascript"></script>
<script src="vendor/ui-ace/worker-xml.js" type="text/javascript"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!--biz script-->
<script type="application/javascript" src="scripts/app.js"></script>
<!--service-->
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="scripts/services/ReleaseService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/CommitService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceLockService.js"></script>
<script type="application/javascript" src="scripts/services/InstanceService.js"></script>
<script type="application/javascript" src="scripts/services/FavoriteService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceBranchService.js"></script>
<script type="application/javascript" src="scripts/services/EventManager.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<!--directive-->
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/directive/namespace-panel-directive.js"></script>
<script type="application/javascript" src="scripts/directive/diff-directive.js"></script>
<script type="application/javascript" src="scripts/directive/release-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/item-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/show-text-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/rollback-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/gray-release-rules-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/merge-and-publish-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/publish-deny-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/delete-namespace-modal-directive.js"></script>
<!--controller-->
<script type="application/javascript" src="scripts/controller/config/ConfigNamespaceController.js"></script>
<script type="application/javascript" src="scripts/controller/config/ConfigBaseInfoController.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html data-ng-app="application">
<head>
<meta charset="UTF-8">
<title>{{'Config.Title' | translate }}</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" href="vendor/jquery-plugin/textareafullscreen.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
</head>
<body>
<apollonav></apollonav>
<div id="config-info" class="apollo-container app">
<div ng-controller="ConfigBaseInfoController">
<div class="J_appNotFound hidden row text-center app-not-found" ng-show="notFoundApp">
<img src="img/404.png">
<br>
<p>
<span ng-bind="pageContext.appId"></span> {{'Config.AppIdNotFound' | translate }}<a
href="app.html">{{'Config.ClickByCreate' | translate }}</a>
</p>
</div>
<div class="side-bar" ng-class="{'position-absolute': viewMode == 1, 'position-fixed': viewMode == 2}">
<div class="J_appFound hidden"
ng-show="!notFoundApp && (viewMode == 1 || (viewMode == 2 && showSideBar))">
<!--env list-->
<section class="panel">
<header class="panel-heading">
{{'Config.EnvList' | translate }}
<span class="pull-right" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.EnvListTips' | translate }}">
<img src="img/question.png" class="i-20" />
</span>
</header>
<div id="treeview" class="no-radius"></div>
</section>
<!--app info-->
<section class="panel">
<header class="panel-heading">
{{'Config.ProjectInfo' | translate }}
<span class="pull-right">
<a href="app/setting.html?#/appid={{pageContext.appId}}"
style="margin-right: 5px;text-decoration:none;">
<img src="img/edit.png" class="i-20 cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Config.ModifyBasicProjectInfo' | translate }}" />
</a>
<img src="img/unlike.png" class="i-20 cursor-pointer" ng-if="!favoriteId"
ng-click="addFavorite()" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.Favorite' | translate }}" />
<img src="img/like.png" class="i-20 cursor-pointer" ng-if="favoriteId"
ng-click="deleteFavorite()" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.CancelFavorite' | translate }}" />
</span>
</header>
<div class="panel-body">
<table class="project-info">
<tbody class="text-left">
<tr>
<th>{{'Common.AppId' | translate }}:</th>
<td ng-bind="appBaseInfo.appId"></td>
</tr>
<tr>
<th>{{'Common.AppName' | translate }}:</th>
<td>
<small ng-bind="appBaseInfo.name"></small>
</td>
</tr>
<tr>
<th>{{'Common.Department' | translate }}:</th>
<td ng-bind="appBaseInfo.orgInfo"></td>
</tr>
<tr>
<th>{{'Common.AppOwner' | translate }}:</th>
<td ng-bind="appBaseInfo.ownerInfo"></td>
</tr>
<tr>
<th>{{'Common.Email' | translate }}:</th>
<td>
<small ng-bind="appBaseInfo.ownerEmail"></small>
</td>
</tr>
<tr ng-show="missEnvs.length > 0">
<th>{{'Config.MissEnv' | translate }}:</th>
<td>
<span ng-repeat="env in missEnvs" ng-bind="env">
</span>
</td>
</tr>
<tr ng-show="missingNamespaces.length > 0">
<th>{{'Config.MissNamespace' | translate }}:</th>
<td>
<span ng-repeat="namespace in missingNamespaces" ng-bind="namespace">
</span>
</td>
</tr>
</tbody>
</table>
</div>
</section>
<!--operation entrance-->
<section>
<apolloentrance apollo-title="'Config.ProjectManage' | translate"
apollo-img-src="'project-manage'"
apollo-href="'app/setting.html?#/appid=' + pageContext.appId"></apolloentrance>
<apolloentrance apollo-title="'Config.AccessKeyManage' | translate"
apollo-img-src="'accesskey-manage'"
apollo-href="'app/access_key.html?#/appid=' + pageContext.appId"></apolloentrance>
<a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
<div class="row icon-text icon-plus-orange">
<p class="btn-title ng-binding">{{'Config.CreateAppMissEnv' | translate }}</p>
</div>
</a>
<a class="list-group-item" ng-show="missingNamespaces.length > 0"
ng-click="createMissingNamespaces()">
<div class="row icon-text icon-plus-orange">
<p class="btn-title ng-binding">{{'Config.CreateAppMissNamespace' | translate }}</p>
</div>
</a>
<apolloentrance apollo-title="'Config.AddCluster' | translate" apollo-img-src="'plus-orange'"
apollo-href="'cluster.html?#/appid=' + pageContext.appId"
ng-show="hasCreateClusterPermission"></apolloentrance>
<div class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()"
ng-show="!hasCreateClusterPermission">
<div class="row icon-text icon-plus-orange">
<p class="btn-title">{{'Config.AddCluster' | translate }}</p>
</div>
</div>
<apolloentrance apollo-title="'Config.AddNamespace' | translate" apollo-img-src="'plus-orange'"
apollo-href="'namespace.html?#/appid=' + pageContext.appId"
ng-show="hasCreateNamespacePermission"></apolloentrance>
<div class="list-group-item cursor-pointer hover" ng-click="showMasterPermissionTips()"
ng-show="!hasCreateNamespacePermission">
<div class="row icon-text icon-plus-orange">
<p class="btn-title">{{'Config.AddNamespace' | translate }}</p>
</div>
</div>
</section>
</div>
</div>
</div>
<!--具体配置信息-->
<!--namespaces-->
<div class="config-item-container hide" ng-class="{'view-mode-1': viewMode == 1, 'view-mode-2': viewMode == 2}"
ng-controller="ConfigNamespaceController">
<h4 class="text-center" ng-show="viewMode == 2">
{{'Config.CurrentlyOperatorEnv' | translate }}:{{pageContext.env}}，
{{'Common.Cluster' | translate }}:{{pageContext.clusterName}}
</h4>
<div class="alert alert-info alert-dismissible" role="alert"
ng-show="(!hideTip || !hideTip[pageContext.appId][pageContext.clusterName]) && envMapClusters[pageContext.env]">
<button class="btn btn-sm btn-default pull-right" style="margin-top: -7px;margin-right:-15px;"
ng-click="closeTip(pageContext.clusterName)">{{'Config.DoNotRemindAgain' | translate }}
</button>
<!--default cluster tip -->
<div ng-show="pageContext.clusterName == 'default'">
<strong>{{'Config.Note' | translate }}:</strong>
<span translate="Config.ClusterIsDefaultTipContent"
translate-value-name="{{envMapClusters[pageContext.env]}}"></span>
</div>
<!--custom cluster tip-->
<div ng-show="pageContext.clusterName != 'default'">
<strong>{{'Config.Note' | translate }}:</strong>
<span translate="Config.ClusterIsCustomTipContent"
translate-value-name="{{pageContext.clusterName}}"></span>
</div>
</div>
<div class="alert alert-info" ng-if="hasNotPublishNamespace">
<p><b>{{'Config.Note' | translate }}:</b> {{'Config.HasNotPublishNamespace' | translate }}</p>
<p>
<mark ng-bind="namespacePublishInfo.join('，')"></mark>
</p>
</div>
<apollonspanel ng-repeat="namespace in namespaces" namespace="namespace" app-id="pageContext.appId"
env="pageContext.env" lock-check="lockCheck" cluster="pageContext.clusterName" user="currentUser"
pre-release-ns="prepareReleaseNamespace" create-item="createItem" edit-item="editItem"
pre-delete-item="preDeleteItem" pre-revoke-item="preRevokeItem"
show-text="showText"
show-no-modify-permission-dialog="showNoModifyPermissionDialog" show-body="namespaces.length < 3"
lazy-load="namespaces.length > 10" pre-create-branch="preCreateBranch"
pre-delete-branch="preDeleteBranch">
</apollonspanel>
<releasemodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</releasemodal>
<itemmodal to-operation-namespace="toOperationNamespace" app-id="pageContext.appId" env="pageContext.env"
cluster="pageContext.clusterName" item="item">
</itemmodal>
<showtextmodal text="text"></showtextmodal>
<rollbackmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</rollbackmodal>
<rulesmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</rulesmodal>
<mergeandpublishmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</mergeandpublishmodal>
<publishdenymodal env="pageContext.env"></publishdenymodal>
<deletenamespacemodal env="pageContext.env"></deletenamespacemodal>
<apolloconfirmdialog apollo-dialog-id="'deleteConfirmDialog'"
apollo-title="'Config.DeleteItem.DialogTitle' | translate"
apollo-detail="'Config.DeleteItem.DialogContent' | translate:this" apollo-show-cancel-btn="true"
apollo-confirm="deleteItem"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'releaseNoPermissionDialog'"
apollo-title="'Config.PublishNoPermission.DialogTitle' | translate"
apollo-detail="'Config.PublishNoPermission.DialogContent' | translate:this"
apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'modifyNoPermissionDialog'"
apollo-title="'Config.ModifyNoPermission.DialogTitle' | translate"
apollo-detail="'Config.ModifyNoPermission.DialogContent' | translate:this"
apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'masterNoPermissionDialog'"
apollo-title="'Config.MasterNoPermission.DialogTitle' | translate"
apollo-detail="'Config.MasterNoPermission.DialogContent' | translate:this"
apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'namespaceLockedDialog'"
apollo-title="'Config.NamespaceLocked.DialogTitle' | translate"
apollo-detail="'Config.NamespaceLocked.DialogContent' | translate:this" apollo-show-cancel-btn="false">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'"
apollo-title="'Config.RollbackAlert.DialogTitle' | translate"
apollo-detail="'Config.RollbackAlert.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="rollback"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'emergencyPublishAlertDialog'"
apollo-title="'Config.EmergencyPublishAlert.DialogTitle' | translate"
apollo-detail="'Config.EmergencyPublishAlert.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="emergencyPublish">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteBranchDialog'"
apollo-title="'Config.DeleteBranch.DialogTitle' | translate"
apollo-detail="'Config.DeleteBranch.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="deleteBranch">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'updateRuleTips'"
apollo-title="'Config.UpdateRuleTips.DialogTitle' | translate"
apollo-detail="'Config.UpdateRuleTips.DialogContent' | translate"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'mergeAndReleaseDenyDialog'"
apollo-title="'Config.MergeAndReleaseDeny.DialogTitle' | translate"
apollo-detail="'Config.MergeAndReleaseDeny.DialogContent' | translate"></apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'grayReleaseWithoutRulesTips'"
apollo-title="'Config.GrayReleaseWithoutRulesTips.DialogTitle' | translate"
apollo-detail="'Config.GrayReleaseWithoutRulesTips.DialogContent' | translate">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteNamespaceDenyForMasterInstanceDialog'"
apollo-title="'Config.DeleteNamespaceDenyForMasterInstance.DialogTitle' | translate"
apollo-detail="'Config.DeleteNamespaceDenyForMasterInstance.DialogContent' | translate:this"
apollo-confirm="continueDeleteNamespace">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteNamespaceDenyForBranchInstanceDialog'"
apollo-title="'Config.DeleteNamespaceDenyForBranchInstance.DialogTitle' | translate"
apollo-detail="'Config.DeleteNamespaceDenyForBranchInstance.DialogContent' | translate:this"
apollo-confirm="continueDeleteNamespace">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'deleteNamespaceDenyForPublicNamespaceDialog'"
apollo-title="'Config.DeleteNamespaceDenyForPublicNamespace.DialogTitle' | translate"
apollo-detail="deleteNamespaceContext.detailReason">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'syntaxCheckFailedDialog'"
apollo-title="'Config.SyntaxCheckFailed.DialogTitle' | translate"
apollo-detail="syntaxCheckContext.syntaxCheckMessage" apollo-extra-class="'pre'">
</apolloconfirmdialog>
<apolloconfirmdialog apollo-dialog-id="'revokeItemConfirmDialog'"
apollo-title="'Config.RevokeItem.DialogTitle' | translate"
apollo-detail="'Config.RevokeItem.DialogContent' | translate:this" apollo-show-cancel-btn="true"
apollo-confirm="revokeItem">
</apolloconfirmdialog>
<div class="modal fade" id="createBranchTips" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">×</span></button>
<h4 class="modal-title">{{'Config.CreateBranchTips.DialogTitle' | translate}}</h4>
</div>
<div class="modal-body" ng-bind-html="'Config.CreateBranchTips.DialogContent' | translate">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default"
data-dismiss="modal">{{'Common.Cancel' | translate}}</button>
<button type="button" class="btn btn-primary" data-dismiss="modal"
ng-click="createBranch()">{{'Common.Ok' | translate}}</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<script src="vendor/jquery-plugin/jquery.textareafullscreen.js" type="text/javascript"></script>
<!--lodash.js-->
<script src="vendor/lodash.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-sanitize.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/bootstrap/js/bootstrap-treeview.min.js" type="text/javascript"></script>
<script src="vendor/diff.min.js" type="text/javascript"></script>
<script src="vendor/clipboard.min.js" type="text/javascript"></script>
<script src="vendor/ui-ace/ace.js" type="text/javascript"></script>
<script src="vendor/ui-ace/ui-ace.min.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-properties.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-xml.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-yaml.js" type="text/javascript"></script>
<script src="vendor/ui-ace/mode-json.js" type="text/javascript"></script>
<script src="vendor/ui-ace/worker-json.js" type="text/javascript"></script>
<script src="vendor/ui-ace/worker-xml.js" type="text/javascript"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!--biz script-->
<script type="application/javascript" src="scripts/app.js"></script>
<!--service-->
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="scripts/services/ReleaseService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/CommitService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceLockService.js"></script>
<script type="application/javascript" src="scripts/services/InstanceService.js"></script>
<script type="application/javascript" src="scripts/services/FavoriteService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceBranchService.js"></script>
<script type="application/javascript" src="scripts/services/EventManager.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<!--directive-->
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/directive/namespace-panel-directive.js"></script>
<script type="application/javascript" src="scripts/directive/diff-directive.js"></script>
<script type="application/javascript" src="scripts/directive/release-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/item-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/show-text-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/rollback-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/gray-release-rules-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/merge-and-publish-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/publish-deny-modal-directive.js"></script>
<script type="application/javascript" src="scripts/directive/delete-namespace-modal-directive.js"></script>
<!--controller-->
<script type="application/javascript" src="scripts/controller/config/ConfigNamespaceController.js"></script>
<script type="application/javascript" src="scripts/controller/config/ConfigBaseInfoController.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case7.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
xxx
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
xxx
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/service-configservice.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.configService.serviceName" . }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.configService.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.configService.service.port }}
targetPort: {{ .Values.configService.service.targetPort }}
selector:
app: {{ include "apollo.configService.fullName" . }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.configService.serviceName" . }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.configService.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.configService.service.port }}
targetPort: {{ .Values.configService.service.targetPort }}
selector:
app: {{ include "apollo.configService.fullName" . }} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case8.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
,
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
,
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/app/setting.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="setting">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'App.Setting.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container project-setting" ng-controller="SettingController">
<section class="col-md-10 col-md-offset-1 panel hidden">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">{{'App.Setting.Title' | translate }} (
{{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> )
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body row">
<section class="context" ng-show="hasAssignUserPermission">
<!--project admin-->
<section class="form-horizontal" ng-show="hasManageAppMasterPermission">
<h5>{{'App.Setting.Admin' | translate }}
<small>
{{'App.Setting.AdminTips' | translate }}
</small>
</h5>
<hr>
<div class="col-md-offset-1">
<form class="form-inline" ng-submit="assignMasterRoleToUser()">
<div class="form-group" style="padding-left: 15px">
<apollouserselector apollo-id="userSelectWidgetId"></apollouserselector>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="submitBtnDisabled">{{'App.Setting.Add' | translate }}
</button>
</form>
<!-- Split button -->
<div class="item-container">
<div class="btn-group item-info" ng-repeat="user in appRoleUsers.masterUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"
ng-click="removeMasterRoleFromUser(user.userId)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</section>
<!--application info-->
<section>
<h5>{{'App.Setting.BasicInfo' | translate }}</h5>
<hr>
<form class="form-horizontal" name="appForm" valdr-type="App" ng-submit="updateAppInfo()">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-3">
<label class="form-control-static" ng-bind="pageContext.appId">
</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.Department' | translate }}
</label>
<div class="col-sm-3">
<select id="organization" ng-disabled="!display.app.edit">
<option></option>
</select>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'App.Setting.ProjectName' | translate }}
</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="appName" ng-model="viewApp.name"
ng-disabled="!display.app.edit">
<small>{{'App.Setting.ProjectNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'App.Setting.ProjectOwner' | translate }}
</label>
<div class="col-sm-6 J_ownerSelectorPanel">
<apollouserselector apollo-id="'ownerSelector'" disabled="!display.app.edit">
</apollouserselector>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="button" class="btn btn-primary" ng-show="!display.app.edit"
ng-click="toggleEditStatus()">
{{'App.Setting.Modify' | translate }}
</button>
<button type="button" class="btn btn-warning" ng-show="display.app.edit"
ng-click="toggleEditStatus()">
{{'App.Setting.Cancel' | translate }}
</button>
<button type="submit" class="btn btn-primary" ng-show="display.app.edit"
ng-disabled="appForm.$invalid || submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="context" ng-show="!hasAssignUserPermission">
<div class="panel-body text-center">
<h4 translate="App.Setting.NoPermissionTips" translate-value-users="{{admins.join(',')}}"></h4>
</div>
</section>
</div>
<apolloconfirmdialog apollo-dialog-id="'warning'" apollo-title="'App.Setting.DeleteAdmin' | translate"
apollo-detail="'App.Setting.CanNotDeleteAllAdmin' | translate" apollo-show-cancel-btn="false">
</apolloconfirmdialog>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/SettingController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="setting">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'App.Setting.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container project-setting" ng-controller="SettingController">
<section class="col-md-10 col-md-offset-1 panel hidden">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">{{'App.Setting.Title' | translate }} (
{{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> )
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body row">
<section class="context" ng-show="hasAssignUserPermission">
<!--project admin-->
<section class="form-horizontal" ng-show="hasManageAppMasterPermission">
<h5>{{'App.Setting.Admin' | translate }}
<small>
{{'App.Setting.AdminTips' | translate }}
</small>
</h5>
<hr>
<div class="col-md-offset-1">
<form class="form-inline" ng-submit="assignMasterRoleToUser()">
<div class="form-group" style="padding-left: 15px">
<apollouserselector apollo-id="userSelectWidgetId"></apollouserselector>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="submitBtnDisabled">{{'App.Setting.Add' | translate }}
</button>
</form>
<!-- Split button -->
<div class="item-container">
<div class="btn-group item-info" ng-repeat="user in appRoleUsers.masterUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"
ng-click="removeMasterRoleFromUser(user.userId)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</section>
<!--application info-->
<section>
<h5>{{'App.Setting.BasicInfo' | translate }}</h5>
<hr>
<form class="form-horizontal" name="appForm" valdr-type="App" ng-submit="updateAppInfo()">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}
</label>
<div class="col-sm-3">
<label class="form-control-static" ng-bind="pageContext.appId">
</label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.Department' | translate }}
</label>
<div class="col-sm-3">
<select id="organization" ng-disabled="!display.app.edit">
<option></option>
</select>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'App.Setting.ProjectName' | translate }}
</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="appName" ng-model="viewApp.name"
ng-disabled="!display.app.edit">
<small>{{'App.Setting.ProjectNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'App.Setting.ProjectOwner' | translate }}
</label>
<div class="col-sm-6 J_ownerSelectorPanel">
<apollouserselector apollo-id="'ownerSelector'" disabled="!display.app.edit">
</apollouserselector>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="button" class="btn btn-primary" ng-show="!display.app.edit"
ng-click="toggleEditStatus()">
{{'App.Setting.Modify' | translate }}
</button>
<button type="button" class="btn btn-warning" ng-show="display.app.edit"
ng-click="toggleEditStatus()">
{{'App.Setting.Cancel' | translate }}
</button>
<button type="submit" class="btn btn-primary" ng-show="display.app.edit"
ng-disabled="appForm.$invalid || submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="context" ng-show="!hasAssignUserPermission">
<div class="panel-body text-center">
<h4 translate="App.Setting.NoPermissionTips" translate-value-users="{{admins.join(',')}}"></h4>
</div>
</section>
</div>
<apolloconfirmdialog apollo-dialog-id="'warning'" apollo-title="'App.Setting.DeleteAdmin' | translate"
apollo-detail="'App.Setting.CanNotDeleteAllAdmin' | translate" apollo-show-cancel-btn="false">
</apolloconfirmdialog>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/SettingController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!--master panel body when not initialized-->
<section class="master-panel-body" ng-if="!namespace.initialized">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}"
ng-click="refreshNamespace()">
<img src="img/more.png">
{{'Component.Namespace.Master.LoadNamespace' | translate }}
</button>
</div>
</div>
</header>
</section>
<!--master panel body-->
<section class="master-panel-body" ng-if="namespace.initialized &&
(namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)">
<img src="img/release.png">
{{'Component.Namespace.Master.Items.Publish' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}"
ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.Rollback' | translate }}
</button>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}">
<img src="img/release-history.png">
{{'Component.Namespace.Master.Items.PublishHistory' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}"
href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}"
ng-show="hasAssignUserPermission">
<img src="img/assign.png">
{{'Component.Namespace.Master.Items.Grant' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}"
ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission"
ng-click="preCreateBranch(namespace)">
<img src="img/test.png">
{{'Component.Namespace.Master.Items.Grayscale' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}"
ng-click="showNoModifyPermissionDialog()"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
{{'Component.Namespace.Master.Items.RequestPermission' | translate }}
</a>
<div class="btn-group"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<img src="img/operate.png"> <span class="caret"></span>
</button>
<ul class="dropdown-menu" style="right: 0; left: -160px;">
<li ng-click="deleteNamespace(namespace)">
<a style="color: red">
<img src="img/delete.png">
{{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a>
</li>
</ul>
</div>
</div>
</div>
</header>
<div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden">
<span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span>
</div>
<!--second header-->
<header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden">
<div class="row">
<div class="col-md-6 col-sm-6 pull-left">
<!--master branch nav tabs-->
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace, 'table')"
ng-show="namespace.isPropertiesFormat">
<a ng-class="{node_active:namespace.viewType == 'table'}">
<img src="img/table.png">
{{'Component.Namespace.Master.Items.ItemList' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'text')">
<a ng-class="{node_active:namespace.viewType == 'text'}">
<img src="img/text.png">
{{'Component.Namespace.Master.Items.ItemListByText' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'history')">
<a ng-class="{node_active:namespace.viewType == 'history'}">
<img src="img/change.png">
{{'Component.Namespace.Master.Items.ItemHistory' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'instance')">
<a ng-class="{node_active:namespace.viewType == 'instance'}">
<img src="img/machine.png">
{{'Component.Namespace.Master.Items.ItemInstance' | translate }}
<span class="badge badge-grey" ng-bind="namespace.instancesCount"></span>
</a>
</li>
</ul>
</div>
<div class="col-md-6 col-sm-6 text-right">
<img src="img/copy.png" class="ns_btn clipboard cursor-pointer"
data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CopyText' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission">
<img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable"
ng-click="syntaxCheck(namespace)">
<img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Change' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal"
data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="modifyByText(namespace)">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)">
<span class="glyphicon glyphicon-filter"></span>
{{'Component.Namespace.Master.Items.FilterItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}"
ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/sync.png">
{{'Component.Namespace.Master.Items.SyncItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}"
ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.RevokeItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}"
ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.isPropertiesFormat">
<img src="img/diff.png">
{{'Component.Namespace.Master.Items.DiffItem' | translate }}
</button>
<button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace
&& namespace.viewType == 'table'
&& namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission" ng-click="createItem(namespace)">
<img src="img/plus.png">
{{'Component.Namespace.Master.Items.AddItem' | translate }}
</button>
</div>
</div>
</header>
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--table view-->
<div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease">
<span style="color: red">
{{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span>
</div>
<!--not link namespace-->
<div ng-if="!namespace.isLinkedNamespace">
<div class="search-input" ng-show="namespace.displayControl.showSearchInput">
<input type="text" class="form-control"
placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}"
ng-model="namespace.searchKey" ng-change="searchItems(namespace)">
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"
ng-class="{'warning': !config.item.value}">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
</div>
<!--link namespace-->
<div class="panel panel-default" ng-if="namespace.isLinkedNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Link.Title' | translate }}
</div>
<div class="col-md-8 col-sm-8">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus,
'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey"
ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'"
ng-blur="namespace.searchStatus='OFF'">
</div>
</div>
</div>
<table class="table table-bordered table-striped table-hover"
ng-if="namespace.viewItems && namespace.viewItems.length">
<thead>
<tr>
<th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.viewItems || !namespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5>
</div>
</div>
<!--link namespace's public namespace-->
<div ng-if="namespace.isLinkedNamespace">
<div class="panel panel-default" ng-if="namespace.publicNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}"
target="_blank">
<small>
({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}},
{{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}})
</small>
</a>
</div>
<div class="col-md-4 col-sm-4 text-center">
<div class="btn-group btn-group-sm" role="group"
ng-show="namespace.publicNamespace.isModified">
<button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE'
|| !namespace.publicNamespaceViewType}"
ng-click="namespace.publicNamespaceViewType = 'RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.Published' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}"
ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }}
</button>
</div>
</div>
<div class="col-md-4 col-sm-4">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF'
|| !namespace.publicNamespace.searchStatus,
'search-focus': namespace.publicNamespace.searchStatus == 'ON'}"
ng-model="namespace.publicNamespace.searchKey"
ng-change="searchItems(namespace.publicNamespace)"
ng-blur="namespace.publicNamespace.searchStatus='OFF'"
ng-focus="namespace.publicNamespace.searchStatus='ON'" />
</div>
</div>
</div>
<!--published items-->
<div
ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'">
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespace.hasPublishedItem">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && !config.isModified && !config.isDeleted">
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
</td>
<td width="35%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="15%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="10%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems
&& namespace.publicNamespace.viewItems.length
&& !namespace.publicNamespace.hasPublishedItem">
<h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5>
</div>
</div>
<!--not published items-->
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && (config.isModified || config.isDeleted)">
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.oldValue)">
<span ng-bind="config.oldValue | limitTo: 250"></span>
<span ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="10%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="5%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5>
</div>
</div>
<div class="panel panel-default" ng-if="!namespace.publicNamespace">
<div class="panel-heading">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
</div>
<div class="panel-body text-center">
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}"
target="_blank">{{namespace.parentAppId}}</a>
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }}
</div>
</div>
</div>
</div>
<!--text view-->
<!--只读模式下的文本内容,不替换换行符-->
<div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text">
</div>
<!--编辑状态下的文本内容,会过滤掉换行符-->
<div ui-ace="aceConfig" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing"
ng-model="namespace.editText">
</div>
<!--history view-->
<div class="J_historyview history-view" ng-show="namespace.viewType == 'history'">
<div class="media" ng-show="namespace.commits && namespace.commits.length"
ng-repeat="commits in namespace.commits">
<div class="media-body">
<div class="row">
<div class="col-md-6 col-sm-6">
<h3 class="media-heading"
ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3>
</div>
<div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div>
</div>
<!--properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }}
</td>
<td width="20%" title="{{item.newItem.key}}">
<span ng-bind="item.newItem.key | limitTo: 250"></span>
<span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
<!--not properties format-->
<div ng-if="!namespace.isPropertiesFormat">
<div ng-repeat="item in commits.changeSets.createItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.value">
</textarea>
</div>
<div ng-repeat="item in commits.changeSets.updateItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.newItem.value">
</textarea>
</div>
</div>
</div>
<hr>
</div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit"
ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }}
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length">
{{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }}
</div>
</div>
<!--instance view-->
<div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'">
<div class="panel-heading">
<div class="row">
<div class="col-md-5 col-sm-5">
<small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small>
</div>
<div class="col-md-7 col-sm-7 text-right">
<div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}"
ng-click="switchInstanceViewType(namespace, 'latest_release')">
{{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }}
<span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}"
ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }}
<span class="badge"
ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'all'}"
ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }}
<span class="badge" ng-bind="namespace.instancesCount"></span>
</button>
</div>
<button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}"
ng-click="refreshInstancesInfo(namespace)">
<img ng-src="{{ '/img/refresh.png' | prefixPath }}" />
</button>
</div>
</div>
</div>
<!--latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'">
<div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}">
{{namespace.latestRelease.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.latestReleaseInstances.content">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
<div class="row text-center"
ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--not latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'">
<div class="panel-default"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0"
ng-repeat="release in namespace.notLatestReleases">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}">
{{release.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
</div>
<div class="text-center"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--all instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'all'">
<div class="panel-default" ng-if="namespace.instancesCount > 0">
<table class="table table-bordered table-striped" ng-if="namespace.allInstances">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.allInstances">
<td width="25%" ng-bind="instance.appId"></td>
<td width="25%" ng-bind="instance.clusterName"></td>
<td width="25%" ng-bind="instance.dataCenter"></td>
<td width="25%" ng-bind="instance.ip"></td>
</tr>
</tbody>
</table>
<div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.instancesCount == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
</div>
</section>
</div>
</section> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!--master panel body when not initialized-->
<section class="master-panel-body" ng-if="!namespace.initialized">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.LoadNamespaceTips' | translate }}"
ng-click="refreshNamespace()">
<img src="img/more.png">
{{'Component.Namespace.Master.LoadNamespace' | translate }}
</button>
</div>
</div>
</header>
</section>
<!--master panel body-->
<section class="master-panel-body" ng-if="namespace.initialized &&
(namespace.hasBranch && namespace.displayControl.currentOperateBranch == 'master' || !namespace.hasBranch)">
<!--main header-->
<header class="panel-heading">
<div class="row">
<div class="col-md-6 col-sm-6 header-namespace">
<b class="namespace-name" ng-bind="namespace.viewName"
data-tooltip="tooltip" data-placement="bottom" title="{{namespace.comment}}"></b>
<span class="label label-warning no-radius namespace-label modify-tip"
ng-show="namespace.itemModifiedCnt > 0">
{{'Component.Namespace.Master.Items.Changed' | translate }}
<span class="badge label badge-white namespace-label" ng-bind="namespace.itemModifiedCnt"></span>
</span>
<span class="label label-primary no-radius namespace-label"
ng-show="namespace.lockOwner">{{'Component.Namespace.Master.Items.ChangedUser' | translate }}:{{namespace.lockOwner}}</span>
</div>
<div class="col-md-6 col-sm-6 text-right header-buttons">
<button type="button" class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishTips' | translate }}"
ng-show="(namespace.hasReleasePermission || namespace.hasModifyPermission)"
ng-disabled="namespace.isTextEditing" ng-click="publish(namespace)">
<img src="img/release.png">
{{'Component.Namespace.Master.Items.Publish' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RollbackTips' | translate }}"
ng-show="namespace.hasReleasePermission" ng-click="rollback(namespace)">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.Rollback' | translate }}
</button>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.PublishHistoryTips' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}">
<img src="img/release-history.png">
{{'Component.Namespace.Master.Items.PublishHistory' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrantTips' | translate }}"
href="{{ '/namespace/role.html' | prefixPath }}?#/appid={{appId}}&namespaceName={{namespace.baseInfo.namespaceName}}"
ng-show="hasAssignUserPermission">
<img src="img/assign.png">
{{'Component.Namespace.Master.Items.Grant' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.GrayscaleTips' | translate }}"
ng-show="!namespace.hasBranch && namespace.isPropertiesFormat && namespace.hasModifyPermission"
ng-click="preCreateBranch(namespace)">
<img src="img/test.png">
{{'Component.Namespace.Master.Items.Grayscale' | translate }}
</a>
<a type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.RequestPermissionTips' | translate }}"
ng-click="showNoModifyPermissionDialog()"
ng-show="!namespace.hasModifyPermission && !namespace.hasReleasePermission">
{{'Component.Namespace.Master.Items.RequestPermission' | translate }}
</a>
<div class="btn-group"
ng-show="namespace.hasModifyPermission || namespace.hasReleasePermission || hasAssignUserPermission">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
<img src="img/operate.png"> <span class="caret"></span>
</button>
<ul class="dropdown-menu" style="right: 0; left: -160px;">
<li ng-click="deleteNamespace(namespace)">
<a style="color: red">
<img src="img/delete.png">
{{'Component.Namespace.Master.Items.DeleteNamespace' | translate }}</a>
</li>
</ul>
</div>
</div>
</div>
</header>
<div id="BODY{{namespace.id}}" ng-class="{'collapse in': showNamespaceBody, 'collapse' : !showNamespaceBody}">
<div class="J_namespace-release-tip well well-sm no-radius text-center" ng-show="namespace.isConfigHidden">
<span style="color: red">{{'Component.Namespace.Master.Items.NoPermissionTips' | translate }}</span>
</div>
<!--second header-->
<header class="panel-heading second-panel-heading" ng-show="!namespace.isConfigHidden">
<div class="row">
<div class="col-md-6 col-sm-6 pull-left">
<!--master branch nav tabs-->
<ul class="nav nav-tabs">
<li role="presentation" ng-click="switchView(namespace, 'table')"
ng-show="namespace.isPropertiesFormat">
<a ng-class="{node_active:namespace.viewType == 'table'}">
<img src="img/table.png">
{{'Component.Namespace.Master.Items.ItemList' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'text')">
<a ng-class="{node_active:namespace.viewType == 'text'}">
<img src="img/text.png">
{{'Component.Namespace.Master.Items.ItemListByText' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'history')">
<a ng-class="{node_active:namespace.viewType == 'history'}">
<img src="img/change.png">
{{'Component.Namespace.Master.Items.ItemHistory' | translate }}
</a>
</li>
<li role="presentation" ng-click="switchView(namespace, 'instance')">
<a ng-class="{node_active:namespace.viewType == 'instance'}">
<img src="img/machine.png">
{{'Component.Namespace.Master.Items.ItemInstance' | translate }}
<span class="badge badge-grey" ng-bind="namespace.instancesCount"></span>
</a>
</li>
</ul>
</div>
<div class="col-md-6 col-sm-6 text-right">
<img src="img/copy.png" class="ns_btn clipboard cursor-pointer"
data-clipboard-text="{{namespace.text}}" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CopyText' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission">
<img src="img/syntax.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.GrammarCheck' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text' && namespace.isSyntaxCheckable"
ng-click="syntaxCheck(namespace)">
<img src="img/cancel.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.CancelChanged' | translate }}"
ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/edit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Change' | translate }}"
ng-show="!namespace.isTextEditing && namespace.viewType == 'text' && namespace.hasModifyPermission"
ng-click="toggleTextEditStatus(namespace)">
<img src="img/submit.png" class="ns_btn cursor-pointer" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SummitChanged' | translate }}" data-toggle="modal"
data-target="#commitModal" ng-show="namespace.isTextEditing && namespace.viewType == 'text'"
ng-click="modifyByText(namespace)">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.SortByKey' | translate }}" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& !namespace.isLinkedNamespace" ng-click="toggleItemSearchInput(namespace)">
<span class="glyphicon glyphicon-filter"></span>
{{'Component.Namespace.Master.Items.FilterItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.SyncItemTips' | translate }}"
ng-click="goToSyncPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/sync.png">
{{'Component.Namespace.Master.Items.SyncItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.RevokeItemTips' | translate }}"
ng-click="preRevokeItem(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission && namespace.isPropertiesFormat">
<img src="img/rollback.png">
{{'Component.Namespace.Master.Items.RevokeItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm J_tableview_btn" data-tooltip="tooltip"
data-placement="bottom" title="{{'Component.Namespace.Master.Items.DiffItemTips' | translate }}"
ng-click="goToDiffPage(namespace)" ng-show="namespace.viewType == 'table' && namespace.displayControl.currentOperateBranch == 'master'
&& namespace.isPropertiesFormat">
<img src="img/diff.png">
{{'Component.Namespace.Master.Items.DiffItem' | translate }}
</button>
<button type="button" class="btn btn-primary btn-sm" ng-show="!namespace.isLinkedNamespace
&& namespace.viewType == 'table'
&& namespace.displayControl.currentOperateBranch == 'master'
&& namespace.hasModifyPermission" ng-click="createItem(namespace)">
<img src="img/plus.png">
{{'Component.Namespace.Master.Items.AddItem' | translate }}
</button>
</div>
</div>
</header>
<!--namespace body-->
<section ng-show="!namespace.isConfigHidden">
<!--table view-->
<div class="namespace-view-table" ng-show="namespace.viewType == 'table'">
<div class="J_namespace-release-tip well well-sm no-radius text-center"
ng-show="namespace.isLatestReleaseLoaded && !namespace.isLinkedNamespace && !namespace.latestRelease">
<span style="color: red">
{{'Component.Namespace.Master.Items.Body.ItemsNoPublishedTips' | translate }}</span>
</div>
<!--not link namespace-->
<div ng-if="!namespace.isLinkedNamespace">
<div class="search-input" ng-show="namespace.displayControl.showSearchInput">
<input type="text" class="form-control"
placeholder="{{'Component.Namespace.Master.Items.Body.FilterByKey' | translate }}"
ng-model="namespace.searchKey" ng-change="searchItems(namespace)">
</div>
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key"
ng-class="{'warning': !config.item.value}">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
</div>
<!--link namespace-->
<div class="panel panel-default" ng-if="namespace.isLinkedNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Link.Title' | translate }}
</div>
<div class="col-md-8 col-sm-8">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.searchStatus == 'OFF' || !namespace.searchStatus,
'search-focus': namespace.searchStatus == 'ON'}" ng-model="namespace.searchKey"
ng-change="searchItems(namespace)" ng-focus="namespace.searchStatus='ON'"
ng-blur="namespace.searchStatus='OFF'">
</div>
</div>
</div>
<table class="table table-bordered table-striped table-hover"
ng-if="namespace.viewItems && namespace.viewItems.length">
<thead>
<tr>
<th>{{'Component.Namespace.Master.Items.Body.PublishState' | translate }}</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover" title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.viewItems |orderBy:col:desc" ng-if="config.item.key">
<td width="8%" class="text-center">
<span class="label label-warning no-radius cursor-pointer" ng-if="config.isModified"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NoPublishTitle' | translate }}"
ng-click="showText(config.oldValue?config.oldValue:('Component.Namespace.Master.Items.Body.NoPublishTips' | translate))">{{'Component.Namespace.Master.Items.Body.NoPublish' | translate }}</span>
<span class="label label-default-light no-radius" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.PublishedTitle' | translate }}"
ng-if="!config.isModified">{{'Component.Namespace.Master.Items.Body.Published' | translate }}</span>
</td>
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-default cursor-pointer" ng-if="config.hasBranchValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.HaveGrayscale' | translate }}"
ng-click="namespace.displayControl.currentOperateBranch=namespace.branchName;namespace.branch.viewType='table'">{{'Component.Namespace.Master.Items.Body.Grayscale' | translate }}</span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="30%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="13%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="16%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="8%" class="text-center" ng-if="!config.isDeleted">
<img src="img/edit.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifyTips' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
<img style="margin-left: 5px;" src="img/cancel.png" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeleteTips' | translate }}"
ng-click="preDeleteItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.viewItems || !namespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.Link.NoCoverLinkItem' | translate }}</h5>
</div>
</div>
<!--link namespace's public namespace-->
<div ng-if="namespace.isLinkedNamespace">
<div class="panel panel-default" ng-if="namespace.publicNamespace">
<div class="panel-heading">
<div class="row">
<div class="padding-top-5 col-md-4 col-sm-4">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.publicNamespace.baseInfo.appId}}&env={{env}}&cluster={{namespace.publicNamespace.baseInfo.clusterName}}"
target="_blank">
<small>
({{'Common.AppId' | translate }}:{{namespace.publicNamespace.baseInfo.appId}},
{{'Common.Cluster' | translate }}:{{namespace.publicNamespace.baseInfo.clusterName}})
</small>
</a>
</div>
<div class="col-md-4 col-sm-4 text-center">
<div class="btn-group btn-group-sm" role="group"
ng-show="namespace.publicNamespace.isModified">
<button type="button" class="btn btn-default" ng-class="{'active':namespace.publicNamespaceViewType == 'RELEASE'
|| !namespace.publicNamespaceViewType}"
ng-click="namespace.publicNamespaceViewType = 'RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.Published' | translate }}
</button>
<button type="button" class="btn btn-default"
ng-class="{'active':namespace.publicNamespaceViewType == 'NOT_RELEASE'}"
ng-click="namespace.publicNamespaceViewType = 'NOT_RELEASE'">
{{'Component.Namespace.Master.Items.Body.Public.NoPublish' | translate }}
</button>
</div>
</div>
<div class="col-md-4 col-sm-4">
<input type="text" class="form-control pull-right" placeholder="filter by key ..."
ng-class="{'search-onblur': namespace.publicNamespace.searchStatus == 'OFF'
|| !namespace.publicNamespace.searchStatus,
'search-focus': namespace.publicNamespace.searchStatus == 'ON'}"
ng-model="namespace.publicNamespace.searchKey"
ng-change="searchItems(namespace.publicNamespace)"
ng-blur="namespace.publicNamespace.searchStatus='OFF'"
ng-focus="namespace.publicNamespace.searchStatus='ON'" />
</div>
</div>
</div>
<!--published items-->
<div
ng-show="!namespace.publicNamespaceViewType || namespace.publicNamespaceViewType == 'RELEASE'">
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespace.hasPublishedItem">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedBy';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModify' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && !config.isModified && !config.isDeleted">
<td width="15%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
</td>
<td width="35%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="15%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="10%" ng-bind="config.item.dataChangeLastModifiedByDisplayName + '(' + config.item.dataChangeLastModifiedBy + ')'">
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="10%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
<td width="6%" class="text-center" ng-if="config.isDeleted">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel" ng-if="namespace.publicNamespace.viewItems
&& namespace.publicNamespace.viewItems.length
&& !namespace.publicNamespace.hasPublishedItem">
<h5>{{'Component.Namespace.Master.Items.Body.Public.NoPublished' | translate }}</h5>
</div>
</div>
<!--not published items-->
<table class="table table-bordered table-striped table-hover"
ng-show="namespace.publicNamespaceViewType == 'NOT_RELEASE'">
<thead>
<tr>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.key';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemKey' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.PublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.NoPublished.NoPublishedValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemComment' | translate }}
</th>
<th class="hover"
title="{{'Component.Namespace.Master.Items.Body.Sort' | translate }}"
ng-click="col='item.dataChangeLastModifiedTime';desc=!desc;">
{{'Component.Namespace.Master.Items.Body.ItemLastModifyTime' | translate }}
<span class="glyphicon glyphicon-sort"></span>
</th>
<th>
{{'Component.Namespace.Master.Items.Body.ItemOperator' | translate }}
</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="config in namespace.publicNamespace.viewItems |orderBy:col:desc"
ng-if="config.item.key && (config.isModified || config.isDeleted)">
<td width="20%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.key)">
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span class="label label-success" ng-if="config.isModified && !config.oldValue"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.NewAddedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.NewAdded' | translate }}</span>
<span class="label label-info"
ng-if="config.isModified && config.oldValue && !config.isDeleted"
data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.ModifiedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Modified' | translate }}</span>
<span class="label label-danger" ng-if="config.isDeleted" data-tooltip="tooltip"
data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.DeletedTips' | translate }}">{{'Component.Namespace.Master.Items.Body.Deleted' | translate }}</span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.oldValue)">
<span ng-bind="config.oldValue | limitTo: 250"></span>
<span ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
</td>
<td width="25%" class="cursor-pointer"
title="{{'Component.Namespace.Master.Items.Body.ClickToSee' | translate }}"
ng-click="showText(config.item.value)">
<span ng-bind="config.item.value | limitTo: 250"></span>
<span ng-bind="config.item.value.length > 250 ? '...': ''"></span>
</td>
<td width="10%" title="{{config.item.comment}}">
<span ng-bind="config.item.comment | limitTo: 250"></span>
<span ng-bind="config.item.comment.length > 250 ?'...' : ''"></span>
</td>
<td width="15%"
ng-bind="config.item.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'">
</td>
<td width="5%" class="text-center" ng-if="!config.isDeleted">
<img src="img/gray.png" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Public.PublishedAndCover' | translate }}"
ng-click="editItem(namespace, config.item)"
ng-show="namespace.hasModifyPermission && !config.covered">
</td>
</tr>
</tbody>
</table>
<div class="text-center no-config-panel"
ng-if="!namespace.publicNamespace.viewItems || !namespace.publicNamespace.viewItems.length">
<h5>{{'Component.Namespace.Master.Items.Body.NoPublished.Title' | translate }}</h5>
</div>
</div>
<div class="panel panel-default" ng-if="!namespace.publicNamespace">
<div class="panel-heading">
{{'Component.Namespace.Master.Items.Body.Public.Title' | translate }}
</div>
<div class="panel-body text-center">
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips1' | translate }}
<a href="{{ '/config.html' | prefixPath }}?#/appid={{namespace.parentAppId}}"
target="_blank">{{namespace.parentAppId}}</a>
{{'Component.Namespace.Master.Items.Body.Public.NoPublicNamespaceTips2' | translate:this }}
</div>
</div>
</div>
</div>
<!--text view-->
<!--只读模式下的文本内容,不替换换行符-->
<div ui-ace="aceConfig" readonly="true" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && !namespace.isTextEditing" ng-model="namespace.text">
</div>
<!--编辑状态下的文本内容,会过滤掉换行符-->
<div ui-ace="aceConfig" class="form-control no-radius"
rows="{{namespace.itemCnt < 10 ? 10: namespace.itemCnt>20 ? 20:namespace.itemCnt}}"
ng-show="namespace.viewType == 'text' && namespace.isTextEditing" ng-disabled="!namespace.isTextEditing"
ng-model="namespace.editText">
</div>
<!--history view-->
<div class="J_historyview history-view" ng-show="namespace.viewType == 'history'">
<div class="media" ng-show="namespace.commits && namespace.commits.length"
ng-repeat="commits in namespace.commits">
<div class="media-body">
<div class="row">
<div class="col-md-6 col-sm-6">
<h3 class="media-heading"
ng-bind="commits.dataChangeCreatedByDisplayName + '(' + commits.dataChangeCreatedBy + ')'"></h3>
</div>
<div class="col-md-6 col-sm-6 text-right">
<h5 class="media-heading"
ng-bind="commits.dataChangeCreatedTime | date: 'yyyy-MM-dd HH:mm:ss'"></h5>
</div>
</div>
<!--properties format-->
<table class="table table-bordered table-striped text-center table-hover"
style="margin-top: 5px;" ng-if="namespace.isPropertiesFormat">
<thead>
<tr>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemType' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemKey' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemOldValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemNewValue' | translate }}
</th>
<th>
{{'Component.Namespace.Master.Items.Body.HistoryView.ItemComment' | translate }}
</th>
</tr>
</thead>
<tbody>
<!--兼容老数据,不显示item类型为空行和注释的item-->
<tr ng-repeat="item in commits.changeSets.createItems" ng-show="item.key">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.NewAdded' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%">
</td>
<td width="28%" class="cursor-pointer" title="{{item.value}}"
ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.updateItems">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Updated' | translate }}
</td>
<td width="20%" title="{{item.newItem.key}}">
<span ng-bind="item.newItem.key | limitTo: 250"></span>
<span ng-bind="item.newItem.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.oldItem.value}}"
ng-click="showText(item.oldItem.value)">
<span ng-bind="item.oldItem.value | limitTo: 250"></span>
<span ng-bind="item.oldItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%" class="cursor-pointer" title="{{item.newItem.value}}"
ng-click="showText(item.newItem.value)">
<span ng-bind="item.newItem.value | limitTo: 250"></span>
<span ng-bind="item.newItem.value.length > 250 ? '...': ''"></span>
</td>
<td width="18%" title="{{item.newItem.comment}}">
<span ng-bind="item.newItem.comment | limitTo: 250"></span>
<span ng-bind="item.newItem.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
<tr ng-repeat="item in commits.changeSets.deleteItems"
ng-show="item.key || item.comment">
<td width="6%">
{{'Component.Namespace.Master.Items.Body.HistoryView.Deleted' | translate }}
</td>
<td width="20%" title="{{item.key}}">
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' :''"></span>
</td>
<td width="28%" title="{{item.value}}">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...': ''"></span>
</td>
<td width="28%">
</td>
<td width="18%" title="{{item.comment}}">
<span ng-bind="item.comment | limitTo: 250"></span>
<span ng-bind="item.comment.length > 250 ?'...' : ''"></span>
</td>
</tr>
</tbody>
</table>
<!--not properties format-->
<div ng-if="!namespace.isPropertiesFormat">
<div ng-repeat="item in commits.changeSets.createItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.value">
</textarea>
</div>
<div ng-repeat="item in commits.changeSets.updateItems">
<textarea class="form-control no-radius" rows="20" ng-disabled="true"
ng-bind="item.newItem.value">
</textarea>
</div>
</div>
</div>
<hr>
</div>
<div class="text-center">
<button type="button" class="btn btn-default" ng-show="!namespace.hasLoadAllCommit"
ng-click="loadCommitHistory(namespace)">{{'Component.Namespace.Master.Items.Body.HistoryView.LoadMore' | translate }}
<span class="glyphicon glyphicon-menu-down"></span></button>
</div>
<div class="empty-container text-center" ng-show="!namespace.commits || !namespace.commits.length">
{{'Component.Namespace.Master.Items.Body.HistoryView.NoHistory' | translate }}
</div>
</div>
<!--instance view-->
<div class="panel panel-default instance-view" ng-show="namespace.viewType == 'instance'">
<div class="panel-heading">
<div class="row">
<div class="col-md-5 col-sm-5">
<small>{{'Component.Namespace.Master.Items.Body.Instance.Tips' | translate }}</small>
</div>
<div class="col-md-7 col-sm-7 text-right">
<div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'latest_release'}"
ng-click="switchInstanceViewType(namespace, 'latest_release')">
{{'Component.Namespace.Master.Items.Body.Instance.UsedNewItem' | translate }}
<span class="badge" ng-bind="namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'not_latest_release'}"
ng-click="switchInstanceViewType(namespace, 'not_latest_release')">{{'Component.Namespace.Master.Items.Body.Instance.NoUsedNewItem' | translate }}
<span class="badge"
ng-bind="namespace.instancesCount - namespace.latestReleaseInstances.total"></span>
</button>
<button type="button" class="btn btn-default"
ng-class="{'btn-primary':namespace.instanceViewType == 'all'}"
ng-click="switchInstanceViewType(namespace, 'all')">{{'Component.Namespace.Master.Items.Body.Instance.AllInstance' | translate }}
<span class="badge" ng-bind="namespace.instancesCount"></span>
</button>
</div>
<button class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.RefreshList' | translate }}"
ng-click="refreshInstancesInfo(namespace)">
<img ng-src="{{ '/img/refresh.png' | prefixPath }}" />
</button>
</div>
</div>
</div>
<!--latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'latest_release'">
<div class="panel-default" ng-if="namespace.latestReleaseInstances.total > 0">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
ng-href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{namespace.latestRelease.id}}">
{{namespace.latestRelease.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.latestReleaseInstances.content">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
<div class="row text-center"
ng-show="namespace.latestReleaseInstances.content.length < namespace.latestReleaseInstances.total">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--not latest release instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'not_latest_release'">
<div class="panel-default"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total > 0"
ng-repeat="release in namespace.notLatestReleases">
<div class="panel-heading">
<a target="_blank" data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Master.Items.Body.Instance.ToSeeItem' | translate }}"
href="{{ '/config/history.html' | prefixPath }}?#/appid={{appId}}&env={{env}}&clusterName={{cluster}}&namespaceName={{namespace.baseInfo.namespaceName}}&releaseId={{release.id}}">
{{release.name}}
</a>
</div>
<table class="table table-bordered table-striped">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemGetTime' | translate }}
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.notLatestReleaseInstances[release.id]">
<td width="20%" ng-bind="instance.appId"></td>
<td width="20%" ng-bind="instance.clusterName"></td>
<td width="20%" ng-bind="instance.dataCenter"></td>
<td width="20%" ng-bind="instance.ip"></td>
<td width="20%">{{instance.configs && instance.configs.length ?
(instance.configs[0].releaseDeliveryTime | date: 'yyyy-MM-dd HH:mm:ss') : ''}}
</td>
</tr>
</tbody>
</table>
</div>
<div class="text-center"
ng-if="namespace.instancesCount - namespace.latestReleaseInstances.total == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
<!--all instances-->
<div class="panel-body" ng-show="namespace.instanceViewType == 'all'">
<div class="panel-default" ng-if="namespace.instancesCount > 0">
<table class="table table-bordered table-striped" ng-if="namespace.allInstances">
<thead>
<tr>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemAppId' | translate }}</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemCluster' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemDataCenter' | translate }}
</td>
<td>{{'Component.Namespace.Master.Items.Body.Instance.ItemIp' | translate }}</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="instance in namespace.allInstances">
<td width="25%" ng-bind="instance.appId"></td>
<td width="25%" ng-bind="instance.clusterName"></td>
<td width="25%" ng-bind="instance.dataCenter"></td>
<td width="25%" ng-bind="instance.ip"></td>
</tr>
</tbody>
</table>
<div class="row text-center" ng-show="namespace.allInstances.length < namespace.instancesCount">
<button class="btn btn-default"
ng-click="loadInstanceInfo(namespace)">{{'Component.Namespace.Master.Items.Body.Instance.LoadMore' | translate }}</button>
</div>
</div>
<div class="text-center" ng-if="namespace.instancesCount == 0">
{{'Component.Namespace.Master.Items.Body.Instance.NoInstanceTips' | translate }}
</div>
</div>
</div>
</section>
</div>
</section> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-mysql-for-apollo-dev-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
labels:
app: service-mysql-for-apollo-dev-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
labels:
app: service-mysql-for-apollo-dev-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-dev-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case1.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/values.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
configdb:
name: apollo-configdb
# apolloconfigdb host
host: ""
port: 3306
dbName: ApolloConfigDB
# apolloconfigdb user name
userName: ""
# apolloconfigdb password
password: ""
connectionStringProperties: characterEncoding=utf8
service:
# whether to create a Service for this host or not
enabled: false
fullNameOverride: ""
port: 3306
type: ClusterIP
configService:
name: apollo-configservice
fullNameOverride: ""
replicaCount: 2
containerPort: 8080
image:
repository: apolloconfig/apollo-configservice
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8080
targetPort: 8080
type: ClusterIP
ingress:
enabled: false
annotations: { }
hosts:
- host: ""
paths: [ ]
tls: [ ]
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
config:
# spring profiles to activate
profiles: "github,kubernetes"
# override apollo.config-service.url: config service url to be accessed by apollo-client
configServiceUrlOverride: ""
# override apollo.admin-service.url: admin service url to be accessed by apollo-portal
adminServiceUrlOverride: ""
# specify the context path, e.g. /apollo
contextPath: ""
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
adminService:
name: apollo-adminservice
fullNameOverride: ""
replicaCount: 2
containerPort: 8090
image:
repository: apolloconfig/apollo-adminservice
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8090
targetPort: 8090
type: ClusterIP
ingress:
enabled: false
annotations: { }
hosts:
- host: ""
paths: [ ]
tls: [ ]
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
config:
# spring profiles to activate
profiles: "github,kubernetes"
# specify the context path, e.g. /apollo
contextPath: ""
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
configdb:
name: apollo-configdb
# apolloconfigdb host
host: ""
port: 3306
dbName: ApolloConfigDB
# apolloconfigdb user name
userName: ""
# apolloconfigdb password
password: ""
connectionStringProperties: characterEncoding=utf8
service:
# whether to create a Service for this host or not
enabled: false
fullNameOverride: ""
port: 3306
type: ClusterIP
configService:
name: apollo-configservice
fullNameOverride: ""
replicaCount: 2
containerPort: 8080
image:
repository: apolloconfig/apollo-configservice
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8080
targetPort: 8080
type: ClusterIP
ingress:
enabled: false
annotations: { }
hosts:
- host: ""
paths: [ ]
tls: [ ]
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
config:
# spring profiles to activate
profiles: "github,kubernetes"
# override apollo.config-service.url: config service url to be accessed by apollo-client
configServiceUrlOverride: ""
# override apollo.admin-service.url: admin service url to be accessed by apollo-portal
adminServiceUrlOverride: ""
# specify the context path, e.g. /apollo
contextPath: ""
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
adminService:
name: apollo-adminservice
fullNameOverride: ""
replicaCount: 2
containerPort: 8090
image:
repository: apolloconfig/apollo-adminservice
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8090
targetPort: 8090
type: ClusterIP
ingress:
enabled: false
annotations: { }
hosts:
- host: ""
paths: [ ]
tls: [ ]
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
config:
# spring profiles to activate
profiles: "github,kubernetes"
# specify the context path, e.g. /apollo
contextPath: ""
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/user-manage.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="user">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'UserMange.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="UserController">
<div class="col-md-8 col-md-offset-2 panel">
<section class="panel-body" ng-show="isRootUser">
<div class="row">
<header class="panel-heading">
{{'UserMange.Title' | translate }}
<small>
{{'UserMange.TitleTips' | translate }}
</small>
</header>
<form class="form-horizontal panel-body" name="appForm"
valdr-type="App" ng-submit="createOrUpdateUser()">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.UserName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="username" ng-model="user.username">
<small>{{'UserMange.UserNameTips' | translate }}</small>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.UserDisplayName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="userDisplayName" ng-model="user.userDisplayName">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.Pwd' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="password" ng-model="user.password">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.Email' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="password" ng-model="user.email">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="appForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</div>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/controller/UserController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="user">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'UserMange.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="UserController">
<div class="col-md-8 col-md-offset-2 panel">
<section class="panel-body" ng-show="isRootUser">
<div class="row">
<header class="panel-heading">
{{'UserMange.Title' | translate }}
<small>
{{'UserMange.TitleTips' | translate }}
</small>
</header>
<form class="form-horizontal panel-body" name="appForm"
valdr-type="App" ng-submit="createOrUpdateUser()">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.UserName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="username" ng-model="user.username">
<small>{{'UserMange.UserNameTips' | translate }}</small>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.UserDisplayName' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="userDisplayName" ng-model="user.userDisplayName">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.Pwd' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="password" ng-model="user.password">
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'UserMange.Email' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="password" ng-model="user.email">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="appForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</div>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/controller/UserController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/index.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="index">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Common.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div id="app-list" class="hidden" ng-controller="IndexController">
<section class="media create-app-list">
<aside class="media-left text-center">
<h5>{{'Index.MyProject' | translate }}</h5>
</aside>
<aside class="media-body">
<div class="app-panel col-md-2 text-center" ng-click="goToCreateAppPage()"
ng-if="hasCreateApplicationPermission">
<div href="#" class="thumbnail create-btn hover cursor-pointer">
<img src="img/plus-white.png" />
<h5>{{'Index.CreateProject' | translate }}</h5>
</div>
</div>
<div class="app-panel col-md-2 text-center" ng-repeat="app in createdApps"
ng-click="goToAppHomePage(app.appId)">
<div href="#" class="thumbnail hover cursor-pointer">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
</div>
</div>
<div class="app-panel col-md-2 text-center" ng-show="hasMoreCreatedApps"
ng-click="getUserCreatedApps()">
<div href="#" class="thumbnail hover cursor-pointer">
<img class="more-img" src="img/more.png" />
<h5>{{'Index.LoadMore' | translate }}</h5>
</div>
</div>
</aside>
</section>
<section class="media favorites-app-list">
<aside class="media-left text-center">
<h5>{{'Index.FavoriteItems' | translate }}</h5>
</aside>
<aside class="media-body">
<div class="app-panel col-md-2 text-center" ng-repeat="app in favorites"
ng-click="goToAppHomePage(app.appId)" ng-mouseover="toggleOperationBtn(app)"
ng-mouseout="toggleOperationBtn(app)">
<div class="thumbnail hover">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
<p class="operate-panel" ng-show="app.showOperationBtn">
<button class="btn btn-default btn-xs" title="{{'Index.Topping' | translate }}"
ng-click="toTop(app.favoriteId);$event.stopPropagation();">
<img src="img/top.png" class="i-15">
</button>
<button class="btn btn-default btn-xs" title="{{'Index.FavoriteCancel' | translate }}"
ng-click="deleteFavorite(app.favoriteId);$event.stopPropagation();">
<img src="img/like.png" class="i-15">
</button>
</p>
</div>
</div>
<div class="col-md-2 text-center" ng-show="hasMoreFavorites" ng-click="getUserFavorites()">
<div href="#" class="thumbnail hover cursor-pointer">
<img class="more-img" src="img/more.png" />
<h5>{{'Index.LoadMore' | translate }}</h5>
</div>
</div>
<div class="no-favorites text-center" ng-show="!favorites || favorites.length == 0">
<h4>{{'Index.FavoriteTip' | translate }}</h4>
</div>
</aside>
</section>
<section class="media visit-app-list" ng-show="visitedApps && visitedApps.length">
<aside class="media-left text-center">
<h5>{{'Index.RecentlyViewedItems' | translate }}</h5>
</aside>
<aside class="media-body">
<div class="app-panel col-md-2 text-center" ng-repeat="app in visitedApps"
ng-click="goToAppHomePage(app.appId)">
<div class="thumbnail hover">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
</div>
</div>
</aside>
</section>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script type="application/javascript">
function getPrefixPath() {
$.ajax({
method: 'get',
async: false,
url: 'prefix-path',
success: function (res) {
window.localStorage.setItem("prefixPath", res);
}
})
}
getPrefixPath();
</script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/FavoriteService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/IndexController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="index">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Common.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div id="app-list" class="hidden" ng-controller="IndexController">
<section class="media create-app-list">
<aside class="media-left text-center">
<h5>{{'Index.MyProject' | translate }}</h5>
</aside>
<aside class="media-body">
<div class="app-panel col-md-2 text-center" ng-click="goToCreateAppPage()"
ng-if="hasCreateApplicationPermission">
<div href="#" class="thumbnail create-btn hover cursor-pointer">
<img src="img/plus-white.png" />
<h5>{{'Index.CreateProject' | translate }}</h5>
</div>
</div>
<div class="app-panel col-md-2 text-center" ng-repeat="app in createdApps"
ng-click="goToAppHomePage(app.appId)">
<div href="#" class="thumbnail hover cursor-pointer">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
</div>
</div>
<div class="app-panel col-md-2 text-center" ng-show="hasMoreCreatedApps"
ng-click="getUserCreatedApps()">
<div href="#" class="thumbnail hover cursor-pointer">
<img class="more-img" src="img/more.png" />
<h5>{{'Index.LoadMore' | translate }}</h5>
</div>
</div>
</aside>
</section>
<section class="media favorites-app-list">
<aside class="media-left text-center">
<h5>{{'Index.FavoriteItems' | translate }}</h5>
</aside>
<aside class="media-body">
<div class="app-panel col-md-2 text-center" ng-repeat="app in favorites"
ng-click="goToAppHomePage(app.appId)" ng-mouseover="toggleOperationBtn(app)"
ng-mouseout="toggleOperationBtn(app)">
<div class="thumbnail hover">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
<p class="operate-panel" ng-show="app.showOperationBtn">
<button class="btn btn-default btn-xs" title="{{'Index.Topping' | translate }}"
ng-click="toTop(app.favoriteId);$event.stopPropagation();">
<img src="img/top.png" class="i-15">
</button>
<button class="btn btn-default btn-xs" title="{{'Index.FavoriteCancel' | translate }}"
ng-click="deleteFavorite(app.favoriteId);$event.stopPropagation();">
<img src="img/like.png" class="i-15">
</button>
</p>
</div>
</div>
<div class="col-md-2 text-center" ng-show="hasMoreFavorites" ng-click="getUserFavorites()">
<div href="#" class="thumbnail hover cursor-pointer">
<img class="more-img" src="img/more.png" />
<h5>{{'Index.LoadMore' | translate }}</h5>
</div>
</div>
<div class="no-favorites text-center" ng-show="!favorites || favorites.length == 0">
<h4>{{'Index.FavoriteTip' | translate }}</h4>
</div>
</aside>
</section>
<section class="media visit-app-list" ng-show="visitedApps && visitedApps.length">
<aside class="media-left text-center">
<h5>{{'Index.RecentlyViewedItems' | translate }}</h5>
</aside>
<aside class="media-body">
<div class="app-panel col-md-2 text-center" ng-repeat="app in visitedApps"
ng-click="goToAppHomePage(app.appId)">
<div class="thumbnail hover">
<h4 ng-bind="app.appId"></h4>
<h5 ng-bind="app.name"></h5>
</div>
</div>
</aside>
</section>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script type="application/javascript">
function getPrefixPath() {
$.ajax({
method: 'get',
async: false,
url: 'prefix-path',
success: function (res) {
window.localStorage.setItem("prefixPath", res);
}
})
}
getPrefixPath();
</script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/FavoriteService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/IndexController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/test/resources/yaml/case3.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
!!javax.script.ScriptEngineManager [
!!java.net.URLClassLoader [[
!!java.net.URL ["http://localhost"]
]]
] | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/service-configdb.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.configdb.service.enabled -}}
---
# service definition for mysql
kind: Service
apiVersion: v1
metadata:
name: {{include "apollo.configdb.serviceName" .}}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.configdb.service.type }}
{{- if eq .Values.configdb.service.type "ExternalName" }}
externalName: {{ required "configdb.host is required!" .Values.configdb.host }}
{{- else }}
ports:
- protocol: TCP
port: {{ .Values.configdb.service.port }}
targetPort: {{ .Values.configdb.port }}
---
kind: Endpoints
apiVersion: v1
metadata:
name: {{include "apollo.configdb.serviceName" .}}
subsets:
- addresses:
- ip: {{ required "configdb.host is required!" .Values.configdb.host }}
ports:
- protocol: TCP
port: {{ .Values.configdb.port }}
{{- end }}
{{- end }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.configdb.service.enabled -}}
---
# service definition for mysql
kind: Service
apiVersion: v1
metadata:
name: {{include "apollo.configdb.serviceName" .}}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
type: {{ .Values.configdb.service.type }}
{{- if eq .Values.configdb.service.type "ExternalName" }}
externalName: {{ required "configdb.host is required!" .Values.configdb.host }}
{{- else }}
ports:
- protocol: TCP
port: {{ .Values.configdb.service.port }}
targetPort: {{ .Values.configdb.port }}
---
kind: Endpoints
apiVersion: v1
metadata:
name: {{include "apollo.configdb.serviceName" .}}
subsets:
- addresses:
- ip: {{ required "configdb.host is required!" .Values.configdb.host }}
ports:
- protocol: TCP
port: {{ .Values.configdb.port }}
{{- end }}
{{- end }} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case3-new.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: 2001
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./docs/charts/index.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v1
entries:
apollo-portal:
- apiVersion: v2
appVersion: 1.8.1
created: "2021-02-21T18:49:22.73663+08:00"
description: A Helm chart for Apollo Portal
digest: 8bac1b48361e2717d7d4ee669a85a14ee22ada96f249300d90ee563def63baea
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-02-21T18:49:22.736009+08:00"
description: A Helm chart for Apollo Portal
digest: 8a55c5f3ddd76b9768067fe6eecfb34b588084557c11882e263abb2af7dfc173
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-02-21T18:49:22.735091+08:00"
description: A Helm chart for Apollo Portal
digest: 1db8b2435e0471ef55c63c47b970e4ae059800f88ed4ac4f1ca6cd27fe502722
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-02-21T18:49:22.734255+08:00"
description: A Helm chart for Apollo Portal
digest: 7c1b4efa13d4cc54a714b3ec836f609a8f97286c465789f6d807d1227cfc5b74
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-02-21T18:49:22.733447+08:00"
description: A Helm chart for Apollo Portal
digest: b838e4478f0c031093691defeffb5805d51189989db0eb9caaa2dc67905c8391
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.0.tgz
version: 0.1.0
apollo-service:
- apiVersion: v2
appVersion: 1.8.1
created: "2021-02-21T18:49:22.744683+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: f88f0c6942353b3d49b4caa43a7580b885ccc94a646428694adc2ed3d43e49fe
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-02-21T18:49:22.743303+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 73e66c651499f93b6f3891e979dcbe2a20ad37809087e42bc98643c604c457c6
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-02-21T18:49:22.739372+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: be9379611b45db416a32b7e1367527faec7c29a969493ca4a0a72b5b87a280f4
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-02-21T18:49:22.738441+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 787a26590d68735341b7839c14274492097fed4a0843fc9a1e5c692194199707
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-02-21T18:49:22.737564+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 65c08f39b54ad1ac1d849cc841ce978bd6e95b0b6cbd2423d9f17f66bc7e8d3e
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.0.tgz
version: 0.1.0
generated: "2021-02-21T18:49:22.732423+08:00"
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v1
entries:
apollo-portal:
- apiVersion: v2
appVersion: 1.8.1
created: "2021-02-21T18:49:22.73663+08:00"
description: A Helm chart for Apollo Portal
digest: 8bac1b48361e2717d7d4ee669a85a14ee22ada96f249300d90ee563def63baea
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-02-21T18:49:22.736009+08:00"
description: A Helm chart for Apollo Portal
digest: 8a55c5f3ddd76b9768067fe6eecfb34b588084557c11882e263abb2af7dfc173
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-02-21T18:49:22.735091+08:00"
description: A Helm chart for Apollo Portal
digest: 1db8b2435e0471ef55c63c47b970e4ae059800f88ed4ac4f1ca6cd27fe502722
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-02-21T18:49:22.734255+08:00"
description: A Helm chart for Apollo Portal
digest: 7c1b4efa13d4cc54a714b3ec836f609a8f97286c465789f6d807d1227cfc5b74
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-02-21T18:49:22.733447+08:00"
description: A Helm chart for Apollo Portal
digest: b838e4478f0c031093691defeffb5805d51189989db0eb9caaa2dc67905c8391
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-portal
type: application
urls:
- apollo-portal-0.1.0.tgz
version: 0.1.0
apollo-service:
- apiVersion: v2
appVersion: 1.8.1
created: "2021-02-21T18:49:22.744683+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: f88f0c6942353b3d49b4caa43a7580b885ccc94a646428694adc2ed3d43e49fe
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.1.tgz
version: 0.2.1
- apiVersion: v2
appVersion: 1.8.0
created: "2021-02-21T18:49:22.743303+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 73e66c651499f93b6f3891e979dcbe2a20ad37809087e42bc98643c604c457c6
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: 1.7.2
created: "2021-02-21T18:49:22.739372+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: be9379611b45db416a32b7e1367527faec7c29a969493ca4a0a72b5b87a280f4
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.2.tgz
version: 0.1.2
- apiVersion: v2
appVersion: 1.7.1
created: "2021-02-21T18:49:22.738441+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 787a26590d68735341b7839c14274492097fed4a0843fc9a1e5c692194199707
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.1.tgz
version: 0.1.1
- apiVersion: v2
appVersion: 1.7.0
created: "2021-02-21T18:49:22.737564+08:00"
description: A Helm chart for Apollo Config Service and Apollo Admin Service
digest: 65c08f39b54ad1ac1d849cc841ce978bd6e95b0b6cbd2423d9f17f66bc7e8d3e
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- email: nobodyiam@gmail.com
name: nobodyiam
url: https://github.com/nobodyiam
name: apollo-service
type: application
urls:
- apollo-service-0.1.0.tgz
version: 0.1.0
generated: "2021-02-21T18:49:22.732423+08:00"
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/login.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en" ng-app="login">
<head>
<meta charset="UTF-8">
<title>{{ 'Common.Title' | translate }}</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="vendor/font-awesome.min.css">
<style type="text/css">
body {
padding-top: 90px;
background: #F7F7F7;
color: #666666;
font-family: 'Roboto', sans-serif;
font-weight: 100;
}
body {
width: 100%;
background: -webkit-linear-gradient(left, #22d686, #24d3d3, #22d686, #24d3d3);
background: linear-gradient(to right, #22d686, #24d3d3, #22d686, #24d3d3);
background-size: 600% 100%;
}
.panel {
border-radius: 5px;
}
label {
font-weight: 300;
}
.panel-login {
border: none;
-webkit-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
-moz-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
}
.panel-login .checkbox input[type=checkbox] {
margin-left: 0px;
}
.panel-login .checkbox label {
padding-left: 25px;
font-weight: 300;
display: inline-block;
position: relative;
}
.panel-login .checkbox {
padding-left: 20px;
}
.panel-login .checkbox label::before {
content: "";
display: inline-block;
position: absolute;
width: 17px;
height: 17px;
left: 0;
margin-left: 0px;
border: 1px solid #cccccc;
border-radius: 3px;
background-color: #fff;
-webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
}
.panel-login .checkbox label::after {
display: inline-block;
position: absolute;
width: 16px;
height: 16px;
left: 0;
top: 0;
margin-left: 0px;
padding-left: 3px;
padding-top: 1px;
font-size: 11px;
color: #555555;
}
.panel-login .checkbox input[type="checkbox"] {
opacity: 0;
}
.panel-login .checkbox input[type="checkbox"]:focus + label::before {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.panel-login .checkbox input[type="checkbox"]:checked + label::after {
font-family: 'FontAwesome';
content: "\f00c";
}
.panel-login > .panel-heading .tabs {
padding: 0;
}
.panel-login h2 {
font-size: 20px;
font-weight: 300;
margin: 30px;
}
.panel-login > .panel-heading {
color: #848c9d;
background-color: #e8e9ec;
border-color: #fff;
text-align: center;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom: 0px;
padding: 0px 15px;
}
.panel-login .form-group {
padding: 0 30px;
}
.panel-login > .panel-heading .login {
padding: 20px 30px;
border-bottom-leftt-radius: 5px;
}
.panel-login > .panel-heading .register {
padding: 20px 30px;
background: #2d3b55;
border-bottom-right-radius: 5px;
}
.panel-login > .panel-heading a {
text-decoration: none;
color: #666;
font-weight: 300;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
}
.panel-login > .panel-heading a#register-form-link {
color: #fff;
width: 100%;
text-align: right;
}
.panel-login > .panel-heading a#login-form-link {
width: 100%;
text-align: left;
}
.panel-login input[type="text"], .panel-login input[type="email"], .panel-login input[type="password"] {
height: 45px;
border: 0;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
-webkit-box-shadow: none;
box-shadow: none;
border-bottom: 1px solid #e7e7e7;
border-radius: 0px;
padding: 6px 0px;
}
.panel-login input:hover,
.panel-login input:focus {
outline: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border-color: #ccc;
}
.btn-login {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-login:hover,
.btn-login:focus {
color: #fff;
background-color: #2D3B55;
}
.forgot-password {
text-decoration: underline;
color: #888;
}
.forgot-password:hover,
.forgot-password:focus {
text-decoration: underline;
color: #666;
}
.btn-register {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-register:hover,
.btn-register:focus {
color: #fff;
background-color: #2D3B55;
}
</style>
</head>
<body>
<div class="container" ng-controller="LoginController">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-login">
<div class="panel-body">
<div class="row">
<div class="col-lg-12">
<form id="login-form" action="signin" method="post" role="form" style="display: block;">
<p class="text-center"><img src="img/logo-detail.png" style="width: 500px;"></p>
<div class="form-group">
<input type="text" name="username" tabindex="1" class="form-control"
placeholder="Username" value="">
</div>
<div class="form-group">
<input type="password" name="password" tabindex="2"
class="form-control" placeholder="Password">
</div>
<div class="form-group" style="color: red">
<small ng-bind="info"></small>
</div>
<div class="col-xs-12 form-group pull-right">
<input type="submit" name="login-submit" id="login-submit" tabindex="4"
class="form-control btn btn-login" value="{{'Login.Login' | translate }}">
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<script type="application/javascript">
function getPrefixPath() {
$.ajax({
method: 'get',
async: false,
url: 'prefix-path',
success: function (res) {
window.localStorage.setItem("prefixPath", res);
}
})
}
getPrefixPath();
</script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/LoginController.js"></script>
<script type="application/javascript">
$(function () {
$('#login-form-link').click(function (e) {
$("#login-form").delay(100).fadeIn(100);
$("#register-form").fadeOut(100);
$('#register-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
$('#register-form-link').click(function (e) {
$("#register-form").delay(100).fadeIn(100);
$("#login-form").fadeOut(100);
$('#login-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
});
</script>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en" ng-app="login">
<head>
<meta charset="UTF-8">
<title>{{ 'Common.Title' | translate }}</title>
<link rel="icon" href="./img/config.png">
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="vendor/font-awesome.min.css">
<style type="text/css">
body {
padding-top: 90px;
background: #F7F7F7;
color: #666666;
font-family: 'Roboto', sans-serif;
font-weight: 100;
}
body {
width: 100%;
background: -webkit-linear-gradient(left, #22d686, #24d3d3, #22d686, #24d3d3);
background: linear-gradient(to right, #22d686, #24d3d3, #22d686, #24d3d3);
background-size: 600% 100%;
}
.panel {
border-radius: 5px;
}
label {
font-weight: 300;
}
.panel-login {
border: none;
-webkit-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
-moz-box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
box-shadow: 0px 0px 49px 14px rgba(188, 190, 194, 0.39);
}
.panel-login .checkbox input[type=checkbox] {
margin-left: 0px;
}
.panel-login .checkbox label {
padding-left: 25px;
font-weight: 300;
display: inline-block;
position: relative;
}
.panel-login .checkbox {
padding-left: 20px;
}
.panel-login .checkbox label::before {
content: "";
display: inline-block;
position: absolute;
width: 17px;
height: 17px;
left: 0;
margin-left: 0px;
border: 1px solid #cccccc;
border-radius: 3px;
background-color: #fff;
-webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
-o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
}
.panel-login .checkbox label::after {
display: inline-block;
position: absolute;
width: 16px;
height: 16px;
left: 0;
top: 0;
margin-left: 0px;
padding-left: 3px;
padding-top: 1px;
font-size: 11px;
color: #555555;
}
.panel-login .checkbox input[type="checkbox"] {
opacity: 0;
}
.panel-login .checkbox input[type="checkbox"]:focus + label::before {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
.panel-login .checkbox input[type="checkbox"]:checked + label::after {
font-family: 'FontAwesome';
content: "\f00c";
}
.panel-login > .panel-heading .tabs {
padding: 0;
}
.panel-login h2 {
font-size: 20px;
font-weight: 300;
margin: 30px;
}
.panel-login > .panel-heading {
color: #848c9d;
background-color: #e8e9ec;
border-color: #fff;
text-align: center;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom: 0px;
padding: 0px 15px;
}
.panel-login .form-group {
padding: 0 30px;
}
.panel-login > .panel-heading .login {
padding: 20px 30px;
border-bottom-leftt-radius: 5px;
}
.panel-login > .panel-heading .register {
padding: 20px 30px;
background: #2d3b55;
border-bottom-right-radius: 5px;
}
.panel-login > .panel-heading a {
text-decoration: none;
color: #666;
font-weight: 300;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
}
.panel-login > .panel-heading a#register-form-link {
color: #fff;
width: 100%;
text-align: right;
}
.panel-login > .panel-heading a#login-form-link {
width: 100%;
text-align: left;
}
.panel-login input[type="text"], .panel-login input[type="email"], .panel-login input[type="password"] {
height: 45px;
border: 0;
font-size: 16px;
-webkit-transition: all 0.1s linear;
-moz-transition: all 0.1s linear;
transition: all 0.1s linear;
-webkit-box-shadow: none;
box-shadow: none;
border-bottom: 1px solid #e7e7e7;
border-radius: 0px;
padding: 6px 0px;
}
.panel-login input:hover,
.panel-login input:focus {
outline: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
border-color: #ccc;
}
.btn-login {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-login:hover,
.btn-login:focus {
color: #fff;
background-color: #2D3B55;
}
.forgot-password {
text-decoration: underline;
color: #888;
}
.forgot-password:hover,
.forgot-password:focus {
text-decoration: underline;
color: #666;
}
.btn-register {
background-color: #E8E9EC;
outline: none;
color: #2D3B55;
font-size: 14px;
height: auto;
font-weight: normal;
padding: 14px 0;
text-transform: uppercase;
border: none;
border-radius: 0px;
box-shadow: none;
}
.btn-register:hover,
.btn-register:focus {
color: #fff;
background-color: #2D3B55;
}
</style>
</head>
<body>
<div class="container" ng-controller="LoginController">
<div class="row">
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-login">
<div class="panel-body">
<div class="row">
<div class="col-lg-12">
<form id="login-form" action="signin" method="post" role="form" style="display: block;">
<p class="text-center"><img src="img/logo-detail.png" style="width: 500px;"></p>
<div class="form-group">
<input type="text" name="username" tabindex="1" class="form-control"
placeholder="Username" value="">
</div>
<div class="form-group">
<input type="password" name="password" tabindex="2"
class="form-control" placeholder="Password">
</div>
<div class="form-group" style="color: red">
<small ng-bind="info"></small>
</div>
<div class="col-xs-12 form-group pull-right">
<input type="submit" name="login-submit" id="login-submit" tabindex="4"
class="form-control btn btn-login" value="{{'Login.Login' | translate }}">
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<script type="application/javascript">
function getPrefixPath() {
$.ajax({
method: 'get',
async: false,
url: 'prefix-path',
success: function (res) {
window.localStorage.setItem("prefixPath", res);
}
})
}
getPrefixPath();
</script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/LoginController.js"></script>
<script type="application/javascript">
$(function () {
$('#login-form-link').click(function (e) {
$("#login-form").delay(100).fadeIn(100);
$("#register-form").fadeOut(100);
$('#register-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
$('#register-form-link').click(function (e) {
$("#register-form").delay(100).fadeIn(100);
$("#login-form").fadeOut(100);
$('#login-form-link').removeClass('active');
$(this).addClass('active');
e.preventDefault();
});
});
</script>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case3.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/config/history.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="release_history">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.History.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="ReleaseHistoryController">
<section class="release-history panel col-md-12 no-radius hidden">
<div class="panel-heading row">
<div class="operation-caption-container col-md-3">
<div class="operation-caption release-operation-normal text-center" style="left:0;">
<small>{{'Config.History.MasterVersionPublish' | translate }}</small>
</div>
<div class="operation-caption release-operation-rollback text-center" style="left: 110px;">
<small>{{'Config.History.MasterVersionRollback' | translate }}</small>
</div>
<div class="operation-caption release-operation-gray text-center" style="left: 220px;">
<small>{{'Config.History.GrayscaleOperator' | translate }}</small>
</div>
</div>
<div class="col-md-6 text-center">
<h4>{{'Config.History.PublishHistory' | translate }}</h4>
<small>({{'Common.AppId' | translate }}:{{pageContext.appId}},
{{'Common.Environment' | translate }}:{{pageContext.env}},
{{'Common.Cluster' | translate }}:{{pageContext.clusterName}},
{{'Common.Namespace' | translate }}:{{pageContext.namespaceName}})
</small>
</div>
<div class="pull-right back-btn">
<a type="button" class="btn btn-info"
href="{{ '/config.html' | prefixPath }}?#/appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
<div class="release-history-container panel-body row"
ng-show="!isConfigHidden && releaseHistories && releaseHistories.length > 0">
<div class="release-history-list col-md-3">
<div class="media hover" ng-class="{'active': releaseHistory.id == selectedReleaseHistory}"
ng-repeat="releaseHistory in releaseHistories"
ng-click="showReleaseHistoryDetail(releaseHistory)">
<div class="release-operation"
ng-class="{'release-operation-normal': releaseHistory.operation == 0 || releaseHistory.operation == 5,
'release-operation-gray': releaseHistory.operation == 2 || releaseHistory.operation == 3 ||
releaseHistory.operation == 4 || releaseHistory.operation == 7 || releaseHistory.operation == 8,
'release-operation-rollback': releaseHistory.operation == 1 || releaseHistory.operation == 6}">
</div>
<h4 class="media-left text-center" ng-bind="releaseHistory.operatorDisplayName + '(' + releaseHistory.operator + ')'">
</h4>
<div class="media-body">
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 0">
{{'Config.History.OperationType0' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 1">
{{'Config.History.OperationType1' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 2">
{{'Config.History.OperationType2' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 3">
{{'Config.History.OperationType3' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 4">
{{'Config.History.OperationType4' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 5">
{{'Config.History.OperationType5' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 6">
{{'Config.History.OperationType6' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 7">
{{'Config.History.OperationType7' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 8">
{{'Config.History.OperationType8' | translate }}</h5>
<h6 class="col-md-5 text-right" ng-bind="releaseHistory.releaseTimeFormatted"></h6>
<span class="label label-warning no-radius emergency-publish"
ng-if="releaseHistory.operationContext.isEmergencyPublish">{{'Config.History.UrgentPublish' | translate }}</span>
</div>
</div>
<div class="load-more media panel-heading text-center hover" ng-show="!hasLoadAll"
ng-click="findReleaseHistory()">
{{'Config.History.LoadMore' | translate }}
</div>
</div>
<!--properties mode info-->
<div class="release-info col-md-9 panel panel-default no-radius" ng-show="!isTextNamespace">
<div class="panel-heading">
<span ng-bind="history.releaseTitle"></span>
<span class="label label-warning no-radius" ng-if="history.isReleaseAbandoned">{{'Config.History.Abandoned' | translate }}</span>
<span class="pull-right" ng-bind="history.releaseTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
<div class="row" style="padding-top: 10px;">
<div class="col-md-5">
<small ng-show="history.releaseComment" ng-bind="history.releaseComment"></small>
</div>
<div class="col-md-7 text-right">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.History.RollbackToTips' | translate }}"
ng-show="namespace.hasReleasePermission && !history.isReleaseAbandoned
&& (history.operation == 0 || history.operation == 1 || history.operation == 4)"
ng-click="preRollback()">
<img src="../img/rollback.png">
{{'Config.History.RollbackTo' | translate }}
</button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active':history.viewType == 'diff'}" data-tooltip="tooltip"
data-placement="bottom" title="{{'Config.History.ChangedItemTips' | translate }}"
ng-click="switchConfigViewType(history, 'diff')">{{'Config.History.ChangedItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active':history.viewType == 'all'}" data-tooltip="tooltip"
data-placement="bottom" title="{{'Config.History.AllItemTips' | translate }}"
ng-click="switchConfigViewType(history, 'all')">{{'Config.History.AllItem' | translate }}
</button>
</div>
</div>
</div>
</div>
<div class="panel-body config">
<section ng-show="history.viewType=='diff'">
<h4 class="section-title">{{'Config.History.ChangedItem' | translate }}</h4>
<div ng-show="history.changes && history.changes.length > 0">
<table class="no-margin table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'Config.History.ChangeType' | translate }}</th>
<th>{{'Config.History.ChangeKey' | translate }}</th>
<th>{{'Config.History.ChangeOldValue' | translate }}</th>
<th>{{'Config.History.ChangeNewValue' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in history.changes">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Config.History.ChangeTypeNew' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Config.History.ChangeTypeModify' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Config.History.ChangeTypeDelete' | translate }}</span>
</td>
<td class="cursor-pointer" width="20%"
ng-click="showText(change.entity.firstEntity.key)">
<span ng-bind="change.entity.firstEntity.key | limitTo: 250"></span>
<span
ng-bind="change.entity.firstEntity.key.length > 250 ? '...' :''"></span>
</td>
<td class="cursor-pointer" width="35%"
ng-click="showText(change.entity.firstEntity.value)">
<span ng-bind="change.entity.firstEntity.value | limitTo: 250"></span>
<span
ng-bind="change.entity.firstEntity.value.length > 250 ? '...' :''"></span>
</td>
<td class="cursor-pointer" width="35%"
ng-click="showText(change.entity.secondEntity.value)">
<span ng-bind="change.entity.secondEntity.value | limitTo: 250"></span>
<span
ng-bind="change.entity.secondEntity.value.length > 250 ? '...' :''"></span>
</td>
</tr>
</tbody>
</table>
</div>
<div class="text-center empty-container"
ng-show="!history.changes || history.changes.length == 0">
<h5>{{'Config.History.NoChange' | translate }}</h5>
</div>
</section>
<section ng-show="history.viewType=='all'">
<h4 class="section-title">{{'Config.History.AllItem' | translate }}</h4>
<table class="no-margin table table-striped table-hover table-bordered"
ng-show="history.configuration && history.configuration.length > 0">
<thead>
<tr>
<th>{{'Config.History.ChangeKey' | translate }}</th>
<th>{{'Config.History.ChangeValue' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in history.configuration">
<td class="cursor-pointer" width="30%" ng-click="showText(item.firstEntity)">
<span ng-bind="item.firstEntity | limitTo: 250"></span>
<span ng-bind="item.firstEntity.length > 250 ? '...' :''"></span>
</td>
<td class="cursor-pointer" width="70%" ng-click="showText(item.secondEntity)">
<span ng-bind="item.secondEntity | limitTo: 250"></span>
<span ng-bind="item.secondEntity.length > 250 ? '...' :''"></span>
</td>
</tr>
</tbody>
</table>
<div class="text-center empty-container"
ng-show="history.viewType=='all' && (!history.configuration || history.configuration.length == 0)">
<h5>{{'Config.History.NoItem' | translate }}</h5>
</div>
</section>
<section
ng-show="history.branchName != history.clusterName && history.operation != 8 && history.operation != 7">
<hr>
<h4 class="section-title">{{'Config.History.GrayscaleRule' | translate }}</h4>
<table class="no-margin table table-striped table-hover table-bordered"
ng-show="history.operationContext.rules">
<thead>
<tr>
<th>{{'Config.History.GrayscaleAppId' | translate }}</th>
<th>{{'Config.History.GrayscaleIp' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="rule in history.operationContext.rules">
<td width="20%" ng-bind="rule.clientAppId"></td>
<td width="80%" ng-bind="rule.clientIpList.join(', ')"></td>
</tr>
</tbody>
</table>
<h5 class="text-center empty-container" ng-show="!history.operationContext.rules">
{{'Config.History.NoGrayscaleRule' | translate }}
</h5>
</section>
</div>
</div>
<!--text mode-->
<div class="release-info col-md-9"
ng-show="isTextNamespace && history.changes && history.changes.length > 0">
<apollodiff ng-repeat="change in history.changes" old-str="change.entity.firstEntity.value"
new-str="change.entity.secondEntity.value" apollo-id="'releaseStrDiff'">
</apollodiff>
</div>
</div>
<div class="panel-body" ng-show="isConfigHidden || !releaseHistories || releaseHistories.length == 0">
<h4 class="text-center empty-container" ng-show="isConfigHidden">
{{'Config.History.NoPermissionTips' | translate }}</h4>
<h4 class="text-center empty-container" ng-show="!isConfigHidden">
{{'Config.History.NoPublishHistory' | translate }}</h4>
</div>
</section>
<showtextmodal text="text"></showtextmodal>
<rollbackmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</rollbackmodal>
<apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'"
apollo-title="'Config.RollbackAlert.DialogTitle' | translate"
apollo-detail="'Config.RollbackAlert.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="rollback">
</apolloconfirmdialog>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/diff.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ReleaseService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/ReleaseHistoryService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/EventManager.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/ReleaseHistoryController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
<script type="application/javascript" src="../scripts/directive/diff-directive.js"></script>
<script type="application/javascript" src="../scripts/directive/rollback-modal-directive.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="release_history">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.History.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="ReleaseHistoryController">
<section class="release-history panel col-md-12 no-radius hidden">
<div class="panel-heading row">
<div class="operation-caption-container col-md-3">
<div class="operation-caption release-operation-normal text-center" style="left:0;">
<small>{{'Config.History.MasterVersionPublish' | translate }}</small>
</div>
<div class="operation-caption release-operation-rollback text-center" style="left: 110px;">
<small>{{'Config.History.MasterVersionRollback' | translate }}</small>
</div>
<div class="operation-caption release-operation-gray text-center" style="left: 220px;">
<small>{{'Config.History.GrayscaleOperator' | translate }}</small>
</div>
</div>
<div class="col-md-6 text-center">
<h4>{{'Config.History.PublishHistory' | translate }}</h4>
<small>({{'Common.AppId' | translate }}:{{pageContext.appId}},
{{'Common.Environment' | translate }}:{{pageContext.env}},
{{'Common.Cluster' | translate }}:{{pageContext.clusterName}},
{{'Common.Namespace' | translate }}:{{pageContext.namespaceName}})
</small>
</div>
<div class="pull-right back-btn">
<a type="button" class="btn btn-info"
href="{{ '/config.html' | prefixPath }}?#/appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
<div class="release-history-container panel-body row"
ng-show="!isConfigHidden && releaseHistories && releaseHistories.length > 0">
<div class="release-history-list col-md-3">
<div class="media hover" ng-class="{'active': releaseHistory.id == selectedReleaseHistory}"
ng-repeat="releaseHistory in releaseHistories"
ng-click="showReleaseHistoryDetail(releaseHistory)">
<div class="release-operation"
ng-class="{'release-operation-normal': releaseHistory.operation == 0 || releaseHistory.operation == 5,
'release-operation-gray': releaseHistory.operation == 2 || releaseHistory.operation == 3 ||
releaseHistory.operation == 4 || releaseHistory.operation == 7 || releaseHistory.operation == 8,
'release-operation-rollback': releaseHistory.operation == 1 || releaseHistory.operation == 6}">
</div>
<h4 class="media-left text-center" ng-bind="releaseHistory.operatorDisplayName + '(' + releaseHistory.operator + ')'">
</h4>
<div class="media-body">
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 0">
{{'Config.History.OperationType0' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 1">
{{'Config.History.OperationType1' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 2">
{{'Config.History.OperationType2' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 3">
{{'Config.History.OperationType3' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 4">
{{'Config.History.OperationType4' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 5">
{{'Config.History.OperationType5' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 6">
{{'Config.History.OperationType6' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 7">
{{'Config.History.OperationType7' | translate }}</h5>
<h5 class="col-md-7 word-break" ng-show="releaseHistory.operation == 8">
{{'Config.History.OperationType8' | translate }}</h5>
<h6 class="col-md-5 text-right" ng-bind="releaseHistory.releaseTimeFormatted"></h6>
<span class="label label-warning no-radius emergency-publish"
ng-if="releaseHistory.operationContext.isEmergencyPublish">{{'Config.History.UrgentPublish' | translate }}</span>
</div>
</div>
<div class="load-more media panel-heading text-center hover" ng-show="!hasLoadAll"
ng-click="findReleaseHistory()">
{{'Config.History.LoadMore' | translate }}
</div>
</div>
<!--properties mode info-->
<div class="release-info col-md-9 panel panel-default no-radius" ng-show="!isTextNamespace">
<div class="panel-heading">
<span ng-bind="history.releaseTitle"></span>
<span class="label label-warning no-radius" ng-if="history.isReleaseAbandoned">{{'Config.History.Abandoned' | translate }}</span>
<span class="pull-right" ng-bind="history.releaseTime | date: 'yyyy-MM-dd HH:mm:ss'"></span>
<div class="row" style="padding-top: 10px;">
<div class="col-md-5">
<small ng-show="history.releaseComment" ng-bind="history.releaseComment"></small>
</div>
<div class="col-md-7 text-right">
<button type="button" class="btn btn-default btn-sm" data-tooltip="tooltip" data-placement="bottom"
title="{{'Config.History.RollbackToTips' | translate }}"
ng-show="namespace.hasReleasePermission && !history.isReleaseAbandoned
&& (history.operation == 0 || history.operation == 1 || history.operation == 4)"
ng-click="preRollback()">
<img src="../img/rollback.png">
{{'Config.History.RollbackTo' | translate }}
</button>
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active':history.viewType == 'diff'}" data-tooltip="tooltip"
data-placement="bottom" title="{{'Config.History.ChangedItemTips' | translate }}"
ng-click="switchConfigViewType(history, 'diff')">{{'Config.History.ChangedItem' | translate }}
</button>
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active':history.viewType == 'all'}" data-tooltip="tooltip"
data-placement="bottom" title="{{'Config.History.AllItemTips' | translate }}"
ng-click="switchConfigViewType(history, 'all')">{{'Config.History.AllItem' | translate }}
</button>
</div>
</div>
</div>
</div>
<div class="panel-body config">
<section ng-show="history.viewType=='diff'">
<h4 class="section-title">{{'Config.History.ChangedItem' | translate }}</h4>
<div ng-show="history.changes && history.changes.length > 0">
<table class="no-margin table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'Config.History.ChangeType' | translate }}</th>
<th>{{'Config.History.ChangeKey' | translate }}</th>
<th>{{'Config.History.ChangeOldValue' | translate }}</th>
<th>{{'Config.History.ChangeNewValue' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="change in history.changes">
<td width="10%">
<span
ng-show="change.type == 'ADDED'">{{'Config.History.ChangeTypeNew' | translate }}</span>
<span
ng-show="change.type == 'MODIFIED'">{{'Config.History.ChangeTypeModify' | translate }}</span>
<span
ng-show="change.type == 'DELETED'">{{'Config.History.ChangeTypeDelete' | translate }}</span>
</td>
<td class="cursor-pointer" width="20%"
ng-click="showText(change.entity.firstEntity.key)">
<span ng-bind="change.entity.firstEntity.key | limitTo: 250"></span>
<span
ng-bind="change.entity.firstEntity.key.length > 250 ? '...' :''"></span>
</td>
<td class="cursor-pointer" width="35%"
ng-click="showText(change.entity.firstEntity.value)">
<span ng-bind="change.entity.firstEntity.value | limitTo: 250"></span>
<span
ng-bind="change.entity.firstEntity.value.length > 250 ? '...' :''"></span>
</td>
<td class="cursor-pointer" width="35%"
ng-click="showText(change.entity.secondEntity.value)">
<span ng-bind="change.entity.secondEntity.value | limitTo: 250"></span>
<span
ng-bind="change.entity.secondEntity.value.length > 250 ? '...' :''"></span>
</td>
</tr>
</tbody>
</table>
</div>
<div class="text-center empty-container"
ng-show="!history.changes || history.changes.length == 0">
<h5>{{'Config.History.NoChange' | translate }}</h5>
</div>
</section>
<section ng-show="history.viewType=='all'">
<h4 class="section-title">{{'Config.History.AllItem' | translate }}</h4>
<table class="no-margin table table-striped table-hover table-bordered"
ng-show="history.configuration && history.configuration.length > 0">
<thead>
<tr>
<th>{{'Config.History.ChangeKey' | translate }}</th>
<th>{{'Config.History.ChangeValue' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in history.configuration">
<td class="cursor-pointer" width="30%" ng-click="showText(item.firstEntity)">
<span ng-bind="item.firstEntity | limitTo: 250"></span>
<span ng-bind="item.firstEntity.length > 250 ? '...' :''"></span>
</td>
<td class="cursor-pointer" width="70%" ng-click="showText(item.secondEntity)">
<span ng-bind="item.secondEntity | limitTo: 250"></span>
<span ng-bind="item.secondEntity.length > 250 ? '...' :''"></span>
</td>
</tr>
</tbody>
</table>
<div class="text-center empty-container"
ng-show="history.viewType=='all' && (!history.configuration || history.configuration.length == 0)">
<h5>{{'Config.History.NoItem' | translate }}</h5>
</div>
</section>
<section
ng-show="history.branchName != history.clusterName && history.operation != 8 && history.operation != 7">
<hr>
<h4 class="section-title">{{'Config.History.GrayscaleRule' | translate }}</h4>
<table class="no-margin table table-striped table-hover table-bordered"
ng-show="history.operationContext.rules">
<thead>
<tr>
<th>{{'Config.History.GrayscaleAppId' | translate }}</th>
<th>{{'Config.History.GrayscaleIp' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="rule in history.operationContext.rules">
<td width="20%" ng-bind="rule.clientAppId"></td>
<td width="80%" ng-bind="rule.clientIpList.join(', ')"></td>
</tr>
</tbody>
</table>
<h5 class="text-center empty-container" ng-show="!history.operationContext.rules">
{{'Config.History.NoGrayscaleRule' | translate }}
</h5>
</section>
</div>
</div>
<!--text mode-->
<div class="release-info col-md-9"
ng-show="isTextNamespace && history.changes && history.changes.length > 0">
<apollodiff ng-repeat="change in history.changes" old-str="change.entity.firstEntity.value"
new-str="change.entity.secondEntity.value" apollo-id="'releaseStrDiff'">
</apollodiff>
</div>
</div>
<div class="panel-body" ng-show="isConfigHidden || !releaseHistories || releaseHistories.length == 0">
<h4 class="text-center empty-container" ng-show="isConfigHidden">
{{'Config.History.NoPermissionTips' | translate }}</h4>
<h4 class="text-center empty-container" ng-show="!isConfigHidden">
{{'Config.History.NoPublishHistory' | translate }}</h4>
</div>
</section>
<showtextmodal text="text"></showtextmodal>
<rollbackmodal app-id="pageContext.appId" env="pageContext.env" cluster="pageContext.clusterName">
</rollbackmodal>
<apolloconfirmdialog apollo-dialog-id="'rollbackAlertDialog'"
apollo-title="'Config.RollbackAlert.DialogTitle' | translate"
apollo-detail="'Config.RollbackAlert.DialogContent' | translate" apollo-show-cancel-btn="true"
apollo-confirm="rollback">
</apolloconfirmdialog>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/diff.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ReleaseService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/ReleaseHistoryService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/EventManager.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/ReleaseHistoryController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
<script type="application/javascript" src="../scripts/directive/diff-directive.js"></script>
<script type="application/javascript" src="../scripts/directive/rollback-modal-directive.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/views/common/footer.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="footer">
<hr>
<p class="text-center">
<span class="glyphicon glyphicon-copyright-mark" aria-hidden="true"></span>{{'Common.Ctrip' | translate }} {{'Common.CtripDepartment' | translate }}
<a href="https://github.com/ctripcorp/apollo" target="_blank">
<img src="{{ '/img/github.png' | prefixPath }}" style="width: 50px; height: 20px;">
</a>
</p>
</div>
<iframe ng-src="{{ '/sso_heartbeat' | prefixPath }}" class="hide"></iframe>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<div class="footer">
<hr>
<p class="text-center">
<span class="glyphicon glyphicon-copyright-mark" aria-hidden="true"></span>{{'Common.Ctrip' | translate }} {{'Common.CtripDepartment' | translate }}
<a href="https://github.com/ctripcorp/apollo" target="_blank">
<img src="{{ '/img/github.png' | prefixPath }}" style="width: 50px; height: 20px;">
</a>
</p>
</div>
<iframe ng-src="{{ '/sso_heartbeat' | prefixPath }}" class="hide"></iframe>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/default_sso_heartbeat.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>SSO Heartbeat</title>
<script type="text/javascript">
var reloading = false;
setInterval(function () {
if (reloading) {
return;
}
reloading = true;
location.reload(true);
}, 60000);
</script>
</head>
<body>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>SSO Heartbeat</title>
<script type="text/javascript">
var reloading = false;
setInterval(function () {
if (reloading) {
return;
}
reloading = true;
location.reload(true);
}, 60000);
</script>
</head>
<body>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./docs/index.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Apollo</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="keywords" content="apollo,configuration,server,java,microservice" />
<meta name="description" content="A reliable configuration management system" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" />
<meta name="google-site-verification" content="CuvYz6OxISNH7wdJsnS8oNtJJn9IP6k0zz5x6m9uXco" />
<!-- theme -->
<link rel="stylesheet" href="css/vue.css" title="vue" />
<link rel="stylesheet" href="css/dark.css" title="dark" disabled />
<link rel="stylesheet" href="css/buble.css" title="buble" disabled />
<link rel="stylesheet" href="css/pure.css" title="pure" disabled />
<style type="text/css">
.sidebar-nav >ul >li.file p >a {
font-size: 15px;
font-weight: 700;
color: #364149;
}
.sidebar-nav .folder {
cursor: pointer;
}
</style>
</head>
<body>
<div id="app">Loading ...</div>
<script>
window.$docsify = {
alias: {
'/': 'zh/README.md',
'/zh/.*/_sidebar.md': '/zh/_sidebar.md',
'/en/.*/_sidebar.md': '/en/_sidebar.md',
'/zh/.*/_navbar.md': '/zh/_navbar.md',
'/en/.*/_navbar.md': '/en/_navbar.md',
'/zh/(.*)': 'zh/$1',
'/en/(.*)': 'en/$1',
},
auto2top: true,
// Only coverpage is loaded when visiting the home page.
onlyCover: true,
coverpage: true,
loadSidebar: true,
loadNavbar: true,
mergeNavbar: true,
maxLevel: 6,
subMaxLevel: 5,
name: 'Apollo',
repo: 'https://github.com/ctripcorp/apollo/',
search: {
noData: {
'/zh/': '没有结果!',
'/en/': 'No results!',
'/': '没有结果!',
},
paths: 'auto',
placeholder: {
'/zh/': '搜索',
'/en/': 'Search',
'/': '搜索',
},
},
// click to copy.
copyCode: {
buttonText: {
'/zh/': '点击复制',
'/en/': 'Copy to clipboard',
'/': 'Copy to clipboard',
},
errorText: {
'/zh/': '错误',
'/en/': 'Error',
'/': 'Error',
},
successText: {
'/zh/': '复制成功',
'/en': 'Copied',
'/': 'Copied',
},
},
// docsify-pagination
pagination: {
crossChapter: true,
crossChapterText: true,
},
plugins: [
// Edit Document Button in each page
function (hook, vm) {
hook.beforeEach(function (html) {
if (/githubusercontent\.com/.test(vm.route.file)) {
url = vm.route.file
.replace('raw.githubusercontent.com', 'github.com')
.replace(/\/master/, '/blob/master')
} else {
url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file
}
var editHtml = '[:memo: Edit Document](' + url + ')\n\n'
return editHtml
+ html
+ '\n\n----\n\n'
+ '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
})
},
],
};
</script>
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
<!-- plugins -->
<!-- support search -->
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script>
<!-- Support docsify sidebar catalog expand and collapse -->
<script src="//cdn.jsdelivr.net/npm/docsify-sidebar-collapse/dist/docsify-sidebar-collapse.min.js"></script>
<!-- Medium's image zoom -->
<script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script>
<!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs -->
<script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script>
<!-- docsify-pagination -->
<script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
<!-- code highlight -->
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-csharp.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-java.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-properties.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-sql.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-xml-doc.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-yaml.min.js"></script>
</body>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d47d58dcc5ba5c0c7dccab29717379c6";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Apollo</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="keywords" content="apollo,configuration,server,java,microservice" />
<meta name="description" content="A reliable configuration management system" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" />
<meta name="google-site-verification" content="CuvYz6OxISNH7wdJsnS8oNtJJn9IP6k0zz5x6m9uXco" />
<!-- theme -->
<link rel="stylesheet" href="css/vue.css" title="vue" />
<link rel="stylesheet" href="css/dark.css" title="dark" disabled />
<link rel="stylesheet" href="css/buble.css" title="buble" disabled />
<link rel="stylesheet" href="css/pure.css" title="pure" disabled />
<style type="text/css">
.sidebar-nav >ul >li.file p >a {
font-size: 15px;
font-weight: 700;
color: #364149;
}
.sidebar-nav .folder {
cursor: pointer;
}
</style>
</head>
<body>
<div id="app">Loading ...</div>
<script>
window.$docsify = {
alias: {
'/': 'zh/README.md',
'/zh/.*/_sidebar.md': '/zh/_sidebar.md',
'/en/.*/_sidebar.md': '/en/_sidebar.md',
'/zh/.*/_navbar.md': '/zh/_navbar.md',
'/en/.*/_navbar.md': '/en/_navbar.md',
'/zh/(.*)': 'zh/$1',
'/en/(.*)': 'en/$1',
},
auto2top: true,
// Only coverpage is loaded when visiting the home page.
onlyCover: true,
coverpage: true,
loadSidebar: true,
loadNavbar: true,
mergeNavbar: true,
maxLevel: 6,
subMaxLevel: 5,
name: 'Apollo',
repo: 'https://github.com/ctripcorp/apollo/',
search: {
noData: {
'/zh/': '没有结果!',
'/en/': 'No results!',
'/': '没有结果!',
},
paths: 'auto',
placeholder: {
'/zh/': '搜索',
'/en/': 'Search',
'/': '搜索',
},
},
// click to copy.
copyCode: {
buttonText: {
'/zh/': '点击复制',
'/en/': 'Copy to clipboard',
'/': 'Copy to clipboard',
},
errorText: {
'/zh/': '错误',
'/en/': 'Error',
'/': 'Error',
},
successText: {
'/zh/': '复制成功',
'/en': 'Copied',
'/': 'Copied',
},
},
// docsify-pagination
pagination: {
crossChapter: true,
crossChapterText: true,
},
plugins: [
// Edit Document Button in each page
function (hook, vm) {
hook.beforeEach(function (html) {
if (/githubusercontent\.com/.test(vm.route.file)) {
url = vm.route.file
.replace('raw.githubusercontent.com', 'github.com')
.replace(/\/master/, '/blob/master')
} else {
url = 'https://github.com/ctripcorp/apollo/blob/master/docs/' + vm.route.file
}
var editHtml = '[:memo: Edit Document](' + url + ')\n\n'
return editHtml
+ html
+ '\n\n----\n\n'
+ '<a href="https://docsify.js.org" target="_blank" style="color: inherit; font-weight: normal; text-decoration: none;">Powered by docsify</a>'
})
},
],
};
</script>
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
<!-- plugins -->
<!-- support search -->
<script src="//cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.min.js"></script>
<!-- Support docsify sidebar catalog expand and collapse -->
<script src="//cdn.jsdelivr.net/npm/docsify-sidebar-collapse/dist/docsify-sidebar-collapse.min.js"></script>
<!-- Medium's image zoom -->
<script src="//cdn.jsdelivr.net/npm/docsify/lib/plugins/zoom-image.min.js"></script>
<!-- Add a simple Click to copy button to all preformatted code blocks to effortlessly allow users to copy example code from your docs -->
<script src="//cdn.jsdelivr.net/npm/docsify-copy-code"></script>
<!-- docsify-pagination -->
<script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
<!-- code highlight -->
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-bash.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-csharp.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-java.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-markdown.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-nginx.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-properties.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-sql.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-xml-doc.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/prismjs@1/components/prism-yaml.min.js"></script>
</body>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d47d58dcc5ba5c0c7dccab29717379c6";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/ingress-configservice.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.configService.ingress.enabled -}}
{{- $fullName := include "apollo.configService.fullName" . -}}
{{- $svcPort := .Values.configService.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
{{- with .Values.configService.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.configService.ingress.tls }}
tls:
{{- range .Values.configService.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.configService.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.configService.ingress.enabled -}}
{{- $fullName := include "apollo.configService.fullName" . -}}
{{- $svcPort := .Values.configService.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
{{- with .Values.configService.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.configService.ingress.tls }}
tls:
{{- range .Values.configService.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.configService.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/test/resources/yaml/case2.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key1: "anotherValue"
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key1: "anotherValue"
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-prod
labels:
app: service-apollo-admin-server-prod
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-prod
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-prod
labels:
app: deployment-apollo-admin-server-prod
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-prod
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-prod
configMap:
name: configmap-apollo-admin-server-prod
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-prod
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 50 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-prod.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-prod
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-prod
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-prod
labels:
app: service-apollo-admin-server-prod
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-prod
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-prod
labels:
app: deployment-apollo-admin-server-prod
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-prod
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-prod
configMap:
name: configmap-apollo-admin-server-prod
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-prod
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 50 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-prod.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-prod
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-prod
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/server_config.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="server_config">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'ServiceConfig.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="ServerConfigController">
<div class="col-md-8 col-md-offset-2 panel">
<section class="panel-body" ng-show="isRootUser">
<div class="row">
<header class="panel-heading">
{{'ServiceConfig.Title' | translate }}
<small>{{'ServiceConfig.Tips' | translate }}</small>
</header>
<div class="panel-body">
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'ServiceConfig.Key' | translate }}
</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="key" ng-model="serverConfig.key"
required>
<small>{{'ServiceConfig.KeyTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info"
ng-click="getServerConfigInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'ServiceConfig.Value' | translate }}
</label>
<div class="col-sm-9">
<textarea class="form-control" rows="4" name="value"
ng-model="serverConfig.value"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
{{'ServiceConfig.Comment' | translate }}</label>
<div class="col-sm-9">
<textarea class="form-control" rows="4" name="comment"
ng-model="serverConfig.comment"></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary" ng-disabled="saveBtnDisabled"
ng-click="create()">
{{'Common.Save' | translate }}
</button>
</div>
</div>
</form>
</div>
</div>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/ServerConfigService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/controller/ServerConfigController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="server_config">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'ServiceConfig.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="ServerConfigController">
<div class="col-md-8 col-md-offset-2 panel">
<section class="panel-body" ng-show="isRootUser">
<div class="row">
<header class="panel-heading">
{{'ServiceConfig.Title' | translate }}
<small>{{'ServiceConfig.Tips' | translate }}</small>
</header>
<div class="panel-body">
<form class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'ServiceConfig.Key' | translate }}
</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="key" ng-model="serverConfig.key"
required>
<small>{{'ServiceConfig.KeyTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info"
ng-click="getServerConfigInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'ServiceConfig.Value' | translate }}
</label>
<div class="col-sm-9">
<textarea class="form-control" rows="4" name="value"
ng-model="serverConfig.value"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
{{'ServiceConfig.Comment' | translate }}</label>
<div class="col-sm-9">
<textarea class="form-control" rows="4" name="comment"
ng-model="serverConfig.comment"></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary" ng-disabled="saveBtnDisabled"
ng-click="create()">
{{'Common.Save' | translate }}
</button>
</div>
</div>
</form>
</div>
</div>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/ServerConfigService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/controller/ServerConfigController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-dev
labels:
app: service-apollo-meta-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-dev
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-dev
labels:
app: service-apollo-config-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30002
selector:
app: pod-apollo-config-server-dev
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-dev
labels:
app: statefulset-apollo-config-server-dev
spec:
serviceName: service-apollo-meta-server-dev
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-dev
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-dev
configMap:
name: configmap-apollo-config-server-dev
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-dev
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-dev
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-dev
labels:
app: service-apollo-meta-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-dev
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-dev
labels:
app: service-apollo-config-server-dev
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30002
selector:
app: pod-apollo-config-server-dev
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-dev
labels:
app: statefulset-apollo-config-server-dev
spec:
serviceName: service-apollo-meta-server-dev
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-dev
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-dev
configMap:
name: configmap-apollo-config-server-dev
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-dev
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-dev
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-apollo-config-server-test-alpha.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-test-alpha
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-test-alpha
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-test-alpha
labels:
app: service-apollo-meta-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-test-alpha
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-test-alpha
labels:
app: service-apollo-config-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30003
selector:
app: pod-apollo-config-server-test-alpha
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-test-alpha
labels:
app: statefulset-apollo-config-server-test-alpha
spec:
serviceName: service-apollo-meta-server-test-alpha
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-test-alpha
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-test-alpha
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-test-alpha
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-test-alpha
configMap:
name: configmap-apollo-config-server-test-alpha
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-test-alpha
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-test-alpha
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-test-alpha.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-test-alpha
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-test-alpha
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-test-alpha
labels:
app: service-apollo-meta-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-test-alpha
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-test-alpha
labels:
app: service-apollo-config-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30003
selector:
app: pod-apollo-config-server-test-alpha
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-test-alpha
labels:
app: statefulset-apollo-config-server-test-alpha
spec:
serviceName: service-apollo-meta-server-test-alpha
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-test-alpha
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-test-alpha
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-test-alpha
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-test-alpha
configMap:
name: configmap-apollo-config-server-test-alpha
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-test-alpha
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-test-alpha
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-test-alpha.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/templates/service-portal.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.portal.serviceName" . }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.service.port }}
targetPort: {{ .Values.service.targetPort }}
selector:
app: {{ include "apollo.portal.fullName" . }}
sessionAffinity: {{ .Values.service.sessionAffinity }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.portal.serviceName" . }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.service.port }}
targetPort: {{ .Values.service.targetPort }}
selector:
app: {{ include "apollo.portal.fullName" . }}
sessionAffinity: {{ .Values.service.sessionAffinity }} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/ctrip_sso_heartbeat.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>SSO Heartbeat</title>
<script type="text/javascript">
var reloading = false;
setInterval(function () {
if (document.cookie.indexOf('memCacheAssertionID=') == -1) {
if (reloading) {
return;
}
reloading = true;
console.log("sso memCacheAssertionID expires, try reloading");
location.reload(true);
}
}, 1000);
</script>
</head>
<body>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>SSO Heartbeat</title>
<script type="text/javascript">
var reloading = false;
setInterval(function () {
if (document.cookie.indexOf('memCacheAssertionID=') == -1) {
if (reloading) {
return;
}
reloading = true;
console.log("sso memCacheAssertionID expires, try reloading");
location.reload(true);
}
}, 1000);
</script>
</head>
<body>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/config_export.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="config_export">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'ConfigExport.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid">
<div class="col-md-8 col-md-offset-2 panel">
<section class="panel-body">
<div class="row">
<header class="panel-heading">
{{'ConfigExport.Title' | translate }}
<small>
{{'ConfigExport.TitleTips' | translate}}
</small>
</header>
<div class="col-sm-offset-2 col-sm-9">
<a href="export" target="_blank">
<button class="btn btn-block btn-lg btn-primary">
{{'ConfigExport.Download' | translate }}
</button>
</a>
</div>
</div>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/SystemInfoService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/services/OrganizationService.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="config_export">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'ConfigExport.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid">
<div class="col-md-8 col-md-offset-2 panel">
<section class="panel-body">
<div class="row">
<header class="panel-heading">
{{'ConfigExport.Title' | translate }}
<small>
{{'ConfigExport.TitleTips' | translate}}
</small>
</header>
<div class="col-sm-offset-2 col-sm-9">
<a href="export" target="_blank">
<button class="btn btn-block btn-lg btn-primary">
{{'ConfigExport.Download' | translate }}
</button>
</a>
</div>
</div>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/SystemInfoService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/services/OrganizationService.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/namespace.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="namespace">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Namespace.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="LinkNamespaceController">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
<div class="row">
<div class="col-md-6">{{'Namespace.Title' | translate }}
<small><a target="_blank"
href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace">
{{'Namespace.UnderstandMore' | translate }}
</a> </small>
</div>
<div class="col-md-6 text-right">
<button type="button" class="btn btn-info"
ng-click="back()">{{'Common.ReturnToIndex' | translate }} </button>
</div>
</div>
</header>
<div class="panel-body">
<div class="alert alert-info no-radius">
<strong>Tips:</strong>
<ul ng-show="type == 'link'">
<li>{{'Namespace.Link.Tips1' | translate }}</li>
<li>{{'Namespace.Link.Tips2' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && appNamespace.isPublic">
<li>{{'Namespace.CreatePublic.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips4' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && !appNamespace.isPublic">
<li>{{'Namespace.CreatePrivate.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips4' | translate }}</li>
</ul>
</div>
<div class="row text-right" style="padding-right: 20px;">
<div class="btn-group btn-group-sm" role="group" aria-label="...">
<button type="button" class="btn btn-default" ng-class="{active:type=='link'}"
ng-click="switchType('link')">{{'Namespace.AssociationPublicNamespace' | translate }}
</button>
<button type="button" class="btn btn-default" ng-class="{active:type=='create'}"
ng-click="switchType('create')">{{'Namespace.CreateNamespace' | translate }}
</button>
</div>
</div>
<form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace"
style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()">
<div class="form-group">
<label class="col-sm-3 control-label">{{'Common.AppId' | translate }}</label>
<div class="col-sm-6" valdr-form-group>
<label class="form-control-static" ng-bind="appId"></label>
</div>
</div>
<div class="form-horizontal" ng-show="type == 'link'">
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.ChooseCluster' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="true"
apollo-select="collectSelectedClusters"></apolloclusterselector>
</div>
</div>
</div>
<div class="form-group" ng-show="type == 'create'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceName' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<div ng-class="{'input-group':appNamespace.isPublic && appendNamespacePrefix}">
<span class="input-group-addon"
ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="appBaseInfo.namespacePrefix"></span>
<input type="text" name="namespaceName" class="form-control"
ng-model="appNamespace.name">
</div>
</div>
<!--public namespace can only be properties -->
<div class="col-sm-2" ng-show="!appNamespace.isPublic">
<select class="form-control" name="format" ng-model="appNamespace.format">
<option value="properties">properties</option>
<option value="xml">xml</option>
<option value="json">json</option>
<option value="yml">yml</option>
<option value="yaml">yaml</option>
<option value="txt">txt</option>
</select>
</div>
<span ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="concatNamespace()" style="line-height: 34px;"></span>
</div>
<div class="form-group" ng-show="type == 'create' && appNamespace.isPublic">
<label class="col-sm-3 control-label">
{{'Namespace.AutoAddDepartmentPrefix' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<div>
<label class="checkbox-inline">
<input type="checkbox" ng-model="appendNamespacePrefix" />
{{appBaseInfo.namespacePrefix}}
</label>
</div>
<small>{{'Namespace.AutoAddDepartmentPrefixTips' | translate }}</small>
</div>
</div>
<div class="form-group"
ng-show="type == 'create' && (pageSetting.canAppAdminCreatePrivateNamespace || hasRootPermission)">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceType' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="true" ng-value="true"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Public' | translate }}
</label>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="false" ng-value="false"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Private' | translate }}
</label>
</div>
</div>
<div class="form-group" ng-show="type == 'create'" valdr-form-group>
<label class="col-sm-3 control-label">{{'Namespace.Remark' | translate }}</label>
<div class="col-sm-7" valdr-form-group>
<textarea class="form-control" rows="3" name="comment"
ng-model="appNamespace.comment"></textarea>
</div>
</div>
<div class="form-group" ng-show="type == 'link'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.Namespace' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<select id="namespaces">
<option></option>
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-10">
<button type="submit" class="btn btn-primary"
ng-disabled="(type == 'create' && namespaceForm.$invalid) || submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
<div class="row text-center" ng-show="step == 2">
<img src="img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Common.Created' | translate }}</h3>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<!--directive-->
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/NamespaceController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="namespace">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Namespace.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="LinkNamespaceController">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
<div class="row">
<div class="col-md-6">{{'Namespace.Title' | translate }}
<small><a target="_blank"
href="https://www.apolloconfig.com/#/zh/design/apollo-core-concept-namespace">
{{'Namespace.UnderstandMore' | translate }}
</a> </small>
</div>
<div class="col-md-6 text-right">
<button type="button" class="btn btn-info"
ng-click="back()">{{'Common.ReturnToIndex' | translate }} </button>
</div>
</div>
</header>
<div class="panel-body">
<div class="alert alert-info no-radius">
<strong>Tips:</strong>
<ul ng-show="type == 'link'">
<li>{{'Namespace.Link.Tips1' | translate }}</li>
<li>{{'Namespace.Link.Tips2' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && appNamespace.isPublic">
<li>{{'Namespace.CreatePublic.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePublic.Tips4' | translate }}</li>
</ul>
<ul ng-show="type == 'create' && !appNamespace.isPublic">
<li>{{'Namespace.CreatePrivate.Tips1' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips2' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips3' | translate }}</li>
<li>{{'Namespace.CreatePrivate.Tips4' | translate }}</li>
</ul>
</div>
<div class="row text-right" style="padding-right: 20px;">
<div class="btn-group btn-group-sm" role="group" aria-label="...">
<button type="button" class="btn btn-default" ng-class="{active:type=='link'}"
ng-click="switchType('link')">{{'Namespace.AssociationPublicNamespace' | translate }}
</button>
<button type="button" class="btn btn-default" ng-class="{active:type=='create'}"
ng-click="switchType('create')">{{'Namespace.CreateNamespace' | translate }}
</button>
</div>
</div>
<form class="form-horizontal" name="namespaceForm" valdr-type="AppNamespace"
style="margin-top: 30px;" ng-show="step == 1" ng-submit="createNamespace()">
<div class="form-group">
<label class="col-sm-3 control-label">{{'Common.AppId' | translate }}</label>
<div class="col-sm-6" valdr-form-group>
<label class="form-control-static" ng-bind="appId"></label>
</div>
</div>
<div class="form-horizontal" ng-show="type == 'link'">
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.ChooseCluster' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<apolloclusterselector apollo-app-id="appId" apollo-default-all-checked="true"
apollo-select="collectSelectedClusters"></apolloclusterselector>
</div>
</div>
</div>
<div class="form-group" ng-show="type == 'create'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceName' | translate }}
</label>
<div class="col-sm-5" valdr-form-group>
<div ng-class="{'input-group':appNamespace.isPublic && appendNamespacePrefix}">
<span class="input-group-addon"
ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="appBaseInfo.namespacePrefix"></span>
<input type="text" name="namespaceName" class="form-control"
ng-model="appNamespace.name">
</div>
</div>
<!--public namespace can only be properties -->
<div class="col-sm-2" ng-show="!appNamespace.isPublic">
<select class="form-control" name="format" ng-model="appNamespace.format">
<option value="properties">properties</option>
<option value="xml">xml</option>
<option value="json">json</option>
<option value="yml">yml</option>
<option value="yaml">yaml</option>
<option value="txt">txt</option>
</select>
</div>
<span ng-show="appNamespace.isPublic && appendNamespacePrefix"
ng-bind="concatNamespace()" style="line-height: 34px;"></span>
</div>
<div class="form-group" ng-show="type == 'create' && appNamespace.isPublic">
<label class="col-sm-3 control-label">
{{'Namespace.AutoAddDepartmentPrefix' | translate }}
</label>
<div class="col-sm-6" valdr-form-group>
<div>
<label class="checkbox-inline">
<input type="checkbox" ng-model="appendNamespacePrefix" />
{{appBaseInfo.namespacePrefix}}
</label>
</div>
<small>{{'Namespace.AutoAddDepartmentPrefixTips' | translate }}</small>
</div>
</div>
<div class="form-group"
ng-show="type == 'create' && (pageSetting.canAppAdminCreatePrivateNamespace || hasRootPermission)">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.NamespaceType' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="true" ng-value="true"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Public' | translate }}
</label>
<label class="radio-inline">
<input type="radio" name="namespaceType" value="false" ng-value="false"
ng-model="appNamespace.isPublic"> {{'Namespace.NamespaceType.Private' | translate }}
</label>
</div>
</div>
<div class="form-group" ng-show="type == 'create'" valdr-form-group>
<label class="col-sm-3 control-label">{{'Namespace.Remark' | translate }}</label>
<div class="col-sm-7" valdr-form-group>
<textarea class="form-control" rows="3" name="comment"
ng-model="appNamespace.comment"></textarea>
</div>
</div>
<div class="form-group" ng-show="type == 'link'">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Namespace.Namespace' | translate }}
</label>
<div class="col-sm-4" valdr-form-group>
<select id="namespaces">
<option></option>
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-10">
<button type="submit" class="btn btn-primary"
ng-disabled="(type == 'create' && namespaceForm.$invalid) || submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
<div class="row text-center" ng-show="step == 2">
<img src="img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Common.Created' | translate }}</h3>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<!--directive-->
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/NamespaceController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/app.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="create_app">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'App.CreateProject' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
{{'App.CreateProject' | translate }}
</header>
<form class="form-horizontal panel-body" name="appForm" ng-controller="CreateAppController"
valdr-type="App"
ng-submit="create()">
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.Department' | translate }}</label>
<div class="col-sm-3">
<select id="organization">
<option></option>
</select>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}</label>
<div class="col-sm-3">
<input type="text" class="form-control" name="appId" ng-model="app.appId">
<small>{{'App.AppIdTips' | translate }}
</small>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppName' | translate }}</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="appName" ng-model="app.name">
<small>{{'App.AppNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppOwnerLong' | translate }}</label>
<div class="col-sm-6 J_ownerSelectorPanel">
<apollouserselector apollo-id="'ownerSelector'" disabled="isOpenManageAppMasterRoleLimit"></apollouserselector>
<small style="color: maroon" ng-if="isOpenManageAppMasterRoleLimit">{{'App.AppOwnerTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{{'Common.AppAdmin' | translate }}<br>
</label>
<div class="col-sm-9 J_adminSelectorPanel">
<apollomultipleuserselector apollo-id="'adminSelector'" ng-disabled="isOpenManageAppMasterRoleLimit"></apollomultipleuserselector>
<br>
<small>{{'App.AppAdminTips1' | translate }}</small>
<br>
<small>{{'App.AppAdminTips2' | translate }}</small>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="appForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="scripts/services/SystemRoleService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/AppController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="create_app">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'App.CreateProject' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
{{'App.CreateProject' | translate }}
</header>
<form class="form-horizontal panel-body" name="appForm" ng-controller="CreateAppController"
valdr-type="App"
ng-submit="create()">
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.Department' | translate }}</label>
<div class="col-sm-3">
<select id="organization">
<option></option>
</select>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}</label>
<div class="col-sm-3">
<input type="text" class="form-control" name="appId" ng-model="app.appId">
<small>{{'App.AppIdTips' | translate }}
</small>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppName' | translate }}</label>
<div class="col-sm-5">
<input type="text" class="form-control" name="appName" ng-model="app.name">
<small>{{'App.AppNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppOwnerLong' | translate }}</label>
<div class="col-sm-6 J_ownerSelectorPanel">
<apollouserselector apollo-id="'ownerSelector'" disabled="isOpenManageAppMasterRoleLimit"></apollouserselector>
<small style="color: maroon" ng-if="isOpenManageAppMasterRoleLimit">{{'App.AppOwnerTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{{'Common.AppAdmin' | translate }}<br>
</label>
<div class="col-sm-9 J_adminSelectorPanel">
<apollomultipleuserselector apollo-id="'adminSelector'" ng-disabled="isOpenManageAppMasterRoleLimit"></apollomultipleuserselector>
<br>
<small>{{'App.AppAdminTips1' | translate }}</small>
<br>
<small>{{'App.AppAdminTips2' | translate }}</small>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="appForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="scripts/services/SystemRoleService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/controller/AppController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case4-new.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-apollo-admin-server-test-alpha.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-alpha
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-alpha
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-alpha
labels:
app: service-apollo-admin-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-alpha
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-alpha
labels:
app: deployment-apollo-admin-server-test-alpha
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-alpha
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-alpha
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-alpha
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-alpha
configMap:
name: configmap-apollo-admin-server-test-alpha
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-alpha
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-alpha.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-alpha
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-alpha
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-alpha.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-alpha
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-alpha
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-alpha
labels:
app: service-apollo-admin-server-test-alpha
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-alpha
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-alpha
labels:
app: deployment-apollo-admin-server-test-alpha
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-alpha
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-alpha
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-alpha
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-alpha
configMap:
name: configmap-apollo-admin-server-test-alpha
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-alpha
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-alpha.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-alpha
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-alpha
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-alpha.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case4.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/system-role-manage.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="systemRole">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<title>{{'SystemRole.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="SystemRoleController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<section class="row">
<h5>{{'SystemRole.AddCreateAppRoleToUser' | translate }}
<small>
{{'SystemRole.AddCreateAppRoleToUserTips' | translate }}
</small>
</h5>
<hr>
<div class="row">
<div class="form-horizontal">
<div class="form-group">
<label
class="col-sm-2 control-label">{{'SystemRole.ChooseUser' | translate }}<br></label>
<div class="col-sm-8">
<form class="form-inline" ng-submit="addCreateApplicationRoleToUser()">
<div class="form-group">
<apollouserselector apollo-id="modifySystemRoleWidgetId">
</apollouserselector>
</div>
<button type="submit" class="btn btn-default"
style="margin-left: 20px;">{{'SystemRole.Add' | translate }}</button>
</form>
<div class="item-container">
<h5>{{'SystemRole.AuthorizedUser' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in hasCreateApplicationPermissionUserList">
<button type="button" class="btn btn-default" ng-bind="user"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="deleteCreateApplicationRoleFromUser(user)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<section class="row">
<h5>{{'SystemRole.ModifyAppAdminUser' | translate }}
<small>
{{'SystemRole.ModifyAppAdminUserTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'SystemRole.AppIdTips' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="app.appId">
<small>{{'SystemRole.Title' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info"
ng-click="getAppInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'SystemRole.AppInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="app.info" ng-bind="app.info"></h5>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'SystemRole.ChooseUser' | translate }}<br></label>
<div class="col-sm-8">
<form class="form-inline">
<div class="form-group">
<apollouserselector apollo-id="modifyManageAppMasterRoleWidgetId">
</apollouserselector>
</div>
</form>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="operateManageAppMasterRoleBtn" ng-click="allowAppMasterAssignRole()">
{{'SystemRole.AllowAppMasterAssignRole' | translate }}
</button>
<button type="submit" class="btn btn-primary"
ng-disabled="operateManageAppMasterRoleBtn" ng-click="deleteAppMasterAssignRole()">
{{'SystemRole.DeleteAppMasterAssignRole' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/SystemRoleService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/controller/role/SystemRoleController.js"></script>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="systemRole">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<title>{{'SystemRole.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="SystemRoleController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<section class="row">
<h5>{{'SystemRole.AddCreateAppRoleToUser' | translate }}
<small>
{{'SystemRole.AddCreateAppRoleToUserTips' | translate }}
</small>
</h5>
<hr>
<div class="row">
<div class="form-horizontal">
<div class="form-group">
<label
class="col-sm-2 control-label">{{'SystemRole.ChooseUser' | translate }}<br></label>
<div class="col-sm-8">
<form class="form-inline" ng-submit="addCreateApplicationRoleToUser()">
<div class="form-group">
<apollouserselector apollo-id="modifySystemRoleWidgetId">
</apollouserselector>
</div>
<button type="submit" class="btn btn-default"
style="margin-left: 20px;">{{'SystemRole.Add' | translate }}</button>
</form>
<div class="item-container">
<h5>{{'SystemRole.AuthorizedUser' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in hasCreateApplicationPermissionUserList">
<button type="button" class="btn btn-default" ng-bind="user"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="deleteCreateApplicationRoleFromUser(user)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<section class="row">
<h5>{{'SystemRole.ModifyAppAdminUser' | translate }}
<small>
{{'SystemRole.ModifyAppAdminUserTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'SystemRole.AppIdTips' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="app.appId">
<small>{{'SystemRole.Title' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info"
ng-click="getAppInfo()">{{'Common.Search' | translate }}</button>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'SystemRole.AppInfo' | translate }}</label>
<div class="col-sm-5">
<h5 ng-show="app.info" ng-bind="app.info"></h5>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{{'SystemRole.ChooseUser' | translate }}<br></label>
<div class="col-sm-8">
<form class="form-inline">
<div class="form-group">
<apollouserselector apollo-id="modifyManageAppMasterRoleWidgetId">
</apollouserselector>
</div>
</form>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary"
ng-disabled="operateManageAppMasterRoleBtn" ng-click="allowAppMasterAssignRole()">
{{'SystemRole.AllowAppMasterAssignRole' | translate }}
</button>
<button type="submit" class="btn btn-primary"
ng-disabled="operateManageAppMasterRoleBtn" ng-click="deleteAppMasterAssignRole()">
{{'SystemRole.DeleteAppMasterAssignRole' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-route.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="vendor/lodash.min.js"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/services/NamespaceService.js"></script>
<script type="application/javascript" src="scripts/services/SystemRoleService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/PageCommon.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/valdr.js"></script>
<script type="application/javascript" src="scripts/controller/role/SystemRoleController.js"></script>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/open/manage.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="open_manage">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Open.Manage.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="OpenManageController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<!--project admin-->
<section class="row">
<h5>{{'Open.Manage.CreateThirdApp' | translate }}
<small>
{{'Open.Manage.CreateThirdAppTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ThirdAppId' | translate }}
</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumer.appId">
<small>{{'Open.Manage.ThirdAppIdTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getTokenByAppId()">查询</button>
</div>
<div class="col-sm-6">
<h4 style="color: red" ng-show="consumerToken"
ng-bind="'Token: ' + consumerToken.token"></h4>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.Department' | translate }}
</label>
<div class="col-sm-3">
<select id="organization">
<option></option>
</select>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ThirdAppName' | translate }}
</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumer.name">
<small>{{'Open.Manage.ThirdAppNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ProjectOwner' | translate }}
</label>
<div class="col-sm-6 J_ownerSelectorPanel">
<apollouserselector apollo-id="'ownerSelector'"></apollouserselector>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="submitBtnDisabled"
ng-click="createConsumer()">
{{'Open.Manage.Create' | translate }}
</button>
</div>
</div>
</form>
</section>
<section class="row">
<h5>{{'Open.Manage.GrantPermission' | translate }}
<small>
{{'Open.Manage.GrantPermissionTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal" ng-submit="assignRoleToConsumer()">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.Token' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="consumerRole.token" required>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ManagedAppId' | translate }}
</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumerRole.appId" required>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'Open.Manage.ManagedNamespace' | translate }}</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumerRole.namespaceName">
<small>{{'Open.Manage.ManagedNamespaceTips' | translate }}</small>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'Open.Manage.GrantType' | translate }}
</label>
<div class="col-sm-3">
<label class="radio-inline">
<input type="radio" name="inlineRadioOptions" ng-value="'NamespaceRole'"
ng-model="consumerRole.type">
{{'Open.Manage.GrantType.Namespace' | translate }}
</label>
<label class="radio-inline">
<input type="radio" name="inlineRadioOptions" ng-value="'AppRole'"
ng-model="consumerRole.type">
{{'Open.Manage.GrantType.App' | translate }}
</label>
</div>
</div>
<div class="form-group" valdr-form-group ng-show="consumerRole.type=='NamespaceRole'">
<label class="col-sm-2 control-label">
{{'Open.Manage.GrantEnv' | translate }}
</label>
<div class="col-sm-10">
<div>
<label class="checkbox-inline" ng-repeat="env in envs">
<input type="checkbox" ng-checked="env.checked" ng-click="switchSelect(env)" />
{{env.env}}
</label>
</div>
<small>{{'Open.Manage.GrantEnvTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/ConsumerService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/open/OpenManageController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="open_manage">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Open.Manage.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid" ng-controller="OpenManageController">
<div class="col-md-10 col-md-offset-1 panel">
<section class="panel-body" ng-show="isRootUser">
<!--project admin-->
<section class="row">
<h5>{{'Open.Manage.CreateThirdApp' | translate }}
<small>
{{'Open.Manage.CreateThirdAppTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ThirdAppId' | translate }}
</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumer.appId">
<small>{{'Open.Manage.ThirdAppIdTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getTokenByAppId()">查询</button>
</div>
<div class="col-sm-6">
<h4 style="color: red" ng-show="consumerToken"
ng-bind="'Token: ' + consumerToken.token"></h4>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.Department' | translate }}
</label>
<div class="col-sm-3">
<select id="organization">
<option></option>
</select>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ThirdAppName' | translate }}
</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumer.name">
<small>{{'Open.Manage.ThirdAppNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ProjectOwner' | translate }}
</label>
<div class="col-sm-6 J_ownerSelectorPanel">
<apollouserselector apollo-id="'ownerSelector'"></apollouserselector>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="submitBtnDisabled"
ng-click="createConsumer()">
{{'Open.Manage.Create' | translate }}
</button>
</div>
</div>
</form>
</section>
<section class="row">
<h5>{{'Open.Manage.GrantPermission' | translate }}
<small>
{{'Open.Manage.GrantPermissionTips' | translate }}
</small>
</h5>
<hr>
<form class="form-horizontal" ng-submit="assignRoleToConsumer()">
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.Token' | translate }}
</label>
<div class="col-sm-5">
<input type="text" class="form-control" ng-model="consumerRole.token" required>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Open.Manage.ManagedAppId' | translate }}
</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumerRole.appId" required>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'Open.Manage.ManagedNamespace' | translate }}</label>
<div class="col-sm-3">
<input type="text" class="form-control" ng-model="consumerRole.namespaceName">
<small>{{'Open.Manage.ManagedNamespaceTips' | translate }}</small>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
{{'Open.Manage.GrantType' | translate }}
</label>
<div class="col-sm-3">
<label class="radio-inline">
<input type="radio" name="inlineRadioOptions" ng-value="'NamespaceRole'"
ng-model="consumerRole.type">
{{'Open.Manage.GrantType.Namespace' | translate }}
</label>
<label class="radio-inline">
<input type="radio" name="inlineRadioOptions" ng-value="'AppRole'"
ng-model="consumerRole.type">
{{'Open.Manage.GrantType.App' | translate }}
</label>
</div>
</div>
<div class="form-group" valdr-form-group ng-show="consumerRole.type=='NamespaceRole'">
<label class="col-sm-2 control-label">
{{'Open.Manage.GrantEnv' | translate }}
</label>
<div class="col-sm-10">
<div>
<label class="checkbox-inline" ng-repeat="env in envs">
<input type="checkbox" ng-checked="env.checked" ng-click="switchSelect(env)" />
{{env.env}}
</label>
</div>
<small>{{'Open.Manage.GrantEnvTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-9">
<button type="submit" class="btn btn-primary" ng-disabled="submitBtnDisabled">
{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
</section>
</section>
<section class="panel-body text-center" ng-if="!isRootUser">
<h4>{{'Common.IsRootUser' | translate }}</h4>
</section>
</div>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/ConsumerService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/open/OpenManageController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case1.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key3:
key4:
key5: '(%sender%) %message%'
key6: '* %sender% %message%'
# commented: "xxx"
list:
- 'item 1'
- 'item 2'
intList:
- 100
- 200
listOfMap:
- key: '#mychannel'
value: ''
- key: '#myprivatechannel'
value: 'mypassword'
listOfList:
- - 'a1'
- 'a2'
- - 'b1'
- 'b2'
listOfList2: [ ['a1', 'a2'], ['b1', 'b2'] ]
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key3:
key4:
key5: '(%sender%) %message%'
key6: '* %sender% %message%'
# commented: "xxx"
list:
- 'item 1'
- 'item 2'
intList:
- 100
- 200
listOfMap:
- key: '#mychannel'
value: ''
- key: '#myprivatechannel'
value: 'mypassword'
listOfList:
- - 'a1'
- 'a2'
- - 'b1'
- 'b2'
listOfList2: [ ['a1', 'a2'], ['b1', 'b2'] ]
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-dev
labels:
app: service-apollo-admin-server-dev
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-dev
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-dev
labels:
app: deployment-apollo-admin-server-dev
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-dev
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-dev
configMap:
name: configmap-apollo-admin-server-dev
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-dev
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-dev.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-dev
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-dev
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-dev
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-dev
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/DevApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-dev
labels:
app: service-apollo-admin-server-dev
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-dev
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-dev
labels:
app: deployment-apollo-admin-server-dev
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-dev
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-dev
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-dev
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-dev
configMap:
name: configmap-apollo-admin-server-dev
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-dev
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-dev.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-dev
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-dev
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-dev.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case3.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-prod
labels:
app: service-apollo-meta-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-prod
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-prod
labels:
app: service-apollo-config-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30005
selector:
app: pod-apollo-config-server-prod
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-prod
labels:
app: statefulset-apollo-config-server-prod
spec:
serviceName: service-apollo-meta-server-prod
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-prod
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-prod
configMap:
name: configmap-apollo-config-server-prod
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-prod
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-prod
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-config-server-prod
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-config-server-prod
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-meta-server-prod
labels:
app: service-apollo-meta-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
app: pod-apollo-config-server-prod
type: ClusterIP
clusterIP: None
sessionAffinity: ClientIP
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-config-server-prod
labels:
app: service-apollo-config-server-prod
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30005
selector:
app: pod-apollo-config-server-prod
type: NodePort
sessionAffinity: ClientIP
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
namespace: sre
name: statefulset-apollo-config-server-prod
labels:
app: statefulset-apollo-config-server-prod
spec:
serviceName: service-apollo-meta-server-prod
replicas: 3
selector:
matchLabels:
app: pod-apollo-config-server-prod
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-config-server-prod
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-config-server-prod
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-config-server-prod
configMap:
name: configmap-apollo-config-server-prod
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apollo-config-server:v1.0.0
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-config-server-prod
ports:
- protocol: TCP
containerPort: 8080
volumeMounts:
- name: volume-configmap-apollo-config-server-prod
mountPath: /apollo-config-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_CONFIG_SERVICE_NAME
value: "service-apollo-config-server-prod.sre"
readinessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/deployment-adminservice.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-adminservice
kind: ConfigMap
apiVersion: v1
metadata:
{{- $adminServiceFullName := include "apollo.adminService.fullName" . }}
name: {{ $adminServiceFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.configdb.serviceName" .}}:{{include "apollo.configdb.servicePort" .}}/{{ .Values.configdb.dbName }}{{ if .Values.configdb.connectionStringProperties }}?{{ .Values.configdb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "configdb.userName is required!" .Values.configdb.userName }}
spring.datasource.password = {{ required "configdb.password is required!" .Values.configdb.password }}
{{- if .Values.adminService.config.contextPath }}
server.servlet.context-path = {{ .Values.adminService.config.contextPath }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $adminServiceFullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.adminService.replicaCount }}
selector:
matchLabels:
app: {{ $adminServiceFullName }}
{{- with .Values.adminService.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $adminServiceFullName }}
spec:
{{- with .Values.adminService.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: volume-configmap-{{ $adminServiceFullName }}
configMap:
name: {{ $adminServiceFullName }}
items:
- key: application-github.properties
path: application-github.properties
defaultMode: 420
containers:
- name: {{ .Values.adminService.name }}
image: "{{ .Values.adminService.image.repository }}:{{ .Values.adminService.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.adminService.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.adminService.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.adminService.config.profiles | quote }}
{{- range $key, $value := .Values.adminService.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: volume-configmap-{{ $adminServiceFullName }}
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
livenessProbe:
tcpSocket:
port: {{ .Values.adminService.containerPort }}
initialDelaySeconds: {{ .Values.adminService.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.adminService.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.adminService.config.contextPath }}/health
port: {{ .Values.adminService.containerPort }}
initialDelaySeconds: {{ .Values.adminService.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.adminService.readiness.periodSeconds }}
resources:
{{- toYaml .Values.adminService.resources | nindent 12 }}
{{- with .Values.adminService.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.adminService.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.adminService.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-adminservice
kind: ConfigMap
apiVersion: v1
metadata:
{{- $adminServiceFullName := include "apollo.adminService.fullName" . }}
name: {{ $adminServiceFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.configdb.serviceName" .}}:{{include "apollo.configdb.servicePort" .}}/{{ .Values.configdb.dbName }}{{ if .Values.configdb.connectionStringProperties }}?{{ .Values.configdb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "configdb.userName is required!" .Values.configdb.userName }}
spring.datasource.password = {{ required "configdb.password is required!" .Values.configdb.password }}
{{- if .Values.adminService.config.contextPath }}
server.servlet.context-path = {{ .Values.adminService.config.contextPath }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $adminServiceFullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.adminService.replicaCount }}
selector:
matchLabels:
app: {{ $adminServiceFullName }}
{{- with .Values.adminService.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $adminServiceFullName }}
spec:
{{- with .Values.adminService.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: volume-configmap-{{ $adminServiceFullName }}
configMap:
name: {{ $adminServiceFullName }}
items:
- key: application-github.properties
path: application-github.properties
defaultMode: 420
containers:
- name: {{ .Values.adminService.name }}
image: "{{ .Values.adminService.image.repository }}:{{ .Values.adminService.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.adminService.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.adminService.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.adminService.config.profiles | quote }}
{{- range $key, $value := .Values.adminService.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: volume-configmap-{{ $adminServiceFullName }}
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
livenessProbe:
tcpSocket:
port: {{ .Values.adminService.containerPort }}
initialDelaySeconds: {{ .Values.adminService.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.adminService.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.adminService.config.contextPath }}/health
port: {{ .Values.adminService.containerPort }}
initialDelaySeconds: {{ .Values.adminService.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.adminService.readiness.periodSeconds }}
resources:
{{- toYaml .Values.adminService.resources | nindent 12 }}
{{- with .Values.adminService.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.adminService.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.adminService.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-apollo-admin-server-test-beta.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-beta
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-beta
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-beta
labels:
app: service-apollo-admin-server-test-beta
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-beta
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-beta
labels:
app: deployment-apollo-admin-server-test-beta
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-beta
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-beta
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-beta
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-beta
configMap:
name: configmap-apollo-admin-server-test-beta
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-beta
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-beta.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-beta
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-beta
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-beta.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-test-beta
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-test-beta
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-test-beta
labels:
app: service-apollo-admin-server-test-beta
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-test-beta
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-test-beta
labels:
app: deployment-apollo-admin-server-test-beta
spec:
replicas: 3
selector:
matchLabels:
app: pod-apollo-admin-server-test-beta
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-test-beta
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-test-beta
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-test-beta
configMap:
name: configmap-apollo-admin-server-test-beta
items:
- key: application-github.properties
path: application-github.properties
initContainers:
- image: alpine-bash:3.8
name: check-service-apollo-config-server-test-beta
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-config-server-test-beta.sre:8080"]
containers:
- image: apollo-admin-server:v1.0.0
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-test-beta
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-test-beta
mountPath: /apollo-admin-server/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-test-beta.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/Chart.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-service
description: A Helm chart for Apollo Config Service and Apollo Admin Service
type: application
version: 0.3.0
appVersion: 1.9.0-SNAPSHOT
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-service
description: A Helm chart for Apollo Config Service and Apollo Admin Service
type: application
version: 0.3.0
appVersion: 1.9.0-SNAPSHOT
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/cluster.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="cluster">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Cluster.CreateCluster' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="ClusterController">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
<div class="row">
<div class="col-md-6">
<h4>{{'Cluster.CreateCluster' | translate }}</h4>
</div>
<div class="col-md-6 text-right">
<a type="button" class="btn btn-info" href="config.html?#/appid={{appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body">
<div class="alert alert-info no-radius" role="alert">
<strong>Tips:</strong>
<ul>
<li>{{'Cluster.Tips.1' | translate }}</li>
<li>{{'Cluster.Tips.2' | translate }}</li>
<li>{{'Cluster.Tips.3' | translate }}</li>
<li>{{'Cluster.Tips.4' | translate }}</li>
</ul>
</div>
<form class="form-horizontal" name="clusterForm" valdr-type="Cluster" ng-show="step == 1"
ng-submit="create()">
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}</label>
<div class="col-sm-6">
<label class="form-control-static" ng-bind="appId"></label>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.ClusterName' | translate }}</label>
<div class="col-sm-6">
<input type="text" class="form-control" name="clusterName" ng-model="clusterName">
<small>{{'Cluster.CreateNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Cluster.ChooseEnvironment' | translate }}</label>
<div class="col-sm-5">
<table class="table table-hover" style="width: 100px">
<tbody>
<tr style="cursor: pointer" ng-repeat="env in envs"
ng-click="toggleEnvCheckedStatus(env)">
<td width="10%"><input type="checkbox" ng-checked="env.checked"
ng-click="switchChecked(env, $event)"></td>
<td width="30%" ng-bind="env.name"></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary"
ng-disabled="clusterForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
<div class="row text-center" ng-show="step == 2">
<img src="img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Common.Created' | translate }}!</h3>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/controller/ClusterController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html>
| <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="cluster">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="./img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" href="vendor/select2/select2.min.css">
<link rel="stylesheet" type="text/css" media='all' href="vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="styles/common-style.css">
<title>{{'Cluster.CreateCluster' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container hidden" ng-controller="ClusterController">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel">
<header class="panel-heading">
<div class="row">
<div class="col-md-6">
<h4>{{'Cluster.CreateCluster' | translate }}</h4>
</div>
<div class="col-md-6 text-right">
<a type="button" class="btn btn-info" href="config.html?#/appid={{appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body">
<div class="alert alert-info no-radius" role="alert">
<strong>Tips:</strong>
<ul>
<li>{{'Cluster.Tips.1' | translate }}</li>
<li>{{'Cluster.Tips.2' | translate }}</li>
<li>{{'Cluster.Tips.3' | translate }}</li>
<li>{{'Cluster.Tips.4' | translate }}</li>
</ul>
</div>
<form class="form-horizontal" name="clusterForm" valdr-type="Cluster" ng-show="step == 1"
ng-submit="create()">
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.AppId' | translate }}</label>
<div class="col-sm-6">
<label class="form-control-static" ng-bind="appId"></label>
</div>
</div>
<div class="form-group" valdr-form-group>
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Common.ClusterName' | translate }}</label>
<div class="col-sm-6">
<input type="text" class="form-control" name="clusterName" ng-model="clusterName">
<small>{{'Cluster.CreateNameTips' | translate }}</small>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<apollorequiredfield></apollorequiredfield>
{{'Cluster.ChooseEnvironment' | translate }}</label>
<div class="col-sm-5">
<table class="table table-hover" style="width: 100px">
<tbody>
<tr style="cursor: pointer" ng-repeat="env in envs"
ng-click="toggleEnvCheckedStatus(env)">
<td width="10%"><input type="checkbox" ng-checked="env.checked"
ng-click="switchChecked(env, $event)"></td>
<td width="30%" ng-bind="env.name"></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary"
ng-disabled="clusterForm.$invalid || submitBtnDisabled">{{'Common.Submit' | translate }}
</button>
</div>
</div>
</form>
<div class="row text-center" ng-show="step == 2">
<img src="img/sync-succ.png" style="height: 100px; width: 100px">
<h3>{{'Common.Created' | translate }}!</h3>
</div>
</div>
</div>
</div>
</div>
</div>
<div ng-include="'views/common/footer.html'"></div>
<!--angular-->
<script src="vendor/angular/angular.min.js"></script>
<script src="vendor/angular/angular-resource.min.js"></script>
<script src="vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="vendor/angular/loading-bar.min.js"></script>
<script src="vendor/angular/angular-cookies.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- jquery.js -->
<script src="vendor/jquery.min.js" type="text/javascript"></script>
<script src="vendor/select2/select2.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<!--valdr-->
<script src="vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<script type="application/javascript" src="scripts/app.js"></script>
<script type="application/javascript" src="scripts/services/AppService.js"></script>
<script type="application/javascript" src="scripts/services/EnvService.js"></script>
<script type="application/javascript" src="scripts/services/UserService.js"></script>
<script type="application/javascript" src="scripts/services/CommonService.js"></script>
<script type="application/javascript" src="scripts/services/ClusterService.js"></script>
<script type="application/javascript" src="scripts/AppUtils.js"></script>
<script type="application/javascript" src="scripts/directive/directive.js"></script>
<script type="application/javascript" src="scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="scripts/controller/ClusterController.js"></script>
<script src="scripts/valdr.js" type="text/javascript"></script>
</body>
</html>
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/values.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
name: apollo-portal
fullNameOverride: ""
replicaCount: 1
containerPort: 8070
image:
repository: apolloconfig/apollo-portal
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8070
targetPort: 8070
type: ClusterIP
sessionAffinity: ClientIP
ingress:
enabled: false
annotations: {}
hosts:
- host: ""
paths: []
tls: []
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
config:
# spring profiles to activate
profiles: "github,auth"
# specify the env names, e.g. dev,pro
envs: ""
# specify the meta servers, e.g.
# dev: http://apollo-configservice-dev:8080
# pro: http://apollo-configservice-pro:8080
metaServers: {}
# specify the context path, e.g. /apollo
contextPath: ""
# extra config files for apollo-portal, e.g. application-ldap.yml
files: {}
portaldb:
name: apollo-portaldb
# apolloportaldb host
host:
port: 3306
dbName: ApolloPortalDB
# apolloportaldb user name
userName:
# apolloportaldb password
password:
connectionStringProperties: characterEncoding=utf8
service:
# whether to create a Service for this host or not
enabled: false
fullNameOverride: ""
port: 3306
type: ClusterIP
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
name: apollo-portal
fullNameOverride: ""
replicaCount: 1
containerPort: 8070
image:
repository: apolloconfig/apollo-portal
tag: ""
pullPolicy: IfNotPresent
imagePullSecrets: []
service:
fullNameOverride: ""
port: 8070
targetPort: 8070
type: ClusterIP
sessionAffinity: ClientIP
ingress:
enabled: false
annotations: {}
hosts:
- host: ""
paths: []
tls: []
liveness:
initialDelaySeconds: 100
periodSeconds: 10
readiness:
initialDelaySeconds: 30
periodSeconds: 5
# environment variables passed to the container, e.g. JAVA_OPTS
env: {}
strategy: {}
resources: {}
nodeSelector: {}
tolerations: []
affinity: {}
config:
# spring profiles to activate
profiles: "github,auth"
# specify the env names, e.g. dev,pro
envs: ""
# specify the meta servers, e.g.
# dev: http://apollo-configservice-dev:8080
# pro: http://apollo-configservice-pro:8080
metaServers: {}
# specify the context path, e.g. /apollo
contextPath: ""
# extra config files for apollo-portal, e.g. application-ldap.yml
files: {}
portaldb:
name: apollo-portaldb
# apolloportaldb host
host:
port: 3306
dbName: ApolloPortalDB
# apolloportaldb user name
userName:
# apolloportaldb password
password:
connectionStringProperties: characterEncoding=utf8
service:
# whether to create a Service for this host or not
enabled: false
fullNameOverride: ""
port: 3306
type: ClusterIP
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
labels:
app: service-mysql-for-portal-server
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
subsets:
- addresses:
# 更改为你的 mysql addresses, 例如 1.1.1.1
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
---
# configmap for apollo-portal-server
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-portal-server
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8
# mysql username
spring.datasource.username = FillInCorrectUser
# mysql password
spring.datasource.password = FillInCorrectPassword
apollo-env.properties: |
dev.meta=http://service-apollo-config-server-dev.sre:8080
fat.meta=http://service-apollo-config-server-test-alpha.sre:8080
uat.meta=http://service-apollo-config-server-test-beta.sre:8080
pro.meta=http://service-apollo-config-server-prod.sre:8080
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-portal-server
labels:
app: service-apollo-portal-server
spec:
ports:
- protocol: TCP
port: 8070
targetPort: 8070
nodePort: 30001
selector:
app: pod-apollo-portal-server
type: NodePort
# portal session 保持
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-portal-server
labels:
app: deployment-apollo-portal-server
spec:
# 3 个实例
replicas: 3
selector:
matchLabels:
app: pod-apollo-portal-server
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-portal-server
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-portal-server
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-portal-server
configMap:
name: configmap-apollo-portal-server
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
initContainers:
# 确保 admin-service 正常提供服务
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-dev
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-dev.sre:8090"]
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-alpha
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-test-alpha.sre:8090"]
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-beta
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-test-beta.sre:8090"]
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-prod
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-prod.sre:8090"]
containers:
- image: apollo-portal-server:v1.0.0 # 更改为你的 docker registry 下的 image
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-portal-server
ports:
- protocol: TCP
containerPort: 8070
volumeMounts:
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal-server/config/application-github.properties
subPath: application-github.properties
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal-server/config/apollo-env.properties
subPath: apollo-env.properties
env:
- name: APOLLO_PORTAL_SERVICE_NAME
value: "service-apollo-portal-server.sre"
readinessProbe:
tcpSocket:
port: 8070
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8070
# 120s 内, server 未启动则重启 container
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# 为外部 mysql 服务设置 service
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
labels:
app: service-mysql-for-portal-server
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-portal-server
subsets:
- addresses:
# 更改为你的 mysql addresses, 例如 1.1.1.1
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306
---
# configmap for apollo-portal-server
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-portal-server
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8
# mysql username
spring.datasource.username = FillInCorrectUser
# mysql password
spring.datasource.password = FillInCorrectPassword
apollo-env.properties: |
dev.meta=http://service-apollo-config-server-dev.sre:8080
fat.meta=http://service-apollo-config-server-test-alpha.sre:8080
uat.meta=http://service-apollo-config-server-test-beta.sre:8080
pro.meta=http://service-apollo-config-server-prod.sre:8080
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-portal-server
labels:
app: service-apollo-portal-server
spec:
ports:
- protocol: TCP
port: 8070
targetPort: 8070
nodePort: 30001
selector:
app: pod-apollo-portal-server
type: NodePort
# portal session 保持
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-portal-server
labels:
app: deployment-apollo-portal-server
spec:
# 3 个实例
replicas: 3
selector:
matchLabels:
app: pod-apollo-portal-server
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-portal-server
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-portal-server
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-portal-server
configMap:
name: configmap-apollo-portal-server
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
initContainers:
# 确保 admin-service 正常提供服务
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-dev
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-dev.sre:8090"]
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-alpha
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-test-alpha.sre:8090"]
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-beta
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-test-beta.sre:8090"]
- image: alpine-bash:3.8
name: check-service-apollo-admin-server-prod
command: ['bash', '-c', "curl --connect-timeout 2 --max-time 5 --retry 60 --retry-delay 1 --retry-max-time 120 service-apollo-admin-server-prod.sre:8090"]
containers:
- image: apollo-portal-server:v1.0.0 # 更改为你的 docker registry 下的 image
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-portal-server
ports:
- protocol: TCP
containerPort: 8070
volumeMounts:
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal-server/config/application-github.properties
subPath: application-github.properties
- name: volume-configmap-apollo-portal-server
mountPath: /apollo-portal-server/config/apollo-env.properties
subPath: apollo-env.properties
env:
- name: APOLLO_PORTAL_SERVICE_NAME
value: "service-apollo-portal-server.sre"
readinessProbe:
tcpSocket:
port: 8070
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8070
# 120s 内, server 未启动则重启 container
initialDelaySeconds: 120
periodSeconds: 15
dnsPolicy: ClusterFirst
restartPolicy: Always
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/templates/service-portaldb.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.portaldb.service.enabled -}}
---
# service definition for mysql
kind: Service
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.portaldb.service.type }}
{{- if eq .Values.portaldb.service.type "ExternalName" }}
externalName: {{ required "portaldb.host is required!" .Values.portaldb.host }}
{{- else }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.service.port }}
targetPort: {{ .Values.portaldb.port }}
---
kind: Endpoints
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
subsets:
- addresses:
- ip: {{ required "portaldb.host is required!" .Values.portaldb.host }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.port }}
{{- end }}
{{- end }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.portaldb.service.enabled -}}
---
# service definition for mysql
kind: Service
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.portaldb.service.type }}
{{- if eq .Values.portaldb.service.type "ExternalName" }}
externalName: {{ required "portaldb.host is required!" .Values.portaldb.host }}
{{- else }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.service.port }}
targetPort: {{ .Values.portaldb.port }}
---
kind: Endpoints
apiVersion: v1
metadata:
name: {{include "apollo.portaldb.serviceName" .}}
subsets:
- addresses:
- ip: {{ required "portaldb.host is required!" .Values.portaldb.host }}
ports:
- protocol: TCP
port: {{ .Values.portaldb.port }}
{{- end }}
{{- end }} | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case2.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key1: "anotherValue"
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key1: "anotherValue"
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case6.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
left hand:
- Ring of Teleportation
- Ring of Speed
right hand:
- Ring of Resist Fire
- Ring of Resist Cold
- Ring of Resist Poison
base armor class: 0
base damage: [4,4]
plus to-hit: 12
plus to-dam: 16
plus to-ac: 0
hero:
hp: 34
sp: 8
level: 4
orc:
hp: 12
sp: 0
level: 2
plain: Scroll of Remove Curse
single-quoted: 'EASY_KNOW'
double-quoted: "?"
literal: | # Borrowed from http://www.kersbergen.com/flump/religion.html
by hjw ___
__ /.-.\
/ )_____________\\ Y
/_ /=== == === === =\ _\_
( /)=== == === === == Y \
`-------------------( o )
\___/
folded: >
It removes all ordinary curses from all equipped items.
Heavy or permanent curses are unaffected.
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
left hand:
- Ring of Teleportation
- Ring of Speed
right hand:
- Ring of Resist Fire
- Ring of Resist Cold
- Ring of Resist Poison
base armor class: 0
base damage: [4,4]
plus to-hit: 12
plus to-dam: 16
plus to-ac: 0
hero:
hp: 34
sp: 8
level: 4
orc:
hp: 12
sp: 0
level: 2
plain: Scroll of Remove Curse
single-quoted: 'EASY_KNOW'
double-quoted: "?"
literal: | # Borrowed from http://www.kersbergen.com/flump/religion.html
by hjw ___
__ /.-.\
/ )_____________\\ Y
/_ /=== == === === =\ _\_
( /)=== == === === == Y \
`-------------------( o )
\___/
folded: >
It removes all ordinary curses from all equipped items.
Heavy or permanent curses are unaffected.
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/templates/deployment-portal.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-portal
kind: ConfigMap
apiVersion: v1
metadata:
{{- $portalFullName := include "apollo.portal.fullName" . }}
name: {{ $portalFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
{{- if .Values.config.envs }}
apollo.portal.envs = {{ .Values.config.envs }}
{{- end }}
{{- if .Values.config.contextPath }}
server.servlet.context-path = {{ .Values.config.contextPath }}
{{- end }}
apollo-env.properties: |
{{- range $env, $address := .Values.config.metaServers }}
{{ $env }}.meta = {{ $address }}
{{- end }}
{{- range $fileName, $content := .Values.config.files }}
{{ $fileName | indent 2 }}: |
{{ $content | indent 4 }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $portalFullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ $portalFullName }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $portalFullName }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: configmap-{{ $portalFullName }}
configMap:
name: {{ $portalFullName }}
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- key: {{ $fileName }}
path: {{ $fileName }}
{{- end }}
defaultMode: 420
containers:
- name: {{ .Values.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.config.profiles | quote }}
{{- range $key, $value := .Values.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/{{ $fileName }}
subPath: {{ $fileName }}
{{- end }}
livenessProbe:
tcpSocket:
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.config.contextPath }}/health
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-portal
kind: ConfigMap
apiVersion: v1
metadata:
{{- $portalFullName := include "apollo.portal.fullName" . }}
name: {{ $portalFullName }}
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
{{- if .Values.config.envs }}
apollo.portal.envs = {{ .Values.config.envs }}
{{- end }}
{{- if .Values.config.contextPath }}
server.servlet.context-path = {{ .Values.config.contextPath }}
{{- end }}
apollo-env.properties: |
{{- range $env, $address := .Values.config.metaServers }}
{{ $env }}.meta = {{ $address }}
{{- end }}
{{- range $fileName, $content := .Values.config.files }}
{{ $fileName | indent 2 }}: |
{{ $content | indent 4 }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ $portalFullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app: {{ $portalFullName }}
{{- with .Values.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
template:
metadata:
labels:
app: {{ $portalFullName }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: configmap-{{ $portalFullName }}
configMap:
name: {{ $portalFullName }}
items:
- key: application-github.properties
path: application-github.properties
- key: apollo-env.properties
path: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- key: {{ $fileName }}
path: {{ $fileName }}
{{- end }}
defaultMode: 420
containers:
- name: {{ .Values.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.containerPort }}
protocol: TCP
env:
- name: SPRING_PROFILES_ACTIVE
value: {{ .Values.config.profiles | quote }}
{{- range $key, $value := .Values.env }}
- name: {{ $key }}
value: {{ $value }}
{{- end }}
volumeMounts:
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/application-github.properties
subPath: application-github.properties
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/apollo-env.properties
subPath: apollo-env.properties
{{- range $fileName, $content := .Values.config.files }}
- name: configmap-{{ $portalFullName }}
mountPath: /apollo-portal/config/{{ $fileName }}
subPath: {{ $fileName }}
{{- end }}
livenessProbe:
tcpSocket:
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
path: {{ .Values.config.contextPath }}/health
port: {{ .Values.containerPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/config/diff.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="diff_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Diff.Title' | translate }}</title>
<style>
.comment-toggle {
margin-left: 8px !important;
}
.diff-content {
margin-top: 12px;
}
</style>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="DiffItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Diff.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Diff.FirstStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Diff.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Diff.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Diff.NextStep' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Diff.TipsTitle' | translate }}:</strong>
<ul>
<li>{{'Config.Diff.Tips' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Diff.DiffCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="false" apollo-select="collectSelectedClusters"
apollo-default-checked-env="pageContext.env"
apollo-default-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2">
<div class="row" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-12">
<label class="control-label">
<input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff"
ng-click="showCommentDiff=!showCommentDiff">
{{'Config.Diff.HasDiffComment' | translate }}
</label>
</div>
<div class="col-sm-12 diff-content">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>Key</td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Value'">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Comment'">
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey">
<td width="15%" ng-bind="key"></td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).comment">
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/DiffConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="diff_item">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.Diff.Title' | translate }}</title>
<style>
.comment-toggle {
margin-left: 8px !important;
}
.diff-content {
margin-top: 12px;
}
</style>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container" ng-controller="DiffItemController">
<section class="panel col-md-offset-1 col-md-10">
<header class="panel-heading">
<div class="row">
<div class="col-md-7">
<h4 class="modal-title">{{'Config.Diff.Title' | translate }}
<small ng-show="syncItemStep == 1">{{'Config.Diff.FirstStep' | translate }}</small>
<small ng-show="syncItemStep == 2">{{'Config.Diff.SecondStep' | translate }}</small>
</h4>
</div>
<div class="col-md-5 text-right">
<button type="button" class="btn btn-primary" ng-show="syncItemStep > 1 && syncItemStep < 3"
ng-click="syncItemNextStep(-1)">{{'Config.Diff.PreviousStep' | translate }}
</button>
<button type="button" class="btn btn-primary" ng-show="syncItemStep < 2"
ng-click="diff()">{{'Config.Diff.NextStep' | translate }}
</button>
<button type="button" class="btn btn-info" data-dismiss="modal"
ng-click="backToAppHomePage()">{{'Common.ReturnToIndex' | translate }}
</button>
</div>
</div>
</header>
<div class="panel-body">
<div class="row" ng-show="syncItemStep == 1">
<div class="alert-info alert no-radius">
<strong>{{'Config.Diff.TipsTitle' | translate }}:</strong>
<ul>
<li>{{'Config.Diff.Tips' | translate }}</li>
</ul>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">{{'Config.Diff.DiffCluster' | translate }}</label>
<div class="col-sm-6">
<apolloclusterselector apollo-app-id="pageContext.appId"
apollo-default-all-checked="false" apollo-select="collectSelectedClusters"
apollo-default-checked-env="pageContext.env"
apollo-default-checked-cluster="pageContext.clusterName"></apolloclusterselector>
</div>
</div>
</div>
<hr>
</div>
<!--step 2-->
<div class="row" ng-show="syncItemStep == 2">
<div class="row" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-12">
<label class="control-label">
<input type="checkbox" class="comment-toggle" ng-checked="showCommentDiff"
ng-click="showCommentDiff=!showCommentDiff">
{{'Config.Diff.HasDiffComment' | translate }}
</label>
</div>
<div class="col-sm-12 diff-content">
<table class="table table-bordered table-striped table-hover">
<thead>
<tr>
<td>Key</td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Value'">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName + ':Comment'">
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="(key, itemsKeyedByCluster) in itemsKeyedByKey">
<td width="15%" ng-bind="key"></td>
<td ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).value">
</td>
<td ng-show="showCommentDiff"
ng-repeat="cluster in syncData.syncToNamespaces"
ng-bind="(itemsKeyedByCluster[cluster.env + ':' + cluster.clusterName + ':' + cluster.namespaceName] || {}).comment">
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>
<showtextmodal text="text" />
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/ConfigService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/controller/config/DiffConfigController.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/directive/show-text-modal-directive.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/test/resources/yaml/case1.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key3:
key4:
key5: '(%sender%) %message%'
key6: '* %sender% %message%'
# commented: "xxx"
list:
- 'item 1'
- 'item 2'
intList:
- 100
- 200
listOfMap:
- key: '#mychannel'
value: ''
- key: '#myprivatechannel'
value: 'mypassword'
listOfList:
- - 'a1'
- 'a2'
- - 'b1'
- 'b2'
listOfList2: [ ['a1', 'a2'], ['b1', 'b2'] ]
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
root:
key1: "someValue"
key2: 100
key3:
key4:
key5: '(%sender%) %message%'
key6: '* %sender% %message%'
# commented: "xxx"
list:
- 'item 1'
- 'item 2'
intList:
- 100
- 200
listOfMap:
- key: '#mychannel'
value: ''
- key: '#myprivatechannel'
value: 'mypassword'
listOfList:
- - 'a1'
- 'a2'
- - 'b1'
- 'b2'
listOfList2: [ ['a1', 'a2'], ['b1', 'b2'] ]
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
labels:
app: service-mysql-for-apollo-test-alpha-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
labels:
app: service-mysql-for-apollo-test-alpha-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-alpha-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/orderedcase.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
k2: "someValue"
k4: "anotherValue"
k1: "yetAnotherValue" | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
k2: "someValue"
k4: "anotherValue"
k1: "yetAnotherValue" | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-portal/src/main/resources/static/namespace/role.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="role">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Namespace.Role.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container">
<section class="panel col-md-offset-1 col-md-10" ng-controller="NamespaceRoleController">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">
{{'Namespace.Role.Title' | translate }}<small>({{'Common.AppId' | translate }}:<label
ng-bind="pageContext.appId"></label> {{'Common.Namespace' | translate }}:<label
ng-bind="pageContext.namespaceName"></label>)</small>
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body" ng-show="hasAssignUserPermission">
<div class="row">
<div class="form-horizontal">
<div class="form-group">
<label
class="col-sm-2 control-label">{{'Namespace.Role.GrantModifyTo' | translate }}<br><small>{{'Namespace.Role.GrantModifyTo2' | translate }}</small></label>
<div class="col-sm-8">
<form class="form-inline" ng-submit="assignRoleToUser('ModifyNamespace')">
<div class="form-group">
<apollouserselector apollo-id="modifyRoleWidgetId"></apollouserselector>
<select class="form-control input-sm" ng-model="modifyRoleSelectedEnv">
<option value="">{{'Namespace.Role.AllEnv' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="modifyRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button>
</form>
<!-- Split button -->
<div class="item-container">
<h5>{{'Namespace.Role.AllEnv' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in rolesAssignedUsers.modifyRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ModifyNamespace', user.userId, null)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
<div class="item-container" ng-repeat="env in envs">
<h5>{{env}}</h5>
<div class="btn-group item-info"
ng-repeat="user in envRolesAssignedUsers[env].modifyRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ModifyNamespace', user.userId, env)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="row" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-2 text-right">
<label
class="control-label">{{'Namespace.Role.GrantPublishTo' | translate }}<br><small>{{'Namespace.Role.GrantPublishTo2' | translate }}</small></label>
</div>
<div class="col-sm-8">
<form class="form-inline" ng-submit="assignRoleToUser('ReleaseNamespace')">
<div class="form-group">
<apollouserselector apollo-id="releaseRoleWidgetId"></apollouserselector>
<select class="form-control input-sm" ng-model="releaseRoleSelectedEnv">
<option value="">{{'Namespace.Role.AllEnv' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="ReleaseRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button>
</form>
<!-- Split button -->
<div class="item-container">
<h5>{{'Namespace.Role.AllEnv' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in rolesAssignedUsers.releaseRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ReleaseNamespace', user.userId, null)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
<div class="item-container" ng-repeat="env in envs">
<h5>{{env}}</h5>
<div class="btn-group item-info"
ng-repeat="user in envRolesAssignedUsers[env].releaseRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ReleaseNamespace', user.userId, env)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="panel-body text-center" ng-show="!hasAssignUserPermission">
<h2>{{'Namespace.Role.NoPermission' | translate }}</h2>
</div>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/controller/role/NamespaceRoleController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="role">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Namespace.Role.Title' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container">
<section class="panel col-md-offset-1 col-md-10" ng-controller="NamespaceRoleController">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">
{{'Namespace.Role.Title' | translate }}<small>({{'Common.AppId' | translate }}:<label
ng-bind="pageContext.appId"></label> {{'Common.Namespace' | translate }}:<label
ng-bind="pageContext.namespaceName"></label>)</small>
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body" ng-show="hasAssignUserPermission">
<div class="row">
<div class="form-horizontal">
<div class="form-group">
<label
class="col-sm-2 control-label">{{'Namespace.Role.GrantModifyTo' | translate }}<br><small>{{'Namespace.Role.GrantModifyTo2' | translate }}</small></label>
<div class="col-sm-8">
<form class="form-inline" ng-submit="assignRoleToUser('ModifyNamespace')">
<div class="form-group">
<apollouserselector apollo-id="modifyRoleWidgetId"></apollouserselector>
<select class="form-control input-sm" ng-model="modifyRoleSelectedEnv">
<option value="">{{'Namespace.Role.AllEnv' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="modifyRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button>
</form>
<!-- Split button -->
<div class="item-container">
<h5>{{'Namespace.Role.AllEnv' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in rolesAssignedUsers.modifyRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ModifyNamespace', user.userId, null)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
<div class="item-container" ng-repeat="env in envs">
<h5>{{env}}</h5>
<div class="btn-group item-info"
ng-repeat="user in envRolesAssignedUsers[env].modifyRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ModifyNamespace', user.userId, env)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="row" style="margin-top: 10px;">
<div class="form-horizontal">
<div class="col-sm-2 text-right">
<label
class="control-label">{{'Namespace.Role.GrantPublishTo' | translate }}<br><small>{{'Namespace.Role.GrantPublishTo2' | translate }}</small></label>
</div>
<div class="col-sm-8">
<form class="form-inline" ng-submit="assignRoleToUser('ReleaseNamespace')">
<div class="form-group">
<apollouserselector apollo-id="releaseRoleWidgetId"></apollouserselector>
<select class="form-control input-sm" ng-model="releaseRoleSelectedEnv">
<option value="">{{'Namespace.Role.AllEnv' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="ReleaseRoleSubmitBtnDisabled">{{'Namespace.Role.Add' | translate }}</button>
</form>
<!-- Split button -->
<div class="item-container">
<h5>{{'Namespace.Role.AllEnv' | translate }}</h5>
<div class="btn-group item-info"
ng-repeat="user in rolesAssignedUsers.releaseRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ReleaseNamespace', user.userId, null)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
<div class="item-container" ng-repeat="env in envs">
<h5>{{env}}</h5>
<div class="btn-group item-info"
ng-repeat="user in envRolesAssignedUsers[env].releaseRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
ng-click="removeUserRole('ReleaseNamespace', user.userId, env)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="panel-body text-center" ng-show="!hasAssignUserPermission">
<h2>{{'Namespace.Role.NoPermission' | translate }}</h2>
</div>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/controller/role/NamespaceRoleController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/templates/ingress-portal.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "apollo.portal.fullName" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "apollo.portal.fullName" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case5.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1000
batch: 2000
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case4.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
--- # document start
# Comments in YAML look like this.
################
# SCALAR TYPES #
################
# Our root object (which continues for the entire document) will be a map,
# which is equivalent to a dictionary, hash or object in other languages.
key: value
another_key: Another value goes here.
a_number_value: 100
scientific_notation: 1e+12
# The number 1 will be interpreted as a number, not a boolean. if you want
# it to be interpreted as a boolean, use true
boolean: true
null_value: null
key with spaces: value
# Notice that strings don't need to be quoted. However, they can be.
however: 'A string, enclosed in quotes.'
'Keys can be quoted too.': "Useful if you want to put a ':' in your key."
single quotes: 'have ''one'' escape pattern'
double quotes: "have many: \", \0, \t, \u263A, \x0d\x0a == \r\n, and more."
# Multiple-line strings can be written either as a 'literal block' (using |),
# or a 'folded block' (using '>').
literal_block: |
This entire block of text will be the value of the 'literal_block' key,
with line breaks being preserved.
The literal continues until de-dented, and the leading indentation is
stripped.
Any lines that are 'more-indented' keep the rest of their indentation -
these lines will be indented by 4 spaces.
folded_style: >
This entire block of text will be the value of 'folded_style', but this
time, all newlines will be replaced with a single space.
Blank lines, like above, are converted to a newline character.
'More-indented' lines keep their newlines, too -
this text will appear over two lines.
####################
# COLLECTION TYPES #
####################
# Nesting uses indentation. 2 space indent is preferred (but not required).
a_nested_map:
key: value
another_key: Another Value
another_nested_map:
hello: hello
# Maps don't have to have string keys.
0.25: a float key
# Keys can also be complex, like multi-line objects
# We use ? followed by a space to indicate the start of a complex key.
? |
This is a key
that has multiple lines
: and this is its value
# YAML also allows mapping between sequences with the complex key syntax
# Some language parsers might complain
# An example
? - Manchester United
- Real Madrid
: [2001-01-01, 2002-02-02]
# Sequences (equivalent to lists or arrays) look like this
# (note that the '-' counts as indentation):
a_sequence:
- Item 1
- Item 2
- 0.5 # sequences can contain disparate types.
- Item 4
- key: value
another_key: another_value
-
- This is a sequence
- inside another sequence
- - - Nested sequence indicators
- can be collapsed
# Since YAML is a superset of JSON, you can also write JSON-style maps and
# sequences:
json_map: {"key": "value"}
json_seq: [3, 2, 1, "takeoff"]
and quotes are optional: {key: [3, 2, 1, takeoff]}
#######################
# EXTRA YAML FEATURES #
#######################
# YAML also has a handy feature called 'anchors', which let you easily duplicate
# content across your document. Both of these keys will have the same value:
anchored_content: &anchor_name This string will appear as the value of two keys.
other_anchor: *anchor_name
# Anchors can be used to duplicate/inherit properties
base: &base
name: Everyone has same name
# The regexp << is called Merge Key Language-Independent Type. It is used to
# indicate that all the keys of one or more specified maps should be inserted
# into the current map.
foo: &foo
<<: *base
age: 10
bar: &bar
<<: *base
age: 20
# foo and bar would also have name: Everyone has same name
# YAML also has tags, which you can use to explicitly declare types.
explicit_string: !!str 0.5
####################
# EXTRA YAML TYPES #
####################
# Strings and numbers aren't the only scalars that YAML can understand.
# ISO-formatted date and datetime literals are also parsed.
datetime: 2001-12-15T02:59:43.1Z
datetime_with_spaces: 2001-12-14 21:59:43.10 -5
date: 2002-12-14
# YAML also has a set type, which looks like this:
set:
? item1
? item2
? item3
or: {item1, item2, item3}
# Sets are just maps with null values; the above is equivalent to:
set2:
item1: null
item2: null
item3: null
... # document end
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
--- # document start
# Comments in YAML look like this.
################
# SCALAR TYPES #
################
# Our root object (which continues for the entire document) will be a map,
# which is equivalent to a dictionary, hash or object in other languages.
key: value
another_key: Another value goes here.
a_number_value: 100
scientific_notation: 1e+12
# The number 1 will be interpreted as a number, not a boolean. if you want
# it to be interpreted as a boolean, use true
boolean: true
null_value: null
key with spaces: value
# Notice that strings don't need to be quoted. However, they can be.
however: 'A string, enclosed in quotes.'
'Keys can be quoted too.': "Useful if you want to put a ':' in your key."
single quotes: 'have ''one'' escape pattern'
double quotes: "have many: \", \0, \t, \u263A, \x0d\x0a == \r\n, and more."
# Multiple-line strings can be written either as a 'literal block' (using |),
# or a 'folded block' (using '>').
literal_block: |
This entire block of text will be the value of the 'literal_block' key,
with line breaks being preserved.
The literal continues until de-dented, and the leading indentation is
stripped.
Any lines that are 'more-indented' keep the rest of their indentation -
these lines will be indented by 4 spaces.
folded_style: >
This entire block of text will be the value of 'folded_style', but this
time, all newlines will be replaced with a single space.
Blank lines, like above, are converted to a newline character.
'More-indented' lines keep their newlines, too -
this text will appear over two lines.
####################
# COLLECTION TYPES #
####################
# Nesting uses indentation. 2 space indent is preferred (but not required).
a_nested_map:
key: value
another_key: Another Value
another_nested_map:
hello: hello
# Maps don't have to have string keys.
0.25: a float key
# Keys can also be complex, like multi-line objects
# We use ? followed by a space to indicate the start of a complex key.
? |
This is a key
that has multiple lines
: and this is its value
# YAML also allows mapping between sequences with the complex key syntax
# Some language parsers might complain
# An example
? - Manchester United
- Real Madrid
: [2001-01-01, 2002-02-02]
# Sequences (equivalent to lists or arrays) look like this
# (note that the '-' counts as indentation):
a_sequence:
- Item 1
- Item 2
- 0.5 # sequences can contain disparate types.
- Item 4
- key: value
another_key: another_value
-
- This is a sequence
- inside another sequence
- - - Nested sequence indicators
- can be collapsed
# Since YAML is a superset of JSON, you can also write JSON-style maps and
# sequences:
json_map: {"key": "value"}
json_seq: [3, 2, 1, "takeoff"]
and quotes are optional: {key: [3, 2, 1, takeoff]}
#######################
# EXTRA YAML FEATURES #
#######################
# YAML also has a handy feature called 'anchors', which let you easily duplicate
# content across your document. Both of these keys will have the same value:
anchored_content: &anchor_name This string will appear as the value of two keys.
other_anchor: *anchor_name
# Anchors can be used to duplicate/inherit properties
base: &base
name: Everyone has same name
# The regexp << is called Merge Key Language-Independent Type. It is used to
# indicate that all the keys of one or more specified maps should be inserted
# into the current map.
foo: &foo
<<: *base
age: 10
bar: &bar
<<: *base
age: 20
# foo and bar would also have name: Everyone has same name
# YAML also has tags, which you can use to explicitly declare types.
explicit_string: !!str 0.5
####################
# EXTRA YAML TYPES #
####################
# Strings and numbers aren't the only scalars that YAML can understand.
# ISO-formatted date and datetime literals are also parsed.
datetime: 2001-12-15T02:59:43.1Z
datetime_with_spaces: 2001-12-14 21:59:43.10 -5
date: 2002-12-14
# YAML also has a set type, which looks like this:
set:
? item1
? item2
? item3
or: {item1, item2, item3}
# Sets are just maps with null values; the above is equivalent to:
set2:
item1: null
item2: null
item3: null
... # document end
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-service/templates/ingress-adminservice.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.adminService.ingress.enabled -}}
{{- $fullName := include "apollo.adminService.fullName" . -}}
{{- $svcPort := .Values.adminService.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
{{- with .Values.adminService.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.adminService.ingress.tls }}
tls:
{{- range .Values.adminService.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.adminService.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
{{- if .Values.adminService.ingress.enabled -}}
{{- $fullName := include "apollo.adminService.fullName" . -}}
{{- $svcPort := .Values.adminService.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "apollo.service.labels" . | nindent 4 }}
{{- with .Values.adminService.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.adminService.ingress.tls }}
tls:
{{- range .Values.adminService.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.adminService.ingress.hosts }}
- host: {{ .host | quote }}
http:
paths:
{{- range .paths }}
- path: {{ . }}
backend:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/helm/apollo-portal/Chart.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-portal
description: A Helm chart for Apollo Portal
type: application
version: 0.3.0
appVersion: 1.9.0-SNAPSHOT
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apiVersion: v2
name: apollo-portal
description: A Helm chart for Apollo Portal
type: application
version: 0.3.0
appVersion: 1.9.0-SNAPSHOT
home: https://github.com/ctripcorp/apollo
icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
maintainers:
- name: nobodyiam
email: nobodyiam@gmail.com
url: https://github.com/nobodyiam
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-mysql-for-apollo-prod-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-prod-env
labels:
app: service-mysql-for-apollo-prod-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-prod-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-prod-env
labels:
app: service-mysql-for-apollo-prod-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-prod-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/yaml/case5.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
- Ada
- APL
- ASP
- Assembly
- Awk
---
- Basic
---
- C
- C# # Note that comments are denoted with ' #' (space and #).
- C++
- Cold Fusion
-
- HTML
- LaTeX
- SGML
- VRML
- XML
- YAML
-
- BSD
- GNU Hurd
- Linux
- 1.1
- - 2.1
- 2.2
- - - 3.1
- 3.2
- 3.3
- name: PyYAML
status: 4
license: MIT
language: Python
- name: PySyck
status: 5
license: BSD
language: Python
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
- Ada
- APL
- ASP
- Assembly
- Awk
---
- Basic
---
- C
- C# # Note that comments are denoted with ' #' (space and #).
- C++
- Cold Fusion
-
- HTML
- LaTeX
- SGML
- VRML
- XML
- YAML
-
- BSD
- GNU Hurd
- Linux
- 1.1
- - 2.1
- 2.2
- - - 3.1
- 3.2
- 3.3
- name: PyYAML
status: 4
license: MIT
language: Python
- name: PySyck
status: 5
license: BSD
language: Python
| -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
labels:
app: service-mysql-for-apollo-test-beta-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
labels:
app: service-mysql-for-apollo-test-beta-env
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
type: ClusterIP
sessionAffinity: None
---
kind: Endpoints
apiVersion: v1
metadata:
namespace: sre
name: service-mysql-for-apollo-test-beta-env
subsets:
- addresses:
- ip: your-mysql-addresses
ports:
- protocol: TCP
port: 3306 | -1 |
apolloconfig/apollo | 3,725 | Fix headers in templates | Closes #3724 | kezhenxu94 | 2021-05-29T05:15:56Z | 2021-05-29T07:44:06Z | 29cdcab6de9b9625113308d18ddaa46b44584bad | b6fa4c676677ff3c962b9e2139b594a598fd655b | Fix headers in templates. Closes #3724 | ./apollo-client/src/test/resources/spring/yaml/case5-new.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: newBatch
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
timeout: 1001
batch: newBatch
| -1 |