diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/gitlink/softbot/controller/user/UserController.java b/src/main/java/com/gitlink/softbot/controller/user/UserController.java index 50ed829..eece4e5 100644 --- a/src/main/java/com/gitlink/softbot/controller/user/UserController.java +++ b/src/main/java/com/gitlink/softbot/controller/user/UserController.java @@ -290,14 +290,14 @@ public class UserController { /** * 判断是否安装该bot - * @param userId + * @param repoOwner * @param botId * @return */ @GetMapping("/judgeIsIntallBot") - public Result judgeIsInstallBot(@RequestParam("user_id") Integer userId,@RequestParam("bot_id") Integer botId){ + public Result judgeIsInstallBot(@RequestParam("repo_owner") String repoOwner,@RequestParam("bot_id") Integer botId){ - Boolean b = userService.judgeIsInstallBot(userId,botId); + Boolean b = userService.judgeIsInstallBot(repoOwner,botId); Result result = new Result<>(); return result.build(b).build(200).build("success!"); } diff --git a/src/main/java/com/gitlink/softbot/entity/db/InstallBot.java b/src/main/java/com/gitlink/softbot/entity/db/InstallBot.java index 3e57657..34f8742 100644 --- a/src/main/java/com/gitlink/softbot/entity/db/InstallBot.java +++ b/src/main/java/com/gitlink/softbot/entity/db/InstallBot.java @@ -40,6 +40,9 @@ public class InstallBot { //添加webhookId private Integer webhookId; + //仓库拥有者login(组织/个人) + private String repoOwner; + @TableField(fill = FieldFill.INSERT) private Date createTime; diff --git a/src/main/java/com/gitlink/softbot/service/user/IUserService.java b/src/main/java/com/gitlink/softbot/service/user/IUserService.java index 2d2626d..7285a18 100644 --- a/src/main/java/com/gitlink/softbot/service/user/IUserService.java +++ b/src/main/java/com/gitlink/softbot/service/user/IUserService.java @@ -50,7 +50,7 @@ public interface IUserService { //拒绝接收转让Bot void refuseTransferBot(RefuseTransferBotRequest refuseTransferBotRequest) throws BotException; //判断是否安装过此bot - boolean judgeIsInstallBot(Integer userId,Integer botId); + boolean judgeIsInstallBot(String repoOwner,Integer botId); GetAllInstallBotsResponse getAllInstallBots(Integer userId); diff --git a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java index 444cbcf..ebad95b 100644 --- a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java +++ b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java @@ -229,7 +229,7 @@ public class UserService extends AbstractUserBot implements IUserService { try { if (!Objects.isNull(installBotList)) { for (InstallBot installBot : installBotList) { - Object[] objects = new Object[]{installBot.getInstallerLogin(), installBot.getStoreRepo()}; + Object[] objects = new Object[]{installBot.getRepoOwner(), installBot.getStoreRepo()}; Response response = api.updateWebhook(installBot.getInstallerId(), objects,installBot.getWebhookId(), webhook); //校验异常 @@ -482,7 +482,7 @@ public class UserService extends AbstractUserBot implements IUserService { for (InstallBot installBot : installBots) { //构造接口参数 - Object[] objects = new Object[]{installBot.getInstallerLogin(), installBot.getStoreRepo()}; + Object[] objects = new Object[]{installBot.getRepoOwner(), installBot.getStoreRepo()}; //调用平台api，删除所有相关webhook Response response = api.deleteWebhook(installBot.getInstallerId(),objects,installBot.getWebhookId()); @@ -645,9 +645,9 @@ public class UserService extends AbstractUserBot implements IUserService { //1.校验有没有安装过此Bot List installBots = installMapper.selectList(Wrappers.lambdaQuery() .eq(InstallBot::getBotId,installMarketBotRequest.getBotId()) - .eq(InstallBot::getInstallerId,installMarketBotRequest.getUserId())); + .in(InstallBot::getRepoOwner,installMarketBotRequest.getStoreList())); if (installBots.size()>0){ - throw new BotException("已经安装过此Bot！"); + throw new BotException("存在仓库已经安装过此Bot！"); } //1.插入到installBot表中 List storeList = installMarketBotRequest.getStoreList(); @@ -668,7 +668,7 @@ public class UserService extends AbstractUserBot implements IUserService { installMapper.insert(installBot); //先获取webhookId构造webhook - Object[] objects = new Object[]{installMarketBotRequest.getLogin(), installBot.getStoreRepo()}; + Object[] objects = new Object[]{installBot.getRepoOwner(), installBot.getStoreRepo()}; Response response = api.addWebhook(installMarketBotRequest.getUserId(), objects, webhook); checkException(response); @@ -710,7 +710,7 @@ public class UserService extends AbstractUserBot implements IUserService { // 检查该仓库安装的bot List installBots = installMapper.selectList(Wrappers.lambdaQuery() .eq(InstallBot::getStoreId,unInstallMarketBotRequest.getStoreId()) - .eq(InstallBot::getInstallerId,unInstallMarketBotRequest.getUserId())); + .eq(InstallBot::getStoreRepo,unInstallMarketBotRequest.getStoreIdentifier())); // 如果安装了bot if(installBots!=null&&installBots.size()>0){ //删除各个webhook @@ -722,7 +722,7 @@ public class UserService extends AbstractUserBot implements IUserService { // 删除仓库的所有安装记录 installMapper.delete(Wrappers.lambdaQuery() .eq(InstallBot::getStoreId,unInstallMarketBotRequest.getStoreId()) - .eq(InstallBot::getInstallerId,unInstallMarketBotRequest.getUserId())); + .eq(InstallBot::getStoreRepo,unInstallMarketBotRequest.getStoreIdentifier())); } } @@ -767,6 +767,7 @@ public class UserService extends AbstractUserBot implements IUserService { installBot.setInstallerLogin(installMarketBotRequest.getLogin()); installBot.setStoreId(storeId); installBot.setStoreRepo(installMarketBotRequest.getRepoMap().get(storeId)); + installBot.setRepoOwner(installMarketBotRequest.getRepoOwnerMap().get(storeId)); installBot.setState(installMarketBotRequest.getState()); installBots.add(installBot); }); @@ -779,6 +780,7 @@ public class UserService extends AbstractUserBot implements IUserService { installBot.setStoreId(storeId); installBot.setInstallerLogin(updateInstallBotRequest.getLogin()); installBot.setStoreRepo(updateInstallBotRequest.getRepoMap().get(storeId)); + installBot.setRepoOwner(updateInstallBotRequest.getRepoMap().get(storeId)); //TODO 如果bot生效，通过平台该bot installBot.setState(updateInstallBotRequest.getState()); return installBot; @@ -791,13 +793,13 @@ public class UserService extends AbstractUserBot implements IUserService { //1.先删除botId和userId对应的所有installBot List installBotList = installMapper.selectList(Wrappers.lambdaQuery() .eq(InstallBot::getBotId,updateInstallBotRequest.getBotId()) - .eq(InstallBot::getInstallerId,updateInstallBotRequest.getUserId())); + .in(InstallBot::getStoreId,updateInstallBotRequest.getStoreList())); if (!Objects.isNull(installBotList)){ for (InstallBot installBot : installBotList){ //先删除webhook - Object[] objects = new Object[]{updateInstallBotRequest.getLogin(),installBot.getStoreRepo()}; + Object[] objects = new Object[]{installBot.getRepoOwner(),installBot.getStoreRepo()}; Response response = api.deleteWebhook(updateInstallBotRequest.getUserId(),objects,installBot.getWebhookId()); checkException(response); } @@ -805,7 +807,7 @@ public class UserService extends AbstractUserBot implements IUserService { installMapper.delete(new QueryWrapper() .eq("bot_id",updateInstallBotRequest.getBotId()) - .eq("installer_id",updateInstallBotRequest.getUserId())); + .eq("store_id",updateInstallBotRequest.getUserId())); List storeList = updateInstallBotRequest.getStoreList(); //2.然后重新插入所有storeId; //新增webhook @@ -817,7 +819,7 @@ public class UserService extends AbstractUserBot implements IUserService { InstallBot installBot = getInstallBot(updateInstallBotRequest,store); installMapper.insert(installBot); - Object[] objects = new Object[]{updateInstallBotRequest.getLogin(),installBot.getStoreRepo()}; + Object[] objects = new Object[]{installBot.getRepoOwner(),installBot.getStoreRepo()}; try { Response response = api.addWebhook(updateInstallBotRequest.getUserId(),objects,webhook); checkException(response); @@ -836,7 +838,7 @@ public class UserService extends AbstractUserBot implements IUserService { public void deleteInstallBot(DeleteInstallBotRequest deleteInstallBotRequest) throws BotException{ List installBots = installMapper.selectList(Wrappers.lambdaQuery() .eq(InstallBot::getBotId,deleteInstallBotRequest.getBotId()) - .eq(InstallBot::getInstallerId,deleteInstallBotRequest.getUserId())); + .eq(InstallBot::getStoreRepo,deleteInstallBotRequest.getStoreRepo())); if (installBots==null||installBots.size()<=0){ throw new BotException("该用户没有要删除的Bot"); } @@ -856,10 +858,10 @@ public class UserService extends AbstractUserBot implements IUserService { //删除install_bot installMapper.delete(Wrappers.lambdaQuery() .eq(InstallBot::getBotId,deleteInstallBotRequest.getBotId()) - .eq(InstallBot::getInstallerId,deleteInstallBotRequest.getUserId())); + .eq(InstallBot::getStoreRepo,deleteInstallBotRequest.getStoreRepo())); //删除webhook for(InstallBot installBot:installBots){ - Object[] objects = new Object[]{deleteInstallBotRequest.getLogin(),installBot.getStoreRepo()}; + Object[] objects = new Object[]{installBot.getRepoOwner(),installBot.getStoreRepo()}; Response response = api.deleteWebhook(deleteInstallBotRequest.getUserId(),objects,installBot.getWebhookId()); checkException(response); } @@ -1120,17 +1122,17 @@ public class UserService extends AbstractUserBot implements IUserService { /** * 判断该用户是否安装此bot - * @param userId + * @param repoOwner * @param botId * @return */ @Override - public boolean judgeIsInstallBot(Integer userId, Integer botId) { + public boolean judgeIsInstallBot(String repoOwner, Integer botId) { //如果公开，则判断安装表里面有没有该用户安装的bot List installBots = installMapper.selectList(Wrappers. lambdaQuery().eq(InstallBot::getBotId,botId) - .eq(InstallBot::getInstallerId,userId)); + .eq(InstallBot::getRepoOwner,repoOwner)); if (!Objects.isNull(installBots)&&installBots.size()>0){ return true; diff --git a/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java b/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java index 0725d2e..e0b8847 100644 --- a/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java +++ b/src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java @@ -26,4 +26,7 @@ public class DeleteInstallBotRequest { @NotNull(message = "botId is required") private Integer botId; private String password; + + @NotNull(message = "repo is required") + private String storeRepo; } diff --git a/src/main/java/com/gitlink/softbot/vo/InstallMarketBotRequest.java b/src/main/java/com/gitlink/softbot/vo/InstallMarketBotRequest.java index 5395311..d2b4131 100644 --- a/src/main/java/com/gitlink/softbot/vo/InstallMarketBotRequest.java +++ b/src/main/java/com/gitlink/softbot/vo/InstallMarketBotRequest.java @@ -26,4 +26,5 @@ public class InstallMarketBotRequest implements Serializable { private List storeList; //TODO 前端修改 private Map repoMap; + private Map repoOwnerMap; } diff --git a/src/main/resources/sql/install_bot_add_column_20230328.sql b/src/main/resources/sql/install_bot_add_column_20230328.sql new file mode 100644 index 0000000..650baad --- /dev/null +++ b/src/main/resources/sql/install_bot_add_column_20230328.sql @@ -0,0 +1,4 @@ +-- ---------------------------- +-- 表install_bot中添加字段 repo_owner:仓库拥有者login(组织/个人) +-- ---------------------------- +ALTER TABLE `install_bot` ADD COLUMN (`repo_owner` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '仓库拥有者login(组织/个人)'); diff --git a/target/classes/com/gitlink/softbot/controller/market/MarketController.class b/target/classes/com/gitlink/softbot/controller/market/MarketController.class index 2520eed..ceedb38 100644 Binary files a/target/classes/com/gitlink/softbot/controller/market/MarketController.class and b/target/classes/com/gitlink/softbot/controller/market/MarketController.class differ diff --git a/target/classes/com/gitlink/softbot/controller/user/UserController.class b/target/classes/com/gitlink/softbot/controller/user/UserController.class index 71171de..ecded76 100644 Binary files a/target/classes/com/gitlink/softbot/controller/user/UserController.class and b/target/classes/com/gitlink/softbot/controller/user/UserController.class differ diff --git a/target/classes/com/gitlink/softbot/entity/db/Bot.class b/target/classes/com/gitlink/softbot/entity/db/Bot.class index 0580863..139a800 100644 Binary files a/target/classes/com/gitlink/softbot/entity/db/Bot.class and b/target/classes/com/gitlink/softbot/entity/db/Bot.class differ diff --git a/target/classes/com/gitlink/softbot/entity/db/InstallBot.class b/target/classes/com/gitlink/softbot/entity/db/InstallBot.class index e8e2957..1adaa0e 100644 Binary files a/target/classes/com/gitlink/softbot/entity/db/InstallBot.class and b/target/classes/com/gitlink/softbot/entity/db/InstallBot.class differ diff --git a/target/classes/com/gitlink/softbot/entity/db/RegisterBot.class b/target/classes/com/gitlink/softbot/entity/db/RegisterBot.class index 2ea027b..ebeb209 100644 Binary files a/target/classes/com/gitlink/softbot/entity/db/RegisterBot.class and b/target/classes/com/gitlink/softbot/entity/db/RegisterBot.class differ diff --git a/target/classes/com/gitlink/softbot/entity/db/TransferBot.class b/target/classes/com/gitlink/softbot/entity/db/TransferBot.class index 6038cbb..686c69c 100644 Binary files a/target/classes/com/gitlink/softbot/entity/db/TransferBot.class and b/target/classes/com/gitlink/softbot/entity/db/TransferBot.class differ diff --git a/target/classes/com/gitlink/softbot/global/vo/Response.class b/target/classes/com/gitlink/softbot/global/vo/Response.class index 6afc833..1395cb9 100644 Binary files a/target/classes/com/gitlink/softbot/global/vo/Response.class and b/target/classes/com/gitlink/softbot/global/vo/Response.class differ diff --git a/target/classes/com/gitlink/softbot/service/market/IMarketService.class b/target/classes/com/gitlink/softbot/service/market/IMarketService.class index 4c5c600..521786c 100644 Binary files a/target/classes/com/gitlink/softbot/service/market/IMarketService.class and b/target/classes/com/gitlink/softbot/service/market/IMarketService.class differ diff --git a/target/classes/com/gitlink/softbot/service/market/impl/MarketService.class b/target/classes/com/gitlink/softbot/service/market/impl/MarketService.class index 64d6acd..2fbeb8b 100644 Binary files a/target/classes/com/gitlink/softbot/service/market/impl/MarketService.class and b/target/classes/com/gitlink/softbot/service/market/impl/MarketService.class differ diff --git a/target/classes/com/gitlink/softbot/service/user/IUserService.class b/target/classes/com/gitlink/softbot/service/user/IUserService.class index a3cec47..c7a5a04 100644 Binary files a/target/classes/com/gitlink/softbot/service/user/IUserService.class and b/target/classes/com/gitlink/softbot/service/user/IUserService.class differ diff --git a/target/classes/com/gitlink/softbot/service/user/impl/UserService.class b/target/classes/com/gitlink/softbot/service/user/impl/UserService.class index f0018cd..0931789 100644 Binary files a/target/classes/com/gitlink/softbot/service/user/impl/UserService.class and b/target/classes/com/gitlink/softbot/service/user/impl/UserService.class differ diff --git a/target/classes/com/gitlink/softbot/utils/AuthOperate.class b/target/classes/com/gitlink/softbot/utils/AuthOperate.class new file mode 100644 index 0000000..1ef303d Binary files /dev/null and b/target/classes/com/gitlink/softbot/utils/AuthOperate.class differ diff --git a/target/classes/com/gitlink/softbot/utils/GitLinkApi.class b/target/classes/com/gitlink/softbot/utils/GitLinkApi.class index c49f79a..a294684 100644 Binary files a/target/classes/com/gitlink/softbot/utils/GitLinkApi.class and b/target/classes/com/gitlink/softbot/utils/GitLinkApi.class differ diff --git a/target/classes/com/gitlink/softbot/utils/RestTemplateUtil.class b/target/classes/com/gitlink/softbot/utils/RestTemplateUtil.class index 77ef41d..1a0c55b 100644 Binary files a/target/classes/com/gitlink/softbot/utils/RestTemplateUtil.class and b/target/classes/com/gitlink/softbot/utils/RestTemplateUtil.class differ diff --git a/target/classes/com/gitlink/softbot/utils/response/AddWebhookResponse.class b/target/classes/com/gitlink/softbot/utils/response/AddWebhookResponse.class new file mode 100644 index 0000000..6db73ca Binary files /dev/null and b/target/classes/com/gitlink/softbot/utils/response/AddWebhookResponse.class differ diff --git a/target/classes/com/gitlink/softbot/utils/response/UserResponse.class b/target/classes/com/gitlink/softbot/utils/response/UserResponse.class new file mode 100644 index 0000000..15fa57d Binary files /dev/null and b/target/classes/com/gitlink/softbot/utils/response/UserResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/BotInputVO.class b/target/classes/com/gitlink/softbot/vo/BotInputVO.class index adbaf6e..12f0f7c 100644 Binary files a/target/classes/com/gitlink/softbot/vo/BotInputVO.class and b/target/classes/com/gitlink/softbot/vo/BotInputVO.class differ diff --git a/target/classes/com/gitlink/softbot/vo/BotOutputVO.class b/target/classes/com/gitlink/softbot/vo/BotOutputVO.class index 2fa634e..df0db05 100644 Binary files a/target/classes/com/gitlink/softbot/vo/BotOutputVO.class and b/target/classes/com/gitlink/softbot/vo/BotOutputVO.class differ diff --git a/target/classes/com/gitlink/softbot/vo/BotToMarketRequest.class b/target/classes/com/gitlink/softbot/vo/BotToMarketRequest.class index df12f93..9eb403b 100644 Binary files a/target/classes/com/gitlink/softbot/vo/BotToMarketRequest.class and b/target/classes/com/gitlink/softbot/vo/BotToMarketRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/CancelTransferBotRequest.class b/target/classes/com/gitlink/softbot/vo/CancelTransferBotRequest.class index 494061f..a3751bc 100644 Binary files a/target/classes/com/gitlink/softbot/vo/CancelTransferBotRequest.class and b/target/classes/com/gitlink/softbot/vo/CancelTransferBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/DeleteBotRequest.class b/target/classes/com/gitlink/softbot/vo/DeleteBotRequest.class index 973de15..b2e7f50 100644 Binary files a/target/classes/com/gitlink/softbot/vo/DeleteBotRequest.class and b/target/classes/com/gitlink/softbot/vo/DeleteBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/DeleteInstallBotRequest.class b/target/classes/com/gitlink/softbot/vo/DeleteInstallBotRequest.class index 794cd36..6a5e020 100644 Binary files a/target/classes/com/gitlink/softbot/vo/DeleteInstallBotRequest.class and b/target/classes/com/gitlink/softbot/vo/DeleteInstallBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetAllInstallBotsResponse.class b/target/classes/com/gitlink/softbot/vo/GetAllInstallBotsResponse.class index 0f3d346..58b4f65 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetAllInstallBotsResponse.class and b/target/classes/com/gitlink/softbot/vo/GetAllInstallBotsResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetBotDetailResponse.class b/target/classes/com/gitlink/softbot/vo/GetBotDetailResponse.class index 371373c..95fafee 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetBotDetailResponse.class and b/target/classes/com/gitlink/softbot/vo/GetBotDetailResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetBotRequest.class b/target/classes/com/gitlink/softbot/vo/GetBotRequest.class index df6f0d8..6179423 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetBotRequest.class and b/target/classes/com/gitlink/softbot/vo/GetBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetBotResponse.class b/target/classes/com/gitlink/softbot/vo/GetBotResponse.class index 0b448b4..454580d 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetBotResponse.class and b/target/classes/com/gitlink/softbot/vo/GetBotResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetInstallBotRequest.class b/target/classes/com/gitlink/softbot/vo/GetInstallBotRequest.class index deeccdd..c9b1a18 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetInstallBotRequest.class and b/target/classes/com/gitlink/softbot/vo/GetInstallBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetInstallBotResponse.class b/target/classes/com/gitlink/softbot/vo/GetInstallBotResponse.class index c2c3936..2176124 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetInstallBotResponse.class and b/target/classes/com/gitlink/softbot/vo/GetInstallBotResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetMarketBotsRequest.class b/target/classes/com/gitlink/softbot/vo/GetMarketBotsRequest.class index 8061413..0f4d6ec 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetMarketBotsRequest.class and b/target/classes/com/gitlink/softbot/vo/GetMarketBotsRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse$GetMarketBot.class b/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse$GetMarketBot.class index 8d89060..0ae0ef9 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse$GetMarketBot.class and b/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse$GetMarketBot.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse.class b/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse.class index d899367..d101108 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse.class and b/target/classes/com/gitlink/softbot/vo/GetMarketBotsResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetRegisterBotResponse.class b/target/classes/com/gitlink/softbot/vo/GetRegisterBotResponse.class index a363c73..b65064d 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetRegisterBotResponse.class and b/target/classes/com/gitlink/softbot/vo/GetRegisterBotResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetTransferFromBotRequest.class b/target/classes/com/gitlink/softbot/vo/GetTransferFromBotRequest.class index 2aed660..7ca9afc 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetTransferFromBotRequest.class and b/target/classes/com/gitlink/softbot/vo/GetTransferFromBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetTransferFromBotResponse.class b/target/classes/com/gitlink/softbot/vo/GetTransferFromBotResponse.class index 312cb0f..286d907 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetTransferFromBotResponse.class and b/target/classes/com/gitlink/softbot/vo/GetTransferFromBotResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetTransferToBot.class b/target/classes/com/gitlink/softbot/vo/GetTransferToBot.class new file mode 100644 index 0000000..24b8296 Binary files /dev/null and b/target/classes/com/gitlink/softbot/vo/GetTransferToBot.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetTransferToBotRequest.class b/target/classes/com/gitlink/softbot/vo/GetTransferToBotRequest.class index 7b3b858..c507d87 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetTransferToBotRequest.class and b/target/classes/com/gitlink/softbot/vo/GetTransferToBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse$GetTransferToBot.class b/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse$GetTransferToBot.class deleted file mode 100644 index c0f2dc2..0000000 Binary files a/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse$GetTransferToBot.class and /dev/null differ diff --git a/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse.class b/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse.class index b2a9769..77a42d7 100644 Binary files a/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse.class and b/target/classes/com/gitlink/softbot/vo/GetTransferToBotResponse.class differ diff --git a/target/classes/com/gitlink/softbot/vo/InstallMarketBotRequest.class b/target/classes/com/gitlink/softbot/vo/InstallMarketBotRequest.class index bcbc1d7..2410984 100644 Binary files a/target/classes/com/gitlink/softbot/vo/InstallMarketBotRequest.class and b/target/classes/com/gitlink/softbot/vo/InstallMarketBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/MarketBotPagesVO1.class b/target/classes/com/gitlink/softbot/vo/MarketBotPagesVO1.class new file mode 100644 index 0000000..a50b140 Binary files /dev/null and b/target/classes/com/gitlink/softbot/vo/MarketBotPagesVO1.class differ diff --git a/target/classes/com/gitlink/softbot/vo/MarketBotVO1.class b/target/classes/com/gitlink/softbot/vo/MarketBotVO1.class new file mode 100644 index 0000000..d781c15 Binary files /dev/null and b/target/classes/com/gitlink/softbot/vo/MarketBotVO1.class differ diff --git a/target/classes/com/gitlink/softbot/vo/ReceiveTransferBotRequest.class b/target/classes/com/gitlink/softbot/vo/ReceiveTransferBotRequest.class index 7eb2ad2..27cbff5 100644 Binary files a/target/classes/com/gitlink/softbot/vo/ReceiveTransferBotRequest.class and b/target/classes/com/gitlink/softbot/vo/ReceiveTransferBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/TransferBotRequest.class b/target/classes/com/gitlink/softbot/vo/TransferBotRequest.class index 6adb759..ce4e480 100644 Binary files a/target/classes/com/gitlink/softbot/vo/TransferBotRequest.class and b/target/classes/com/gitlink/softbot/vo/TransferBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/UnInstallMarketBotRequest.class b/target/classes/com/gitlink/softbot/vo/UnInstallMarketBotRequest.class new file mode 100644 index 0000000..3344a8b Binary files /dev/null and b/target/classes/com/gitlink/softbot/vo/UnInstallMarketBotRequest.class differ diff --git a/target/classes/com/gitlink/softbot/vo/UpdateInstallBotRequest.class b/target/classes/com/gitlink/softbot/vo/UpdateInstallBotRequest.class index b0df610..256838c 100644 Binary files a/target/classes/com/gitlink/softbot/vo/UpdateInstallBotRequest.class and b/target/classes/com/gitlink/softbot/vo/UpdateInstallBotRequest.class differ diff --git a/target/classes/sql/soft_bot.sql b/target/classes/sql/soft_bot.sql index 082ff59..fc94439 100644 --- a/target/classes/sql/soft_bot.sql +++ b/target/classes/sql/soft_bot.sql @@ -1,208 +1,197 @@ /* - Navicat Premium Data Transfer +Navicat MySQL Data Transfer - Source Server : localhost_3306 - Source Server Type : MySQL - Source Server Version : 50729 - Source Host : localhost:3306 - Source Schema : softbot +Source Server : localhost +Source Server Version : 80023 +Source Host : localhost:3306 +Source Database : soft_bot - Target Server Type : MySQL - Target Server Version : 50729 - File Encoding : 65001 +Target Server Type : MYSQL +Target Server Version : 80023 +File Encoding : 65001 - Date: 12/01/2023 11:54:00 +Date: 2023-03-08 00:00:56 */ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; +SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- -- Table structure for bot -- ---------------------------- DROP TABLE IF EXISTS `bot`; -CREATE TABLE `bot` ( - `id` int(255) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'bot名称', - `bot_des` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT 'bot描述', - `webhook` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'bot回调url', - `is_public` tinyint(255) NULL DEFAULT NULL COMMENT '0:私有1：公开', - `logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'logo', - `state` tinyint(255) NULL DEFAULT NULL COMMENT '0:挂起1：工作', - `client_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户端id（后台生成）', - `client_secret` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户端密钥（后台生成）', - `web_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主页网址', - `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', - `install_num` int(11) NULL DEFAULT 0 COMMENT '下载数量', - `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `name`(`bot_name`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 801 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `bot` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `bot_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'bot名称', + `bot_des` longtext CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT 'bot描述', + `webhook` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'bot回调url', + `is_public` tinyint DEFAULT NULL COMMENT '0:私有1：公开', + `logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'logo', + `state` tinyint DEFAULT NULL COMMENT '0:挂起1：工作', + `client_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '客户端id（后台生成）', + `client_secret` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '客户端密钥（后台生成）', + `web_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '主页网址', + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类型', + `install_num` int DEFAULT '0' COMMENT '下载数量', + `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `uid` int DEFAULT NULL, + `owner_id` int DEFAULT NULL, + `private_key` text, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `name` (`bot_name`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=802 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of bot -- ---------------------------- -INSERT INTO `bot` VALUES (782, 'asd阿松大', 'miaoshusd', 'www.hauhahasd.com', 1, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdret4', '送的饭', 0, '2022-12-29 11:56:56', '2022-12-29 11:56:56'); -INSERT INTO `bot` VALUES (783, 'botnameegdret', 'miaoshusd', 'www.hauhahasd.com', 1, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdret', '阿松大', 0, '2022-12-29 11:56:58', '2022-12-29 11:56:58'); -INSERT INTO `bot` VALUES (791, 'botnameegdretui', 'miaoshusd', 'www.hauhahasd.com', 1, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdretui', '阿松大', 0, '2022-12-29 18:21:57', '2022-12-29 18:21:57'); -INSERT INTO `bot` VALUES (792, 'botnameegdretop', 'miaoshusd', 'www.hauhahasd.com', 0, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdretop', NULL, 0, '2022-12-29 18:34:26', '2022-12-29 18:34:26'); -INSERT INTO `bot` VALUES (793, 'botnameegdretopjkl', 'miaoshusd', 'www.hauhahasd.com', 0, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdretopjkl', NULL, 0, '2022-12-29 18:42:26', '2022-12-29 18:42:26'); -INSERT INTO `bot` VALUES (794, 'botnameegdretopjklasd', 'miaoshusd', 'www.hauhahasd.com', 0, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdretopjklasd', NULL, 0, '2022-12-29 18:45:54', '2022-12-29 18:45:54'); -INSERT INTO `bot` VALUES (799, 'botnameegdretopjklasdfdg', 'miaoshusd', 'www.hauhahasd.com', 0, 'asdasdasfdg', 0, 'qwer', 'ert', 'botnameegdretopjklasdfdg', 'asdasd', 0, '2022-12-29 20:07:52', '2022-12-29 20:07:52'); +INSERT INTO `bot` VALUES ('783', 'botnameegdret', 'miaoshusd', 'http://localhost:10000', '1', 'asdasdasfdg', '0', 'qwer', 'ert', 'botnameegdret', '疑修管理', '6', '2023-03-07 17:42:13', '2023-03-07 17:42:13', null, '84993', null); +INSERT INTO `bot` VALUES ('791', 'botnameegdretui', 'miaoshusd', 'www.hauhahasd.com', '1', 'asdasdasfdg', '0', 'qwer', 'ert', 'botnameegdretui', '疑修管理', '1', '2023-03-07 17:23:28', '2023-03-06 23:05:28', null, '84993', null); +INSERT INTO `bot` VALUES ('792', 'botnameegdretop', 'miaoshusd', 'www.hauhahasd.com', '0', 'asdasdasfdg', '0', 'qwer', 'ert', 'botnameegdretop', null, '0', '2023-03-06 23:05:29', '2023-03-06 23:05:29', null, '84993', null); -- ---------------------------- -- Table structure for bot_category -- ---------------------------- DROP TABLE IF EXISTS `bot_category`; -CREATE TABLE `bot_category` ( - `id` int(11) NOT NULL, - `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `bot_category` ( + `id` int NOT NULL, + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of bot_category -- ---------------------------- -INSERT INTO `bot_category` VALUES (1, '接口管理'); -INSERT INTO `bot_category` VALUES (2, '合情请求管理'); -INSERT INTO `bot_category` VALUES (3, '文档管理'); -INSERT INTO `bot_category` VALUES (4, '依赖管理'); -INSERT INTO `bot_category` VALUES (5, '代码审阅'); -INSERT INTO `bot_category` VALUES (6, '代码质量'); -INSERT INTO `bot_category` VALUES (7, '构建'); -INSERT INTO `bot_category` VALUES (8, '测试'); -INSERT INTO `bot_category` VALUES (9, '部署'); -INSERT INTO `bot_category` VALUES (10, '其他'); +INSERT INTO `bot_category` VALUES ('1', '疑修管理'); +INSERT INTO `bot_category` VALUES ('2', '合并请求管理'); +INSERT INTO `bot_category` VALUES ('3', '代码审阅'); +INSERT INTO `bot_category` VALUES ('4', '代码质量'); +INSERT INTO `bot_category` VALUES ('5', '依赖管理'); +INSERT INTO `bot_category` VALUES ('6', '构建'); +INSERT INTO `bot_category` VALUES ('7', '测试'); +INSERT INTO `bot_category` VALUES ('8', '部署'); +INSERT INTO `bot_category` VALUES ('9', '文档管理'); +INSERT INTO `bot_category` VALUES ('10', '其他'); -- ---------------------------- -- Table structure for bot_limit_event -- ---------------------------- DROP TABLE IF EXISTS `bot_limit_event`; -CREATE TABLE `bot_limit_event` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_id` int(255) NOT NULL COMMENT 'bot的唯一标识', - `read_write_code` tinyint(4) NOT NULL COMMENT '0：只读1：读写2:无权限', - `read_write_pr` tinyint(4) NOT NULL COMMENT '0：只读1：读写2:无权限', - `auth_category` tinyint(4) NOT NULL COMMENT '0：代码仓库权限1：合并请求权限2:无权限', - `event` tinyint(4) NOT NULL COMMENT '0：git推送到存储库1：创建分支或标签2：删除分支或标签3：合并请求被打开或重新打开4：合并请求被分配\r\n5：无权限', - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `bot_limit_event` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `bot_id` int NOT NULL COMMENT 'bot的唯一标识', + `read_write_code` tinyint NOT NULL COMMENT '0：只读1：读写2:无权限', + `read_write_pr` tinyint NOT NULL COMMENT '0：只读1：读写2:无权限', + `auth_category` tinyint NOT NULL COMMENT '0：代码仓库权限1：合并请求权限2:无权限', + `event` tinyint NOT NULL COMMENT '0：git推送到存储库1：创建分支或标签2：删除分支或标签3：合并请求被打开或重新打开4：合并请求被分配\r\n5：无权限', + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of bot_limit_event -- ---------------------------- -INSERT INTO `bot_limit_event` VALUES (17, 782, 0, 1, 0, 1, '2022-10-02 22:19:34', '2022-10-02 22:19:34'); -INSERT INTO `bot_limit_event` VALUES (18, 783, 0, 1, 0, 1, '2022-10-05 19:21:53', '2022-10-05 19:21:53'); -INSERT INTO `bot_limit_event` VALUES (19, 791, 0, 1, 0, 1, '2022-10-07 20:19:22', '2022-10-07 20:19:22'); -INSERT INTO `bot_limit_event` VALUES (20, 792, 1, 2, 0, 2, '2022-12-29 18:34:26', '2022-12-29 18:34:26'); -INSERT INTO `bot_limit_event` VALUES (21, 793, 1, 2, 0, 1, '2022-12-29 18:42:26', '2022-12-29 18:42:26'); -INSERT INTO `bot_limit_event` VALUES (22, 793, 2, 1, 1, 3, '2022-12-29 18:42:26', '2022-12-29 18:42:26'); -INSERT INTO `bot_limit_event` VALUES (23, 794, 1, 2, 0, 1, '2022-12-29 18:45:54', '2022-12-29 18:45:54'); -INSERT INTO `bot_limit_event` VALUES (24, 794, 1, 2, 0, 2, '2022-12-29 18:45:54', '2022-12-29 18:45:54'); -INSERT INTO `bot_limit_event` VALUES (25, 794, 2, 1, 1, 3, '2022-12-29 18:45:54', '2022-12-29 18:45:54'); -INSERT INTO `bot_limit_event` VALUES (26, 794, 2, 1, 1, 4, '2022-12-29 18:45:54', '2022-12-29 18:45:54'); -INSERT INTO `bot_limit_event` VALUES (27, 799, 1, 2, 0, 1, '2022-12-29 19:30:05', '2022-12-29 19:30:05'); -INSERT INTO `bot_limit_event` VALUES (28, 799, 1, 2, 0, 2, '2022-12-29 19:30:05', '2022-12-29 19:30:05'); +INSERT INTO `bot_limit_event` VALUES ('18', '783', '0', '1', '0', '1', '2022-10-05 19:21:53', '2022-10-05 19:21:53'); +INSERT INTO `bot_limit_event` VALUES ('19', '791', '0', '1', '0', '1', '2022-10-07 20:19:22', '2022-10-07 20:19:22'); +INSERT INTO `bot_limit_event` VALUES ('20', '792', '1', '2', '0', '2', '2022-12-29 18:34:26', '2022-12-29 18:34:26'); +INSERT INTO `bot_limit_event` VALUES ('21', '793', '1', '2', '0', '1', '2022-12-29 18:42:26', '2022-12-29 18:42:26'); +INSERT INTO `bot_limit_event` VALUES ('23', '794', '1', '2', '0', '1', '2022-12-29 18:45:54', '2022-12-29 18:45:54'); +INSERT INTO `bot_limit_event` VALUES ('27', '799', '1', '2', '0', '1', '2022-12-29 19:30:05', '2022-12-29 19:30:05'); +INSERT INTO `bot_limit_event` VALUES ('28', '799', '2', '1', '1', '2', '2022-12-29 19:30:05', '2022-12-29 19:30:05'); -- ---------------------------- -- Table structure for install_bot -- ---------------------------- DROP TABLE IF EXISTS `install_bot`; -CREATE TABLE `install_bot` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_id` int(255) NOT NULL COMMENT 'bot唯一标识', - `installer_id` int(255) NOT NULL COMMENT '安装者唯一标识', - `store_id` int(255) NOT NULL COMMENT '仓库唯一标识', - `state` tinyint(4) NOT NULL COMMENT '0：挂起1：工作2：卸载', - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间 ', - `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `install_bot` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `bot_id` int NOT NULL COMMENT 'bot唯一标识', + `installer_id` int NOT NULL COMMENT '安装者唯一标识', + `store_id` int NOT NULL COMMENT '仓库唯一标识', + `state` tinyint NOT NULL COMMENT '0：挂起1：工作2：卸载', + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间 ', + `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `installer_login` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `store_repo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `webhook_id` int DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of install_bot -- ---------------------------- -INSERT INTO `install_bot` VALUES (2, 782, 123, 1, 1, '2022-10-07 20:49:53', '2022-10-07 20:49:53'); -- ---------------------------- -- Table structure for market_bot -- ---------------------------- DROP TABLE IF EXISTS `market_bot`; -CREATE TABLE `market_bot` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_id` int(255) NOT NULL COMMENT 'bot唯一 标识', - `market_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上市名称', - `market_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上市简介', - `market_intro` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '详细介绍', - `first_func` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主要功能', - `second_func` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '次要功能', - `webhook` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '回调url', - `is_receive_ag1` tinyint(4) NULL DEFAULT 0 COMMENT '0:接收协议1：不接受收开发者协议', - `is_receive_ag2` tinyint(4) NULL DEFAULT 0 COMMENT '0:接收协议1：不接受平台协议', - `market_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '上市时间', - `logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '头像', - `install_num` int(11) NULL DEFAULT 0 COMMENT '安装次数', - `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `唯一`(`bot_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 55 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `market_bot` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `bot_id` int NOT NULL COMMENT 'bot唯一 标识', + `market_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '上市名称', + `market_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '上市简介', + `market_intro` longtext CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '详细介绍', + `first_func` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主要功能', + `second_func` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '次要功能', + `webhook` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '回调url', + `is_receive_ag1` tinyint DEFAULT '0' COMMENT '0:接收协议1：不接受收开发者协议', + `is_receive_ag2` tinyint DEFAULT '0' COMMENT '0:接收协议1：不接受平台协议', + `market_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '上市时间', + `logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '头像', + `install_num` int DEFAULT '0' COMMENT '安装次数', + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类型', + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `唯一` (`bot_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of market_bot -- ---------------------------- -INSERT INTO `market_bot` VALUES (46, 782, 'asd', 'asd', NULL, 'asdsdf', 'asdasd', 'asd', 1, 1, '2022-10-07 19:25:16', 'asd', 0, 'asd', '2022-10-07 19:25:16', '2022-10-07 19:25:16'); -INSERT INTO `market_bot` VALUES (49, 783, 'asdasd', 'asd', NULL, 'asdsdf', 'asdasd', 'sad', 1, 1, '2022-10-07 19:25:22', 'sd', 0, 'asd', '2022-10-07 19:25:22', '2022-10-07 19:25:22'); -INSERT INTO `market_bot` VALUES (54, 791, 'asder', 'asd', 'asdasd', 'asdsdf', 'asdasd', 'www.asd.com', 0, 0, '2022-12-29 18:22:01', 'asd', 0, 'xcv', '2022-12-29 18:22:01', '2022-12-29 18:22:01'); +INSERT INTO `market_bot` VALUES ('49', '783', 'qwe', 'asd', null, '代码审阅', '疑修管理', 'sad', '1', '1', '2023-03-06 21:07:01', 'sd', '6', 'asd', '2023-03-06 21:07:01', '2023-03-07 17:40:57'); +INSERT INTO `market_bot` VALUES ('54', '791', 'asder', 'asd', 'asdasd', '其他', '', 'www.asd.com', '0', '0', '2023-03-06 21:06:58', 'asd', '1', 'xcv', '2023-03-06 21:06:58', '2023-03-07 17:23:28'); -- ---------------------------- -- Table structure for register_bot -- ---------------------------- DROP TABLE IF EXISTS `register_bot`; -CREATE TABLE `register_bot` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_id` int(255) NOT NULL COMMENT 'bot唯一标识', - `developer_id` int(255) NOT NULL COMMENT 'bot开发者唯一标识', - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `bot_id`(`bot_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `register_bot` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `bot_id` int NOT NULL COMMENT 'bot唯一标识', + `developer_id` int NOT NULL COMMENT 'bot开发者唯一标识', + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `developer_login` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `bot_id` (`bot_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of register_bot -- ---------------------------- -INSERT INTO `register_bot` VALUES (2, 782, 1234, '2022-10-02 22:19:34', '2022-10-02 22:19:34'); -INSERT INTO `register_bot` VALUES (3, 783, 1234, '2022-10-05 19:21:53', '2022-10-05 19:21:53'); -INSERT INTO `register_bot` VALUES (4, 791, 1234, '2022-12-29 18:27:41', '2022-12-29 18:27:41'); -INSERT INTO `register_bot` VALUES (5, 792, 1234, '2022-12-29 18:34:26', '2022-12-29 18:34:26'); -INSERT INTO `register_bot` VALUES (6, 793, 1234, '2022-12-29 18:42:26', '2022-12-29 18:42:26'); -INSERT INTO `register_bot` VALUES (7, 794, 1234, '2022-12-29 18:45:54', '2022-12-29 18:45:54'); -INSERT INTO `register_bot` VALUES (8, 799, 1234, '2022-12-29 19:30:05', '2022-12-29 19:30:05'); +INSERT INTO `register_bot` VALUES ('3', '783', '84993', '2023-03-07 09:46:37', '2023-03-07 09:46:37', 'durian'); +INSERT INTO `register_bot` VALUES ('4', '791', '84993', '2023-03-07 09:46:37', '2023-03-07 09:46:37', 'durian'); +INSERT INTO `register_bot` VALUES ('5', '792', '84993', '2023-03-07 09:46:35', '2023-03-07 09:46:35', 'durian'); -- ---------------------------- -- Table structure for transfer_bot -- ---------------------------- DROP TABLE IF EXISTS `transfer_bot`; -CREATE TABLE `transfer_bot` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_id` int(255) NOT NULL COMMENT 'bot唯一标识', - `transfer_from_id` int(255) NOT NULL COMMENT '转让者唯一标识', - `transfer_to_id` int(255) NOT NULL COMMENT '接收者唯一标识', - `is_success` tinyint(4) NOT NULL COMMENT '0:转让失败，1：转让成功 2:待接收', - `transfer_time` datetime NOT NULL COMMENT '转让时间', - `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; +CREATE TABLE `transfer_bot` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `bot_id` int NOT NULL COMMENT 'bot唯一标识', + `transfer_from_id` int NOT NULL COMMENT '转让者唯一标识', + `transfer_to_id` int NOT NULL COMMENT '接收者唯一标识', + `is_success` tinyint NOT NULL COMMENT '0:转让失败，1：转让成功 2:待接收', + `transfer_time` datetime NOT NULL COMMENT '转让时间', + `create_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `from_login` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `to_login` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of transfer_bot -- ---------------------------- -INSERT INTO `transfer_bot` VALUES (1, 782, 456, 789, 1, '2022-10-05 19:37:56', '2023-01-03 10:55:40', '2023-01-03 10:55:40'); - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/target/test-classes/com/gitlink/softbot/service/market/GitLinkApiTest.class b/target/test-classes/com/gitlink/softbot/service/market/GitLinkApiTest.class index 1b10392..9206f8c 100644 Binary files a/target/test-classes/com/gitlink/softbot/service/market/GitLinkApiTest.class and b/target/test-classes/com/gitlink/softbot/service/market/GitLinkApiTest.class differ