From 28539d07528afb5f18f16d151fe0d8e2e5d6c565 Mon Sep 17 00:00:00 2001 From: wangqing <250543222@qq.com> Date: Sat, 17 Jul 2021 15:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=A1=AB=E5=86=99=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=BE=AE=E4=BF=A1=E6=98=AF=E5=90=A6=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/tduck.sql | 7 ++++--- .../cloud/api/web/controller/UserProjectController.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/tduck.sql b/doc/tduck.sql index 1f9c488..1e25e7f 100644 --- a/doc/tduck.sql +++ b/doc/tduck.sql @@ -4,13 +4,14 @@ Source Server : ivo Source Server Type : MySQL Source Server Version : 50718 + Source Host : sh-cynosdbmysql-grp-e911sges.sql.tencentcdb.com:29062 Source Schema : tduck Target Server Type : MySQL Target Server Version : 50718 File Encoding : 65001 - Date: 17/07/2021 15:07:35 + Date: 17/07/2021 15:12:39 */ SET NAMES utf8mb4; @@ -219,7 +220,7 @@ CREATE TABLE `pr_user_project_result` ( -- ---------------------------- DROP TABLE IF EXISTS `pr_user_project_setting`; CREATE TABLE `pr_user_project_setting` ( - `id` bigint(20) NOT NULL, + `id` bigint(20) NOT NULL AUTO_INCREMENT, `project_key` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目key', `submit_prompt_img` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交提示图片', `submit_prompt_text` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提交提示文字', @@ -246,7 +247,7 @@ CREATE TABLE `pr_user_project_setting` ( `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `project_key`(`project_key`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目表单项' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 530 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目表单项' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for pr_user_project_theme diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 89a55e0..9f6e39f 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -439,8 +439,8 @@ public class UserProjectController { * 当前设置的状态 */ @GetMapping("/user/project/setting-status") - public Result querySettingStatus(@RequestParam String projectKey, HttpServletRequest request) { - return userProjectSettingService.getUserProjectSettingStatus(projectKey, HttpUtils.getIpAddr(request), ""); + public Result querySettingStatus(@RequestParam String projectKey,@RequestParam String wxOpenId, HttpServletRequest request) { + return userProjectSettingService.getUserProjectSettingStatus(projectKey, HttpUtils.getIpAddr(request), wxOpenId); }