修改配置

src/main/java/cn/quantgroup/xyqb/config/motan/MotanConfig.java

@@ -4,16 +4,16 @@ import com.weibo.api.motan.config.springsupport.AnnotationBean;
 import com.weibo.api.motan.config.springsupport.BasicServiceConfigBean;
 import com.weibo.api.motan.config.springsupport.ProtocolConfigBean;
 import com.weibo.api.motan.config.springsupport.RegistryConfigBean;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * Created by 11 on 2017/2/27.
  */
-@EnableAutoConfiguration
-@SpringBootApplication
+@Configuration
 public class MotanConfig {
+
     @Bean
     public AnnotationBean motanAnnotationBean() {
         AnnotationBean motanAnnotationBean = new AnnotationBean();
@@ -22,32 +22,39 @@ public class MotanConfig {
     }
 
     @Bean(name = "userMotan")
-    public ProtocolConfigBean protocolConfig1() {
+    public ProtocolConfigBean protocolConfig1(
+            @Value("${protocol.isDefault}") Boolean isDefault ,@Value("${protocol.name}") String name,
+            @Value("${protocol.contentLength}") int contentLength) {
         ProtocolConfigBean config = new ProtocolConfigBean();
-        config.setDefault(true);
-        config.setName("motan");
-        config.setMaxContentLength(1048576);
+        config.setDefault(isDefault);
+        config.setName(name);
+        config.setMaxContentLength(contentLength);
         return config;
     }
 
 
     @Bean(name="registryConfig")
-    public RegistryConfigBean registryConfig() {
+    public RegistryConfigBean registryConfig(@Value("${registry.protocol}") String registryProtocol,
+                                             @Value("${registry.address}") String registryAddress
+    ) {
         RegistryConfigBean config = new RegistryConfigBean();
-        config.setRegProtocol("zookeeper");
-        config.setAddress("127.0.0.1:2181");
+        config.setRegProtocol(registryProtocol);
+        config.setAddress(registryAddress);
         return config;
     }
 
     @Bean
-    public BasicServiceConfigBean baseServiceConfig() {
+    public BasicServiceConfigBean baseServiceConfig(@Value("${motan.port}") int motanPort,
+                                                    @Value("${motan.user.group}") String userGroup,
+                                                    @Value("${motan.user.module}") String userModule,
+                                                    @Value("${motan.application:xyqbUserMotan}") String applicationName) {
         BasicServiceConfigBean config = new BasicServiceConfigBean();
-        config.setExport("userMotan:8002");
-        config.setGroup("userGroup");
+        config.setExport("userMotan:" + motanPort);
+        config.setGroup(userGroup);
         config.setAccessLog(true);
         config.setShareChannel(true);
-        config.setModule("user-motan-rpc");
-        config.setApplication("xyqbUserMotan");
+        config.setModule(userModule);
+        config.setApplication(applicationName);
         config.setRegistry("registryConfig");
         return config;
     }