Skip to content

Commit de67b77

Browse files
committed
update
1 parent 2c96d54 commit de67b77

8 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/FileBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.chanjar.weixin.cp.bean.messagebuilder;
22

3-
import me.chanjar.weixin.cp.api.WxCpConsts;
3+
import me.chanjar.weixin.common.api.WxConsts;
44
import me.chanjar.weixin.cp.bean.WxCpMessage;
55

66
/**
@@ -15,7 +15,7 @@ public final class FileBuilder extends BaseBuilder<FileBuilder> {
1515
private String mediaId;
1616

1717
public FileBuilder() {
18-
this.msgType = WxCpConsts.CUSTOM_MSG_FILE;
18+
this.msgType = WxConsts.CUSTOM_MSG_FILE;
1919
}
2020

2121
public FileBuilder mediaId(String media_id) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/ImageBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.chanjar.weixin.cp.bean.messagebuilder;
22

3-
import me.chanjar.weixin.cp.api.WxCpConsts;
3+
import me.chanjar.weixin.common.api.WxConsts;
44
import me.chanjar.weixin.cp.bean.WxCpMessage;
55

66
/**
@@ -15,7 +15,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
1515
private String mediaId;
1616

1717
public ImageBuilder() {
18-
this.msgType = WxCpConsts.CUSTOM_MSG_IMAGE;
18+
this.msgType = WxConsts.CUSTOM_MSG_IMAGE;
1919
}
2020

2121
public ImageBuilder mediaId(String media_id) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package me.chanjar.weixin.cp.bean.messagebuilder;
22

3+
import me.chanjar.weixin.common.api.WxConsts;
4+
import me.chanjar.weixin.cp.bean.WxCpMessage;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58

6-
import me.chanjar.weixin.cp.api.WxCpConsts;
7-
import me.chanjar.weixin.cp.bean.WxCpMessage;
8-
99
/**
1010
* 图文消息builder
1111
* <pre>
@@ -20,7 +20,7 @@ public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
2020
private List<WxCpMessage.WxArticle> articles = new ArrayList<WxCpMessage.WxArticle>();
2121

2222
public NewsBuilder() {
23-
this.msgType = WxCpConsts.CUSTOM_MSG_NEWS;
23+
this.msgType = WxConsts.CUSTOM_MSG_NEWS;
2424
}
2525

2626
public NewsBuilder addArticle(WxCpMessage.WxArticle article) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.chanjar.weixin.cp.bean.messagebuilder;
22

3-
import me.chanjar.weixin.cp.api.WxCpConsts;
3+
import me.chanjar.weixin.common.api.WxConsts;
44
import me.chanjar.weixin.cp.bean.WxCpMessage;
55

66
/**
@@ -15,7 +15,7 @@ public final class TextBuilder extends BaseBuilder<TextBuilder> {
1515
private String content;
1616

1717
public TextBuilder() {
18-
this.msgType = WxCpConsts.CUSTOM_MSG_TEXT;
18+
this.msgType = WxConsts.CUSTOM_MSG_TEXT;
1919
}
2020

2121
public TextBuilder content(String content) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VideoBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.chanjar.weixin.cp.bean.messagebuilder;
22

3-
import me.chanjar.weixin.cp.api.WxCpConsts;
3+
import me.chanjar.weixin.common.api.WxConsts;
44
import me.chanjar.weixin.cp.bean.WxCpMessage;
55

66
/**
@@ -24,7 +24,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> {
2424
private String thumbMediaId;
2525

2626
public VideoBuilder() {
27-
this.msgType = WxCpConsts.CUSTOM_MSG_VIDEO;
27+
this.msgType = WxConsts.CUSTOM_MSG_VIDEO;
2828
}
2929

3030
public VideoBuilder mediaId(String mediaId) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/VoiceBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.chanjar.weixin.cp.bean.messagebuilder;
22

3-
import me.chanjar.weixin.cp.api.WxCpConsts;
3+
import me.chanjar.weixin.common.api.WxConsts;
44
import me.chanjar.weixin.cp.bean.WxCpMessage;
55

66
/**
@@ -15,7 +15,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder> {
1515
private String mediaId;
1616

1717
public VoiceBuilder() {
18-
this.msgType = WxCpConsts.CUSTOM_MSG_VOICE;
18+
this.msgType = WxConsts.CUSTOM_MSG_VOICE;
1919
}
2020

2121
public VoiceBuilder mediaId(String media_id) {

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpDepartAPITest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public class WxCpDepartAPITest {
2222

2323
@Inject
24-
protected WxCpServiceImpl wxService;
24+
protected WxCpServiceImpl wxCpService;
2525

2626
protected WxCpDepart depart;
2727

@@ -30,13 +30,13 @@ public void testDepartCreate() throws WxErrorException {
3030
depart.setName("子部门" + System.currentTimeMillis());
3131
depart.setParentId(1);
3232
depart.setOrder(1);
33-
Integer departId = wxService.departCreate(depart);
33+
Integer departId = wxCpService.departCreate(depart);
3434
}
3535

3636
@Test(dependsOnMethods = "testDepartCreate")
3737
public void testDepartGet() throws WxErrorException {
3838
System.out.println("=================获取部门");
39-
List<WxCpDepart> departList = wxService.departGet();
39+
List<WxCpDepart> departList = wxCpService.departGet();
4040
Assert.assertNotNull(departList);
4141
Assert.assertTrue(departList.size() > 0);
4242
for (WxCpDepart g : departList) {
@@ -50,14 +50,14 @@ public void testDepartGet() throws WxErrorException {
5050
public void testDepartUpdate() throws WxErrorException {
5151
System.out.println("=================更新部门");
5252
depart.setName("子部门改名" + System.currentTimeMillis());
53-
wxService.departUpdate(depart);
53+
wxCpService.departUpdate(depart);
5454
}
5555

5656
@Test(dependsOnMethods = "testDepartUpdate")
5757
public void testDepartDelete() throws WxErrorException {
5858
System.out.println("=================删除部门");
5959
System.out.println(depart.getId() + ":" + depart.getName());
60-
wxService.departDelete(depart.getId());
60+
wxCpService.departDelete(depart.getId());
6161
}
6262

6363
}

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpUserAPITest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class WxCpUserAPITest {
2121

2222
@Inject
23-
protected WxCpServiceImpl wxService;
23+
protected WxCpServiceImpl wxCpService;
2424

2525
protected WxCpDepart depart;
2626

@@ -35,7 +35,7 @@ public void testUserCreate() throws WxErrorException {
3535
user.setPosition("老婆");
3636
user.setTel("3300393");
3737
user.addExtAttr("爱好", "老公");
38-
wxService.userCreate(user);
38+
wxCpService.userCreate(user);
3939
}
4040

4141
@Test(dependsOnMethods = "testUserCreate")
@@ -44,23 +44,23 @@ public void testUserUpdate() throws WxErrorException {
4444
user.setUserId("xiaohe.yang");
4545
user.setName("杨宝");
4646
user.addExtAttr("爱好", "老公2");
47-
wxService.userUpdate(user);
47+
wxCpService.userUpdate(user);
4848
}
4949

5050
@Test(dependsOnMethods = "testUserUpdate")
5151
public void testUserGet() throws WxErrorException {
52-
WxCpUser user = wxService.userGet("xiaohe.yang");
52+
WxCpUser user = wxCpService.userGet("xiaohe.yang");
5353
Assert.assertNotNull(user);
5454
}
5555

5656
@Test(dependsOnMethods = "testUserGet")
5757
public void testDepartGetUsers() throws WxErrorException {
58-
List<WxCpUser> users = wxService.departGetUsers(1, true, 0);
58+
List<WxCpUser> users = wxCpService.departGetUsers(1, true, 0);
5959
Assert.assertNotEquals(users.size(), 0);
6060
}
6161

6262
@Test(dependsOnMethods = "testDepartGetUsers")
6363
public void testUserDelete() throws WxErrorException {
64-
wxService.userDelete("xiaohe.yang");
64+
wxCpService.userDelete("xiaohe.yang");
6565
}
6666
}

0 commit comments

Comments
 (0)