diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java index ce889fb4..ac15b5ee 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java @@ -1,6 +1,6 @@ package me.chanjar.weixin.cp.bean.messagebuilder; -import me.chanjar.weixin.cp.api.WxCpConsts; +import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.cp.bean.WxCpMessage; /** @@ -15,7 +15,7 @@ public final class FileBuilder extends BaseBuilder { private String mediaId; public FileBuilder() { - this.msgType = WxCpConsts.CUSTOM_MSG_FILE; + this.msgType = WxConsts.CUSTOM_MSG_FILE; } public FileBuilder mediaId(String media_id) { diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java index 40232466..5098708a 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java @@ -1,6 +1,6 @@ package me.chanjar.weixin.cp.bean.messagebuilder; -import me.chanjar.weixin.cp.api.WxCpConsts; +import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.cp.bean.WxCpMessage; /** @@ -15,7 +15,7 @@ public final class ImageBuilder extends BaseBuilder { private String mediaId; public ImageBuilder() { - this.msgType = WxCpConsts.CUSTOM_MSG_IMAGE; + this.msgType = WxConsts.CUSTOM_MSG_IMAGE; } public ImageBuilder mediaId(String media_id) { diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java index b1ab19a6..0711b6f5 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java @@ -1,11 +1,11 @@ package me.chanjar.weixin.cp.bean.messagebuilder; +import me.chanjar.weixin.common.api.WxConsts; +import me.chanjar.weixin.cp.bean.WxCpMessage; + import java.util.ArrayList; import java.util.List; -import me.chanjar.weixin.cp.api.WxCpConsts; -import me.chanjar.weixin.cp.bean.WxCpMessage; - /** * 图文消息builder *
@@ -20,7 +20,7 @@ public final class NewsBuilder extends BaseBuilder {
   private List articles = new ArrayList();
   
   public NewsBuilder() {
-    this.msgType = WxCpConsts.CUSTOM_MSG_NEWS;
+    this.msgType = WxConsts.CUSTOM_MSG_NEWS;
   }
 
   public NewsBuilder addArticle(WxCpMessage.WxArticle article) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java
index 3bf6e710..44a75b8f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java
@@ -1,6 +1,6 @@
 package me.chanjar.weixin.cp.bean.messagebuilder;
 
-import me.chanjar.weixin.cp.api.WxCpConsts;
+import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 
 /**
@@ -15,7 +15,7 @@ public final class TextBuilder extends BaseBuilder {
   private String content;
 
   public TextBuilder() {
-    this.msgType = WxCpConsts.CUSTOM_MSG_TEXT;
+    this.msgType = WxConsts.CUSTOM_MSG_TEXT;
   }
 
   public TextBuilder content(String content) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java
index a94499a2..32990fa3 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java
@@ -1,6 +1,6 @@
 package me.chanjar.weixin.cp.bean.messagebuilder;
 
-import me.chanjar.weixin.cp.api.WxCpConsts;
+import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 
 /**
@@ -24,7 +24,7 @@ public final class VideoBuilder extends BaseBuilder {
   private String thumbMediaId;
 
   public VideoBuilder() {
-    this.msgType = WxCpConsts.CUSTOM_MSG_VIDEO;
+    this.msgType = WxConsts.CUSTOM_MSG_VIDEO;
   }
 
   public VideoBuilder mediaId(String mediaId) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java
index 7139811b..99914fcd 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java
@@ -1,6 +1,6 @@
 package me.chanjar.weixin.cp.bean.messagebuilder;
 
-import me.chanjar.weixin.cp.api.WxCpConsts;
+import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 
 /**
@@ -15,7 +15,7 @@ public final class VoiceBuilder extends BaseBuilder {
   private String mediaId;
 
   public VoiceBuilder() {
-    this.msgType = WxCpConsts.CUSTOM_MSG_VOICE;
+    this.msgType = WxConsts.CUSTOM_MSG_VOICE;
   }
 
   public VoiceBuilder mediaId(String media_id) {
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java
index 1183424f..28cf15b0 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java
@@ -21,7 +21,7 @@ import com.google.inject.Inject;
 public class WxCpDepartAPITest {
 
   @Inject
-  protected WxCpServiceImpl wxService;
+  protected WxCpServiceImpl wxCpService;
 
   protected WxCpDepart depart;
 
@@ -30,13 +30,13 @@ public class WxCpDepartAPITest {
     depart.setName("子部门" + System.currentTimeMillis());
     depart.setParentId(1);
     depart.setOrder(1);
-    Integer departId = wxService.departCreate(depart);
+    Integer departId = wxCpService.departCreate(depart);
   }
 
   @Test(dependsOnMethods = "testDepartCreate")
   public void testDepartGet() throws WxErrorException {
     System.out.println("=================获取部门");
-    List departList = wxService.departGet();
+    List departList = wxCpService.departGet();
     Assert.assertNotNull(departList);
     Assert.assertTrue(departList.size() > 0);
     for (WxCpDepart g : departList) {
@@ -50,14 +50,14 @@ public class WxCpDepartAPITest {
   public void testDepartUpdate() throws WxErrorException {
     System.out.println("=================更新部门");
     depart.setName("子部门改名" + System.currentTimeMillis());
-    wxService.departUpdate(depart);
+    wxCpService.departUpdate(depart);
   }
 
   @Test(dependsOnMethods = "testDepartUpdate")
   public void testDepartDelete() throws WxErrorException {
     System.out.println("=================删除部门");
     System.out.println(depart.getId() + ":" + depart.getName());
-    wxService.departDelete(depart.getId());
+    wxCpService.departDelete(depart.getId());
   }
 
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java
index 391d205c..9efb8a09 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java
@@ -20,7 +20,7 @@ import java.util.List;
 public class WxCpUserAPITest {
 
   @Inject
-  protected WxCpServiceImpl wxService;
+  protected WxCpServiceImpl wxCpService;
 
   protected WxCpDepart depart;
 
@@ -35,7 +35,7 @@ public class WxCpUserAPITest {
     user.setPosition("老婆");
     user.setTel("3300393");
     user.addExtAttr("爱好", "老公");
-    wxService.userCreate(user);
+    wxCpService.userCreate(user);
   }
 
   @Test(dependsOnMethods = "testUserCreate")
@@ -44,23 +44,23 @@ public class WxCpUserAPITest {
     user.setUserId("xiaohe.yang");
     user.setName("杨宝");
     user.addExtAttr("爱好", "老公2");
-    wxService.userUpdate(user);
+    wxCpService.userUpdate(user);
   }
 
   @Test(dependsOnMethods = "testUserUpdate")
   public void testUserGet() throws WxErrorException {
-    WxCpUser user = wxService.userGet("xiaohe.yang");
+    WxCpUser user = wxCpService.userGet("xiaohe.yang");
     Assert.assertNotNull(user);
   }
 
   @Test(dependsOnMethods = "testUserGet")
   public void testDepartGetUsers() throws WxErrorException {
-    List users = wxService.departGetUsers(1, true, 0);
+    List users = wxCpService.departGetUsers(1, true, 0);
     Assert.assertNotEquals(users.size(), 0);
   }
 
   @Test(dependsOnMethods = "testDepartGetUsers")
   public void testUserDelete() throws WxErrorException {
-    wxService.userDelete("xiaohe.yang");
+    wxCpService.userDelete("xiaohe.yang");
   }
 }