Merge branch 'master' into dev

README.md

@@ -17,6 +17,9 @@ https://my.oschina.net/giegie/blog
  ### 视频教程
 https://www.bilibili.com/video/av20229859/
 
+### 使用文档
+[这是一本关于微服务权限框架pig的使用手册](https://www.kancloud.cn/lengleng/pig-guide/550709)
+
 
  ### 默认账号：admin 密码：123456
 

pig-common/src/main/java/com/github/pig/common/constant/MqQueueConstant.java

@@ -24,5 +24,5 @@ public interface MqQueueConstant {
     /**
      * zipkin 队列
      */
-    String ZIPLIN_NAME_QUEUE = "zipkin";
+    String ZIPKIN_NAME_QUEUE = "zipkin";
 }

pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/RabbitConfig.java

@@ -44,6 +44,6 @@ public class RabbitConfig {
 
     @Bean
     public Queue initZipkinQueue() {
-        return new Queue(MqQueueConstant.ZIPLIN_NAME_QUEUE);
+        return new Queue(MqQueueConstant.ZIPKIN_NAME_QUEUE);
     }
 }