Skip to content

Commit c78a1f5

Browse files
liming1019binarywang
liming1019
authored and
binarywang
committed
🆕 #2784【开放平台】增加批量代云开发之环境管理相关接口
1 parent 452dd58 commit c78a1f5

File tree

9 files changed

+267
-9
lines changed

9 files changed

+267
-9
lines changed

‎weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaShopOrderService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public interface WxMaShopOrderService {
1919

2020
WxMaShopBaseResponse orderPay(WxMaShopOrderPayRequest request) throws WxErrorException;
2121

22-
WxMaShopGetOrderResponse getOrder(Integer orderId, String outOrderId, String openid)
22+
WxMaShopGetOrderResponse getOrder(Long orderId, String outOrderId, String openid)
2323
throws WxErrorException;
2424

2525

‎weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopOrderServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public WxMaShopBaseResponse orderPay(WxMaShopOrderPayRequest request) throws WxE
5656
}
5757

5858
@Override
59-
public WxMaShopGetOrderResponse getOrder(Integer orderId, String outOrderId, String openid) throws WxErrorException {
59+
public WxMaShopGetOrderResponse getOrder(Long orderId, String outOrderId, String openid) throws WxErrorException {
6060
return this.post(ORDER_GET, GsonHelper.buildJsonObject("order_id", orderId, "out_order_id", outOrderId,
6161
"openid", openid), WxMaShopGetOrderResponse.class);
6262
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
import me.chanjar.weixin.open.bean.minishop.goods.*;
1616
import me.chanjar.weixin.open.bean.minishop.limitdiscount.LimitDiscountGoods;
1717
import me.chanjar.weixin.open.bean.result.*;
18+
import me.chanjar.weixin.open.bean.tcb.ShareCloudBaseEnvRequest;
19+
import me.chanjar.weixin.open.bean.tcb.ShareCloudBaseEnvResponse;
20+
import me.chanjar.weixin.open.bean.tcbComponent.GetShareCloudBaseEnvResponse;
21+
import me.chanjar.weixin.open.bean.tcbComponent.GetTcbEnvListResponse;
1822
import org.jetbrains.annotations.Nullable;
1923

2024
import java.io.File;
@@ -130,9 +134,9 @@ public interface WxOpenComponentService {
130134
*/
131135
String FAST_REGISTER_PERSONAL_WEAPP_SEARCH_URL = "https://api.weixin.qq.com/wxa/component/fastregisterpersonalweapp?action=query";
132136

133-
/**
134-
* 快速创建试用小程序接口.
135-
*/
137+
/**
138+
* 快速创建试用小程序接口.
139+
*/
136140
String FAST_REGISTER_BETA_WEAPP_URL = "https://api.weixin.qq.com/wxa/component/fastregisterbetaweapp";
137141

138142
/**
@@ -184,6 +188,13 @@ public interface WxOpenComponentService {
184188

185189
String MINISHOP_GET_DELIVERY_COMPANY_URL = "https://api.weixin.qq.com/product/delivery/get_company_list";
186190

191+
String BATCH_GET_ENVID_URL = "https://api.weixin.qq.com/componenttcb/batchgetenvid";
192+
193+
String DESCRIBE_ENVS_URL = "https://api.weixin.qq.com/componenttcb/describeenvs";
194+
195+
String MODIFY_ENV_URL = "https://api.weixin.qq.com/tcb/modifyenv";
196+
197+
String BATCH_SHARE_ENV = "https://api.weixin.qq.com/componenttcb/batchshareenv";
187198

188199
/**
189200
* Gets wx mp service by appid.
@@ -600,9 +611,9 @@ public interface WxOpenComponentService {
600611
* https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/Register_Mini_Programs/fastregisterpersonalweapp.html
601612
* 快速创建个人小程序
602613
*
603-
* @param idname 个人用户名字
604-
* @param wxuser 个人用户微信号
605-
* @param componentPhone 第三方联系电话
614+
* @param idname 个人用户名字
615+
* @param wxuser 个人用户微信号
616+
* @param componentPhone 第三方联系电话
606617
* @return the wx open result
607618
* @throws WxErrorException
608619
*/
@@ -622,7 +633,7 @@ public interface WxOpenComponentService {
622633
* https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/beta_Mini_Programs/fastregister.html
623634
* 注册试用小程序
624635
*
625-
* @param name 小程序名称
636+
* @param name 小程序名称
626637
* @param openid 微信用户的openid（不是微信号）
627638
* @return the wx open result
628639
* @throws WxErrorException
@@ -1020,4 +1031,44 @@ public interface WxOpenComponentService {
10201031
* @return
10211032
*/
10221033
WxOpenResult updateLimitDiscountStatus(String appId, Long taskId, Integer status) throws WxErrorException;
1034+
1035+
/**
1036+
* 查询环境共享信息
1037+
* https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/cloudbase-batch/env-mgnt/getShareCloudbaseEnv.html
1038+
*
1039+
* @param appids 要查询的appid
1040+
* @return
1041+
*/
1042+
GetShareCloudBaseEnvResponse getShareCloudBaseEnv(List<String> appids) throws WxErrorException;
1043+
1044+
1045+
/**
1046+
* 获取环境信息
1047+
* https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/cloudbase-batch/env-mgnt/getTcbEnvList.html
1048+
*
1049+
* @return
1050+
* @throws WxErrorException
1051+
*/
1052+
GetTcbEnvListResponse getTcbEnvList() throws WxErrorException;
1053+
1054+
/**
1055+
* 转换云环境
1056+
* https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/cloudbase-batch/env-mgnt/changeTcbEnv.html
1057+
*
1058+
* @param env 环境id
1059+
* @return
1060+
* @throws WxErrorException
1061+
*/
1062+
WxOpenResult changeTcbEnv(String env) throws WxErrorException;
1063+
1064+
1065+
/**
1066+
* 环境共享
1067+
* https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/cloudbase-batch/env-mgnt/shareCloudbaseEnv.html
1068+
*
1069+
* @param request
1070+
* @return
1071+
* @throws WxErrorException
1072+
*/
1073+
ShareCloudBaseEnvResponse shareCloudBaseEnv(ShareCloudBaseEnvRequest request) throws WxErrorException;
10231074
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.chanjar.weixin.open.api.impl;
22

33
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
4+
import com.google.gson.Gson;
45
import com.google.gson.JsonArray;
56
import com.google.gson.JsonObject;
67
import com.google.gson.reflect.TypeToken;
@@ -28,6 +29,10 @@
2829
import me.chanjar.weixin.open.bean.minishop.limitdiscount.LimitDiscountGoods;
2930
import me.chanjar.weixin.open.bean.minishop.limitdiscount.LimitDiscountSku;
3031
import me.chanjar.weixin.open.bean.result.*;
32+
import me.chanjar.weixin.open.bean.tcb.ShareCloudBaseEnvRequest;
33+
import me.chanjar.weixin.open.bean.tcb.ShareCloudBaseEnvResponse;
34+
import me.chanjar.weixin.open.bean.tcbComponent.GetShareCloudBaseEnvResponse;
35+
import me.chanjar.weixin.open.bean.tcbComponent.GetTcbEnvListResponse;
3136
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
3237
import org.apache.commons.lang3.StringUtils;
3338
import org.jetbrains.annotations.Nullable;
@@ -1222,4 +1227,37 @@ public WxOpenResult updateLimitDiscountStatus(String appId, Long taskId, Integer
12221227

12231228
return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
12241229
}
1230+
1231+
@Override
1232+
public GetShareCloudBaseEnvResponse getShareCloudBaseEnv(List<String> appids) throws WxErrorException {
1233+
JsonObject jsonObject = new JsonObject();
1234+
JsonArray jsonArray = new JsonArray();
1235+
for(String appId : appids) {
1236+
jsonArray.add(appId);
1237+
}
1238+
jsonObject.add("appids", jsonArray);
1239+
String response = post(BATCH_GET_ENVID_URL, jsonObject.toString());
1240+
return WxOpenGsonBuilder.create().fromJson(response, GetShareCloudBaseEnvResponse.class);
1241+
}
1242+
1243+
@Override
1244+
public GetTcbEnvListResponse getTcbEnvList() throws WxErrorException {
1245+
String response = post(DESCRIBE_ENVS_URL, new JsonObject().toString());
1246+
return WxOpenGsonBuilder.create().fromJson(response, GetTcbEnvListResponse.class);
1247+
}
1248+
1249+
@Override
1250+
public WxOpenResult changeTcbEnv(String env) throws WxErrorException {
1251+
JsonObject jsonObject = new JsonObject();
1252+
jsonObject.addProperty("env", env);
1253+
String response = post(MODIFY_ENV_URL, jsonObject.toString());
1254+
return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
1255+
}
1256+
1257+
@Override
1258+
public ShareCloudBaseEnvResponse shareCloudBaseEnv(ShareCloudBaseEnvRequest request) throws WxErrorException {
1259+
Gson gson = new Gson();
1260+
String response = post(BATCH_SHARE_ENV, gson.toJson(request));
1261+
return WxOpenGsonBuilder.create().fromJson(response, ShareCloudBaseEnvResponse.class);
1262+
}
12251263
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/tcb/ShareCloudBaseEnvRequest.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package me.chanjar.weixin.open.bean.tcb;
2+
3+
import com.google.gson.annotations.SerializedName;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Builder;
6+
import lombok.Data;
7+
import lombok.NoArgsConstructor;
8+
9+
import java.io.Serializable;
10+
import java.util.List;
11+
12+
@Data
13+
@Builder
14+
@AllArgsConstructor
15+
@NoArgsConstructor
16+
public class ShareCloudBaseEnvRequest implements Serializable {
17+
private static final long serialVersionUID = 410566969624593042L;
18+
19+
@SerializedName("data")
20+
private List<DataDTO> data;
21+
22+
@Data
23+
@Builder
24+
@AllArgsConstructor
25+
@NoArgsConstructor
26+
public static class DataDTO implements Serializable {
27+
@SerializedName("env")
28+
private String env;
29+
@SerializedName("appids")
30+
private List<String> appids;
31+
}
32+
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/tcb/ShareCloudBaseEnvResponse.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package me.chanjar.weixin.open.bean.tcb;
2+
3+
import com.google.gson.annotations.SerializedName;
4+
import lombok.Builder;
5+
import lombok.Data;
6+
import me.chanjar.weixin.open.bean.result.WxOpenResult;
7+
8+
import java.io.Serializable;
9+
import java.util.List;
10+
11+
@Data
12+
@Builder
13+
public class ShareCloudBaseEnvResponse extends WxOpenResult implements Serializable {
14+
private static final long serialVersionUID = 316444074975118997L;
15+
16+
@SerializedName("err_list")
17+
private List<ErrListDTO> errList;
18+
19+
@Data
20+
public static class ErrListDTO implements Serializable {
21+
@SerializedName("env")
22+
private String env;
23+
@SerializedName("appid")
24+
private String appid;
25+
@SerializedName("errmsg")
26+
private String errmsg;
27+
}
28+
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/tcbComponent/GetShareCloudBaseEnvResponse.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package me.chanjar.weixin.open.bean.tcbComponent;
2+
3+
import com.google.gson.annotations.SerializedName;
4+
import lombok.Data;
5+
import me.chanjar.weixin.open.bean.result.WxOpenResult;
6+
7+
import java.io.Serializable;
8+
import java.util.List;
9+
10+
@Data
11+
public class GetShareCloudBaseEnvResponse extends WxOpenResult implements Serializable {
12+
private static final long serialVersionUID = -6267755285547585403L;
13+
14+
@SerializedName("relation_data")
15+
private List<RelationDataDTO> relationData;
16+
17+
@SerializedName("err_list")
18+
private List<ErrListDTO> errList;
19+
20+
@Data
21+
public static class RelationDataDTO implements Serializable {
22+
@SerializedName("appid")
23+
private String appid;
24+
@SerializedName("env_list")
25+
private List<String> envList;
26+
}
27+
28+
@Data
29+
public static class ErrListDTO implements Serializable {
30+
@SerializedName("appid")
31+
private String appid;
32+
@SerializedName("errmsg")
33+
private String errmsg;
34+
}
35+
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/tcbComponent/GetTcbEnvListResponse.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package me.chanjar.weixin.open.bean.tcbComponent;
2+
3+
import com.google.gson.annotations.SerializedName;
4+
import lombok.Data;
5+
import me.chanjar.weixin.open.bean.result.WxOpenResult;
6+
7+
import java.io.Serializable;
8+
import java.util.List;
9+
10+
@Data
11+
public class GetTcbEnvListResponse extends WxOpenResult implements Serializable {
12+
private static final long serialVersionUID = -5896318347861752798L;
13+
14+
@SerializedName("info_list")
15+
private List<InfoListDTO> infoList;
16+
17+
@Data
18+
public static class InfoListDTO implements Serializable {
19+
@SerializedName("env")
20+
private String env;
21+
@SerializedName("alias")
22+
private String alias;
23+
@SerializedName("create_time")
24+
private String createTime;
25+
@SerializedName("update_time")
26+
private String updateTime;
27+
@SerializedName("status")
28+
private String status;
29+
@SerializedName("package_id")
30+
private String packageId;
31+
@SerializedName("package_name")
32+
private String packageName;
33+
@SerializedName("dbinstance_id")
34+
private String dbinstanceId;
35+
@SerializedName("bucket_id")
36+
private String bucketId;
37+
}
38+
}

‎weixin-java-open/src/test/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImplTest.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
import com.google.inject.Inject;
44
import me.chanjar.weixin.common.error.WxErrorException;
55
import me.chanjar.weixin.open.api.WxOpenComponentService;
6+
import me.chanjar.weixin.open.bean.result.WxOpenResult;
7+
import me.chanjar.weixin.open.bean.tcb.ShareCloudBaseEnvRequest;
8+
import me.chanjar.weixin.open.bean.tcb.ShareCloudBaseEnvResponse;
9+
import me.chanjar.weixin.open.bean.tcbComponent.GetShareCloudBaseEnvResponse;
10+
import me.chanjar.weixin.open.bean.tcbComponent.GetTcbEnvListResponse;
611
import me.chanjar.weixin.open.test.ApiTestModule;
12+
import org.testng.Assert;
713
import org.testng.annotations.Guice;
814
import org.testng.annotations.Test;
915

16+
import java.util.Arrays;
17+
1018
/**
1119
* 单元测试类.
1220
*
@@ -171,4 +179,32 @@ public void testFastRegisterWeappSearch() {
171179
public void testStartPushTicket() throws WxErrorException {
172180
wxOpenComponentService.startPushTicket();
173181
}
182+
183+
@Test
184+
public void testGetShareCloudBaseEnv() throws WxErrorException {
185+
GetShareCloudBaseEnvResponse response = wxOpenComponentService.getShareCloudBaseEnv(Arrays.asList("wxad2ee6fa2df2c46d"));
186+
Assert.assertNotNull(response);
187+
}
188+
189+
@Test
190+
public void testGetTcbEnvListv() throws WxErrorException {
191+
GetTcbEnvListResponse response = wxOpenComponentService.getTcbEnvList();
192+
Assert.assertNotNull(response);
193+
}
194+
195+
@Test
196+
public void testChangeTcbEnv() throws WxErrorException {
197+
WxOpenResult response = wxOpenComponentService.changeTcbEnv("test");
198+
Assert.assertNotNull(response);
199+
}
200+
201+
@Test
202+
public void testShareCloudBaseEnv() throws WxErrorException {
203+
ShareCloudBaseEnvRequest request = ShareCloudBaseEnvRequest.builder()
204+
.data(Arrays.asList(ShareCloudBaseEnvRequest.DataDTO.builder()
205+
.env("test-env-6gni9ity244a6ea3").appids(Arrays.asList("wx5fe6bb43205e9e07")).build()))
206+
.build();
207+
ShareCloudBaseEnvResponse response = wxOpenComponentService.shareCloudBaseEnv(request);
208+
Assert.assertNotNull(response);
209+
}
174210
}

0 commit comments

Comments
 (0)