yangyoupeng / microservice

Go to a project
Toggle navigation Toggle navigation pinning
yangyoupeng
4a378496 1 parent 84b50203

修改alpaca-dependencies的版本

Inline Side-by-side
Showing 7 changed files with 15 additions and 183 deletions
......@@ -117,7 +117,7 @@
</executions>
</plugin>
<!-- 是为了将工程打包runnable jar包 ，如果不指定mainClass，那么maven就会搜索包含main方法的类。 -->
<!-- 是为了将工程打包runnable jar包 ，如果不指定mainClass，那么maven就会搜索包含main方法的类。
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
......@@ -134,7 +134,7 @@
</execution>
</executions>
</plugin>
-->
</plugins>
......
......@@ -23,10 +23,10 @@
</dependency>
<dependency>
<groupId>com.zhaoonline</groupId>
<artifactId>alpaca-config-zookeeper</artifactId>
<groupId>com.zhaoonline</groupId>
<artifactId>alpaca-config-zookeeper</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zhaoonline</groupId>
......
/*
* All rights Reserved, Copyright (C) ZhaoOnline LIMITED 2016
* FileName: PropertieLoader.java
* Version: $Revision$
* Package Name:com.zhaoonline.message.queue
* Modify record:
* NO. | Date | Name | Content
* 1 | 2016年8月4日 | zhaoonline)yangyoupeng | original version
*/
package com.zhaoonline.message.queue;
import org.springframework.boot.context.properties.ConfigurationProperties;
import com.zhaoonline.alpaca.config.bootstrap.Component;
/**
* class AliMNSPropertiesComponent <BR>
* class description:从zk上面拿配置信息,ZK上面存储的目录结构：
* config/components/
* /mq::dev/ -->这里的mq对应getName方法的返回值,dev是Component中指定的。
* /aliyun.topic --> 这里的aliyun对应@ConfigurationProperties("aliyun")中设置的aliyun
* /aliyun.topicProducer --> topic、topicProducer、topicConsumer1、securityAccessKey、securitySecretKey就是对应这里对象的各个property
* /aliyun.topicConsumer1
* /aliyun.securityAccessKey
* /aliyun.securitySecretKey
* <BR>
* Remark: <BR>
* @version 1.00 2016年8月4日
* @author zhaoonline)yangyoupeng
*/
@ConfigurationProperties("aliyun")
@org.springframework.stereotype.Component
public class AliMNSPropertiesComponent implements Component {
private String topic;
private String topicQueue1;
private String securityAccessKey;
private String securitySecretKey;
private String endPoint;
/**
* @Override
* @see com.zhaoonline.alpaca.config.bootstrap.Component#getName() <BR>
* Method name: getName <BR>
* Description: please write your description <BR>
* Remark: <BR>
* @return <BR>
*/
@Override
public String getName() {
return "mq";
}
/**
* Method name: getTopic <BR>
* Description: 消息队列的Topic <BR>
* @return String <BR>
*/
public String getTopic() {
return topic;
}
/**
* Method name: setTopic <BR>
* Description: please write your description <BR>
* @param topic String <BR>
*/
public void setTopic(String topic) {
this.topic = topic;
}
/**
* Method name: getTopicQueue1 <BR>
* Description: please write your description <BR>
* @return String <BR>
*/
public String getTopicQueue1() {
return topicQueue1;
}
/**
* Method name: setTopicQueue1 <BR>
* Description: please write your description <BR>
* @param topicQueue1 String <BR>
*/
public void setTopicQueue1(String topicQueue1) {
this.topicQueue1 = topicQueue1;
}
/**
* Method name: getSecurityAccessKey <BR>
* Description:阿里云的accessKey <BR>
* @return String <BR>
*/
public String getSecurityAccessKey() {
return securityAccessKey;
}
/**
* Method name: setSecurityAccessKey <BR>
* Description: please write your description <BR>
* @param securityAccessKey String <BR>
*/
public void setSecurityAccessKey(String securityAccessKey) {
this.securityAccessKey = securityAccessKey;
}
/**
* Method name: getSecuritySecretKey <BR>
* Description:阿里云的SecretKey <BR>
* @return String <BR>
*/
public String getSecuritySecretKey() {
return securitySecretKey;
}
/**
* Method name: setSecuritySecretKey <BR>
* Description: please write your description <BR>
* @param securitySecretKey String <BR>
*/
public void setSecuritySecretKey(String securitySecretKey) {
this.securitySecretKey = securitySecretKey;
}
/**
* Method name: getEndPoint <BR>
* Description: please write your description <BR>
* @return String <BR>
*/
public String getEndPoint() {
return endPoint;
}
/**
* Method name: setEndPoint <BR>
* Description: please write your description <BR>
* @param endPoint String <BR>
*/
public void setEndPoint(String endPoint) {
this.endPoint = endPoint;
}
}
......@@ -10,6 +10,7 @@
package com.zhaoonline.message.queue;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
......@@ -20,21 +21,22 @@ import org.springframework.stereotype.Component;
* @author zhaoonline)yangyoupeng
*/
@Component
@ConfigurationProperties("alpaca.components.aliyun")
public class AliMNSPropertiesConfigBean {
@Value("${component.mq.aliyun.topic}")
//@Value("${component.mq.aliyun.topic}")
private String topic;
@Value("${component.mq.aliyun.securityAccessKey}")
//@Value("${component.mq.aliyun.securityAccessKey}")
private String securityAccessKey;
@Value("${component.mq.aliyun.securitySecretKey}")
//@Value("${component.mq.aliyun.securitySecretKey}")
private String securitySecretKey;
@Value("${component.mq.aliyun.endPoint}")
//@Value("${component.mq.aliyun.endPoint}")
private String endPoint;
@Value("${component.mq.aliyun.topicQueue1}")
//@Value("${component.mq.aliyun.topicQueue1}")
private String topicQueue1;
/**
......
......@@ -11,7 +11,6 @@ package com.zhaoonline.message.test.queue;
import org.springframework.boot.context.properties.ConfigurationProperties;
import com.zhaoonline.alpaca.config.bootstrap.Component;
/**
* class name:MockProperitesLoader <BR>
......@@ -22,19 +21,7 @@ import com.zhaoonline.alpaca.config.bootstrap.Component;
*/
@ConfigurationProperties("component.testComponet")
@org.springframework.stereotype.Component
public class MockProperitesLoader implements Component {
/**
* @Override
* @see com.zhaoonline.alpaca.config.bootstrap.Component#getName() <BR>
* Method name: getName <BR>
* Description: please write your description <BR>
* Remark: <BR>
* @return <BR>
*/
@Override
public String getName() {
return "testComponent";
}
public class MockProperitesLoader {
private String property;
......
......@@ -63,7 +63,7 @@ public class TestThread {
@Override
public void run() {
ExcludeLock lock = new ExcludeLock(factory, testLock,4000,6000);
ExcludeLock lock = new ExcludeLock(factory, testLock,1000,6000);
try {
boolean result=lock.acquireLock();
......
......@@ -28,7 +28,7 @@
<dependency>
<groupId>com.zhaoonline</groupId>
<artifactId>alpaca-dependencies</artifactId>
<version>1.0</version>
<version>1.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......