Skip to content

donghu / pipi-data-center

Go to a project
Commit f562144c by donghu
Options

更新代码

1 parent a0483d7e
Inline Side-by-side
Showing 27 changed files with 691 additions and 78 deletions
.classpath
......@@ -23,6 +23,10 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
.gitignore 0 → 100644
/target/
src/main/java/com/pipi/qa/basic/BasicData.java
package com.pipi.qa.basic;
public class BasicData {
public final static String userName = "admin";
public final static String passWord = "ZnVsdTk5NjM1";
public final static String preTestUserName = "chengjie";
public final static String preTestPassWord = "MXFhejJ3c3gzZWRj";
}
......
src/main/java/com/pipi/qa/bean/Player.java
......@@ -3,8 +3,15 @@ package com.pipi.qa.bean;
public class Player {
private String env;
private String mobile;
private String techLevelId;
private String id;
private String categoryId;
public String getEnv() {
return env;
}
......@@ -17,6 +24,24 @@ public class Player {
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getTechLevelId() {
return techLevelId;
}
public void setTechLevelId(String techLevelId) {
this.techLevelId = techLevelId;
}
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(String categoryId) {
this.categoryId = categoryId;
}
}
src/main/java/com/pipi/qa/bean/Room.java
......@@ -6,8 +6,16 @@ public class Room {
private String mobile;
private String guildCode;
private String roomNo;
private String roomName;
private long roomType;
private long roomCategoryId;
private String activityId;
private String amount;
......@@ -82,4 +90,37 @@ public class Room {
this.times = times;
}
public String getGuildCode() {
return guildCode;
}
public void setGuildCode(String guildCode) {
this.guildCode = guildCode;
}
public String getRoomName() {
return roomName;
}
public void setRoomName(String roomName) {
this.roomName = roomName;
}
public long getRoomType() {
return roomType;
}
public void setRoomType(long roomType) {
this.roomType = roomType;
}
public long getRoomCategoryId() {
return roomCategoryId;
}
public void setRoomCategoryId(long roomCategoryId) {
this.roomCategoryId = roomCategoryId;
}
}
src/main/java/com/pipi/qa/bean/User.java
......@@ -15,6 +15,10 @@ public class User {
private String ext;
private long money;
private long openStatus;
private long guildBiz;
public String getEnv() {
return env;
......@@ -71,6 +75,22 @@ public class User {
public void setMoney(long money) {
this.money = money;
}
public long getOpenStatus() {
return openStatus;
}
public void setOpenStatus(long openStatus) {
this.openStatus = openStatus;
}
public long getGuildBiz() {
return guildBiz;
}
public void setGuildBiz(long guildBiz) {
this.guildBiz = guildBiz;
}
}
src/main/java/com/pipi/qa/controller/common/CosPlayPlayerController.java
......@@ -57,6 +57,58 @@ public class CosPlayPlayerController {
}
/**
* 陪玩师申请入驻
* @param PlayerApply
* @return
*/
@ApiOperation(value = "陪玩师申请入驻", notes = "输入手机号")
@RequestMapping(value = "/saveInfoTech", method = RequestMethod.POST)
@ResponseBody
public JSONObject saveInfoTech(@RequestBody Player player) {
String mobile = player.getMobile();
String env = player.getEnv();
String techLevelId = player.getTechLevelId();
String id =player.getId();
String categoryId = player.getCategoryId();
//登录获取token、userId
JSONObject loginRes = cosPlayPlayerService.login(mobile, env);
token = loginRes.getJSONObject("data").getString("token");
userId = loginRes.getJSONObject("data").getString("id");
JSONObject jsonObj = cosPlayPlayerService.saveInfoTech(token, userId, categoryId, techLevelId, env);
logger.info("env:"+env+"mobile:"+mobile);
return jsonObj;
}
/**
* 申请陪玩师及入驻
* @param PlayerApply
* @return
*/
@ApiOperation(value = "申请陪玩师及入驻", notes = "输入手机号")
@RequestMapping(value = "/playerApplyAndSaveInfoTech", method = RequestMethod.POST)
@ResponseBody
public JSONObject playerApplyAndSaveInfoTech(@RequestBody Player player) {
String mobile = player.getMobile();
String env = player.getEnv();
String techLevelId = player.getTechLevelId();
String id =player.getId();
String categoryId = player.getCategoryId();
//登录获取token、userId
JSONObject loginRes = cosPlayPlayerService.login(mobile, env);
token = loginRes.getJSONObject("data").getString("token");
userId = loginRes.getJSONObject("data").getString("id");
//申请陪玩师
cosPlayPlayerService.SubmitAuthentication(token, userId, env);
//提交陪玩师资料
cosPlayPlayerService.saveUserInfo(token, userId, env);
//申请陪玩师技能
JSONObject jsonObj = cosPlayPlayerService.saveInfoTech(token, userId, categoryId, techLevelId, env);
logger.info("env:"+env+"mobile:"+mobile);
return jsonObj;
}
/**
*充钻石
* @param User
* @return
......@@ -152,5 +204,89 @@ public class CosPlayPlayerController {
JSONObject jsonObj = cosPlayPlayerService.lotteryActivity(mobile, roomNo, activityId, times, env);
return jsonObj;
}
/**
*创建公会
* @param PlayerApply
* @return
*/
@ApiOperation(value = "创建公会", notes = "是否开启自定义分成,1开启，0不开启,guildBiz语音1，游戏2，全部0")
@RequestMapping(value = "/guildCreate", method = RequestMethod.POST)
@ResponseBody
public JSONObject guildCreate(@RequestBody User user) {
String mobile = user.getMobile();
String env = user.getEnv();
long guildBiz = user.getGuildBiz();
long openStatus = user.getOpenStatus();
JSONObject jsonObj = cosPlayPlayerService.guildCreate(mobile, openStatus, guildBiz, env);
return jsonObj;
}
/**
*申请加入公会
* @param guildCenter
* @return
*/
@ApiOperation(value = "申请加入公会", notes = "支持按公会ID申请加入，需要审核")
@RequestMapping(value = "/guildCenter", method = RequestMethod.POST)
@ResponseBody
public JSONObject guildCenter(@RequestBody Room room) {
String mobile = room.getMobile();
String env = room.getEnv();
String guildCode = room.getGuildCode();
JSONObject jsonObj = cosPlayPlayerService.guildCenter(mobile, guildCode, env);
return jsonObj;
}
/**
*审核加入公会
* @param applyList
* @return
*/
@ApiOperation(value = "审核加入公会", notes = "审核人员")
@RequestMapping(value = "/applyList", method = RequestMethod.POST)
@ResponseBody
public JSONObject applyList(@RequestBody Room room) {
String mobile = room.getMobile();
String env = room.getEnv();
String guildCode = room.getGuildCode();
JSONObject jsonObj = cosPlayPlayerService.applyList(mobile, env);
return jsonObj;
}
/**
*加入公会及审核
* @param applyList
* @return
*/
@ApiOperation(value = "申请加入公会及审核", notes = "审核人员")
@RequestMapping(value = "/auditGuild", method = RequestMethod.POST)
@ResponseBody
public JSONObject auditGuild(@RequestBody Room room) {
String mobile = room.getMobile();
String env = room.getEnv();
String guildCode = room.getGuildCode();
JSONObject jsonObj = cosPlayPlayerService.auditGuild(mobile, guildCode, env);
return jsonObj;
}
/**
*创建厅
* @param roomSave
* @return
*/
@ApiOperation(value = "创建厅", notes = "")
@RequestMapping(value = "/roomSave", method = RequestMethod.POST)
@ResponseBody
public JSONObject roomSave(@RequestBody Room room) {
String mobile = room.getMobile();
String env = room.getEnv();
long roomCategoryId = room.getRoomCategoryId();
long roomType = room.getRoomType();
String roomName = room.getRoomName();
JSONObject jsonObj = cosPlayPlayerService.roomSave(mobile, roomName, roomType, roomCategoryId, env);
return jsonObj;
}
}
src/main/java/com/pipi/qa/service/CosPlayPlayerService.java
package com.pipi.qa.service;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -18,7 +20,7 @@ public interface CosPlayPlayerService {
public JSONObject SubmitAuthentication(String token,String userId,String env);
public String getAdminToken(String username, String password, String env);
public String getAdminToken(String env);
public JSONObject saveUserInfo(String token, String userId, String env);
......@@ -34,4 +36,24 @@ public interface CosPlayPlayerService {
public JSONObject lotteryActivity(String mobile,String roomNo, String activityId, String times, String env);
public JSONObject saveInfoTech(String token, String userId, String categoryId, String techLevelId, String env);
public JSONObject guildCreate(String mobile, long openStatus, long guildBiz, String env);
public JSONObject guildList(Map<String, Object> adminHeaders, String guildCode, String env);
public JSONObject roomSave(String mobile, String roomName, long roomType, long roomCategoryId, String env);
public JSONObject userList(String mobile, String env);
public JSONObject guildCenter(String mobile,String queryStr, String env);
public long guildSearch(String mobile, String queryStr, String env);
public JSONObject applyList(String mobile, String env);
public JSONObject handleApply(String mobile, long applyId, String env);
public JSONObject auditGuild(String mobile, String queryStr, String env);
}
src/main/java/com/pipi/qa/service/impl/CosPlyaPlayerServiceImpl.java
......@@ -26,6 +26,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
public static String emblemUrl = "https://test-game-play.oss-cn-hangzhou.aliyuncs.com/temp/2021/4/17/66ed341c47764ff1b12c834eda023956.jpg";
public static String pngURL = "http://test-game-play.oss-cn-hangzhou.aliyuncs.com/temp/2020/11/11/c343b09eccfe4f14b56f33b2f42041d2.jpg";
/**
* 登录
......@@ -74,9 +75,15 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
*/
@Override
public String getAdminToken(String username,String password,String env) {
public String getAdminToken(String env) {
String adminLoginUrl = "https://"+env+"-api-admin.apeiwan.com/login";
Map<String, Object> params = new HashMap();
String username = BasicData.userName;
String password = BasicData.passWord;
if(env.equals("pre-test")){
username = BasicData.preTestUserName;
password = BasicData.preTestPassWord;
}
params.put("username", username);
params.put("password", password);
JSONObject jsonObj = HttpToolKit.invokePost(adminLoginUrl, null, params ).getJSONObject();
......@@ -102,8 +109,8 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
Map<String, Object> params = new HashMap();
params.put("authType", 0);
params.put("userId", userId);
params.put("userName", "testc");
params.put("cardNo", "12124333541551");
params.put("userName", userId);
params.put("cardNo", userId);
params.put("cardHandUrl", cardHandUrl);
params.put("cardUrl", cardUrl);
params.put("emblemUrl", emblemUrl);
......@@ -112,7 +119,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
String authUrl = "https://"+env+"-api-h5.apeiwan.com/api/v2/user/body-auth/save";
HttpToolKit.invokePost(authUrl, headers, params);
//获取控制台用户token
String adminToken = getAdminToken(BasicData.userName, BasicData.passWord, env);
String adminToken = getAdminToken(env);
String passUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/user/body-auth/pass";
Map<String, Object> headers1 = new HashMap();
headers1.put("token", adminToken);
......@@ -141,7 +148,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
params.put("videoUrl", pngURL);
HttpToolKit.invokePost(saveUserInfoUrl, headers, params).getJSONObject();
//获取控制台用户token
String adminToken = getAdminToken(BasicData.userName, BasicData.passWord, env);
String adminToken = getAdminToken(env);
String authUpdateUrl = "https://"+env+"-api-admin.apeiwan.com/api/v2/user/info-auth-update";
Map<String, Object> headers1 = new HashMap();
headers1.put("token", adminToken);
......@@ -154,6 +161,54 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
return jsonObj;
}
@Override
public JSONObject saveInfoTech(String token,String userId, String categoryId,String techLevelId,String env) {
//提交王者荣耀陪玩师入驻申请
headers.put("token", token);
String saveInfoTechUrl = "https://"+env+"-api-h5.apeiwan.com/api/v2/user/save-info-tech";
Map<String, Object> params = new HashMap();
//技能ID,首次申请为空
params.put("id", "");
params.put("userId", userId);
//品类
params.put("categoryId", categoryId);
//等级，如王者荣耀
params.put("techLevelId", techLevelId);
params.put("voice", "http://test-game-play.oss-cn-hangzhou.aliyuncs.com/2021/5/25/b5cfddf754744946998c49be57bda518.mp3");
params.put("voiceDuration", 8);
params.put("gradePicUrl", pngURL);
params.put("description", "非常好");
HttpToolKit.invokePost(saveInfoTechUrl, headers, params).getJSONObject();
//获取控制台用户token
String adminToken = getAdminToken(env);
String techAuthUrl = "https://"+env+"-api-admin.apeiwan.com/api/v2/user/tech-auth/pass";
Map<String, Object> headers1 = new HashMap();
headers1.put("token", adminToken);
Map<String, Object> updateParams = new HashMap();
//查询技能ID
String id = "";
String techAuthListUrl = "https://"+env+"-api-admin.apeiwan.com/api/v2/user/tech/to-audit/list";
Map<String, Object> techAuthListParams = new HashMap();
techAuthListParams.put("pageNum", "1");
techAuthListParams.put("pageSize", "10");
techAuthListParams.put("authStatus", 7);
techAuthListParams.put("type", false);
JSONObject techAuthListJson = HttpToolKit.invokePost(techAuthListUrl, headers1, techAuthListParams).getJSONObject();
JSONArray jsonArr = techAuthListJson.getJSONObject("data").getJSONArray("list");
JSONObject jsonObj1 = (JSONObject) jsonArr.get(0);
id = jsonObj1.getString("id");
logger.info("技能ID："+id);
updateParams.put("id", id);
updateParams.put("maxPrice", "");
updateParams.put("techLevelId", "6");
//审批入驻
JSONObject jsonObj = HttpToolKit.invokePost(techAuthUrl, headers1, updateParams).getJSONObject();
return jsonObj;
}
/**
* 充钻石
* @param env
......@@ -163,7 +218,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
@Override
public JSONObject virtualMoneyModify(String mobile,long money,String env) {
//获取控制台用户token
String adminToken = getAdminToken(BasicData.userName, BasicData.passWord, env);
String adminToken = getAdminToken(env);
//根据用户手机号获取userId
String userListUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/user/list";
Map<String, Object> adminHeaders = new HashMap();
......@@ -199,7 +254,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
@Override
public JSONObject moneyDetailsSave(String mobile,long money,String env) {
//获取控制台用户token
String adminToken = getAdminToken(BasicData.userName, BasicData.passWord, env);
String adminToken = getAdminToken(env);
//根据用户手机号获取userId
String userListUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/user/list";
Map<String, Object> adminHeaders = new HashMap();
......@@ -269,7 +324,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
@Override
public JSONObject giftList(String env) {
//获取控制台用户token
String adminToken = getAdminToken(BasicData.userName, BasicData.passWord, env);
String adminToken = getAdminToken(env);
Map<String, Object> adminHeaders = new HashMap();
adminHeaders.put("token", adminToken);
//查询礼物列表
......@@ -292,7 +347,7 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
@Override
public JSONObject activityList(String env) {
//获取控制台用户token
String adminToken = getAdminToken(BasicData.userName, BasicData.passWord, env);
String adminToken = getAdminToken(env);
Map<String, Object> adminHeaders = new HashMap();
adminHeaders.put("token", adminToken);
//幸运夺宝箱列表
......@@ -326,11 +381,293 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
}
/**
* 申请开公会
* @param env
* @param mobile
* @param guildBiz
* @param openStatus
* @return
*/
@Override
public JSONObject guildCreate(String mobile,long openStatus, long guildBiz, String env) {
String appToken = this.getAppToken(mobile, env);
headers.put("token", appToken);
String guildCreateUrl = "http://"+env+"-guild-api.apeiwan.com/api/v1/guild-center/guild/create";
Map<String, Object> guildCreateParams = new HashMap();
guildCreateParams.put("leaderQq", "253772296");
guildCreateParams.put("leaderName", "心玄");
guildCreateParams.put("guildAuditPics", "http://test-game-play.oss-cn-hangzhou.aliyuncs.com/temp/2021/6/10/c117b205ae6d4ffc86d7cfb095c34756.jpeg");
guildCreateParams.put("companyName", "");
guildCreateParams.put("guildType", 1);
guildCreateParams.put("description", "欢迎来到我的公会");
guildCreateParams.put("remark", "欢迎来到我的公会");
guildCreateParams.put("maxNum", "50");
guildCreateParams.put("logoUrl", "http://test-game-play.oss-cn-hangzhou.aliyuncs.com/temp/2021/6/10/41ccae2242e74da8a554726da01f1dc2.jpeg");
guildCreateParams.put("guildName", "心玄的公会");
HttpToolKit.invokePost(guildCreateUrl, headers, guildCreateParams).getJSONObject();
//获取控制台用户token
String adminToken = getAdminToken(env);
//根据用户手机号获取公会ID
String auditListUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/guild-center/guild/audit-list";
Map<String, Object> adminHeaders = new HashMap();
adminHeaders.put("token", adminToken);
Map<String, Object> updateParams = new HashMap();
updateParams.put("pageNum", 1);
updateParams.put("pageSize", 10);
updateParams.put("mobile", mobile);
JSONObject jsonObj = HttpToolKit.invokePost(auditListUrl, adminHeaders, updateParams).getJSONObject();
JSONArray jsonArr = jsonObj.getJSONObject("data").getJSONArray("list");
JSONObject jsonObj1 = (JSONObject) jsonArr.get(0);
String guildAuditId = jsonObj1.getString("id");
logger.info("id:"+guildAuditId);
//审核公会 //公会自定义分成 //分成权限设置
Map<String, Object> auditHandleParams = new HashMap();
String auditHandleUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/guild-center/guild/audit-handle";
//审核状态
auditHandleParams.put("auditStatus", 2);
//审核ID
auditHandleParams.put("guildAuditId", guildAuditId);
//guildBiz语音1，游戏2，全部0
auditHandleParams.put("guildBiz", 0);
//openStatus是否开启自定义分成,1开启，0不开启，
auditHandleParams.put("openStatus",1);
JSONObject jsonObj2 = HttpToolKit.invokePost(auditHandleUrl, adminHeaders, auditHandleParams).getJSONObject();
return jsonObj2;
}
/**
* 根据公会ID获取会长相关信息
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject guildList(Map<String, Object> adminHeaders,String guildCode, String env) {
//获取会长相关信息
String guildListUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/guild-center/guild/list";
Map<String, Object> guildListParams = new HashMap();
guildListParams.put("guildCode", guildCode);
guildListParams.put("pageNum", 1);
guildListParams.put("pageSize", 999999);
JSONObject giftListJsonObj = HttpToolKit.invokePost(guildListUrl, adminHeaders, guildListParams).getJSONObject();
JSONArray jsonArr = giftListJsonObj.getJSONObject("data").getJSONArray("list");
JSONObject jsonObj1 = (JSONObject) jsonArr.get(0);
logger.info("获取会长相关信息:"+jsonObj1);
return jsonObj1;
}
/**
* 根据手机号获取userId、公会信息
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject userList(String mobile,String env) {
//获取控制台用户token
String adminToken = getAdminToken(env);
//根据用户手机号获取userId
String userListUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/user/list";
Map<String, Object> adminHeaders = new HashMap();
adminHeaders.put("token", adminToken);
Map<String, Object> updateParams = new HashMap();
updateParams.put("pageNum", 1);
updateParams.put("pageSize", 10);
updateParams.put("mobile", mobile);
JSONObject jsonObj = HttpToolKit.invokePost(userListUrl, adminHeaders, updateParams).getJSONObject();
JSONArray jsonArr = jsonObj.getJSONObject("data").getJSONArray("list");
JSONObject jsonObj1 = (JSONObject) jsonArr.get(0);
return jsonObj1;
}
/**
* 创建房间
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject roomSave(String mobile,String roomName,long roomType,long roomCategoryId, String env) {
//获取控制台用户token
String adminToken = getAdminToken(env);
Map<String, Object> adminHeaders = new HashMap();
adminHeaders.put("token", adminToken);
//创建房间
String roomSaveUrl = "https://"+env+"-api-admin.apeiwan.com/api/v1/room/save";
Map<String, Object> roomSaveParams = new HashMap();
//房间属性，是否为公会厅，1为公会，2为非公会
roomSaveParams.put("roomType", roomType);
//通过房主手机号获取公会信息及leaderId
JSONObject jsObj= this.userList(mobile, env);
String guildCode = jsObj.getString("guildCode");
//公会ID
roomSaveParams.put("guildCode", guildCode);
String hostUserId = null;
String leaderNickName = null;
//如果为公会厅，则获取会长相关信息
if(roomType==1){
JSONObject guildList = this.guildList(adminHeaders, guildCode, env);
hostUserId = guildList.getString("leaderId");
leaderNickName = guildList.getString("leaderNickName");
roomSaveParams.put("hostUserId", hostUserId);
roomSaveParams.put("hostUserName", leaderNickName);
}
//如果为非公会厅，则获取房主相关信息
else{
hostUserId = jsObj.getString("id");
leaderNickName = jsObj.getString("nickname");
roomSaveParams.put("hostUserId", hostUserId);
roomSaveParams.put("hostUserName", leaderNickName);
//兼容guildCode为null的情况
if(guildCode==null){
roomSaveParams.put("guildCode", "");
}
}
roomSaveParams.put("roomIcon", "http://game-play.oss-cn-hangzhou.aliyuncs.com/temp/2021/6/16/9729215f7fad47a1a5d511b9a710620e.jpg");
//是否激活
roomSaveParams.put("isActivate", true);
//厅名称
roomSaveParams.put("roomName", roomName);
//房间类型：2为派单厅 3为女生厅，4为点唱厅，8为直播厅，17为男生厅
roomSaveParams.put("roomCategoryId", roomCategoryId);
roomSaveParams.put("orderRoomSerial", "1");
roomSaveParams.put("virtualPeople", "1");
roomSaveParams.put("remark", roomName);
logger.info("roomSaveParams:"+roomSaveParams.toString());
JSONObject giftListJsonObj = HttpToolKit.invokePost(roomSaveUrl, adminHeaders, roomSaveParams).getJSONObject();
return giftListJsonObj;
}
/**
* 申请加入公会
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject guildCenter(String mobile,String queryStr,String env) {
String sendUrl = "https://"+env+"-guild-api.apeiwan.com/api/v1/guild-center/guild/join";
String appToken = this.getAppToken(mobile, env);
Map<String, Object> sendParams = new HashMap();
headers.put("token", appToken);
//根据guildCode获取guildId
long guildId = this.guildSearch(mobile, queryStr, env);
sendParams.put("guildId", guildId);
sendParams.put("applyRemark", "我是test，想加入公会");
JSONObject jsonObj = null;
if(guildId!=0){
jsonObj = HttpToolKit.invokePost(sendUrl, headers, sendParams).getJSONObject();
}
else{
jsonObj = new JSONObject();
jsonObj.put("desc", "未找到该公会！");
}
return jsonObj;
}
/**
* 搜索公会
* @param env
* @param mobile
* @return
*/
@Override
public long guildSearch(String mobile,String queryStr,String env) {
String searchUrl = "https://"+env+"-guild-api.apeiwan.com/api/v1/guild-center/guild/search";
Map<String, Object> sendParams = new HashMap();
//根据guildCode获取guildId
sendParams.put("pageNum", "1");
sendParams.put("pageSize", "20");
sendParams.put("queryStr", queryStr);
JSONObject jsonObj = HttpToolKit.invokePost(searchUrl, headers, sendParams).getJSONObject();
JSONArray jsonArr = jsonObj.getJSONObject("data").getJSONArray("list");
long guildId = 0;
if(jsonArr.size()!=0){
JSONObject jsonObj1 = (JSONObject) jsonArr.get(0);
guildId = jsonObj1.getLong("id");
}
logger.info("guildId:"+guildId);
return guildId;
}
/**
* 审核加入公会
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject applyList(String mobile,String env) {
String searchUrl = "https://"+env+"-guild-api.apeiwan.com/api/v1/guild-center/guild/apply-list";
String appToken = this.getAppToken(mobile, env);
headers.put("token", appToken);
long guildId = 0;
//根据用户手机号获取公会ID
JSONObject jsObj = this.userList(mobile, env);
String guildCode = jsObj.getString("guildCode");
guildId = this.guildSearch(mobile, guildCode, env);
Map<String, Object> sendParams = new HashMap();
//根据公会ID即guildCode获取guildId
sendParams.put("pageNum", "1");
sendParams.put("pageSize", "20");
sendParams.put("applyType", "1");
sendParams.put("guildId", guildId);
JSONObject jsonObj = HttpToolKit.invokePost(searchUrl, headers, sendParams).getJSONObject();
JSONArray jsonArr = jsonObj.getJSONObject("data").getJSONArray("list");
JSONObject jsonObj1 = (JSONObject) jsonArr.get(0);
long applyId = jsonObj1.getLong("applyId");
logger.info("applyId:"+applyId);
JSONObject jsObj1 = this.handleApply(mobile, applyId, env);
return jsObj1;
}
/**
* 申请加入公会及审核
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject auditGuild (String mobile,String queryStr,String env) {
//通过公会ID申请加入公会
this.guildCenter(mobile, queryStr, env);
//获取控制台用户token
String adminToken = getAdminToken(env);
Map<String, Object> adminHeaders = new HashMap();
adminHeaders.put("token", adminToken);
//根据公会ID获取会长相关信息
JSONObject guildList = this.guildList(adminHeaders, queryStr, env);
String LeaderMobile = guildList.getString("mobile");
JSONObject jsonObj = this.applyList(LeaderMobile, env);
return jsonObj;
}
/**
* 审核加入公会
* @param env
* @param mobile
* @return
*/
@Override
public JSONObject handleApply(String mobile,long applyId,String env) {
String handleApplyUrl = "https://"+env+"-guild-api.apeiwan.com/api/v1/guild-center/guild/handle-apply";
Map<String, Object> sendParams = new HashMap();
sendParams.put("applyId", applyId);
sendParams.put("handleStatus", 2);
sendParams.put("configs", "[]");
JSONObject jsonObj = HttpToolKit.invokePost(handleApplyUrl, headers, sendParams).getJSONObject();
return jsonObj;
}
public static void main(String args[]){
CosPlyaPlayerServiceImpl CosPlyaPlayerServiceImpl = new CosPlyaPlayerServiceImpl();
String env = "t5";
String mobile = "13823774138";
CosPlyaPlayerServiceImpl cosPlyaPlayerServiceImpl = new CosPlyaPlayerServiceImpl();
String env = "pre-test";
String mobile = "13823774131";
String roomNo = "TEST902661";
String productId = "444";
String userIds = "2952662,2952651";
......@@ -338,19 +675,41 @@ public class CosPlyaPlayerServiceImpl implements CosPlayPlayerService {
long money=10;
String times="1";
String activityId="110";
//JSONObject loginRes = CosPlyaPlayerServiceImpl.login(mobile,env);
//JSONObject loginRes = cosPlyaPlayerServiceImpl.login(mobile,env);
//String token = loginRes.getJSONObject("data").getString("token");
//String userId = loginRes.getJSONObject("data").getString("id");
//CosPlyaPlayerServiceImpl.SubmitAuthentication(token,userId,env);
String techLevelId="107";
String categoryId="30";
String id = "";
long openStatus=1;
long guildBiz=0;
//cosPlyaPlayerServiceImpl.guildCreate(mobile,openStatus,guildBiz,"t");
//cosPlyaPlayerServiceImpl.SubmitAuthentication(token,userId,env);
//CosPlyaPlayerServiceImpl.saveUserInfo(token, userId, env);
//CosPlyaPlayerServiceImpl.virtualMoneyModify(mobile,money,env);
//CosPlyaPlayerServiceImpl.send(mobile, roomNo, productId,amount,userIds,env);
//CosPlyaPlayerServiceImpl.giftList(env);
//CosPlyaPlayerServiceImpl.moneyDetailsSave(mobile, money, env);
//CosPlyaPlayerServiceImpl.activityList(env);
CosPlyaPlayerServiceImpl.lotteryActivity(mobile, roomNo, activityId, times, env);
}
//CosPlyaPlayerServiceImpl.lotteryActivity(mobile, roomNo, activityId, times, env);
//cosPlyaPlayerServiceImpl.saveInfoTech(mobile, categoryId, techLevelId, env);
//String guildCode ="16208545";
//房间属性，是否为公会厅，1为公会，2为非公会
long roomType = 2;
String roomName = "我的非公会厅1";
long roomCategoryId = 2;
String queryStr = "10113062";
long applyId = 87148;
// cosPlyaPlayerServiceImpl.roomSave(mobile, roomName, roomType, roomCategoryId , env);
//cosPlyaPlayerServiceImpl.userList(mobile, env); 公会ID 12359482 13823774131
//cosPlyaPlayerServiceImpl.guildCenter(mobile, queryStr, env);
//cosPlyaPlayerServiceImpl.guildSearch(mobile, queryStr, env);
//公会审批列表
//cosPlyaPlayerServiceImpl.applyList(mobile, env);
//cosPlyaPlayerServiceImpl.handleApply(mobile,applyId,env);
cosPlyaPlayerServiceImpl.auditGuild("13823774135", queryStr, env);
}
}
target/maven-archiver/pom.properties
#Generated by Apache Maven
#Tue May 25 13:01:27 CST 2021
#Tue Jun 22 17:46:33 CST 2021
version=1.5.9.RELEASE
groupId=com.pipi.qa
artifactId=pipi-data-center
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\dao\CommonDao.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ArithUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\RSAtest.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\basic\BasicData.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\DateUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\config\SwaggerConfiguration.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\bean\User.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\ResourceNotFoundException.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\Base64Utils.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\ForbiddenException.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\HttpResult.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\enums\OrderPriceTypeEnum.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\RandomUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\SystemErrorCodeConstant.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\service\SynIntegratedInterface.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\InstanceInformation.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\sql\SqlConfig.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\FileUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\DataCenterApplication.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\tools\HttpToolKit.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\service\impl\SynIntegratedInterfaceImpl.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\bean\Room.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpMethod.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\bean\HttpConfig.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ErrorCode.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\RSAUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\service\impl\CosPlyaPlayerServiceImpl.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\MD5Util.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\service\CosPlayPlayerService.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpRequest.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\config\BaseConfigReader.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\controller\common\CosPlayPlayerController.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ObjectEquals.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\Base64Tool.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ExceptionUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\TestCase.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\SleepUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\BadRequestException.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\bean\Player.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\JsonFormatUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\PhoneUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\PropUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\testmd5.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpResponse.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\config\BaseConfigReader.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\JsonToBean.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\BusinessException.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\CommonUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\StringUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\GetPhoto.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\DbUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\StringNum.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpUtil.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\controller\common\BaseController.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\autocode\http\HttpCodeGenerator.java
C:\java-mars\eclipse\work\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\UrlWrapper.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\InstanceInformation.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ObjectEquals.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\PhoneUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\UrlWrapper.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpRequest.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\service\impl\CosPlyaPlayerServiceImpl.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\ForbiddenException.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\sql\SqlConfig.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\bean\User.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\RSAtest.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ErrorCode.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\DataCenterApplication.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\PropUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\TestCase.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\tools\HttpToolKit.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\ResourceNotFoundException.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\bean\HttpConfig.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\CommonUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\service\CosPlayPlayerService.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\basic\BasicData.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\config\SwaggerConfiguration.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\SleepUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\JsonToBean.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\bean\Player.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\HttpResult.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\RandomUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\GetPhoto.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpResponse.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\RSAUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\BadRequestException.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\testmd5.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\controller\common\BaseController.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\Base64Tool.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\config\BaseConfigReader.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ArithUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\http\HttpMethod.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\controller\common\CosPlayPlayerController.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\DbUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\StringUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\enums\OrderPriceTypeEnum.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\autocode\http\HttpCodeGenerator.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\JsonFormatUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\dao\CommonDao.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\FileUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\StringNum.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\DateUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\SystemErrorCodeConstant.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\config\BaseConfigReader.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\ExceptionUtil.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\MD5Util.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\utils\common\Base64Utils.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\framework\exception\BusinessException.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\service\SynIntegratedInterface.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\bean\Room.java
D:\code\pipi-data-center\src\main\java\com\pipi\qa\service\impl\SynIntegratedInterfaceImpl.java
target/pipi-data-center.war
This file is too large to display.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!