You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2018/10/17 07:17:24 UTC
[incubator-dubbo-ops] branch develop updated: Add environment
difference and CORS setting (#139)
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new 85b7e61 Add environment difference and CORS setting (#139)
85b7e61 is described below
commit 85b7e61aee62d18c84a9167216e6207bdbe56d54
Author: Zhiguo.Chen <ch...@live.com>
AuthorDate: Wed Oct 17 15:17:20 2018 +0800
Add environment difference and CORS setting (#139)
* Add cors setting
* Add environment difference and cors setting
---
.../java/org/apache/dubbo/admin/config/I18nConfig.java | 15 +++++++++++++++
...cation.properties => application-develop.properties} | 2 --
...ion.properties => application-production.properties} | 2 --
.../src/main/resources/application.properties | 2 +-
pom.xml | 17 +++++++++++++++++
5 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/I18nConfig.java b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/I18nConfig.java
index 5631dbb..e5a6ab0 100644
--- a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/I18nConfig.java
+++ b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/I18nConfig.java
@@ -17,11 +17,13 @@
package org.apache.dubbo.admin.config;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
@@ -36,6 +38,9 @@ import java.util.Locale;
//@ImportResource({"classpath*:dubbo-admin.xml"})
public class I18nConfig implements WebMvcConfigurer {
+ @Value("${spring.profiles.active}")
+ private String activeProfile;
+
@Bean
public LocaleResolver localeResolver() {
SessionLocaleResolver sessionLocaleResolver = new SessionLocaleResolver();
@@ -52,6 +57,16 @@ public class I18nConfig implements WebMvcConfigurer {
}
@Override
+ public void addCorsMappings(CorsRegistry registry) {
+ if (activeProfile.equals("develop")) {
+ registry.addMapping("/**")
+ .allowedHeaders("*")
+ .allowedMethods("*")
+ .allowedOrigins("*");
+ }
+ }
+
+ @Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(localeChangeInterceptor());
}
diff --git a/dubbo-admin-backend/src/main/resources/application.properties b/dubbo-admin-backend/src/main/resources/application-develop.properties
similarity index 93%
copy from dubbo-admin-backend/src/main/resources/application.properties
copy to dubbo-admin-backend/src/main/resources/application-develop.properties
index c8af9a9..45eb1d1 100644
--- a/dubbo-admin-backend/src/main/resources/application.properties
+++ b/dubbo-admin-backend/src/main/resources/application-develop.properties
@@ -16,5 +16,3 @@
#
dubbo.registry.address=zookeeper://127.0.0.1:2181
-spring.root.password=root
-spring.guest.password=guest
diff --git a/dubbo-admin-backend/src/main/resources/application.properties b/dubbo-admin-backend/src/main/resources/application-production.properties
similarity index 93%
copy from dubbo-admin-backend/src/main/resources/application.properties
copy to dubbo-admin-backend/src/main/resources/application-production.properties
index c8af9a9..45eb1d1 100644
--- a/dubbo-admin-backend/src/main/resources/application.properties
+++ b/dubbo-admin-backend/src/main/resources/application-production.properties
@@ -16,5 +16,3 @@
#
dubbo.registry.address=zookeeper://127.0.0.1:2181
-spring.root.password=root
-spring.guest.password=guest
diff --git a/dubbo-admin-backend/src/main/resources/application.properties b/dubbo-admin-backend/src/main/resources/application.properties
index c8af9a9..8b9fcb4 100644
--- a/dubbo-admin-backend/src/main/resources/application.properties
+++ b/dubbo-admin-backend/src/main/resources/application.properties
@@ -15,6 +15,6 @@
# limitations under the License.
#
-dubbo.registry.address=zookeeper://127.0.0.1:2181
spring.root.password=root
spring.guest.password=guest
+spring.profiles.active=@activeProfile@
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 69f7144..e18be9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,24 @@
</dependencies>
</dependencyManagement>
+ <profiles>
+ <profile>
+ <id>develop</id>
+ <properties>
+ <activeProfile>develop</activeProfile>
+ </properties>
+ </profile>
+ <profile>
+ <id>production</id>
+ <properties>
+ <activeProfile>production</activeProfile>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
</project>