diff --git a/src/main/java/com/gitlink/softbot/controller/market/MarketController.java b/src/main/java/com/gitlink/softbot/controller/market/MarketController.java index 1a0acc9..9d55833 100644 --- a/src/main/java/com/gitlink/softbot/controller/market/MarketController.java +++ b/src/main/java/com/gitlink/softbot/controller/market/MarketController.java @@ -67,7 +67,7 @@ public class MarketController { * @return */ @GetMapping("/getBotDetail") - public Result getBotDetail(@RequestParam("bot_id") Integer botId,@RequestParam("user_id") Integer userId){ + public Result getBotDetail(@RequestParam(value = "bot_id",required = true) Integer botId,@RequestParam(value = "user_id",required = false) Integer userId){ GetBotDetailResponse getBotDetailResponse = marketService.getBotDetail(userId,botId); Result result = new Result<>(); diff --git a/src/main/java/com/gitlink/softbot/entity/db/Bot.java b/src/main/java/com/gitlink/softbot/entity/db/Bot.java index 78de81a..08dd559 100644 --- a/src/main/java/com/gitlink/softbot/entity/db/Bot.java +++ b/src/main/java/com/gitlink/softbot/entity/db/Bot.java @@ -43,7 +43,7 @@ public class Bot { private Integer installNum; - private int category; + private String category; @TableField(fill = FieldFill.INSERT_UPDATE) diff --git a/src/main/java/com/gitlink/softbot/vo/GetBotDetailResponse.java b/src/main/java/com/gitlink/softbot/vo/GetBotDetailResponse.java index dc2696e..0a02416 100644 --- a/src/main/java/com/gitlink/softbot/vo/GetBotDetailResponse.java +++ b/src/main/java/com/gitlink/softbot/vo/GetBotDetailResponse.java @@ -31,4 +31,9 @@ public class GetBotDetailResponse { //头像 private String logo; + /** + * bot类型 + */ + private String category; + } diff --git a/src/main/resources/sql/soft_bot.sql b/src/main/resources/sql/soft_bot.sql index 54c8fb9..d2107fa 100644 --- a/src/main/resources/sql/soft_bot.sql +++ b/src/main/resources/sql/soft_bot.sql @@ -23,22 +23,22 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `bot`; CREATE TABLE `bot` ( `id` int(255) NOT NULL AUTO_INCREMENT COMMENT '主键', - `bot_name` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT 'bot名称', - `bot_des` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT 'bot描述', - `webhook` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT 'bot回调url', + `bot_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'bot名称', + `bot_des` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'bot描述', + `webhook` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'bot回调url', `is_public` tinyint(255) NOT NULL COMMENT '0:私有1：公开', - `logo` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT 'logo', + `logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'logo', `state` tinyint(255) NULL DEFAULT NULL COMMENT '0:挂起1：工作', - `client_id` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '客户端id（后台生成）', - `client_secret` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '客户端密钥（后台生成）', - `web_url` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '主页网址', + `client_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户端id（后台生成）', + `client_secret` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '客户端密钥（后台生成）', + `web_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主页网址', `category` int(11) 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 = 792 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 792 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of bot @@ -53,9 +53,9 @@ INSERT INTO `bot` VALUES (791, 'botnameegdretui', 'miaoshusd', 'www.hauhahasd.co DROP TABLE IF EXISTS `bot_category`; CREATE TABLE `bot_category` ( `id` int(11) NOT NULL, - `category` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL, + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of bot_category @@ -79,7 +79,7 @@ CREATE TABLE `bot_limit_event` ( `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 = 20 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of bot_limit_event @@ -101,7 +101,7 @@ CREATE TABLE `install_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 -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of install_bot @@ -115,22 +115,22 @@ 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 latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '上市名称', - `market_desc` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '上市简介', - `first_func` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '主要功能', - `second_func` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '次要功能', - `webhook` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '回调url', + `market_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '上市名称', + `market_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL 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 NOT NULL COMMENT '次要功能', + `webhook` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '回调url', `is_receive_ag1` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0:接收协议1：不接受收开发者协议', `is_receive_ag2` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0:接收协议1：不接受平台协议', `market_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '上市时间', - `logo` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '头像', + `logo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '头像', `install_num` int(11) NOT NULL DEFAULT 0 COMMENT '安装次数', - `category` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '类型', + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci 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, UNIQUE INDEX `唯一`(`bot_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 50 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 50 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of market_bot @@ -150,7 +150,7 @@ CREATE TABLE `register_bot` ( `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 = 5 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of register_bot @@ -173,7 +173,7 @@ CREATE TABLE `transfer_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 -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of transfer_bot