修正文件编码

yujiasun · yujiasun · commit 0511d9714ba5 · 2016-08-23T11:38:58.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,13 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
+      		<plugin>
+        		<groupId>org.apache.maven.plugins</groupId>
+        		<artifactId>maven-surefire-plugin</artifactId>
+        		<configuration>
+          			<skip>true</skip>
+        		</configuration>
+      		</plugin>
         </plugins>
     </build>
     <developers>
diff --git a/src/main/java/com/distributed/limit/redis/LimitRule.java b/src/main/java/com/distributed/limit/redis/LimitRule.java
@@ -3,18 +3,18 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * ���ƹ���
+ * 限制规则
  * Created by sunyujia@aliyun.com on 2015/9/30.
  */
 public class LimitRule {
 
     /**
-     * ��λʱ��
+     * 单位时间
      */
     private int seconds;
 
     /**
-     * ��λʱ�������Ƶķ��ʴ���
+     * 单位时间内限制的访问次数
      */
     private int limitCount;
 
diff --git a/src/main/java/com/distributed/lock/zk/ZkReentrantLock.java b/src/main/java/com/distributed/lock/zk/ZkReentrantLock.java
@@ -14,41 +14,41 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * ����Zookeeper�Ŀ����뻥����(��������:�����ڳ���zk����jvm������)
+ * 基于Zookeeper的可重入互斥锁(关于重入:仅限于持有zk锁的jvm内重入)
  * Created by sunyujia@aliyun.com on 2016/2/24.
  */
 public class ZkReentrantLock implements DistributedReentrantLock {
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(ZkReentrantLock.class);
 
     /**
-     * �̳߳�
+     * 线程池
      */
     private static final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(10);
 
     /**
-     * ����PERSISTENT���ڵ�ĸ�λ��
+     * 所有PERSISTENT锁节点的根位置
      */
     public static final String ROOT_PATH = "/ROOT_LOCK/";
 
     /**
-     * ÿ���ӳ�����PERSISTENT�ڵ��ʱ��  Unit:MILLISECONDS
+     * 每次延迟清理PERSISTENT节点的时间  Unit:MILLISECONDS
      */
     private long delayTimeForClean = 1000;
 
     /**
-     * zk ������ʵ��
+     * zk 共享锁实现
      */
     private InterProcessMutex interProcessMutex = null;
 
 
     /**
-     * ����ID,��Ӧzkһ��PERSISTENT�ڵ�,�¹�EPHEMERAL�ڵ�.
+     * 锁的ID,对应zk一个PERSISTENT节点,下挂EPHEMERAL节点.
      */
     private String path;
 
 
     /**
-     * zk�Ŀͻ���
+     * zk的客户端
      */
     private CuratorFramework client;
 
@@ -107,7 +107,7 @@ public void run() {
             } catch (KeeperException.NotEmptyException e2) {
                 //nothing
             } catch (Exception e) {
-                log.error(e.getMessage(), e);//׼��ɾ��ʱ,�������̴߳�����
+                log.error(e.getMessage(), e);//准备删除时,正好有线程创建锁
             }
         }
     }
diff --git a/src/main/java/com/distributed/lock/zk/ZkReentrantLockCleanerTask.java b/src/main/java/com/distributed/lock/zk/ZkReentrantLockCleanerTask.java
@@ -21,7 +21,7 @@ public class ZkReentrantLockCleanerTask extends TimerTask {
     private Timer timer;
 
     /**
-     * �������
+     * 检查周期
      */
     private long period=5000;
     /**
@@ -70,7 +70,7 @@ public void run() {
     private void cleanNode(String path){
         try {
             if(isEmpty(this.client.getChildren().forPath(path))){
-                this.client.delete().forPath(path);//���ô����ӽڵ��޷�ɾ����zk��ԭ��������������.
+                this.client.delete().forPath(path);//利用存在子节点无法删除和zk的原子性这两个特性.
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/test/java/com/distributed/limit/redis/AccessSpeedLimitTest.java b/src/test/java/com/distributed/limit/redis/AccessSpeedLimitTest.java
@@ -18,7 +18,7 @@ public void test1() throws InterruptedException {
         AccessSpeedLimit accessSpeedLimit=new AccessSpeedLimit(jp);
         SimpleDateFormat sdf=new SimpleDateFormat(" mm:ss");
         while(true){
-            //10.0.0.1���ipÿ1����������5��if���ڴ���.
+            //10.0.0.1这个ip每1秒钟最多访问5次if块内代码.
             if(accessSpeedLimit.tryAccess("10.0.0.1", 1,5)){
                 System.out.println("yes"+sdf.format(new Date()));
             }else{
@@ -40,7 +40,7 @@ public void test2() throws InterruptedException {
         AccessSpeedLimit accessSpeedLimit=new AccessSpeedLimit(jp);
         SimpleDateFormat sdf=new SimpleDateFormat(" mm:ss");
         while(true){
-            //10.0.0.1���ipÿ1����������5��if���ڴ���.1�볬��10�κ�,����2��,2�����޷�����.
+            //10.0.0.1这个ip每1秒钟最多访问5次if块内代码.1秒超过10次后,锁定2秒,2秒内无法访问.
             if(accessSpeedLimit.tryAccess("10.0.0.1",limitRule)){
                 System.out.println("yes"+sdf.format(new Date()));
             }else{
diff --git a/src/test/java/com/distributed/lock/redis/SimpleTest.java b/src/test/java/com/distributed/lock/redis/SimpleTest.java
@@ -15,32 +15,32 @@
 public class SimpleTest {
 
     public static void main(String[] args) throws Exception {
-        JedisPool jedisPool=new JedisPool("127.0.0.1",6379);//ʵ��Ӧ��ʱ��ͨ��springע��
-        RedisReentrantLock lock=new RedisReentrantLock(jedisPool,"������ˮ��");
+        JedisPool jedisPool=new JedisPool("127.0.0.1",6379);//实际应用时可通过spring注入
+        RedisReentrantLock lock=new RedisReentrantLock(jedisPool,"订单流水号");
         try {
             if (lock.tryLock(5000L, TimeUnit.MILLISECONDS)) {
-                //TODO �������Ҫ������
+                //TODO 获得锁后要做的事
             }else{
-                //TODO �������ʱ��Ҫ������
+                //TODO 获得锁超时后要做的事
             }
         }finally {
             lock.unlock();
         }
     }
 
     public static void test1(){
-        JedisPool jedisPool=new JedisPool("127.0.0.1",6379);//ʵ��Ӧ��ʱ��ͨ��springע��
-        final RedisDistributedLockTemplate template=new RedisDistributedLockTemplate(jedisPool);//������̰߳�ȫ,��ͨ��springע��
-        template.execute("������ˮ��", 5000, new Callback() {
+        JedisPool jedisPool=new JedisPool("127.0.0.1",6379);//实际应用时可通过spring注入
+        final RedisDistributedLockTemplate template=new RedisDistributedLockTemplate(jedisPool);//本类多线程安全,可通过spring注入
+        template.execute("订单流水号", 5000, new Callback() {
             @Override
             public Object onGetLock() throws InterruptedException {
-                //TODO �������Ҫ������
+                //TODO 获得锁后要做的事
                 return null;
             }
 
             @Override
             public Object onTimeout() throws InterruptedException {
-                //TODO �������ʱ��Ҫ������
+                //TODO 获得锁超时后要做的事
                 return null;
             }
         });
diff --git a/src/test/java/com/distributed/lock/zk/ZkReentrantLockTemplateTest.java b/src/test/java/com/distributed/lock/zk/ZkReentrantLockTemplateTest.java
@@ -63,17 +63,17 @@ public static void main(String[] args){
     CuratorFramework client = CuratorFrameworkFactory.newClient("127.0.0.1:2181", retryPolicy);
     client.start();
 
-    final ZkDistributedLockTemplate template=new ZkDistributedLockTemplate(client);//������̰߳�ȫ,��ͨ��springע��
-    template.execute("������ˮ��", 5000, new Callback() {
+    final ZkDistributedLockTemplate template=new ZkDistributedLockTemplate(client);//本类多线程安全,可通过spring注入
+    template.execute("订单流水号", 5000, new Callback() {
         @Override
         public Object onGetLock() throws InterruptedException {
-            //TODO �������Ҫ������
+            //TODO 获得锁后要做的事
             return null;
         }
 
         @Override
         public Object onTimeout() throws InterruptedException {
-            //TODO �������ʱ��Ҫ������
+            //TODO 获得锁超时后要做的事
             return null;
         }
     });
