From eb6ed25080649b8e87655b1e93140e984590f974 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Sun, 30 May 2021 12:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=BB=91=E5=8A=A8=E9=AA=8C?=
=?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 6 +-
tduck-api/pom.xml | 4 +-
.../config/CaptchaCacheServiceProvider.java | 15 +-
.../tduck/cloud/api/config/FilterConfig.java | 2 +-
.../api/web/filter/ValidateCodeFilter.java | 5 +-
...m.anji.captcha.service.CaptchaCacheService | 1 +
.../src/main/resources/application-prod1.yml | 12 +-
tduck-api/src/main/resources/application.yml | 1 +
.../db/migration/V1.0_20210323_2217__init.sql | 277 ------------------
.../migration/V2.0_20210412_1234__update.sql | 2 -
10 files changed, 24 insertions(+), 301 deletions(-)
create mode 100644 tduck-api/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService
delete mode 100644 tduck-api/src/main/resources/db/migration/V1.0_20210323_2217__init.sql
delete mode 100644 tduck-api/src/main/resources/db/migration/V2.0_20210412_1234__update.sql
diff --git a/pom.xml b/pom.xml
index cae63ff..97152c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
3.0.1
0.7.0
4.0.0
- 1.2.7
+ 1.2.8
1.2.75
4.0.11
5.0.0
@@ -141,8 +141,8 @@
- com.github.anji-plus
- captcha-spring-boot-starter
+ com.anji-plus
+ spring-boot-starter-captcha
${captcha.version}
diff --git a/tduck-api/pom.xml b/tduck-api/pom.xml
index 28959bb..44470f5 100644
--- a/tduck-api/pom.xml
+++ b/tduck-api/pom.xml
@@ -53,8 +53,8 @@
0.0.1-SNAPSHOT
- com.github.anji-plus
- captcha-spring-boot-starter
+ com.anji-plus
+ spring-boot-starter-captcha
com.alibaba
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/config/CaptchaCacheServiceProvider.java b/tduck-api/src/main/java/com/tduck/cloud/api/config/CaptchaCacheServiceProvider.java
index 537b4da..8b5cda2 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/config/CaptchaCacheServiceProvider.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/config/CaptchaCacheServiceProvider.java
@@ -1,41 +1,40 @@
package com.tduck.cloud.api.config;
import com.anji.captcha.service.CaptchaCacheService;
-import com.google.auto.service.AutoService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.RedisTemplate;
+
import java.util.concurrent.TimeUnit;
/**
* @author smalljop
*/
-@AutoService(CaptchaCacheService.class)
public class CaptchaCacheServiceProvider implements CaptchaCacheService {
private static final String REDIS = "redis";
@Autowired
- private StringRedisTemplate stringRedisTemplate;
+ private RedisTemplate redisTemplate;
@Override
public void set(String key, String value, long expiresInSeconds) {
- stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
+ redisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public boolean exists(String key) {
- return stringRedisTemplate.hasKey(key);
+ return redisTemplate.hasKey(key);
}
@Override
public void delete(String key) {
- stringRedisTemplate.delete(key);
+ redisTemplate.delete(key);
}
@Override
public String get(String key) {
- return stringRedisTemplate.opsForValue().get(key);
+ return redisTemplate.opsForValue().get(key);
}
@Override
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java b/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java
index 134c5de..776957c 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java
@@ -92,7 +92,7 @@ public class FilterConfig {
* @return
*/
@Bean
- @ConditionalOnProperty(prefix = "aj.captcha.enable", name = "enable", havingValue = "true")
+ @ConditionalOnProperty(prefix = "aj.captcha", name = "enable", havingValue = "true", matchIfMissing = true)
public FilterRegistrationBean validateCodeFilterRegistration() {
FilterRegistrationBean registration = new FilterRegistrationBean();
registration.setDispatcherTypes(DispatcherType.REQUEST);
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/filter/ValidateCodeFilter.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/filter/ValidateCodeFilter.java
index f41b02b..45bab18 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/filter/ValidateCodeFilter.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/filter/ValidateCodeFilter.java
@@ -35,8 +35,9 @@ public class ValidateCodeFilter implements Filter {
return;
}
String code = request.getParameter("slideCode");
- if(StrUtil.isBlank(code)){
- ResponseUtils.outJson(response, Result.failed(ResponseCodeConstants.NEED_VERIFICATION,""));
+ if (StrUtil.isBlank(code)) {
+ ResponseUtils.outJson(response, Result.failed(ResponseCodeConstants.NEED_VERIFICATION, ""));
+ return;
}
CaptchaService captchaService = SpringContextUtils.getBean(CaptchaService.class);
CaptchaVO vo = new CaptchaVO();
diff --git a/tduck-api/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService b/tduck-api/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService
new file mode 100644
index 0000000..3a1975d
--- /dev/null
+++ b/tduck-api/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService
@@ -0,0 +1 @@
+com.tduck.cloud.api.config.CaptchaCacheServiceProvider
\ No newline at end of file
diff --git a/tduck-api/src/main/resources/application-prod1.yml b/tduck-api/src/main/resources/application-prod1.yml
index b9a8b1d..c70a914 100644
--- a/tduck-api/src/main/resources/application-prod1.yml
+++ b/tduck-api/src/main/resources/application-prod1.yml
@@ -26,9 +26,9 @@ spring:
max-idle: 10 # 连接池中的最大空闲连接
min-idle: 5 # 连接池中的最小空闲连接
mail:
- host: smtp.88.com
- username: mpw:/GXJe5uECs53VI+e8gc3R9HQ9h3VyzR8cJ0RNTPHMWQ=
- password: mpw:oZpXgWsoal59sd249H14+XZJVZ2moRDIcUxf2b+EkO8=
+ host: smtp.exmail.qq.com
+ username: server@tduckapp.com
+ password: 8rH69a47pV2qynVE
logging:
level:
@@ -56,9 +56,9 @@ platform:
validateCodeTemplateId: 808150
retrievePwdValidateCodeTemplateId: 809014
front:
- baseUrl: https://tduck.smileyi.top/
- resetPwdUrl: https://tduck.smileyi.top/forget/password?code={}&email={}
- updateEmailUrl: https://localhost:8888/account/forget/validate?type=updateEmail&code={}&email={}
+ baseUrl: https://demo.tduckapp.com/
+ resetPwdUrl: https://demo.tduckapp.com//forget/password?code={}&email={}
+ updateEmailUrl: https://demo.tduckapp.com/forget/validate?type=updateEmail&code={}&email={}
wx:
mp:
diff --git a/tduck-api/src/main/resources/application.yml b/tduck-api/src/main/resources/application.yml
index 277378c..fe8e977 100644
--- a/tduck-api/src/main/resources/application.yml
+++ b/tduck-api/src/main/resources/application.yml
@@ -78,3 +78,4 @@ aj:
captcha:
enable: true
water-mark: tduck
+ cache-type: redis
diff --git a/tduck-api/src/main/resources/db/migration/V1.0_20210323_2217__init.sql b/tduck-api/src/main/resources/db/migration/V1.0_20210323_2217__init.sql
deleted file mode 100644
index fdf86b2..0000000
--- a/tduck-api/src/main/resources/db/migration/V1.0_20210323_2217__init.sql
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server : 47.103.113.65
- Source Server Type : MySQL
- Source Server Version : 50719
- Source Host : 47.103.113.65:3306
- Source Schema : tduck
-
- Target Server Type : MySQL
- Target Server Version : 50719
- File Encoding : 65001
-
- Date: 08/04/2021 22:44:13
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for ac_user
--- ----------------------------
-DROP TABLE IF EXISTS `ac_user`;
-CREATE TABLE `ac_user` (
- `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
- `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '姓名',
- `avatar` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '头像',
- `gender` tinyint(1) NOT NULL DEFAULT 0 COMMENT '性别0未知 1男2女',
- `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',
- `phone_number` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号',
- `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
- `reg_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '注册渠道',
- `last_login_channel` tinyint(4) NULL DEFAULT NULL COMMENT '最后登录渠道',
- `last_login_time` datetime NULL DEFAULT NULL COMMENT '最后登录时间',
- `last_login_ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最后登录Ip',
- `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '状态',
- `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for ac_user_authorize
--- ----------------------------
-DROP TABLE IF EXISTS `ac_user_authorize`;
-CREATE TABLE `ac_user_authorize` (
- `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
- `type` tinyint(1) NOT NULL COMMENT '第三方平台类型',
- `app_id` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '平台AppId',
- `open_id` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '平台OpenId',
- `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '平台用户名',
- `user_id` bigint(11) NULL DEFAULT NULL COMMENT '用户Id',
- `user_info` json NULL COMMENT '平台用户信息',
- `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '第三方用户授权信息' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_project_template
--- ----------------------------
-DROP TABLE IF EXISTS `pr_project_template`;
-CREATE TABLE `pr_project_template` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '模板唯一标识',
- `cover_img` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '封面图',
- `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目名称',
- `describe` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '项目描述',
- `like_count` int(10) NULL DEFAULT 0 COMMENT '喜欢数',
- `category_id` int(2) NOT NULL COMMENT '项目类型',
- `status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '状态',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `code`(`key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_project_template_category
--- ----------------------------
-DROP TABLE IF EXISTS `pr_project_template_category`;
-CREATE TABLE `pr_project_template_category` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主题名称',
- `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目模板分类' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_project_template_item
--- ----------------------------
-DROP TABLE IF EXISTS `pr_project_template_item`;
-CREATE TABLE `pr_project_template_item` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `project_key` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目key',
- `form_item_id` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '表单项Id',
- `type` tinyint(5) NOT NULL COMMENT '表单项类型 ',
- `label` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '表单项标题',
- `show_label` tinyint(1) NOT NULL COMMENT '是否显示标签',
- `default_value` json NULL COMMENT '表单项默认值',
- `required` tinyint(1) NOT NULL COMMENT '是否必填',
- `placeholder` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '输入型提示文字',
- `span` int(10) NOT NULL DEFAULT 24 COMMENT '栅格宽度',
- `sort` bigint(20) NULL DEFAULT 0 COMMENT '排序',
- `expand` json NULL COMMENT '扩展字段 表单项独有字段',
- `reg_list` json NULL COMMENT '正则表达式 ',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- INDEX `project_key`(`project_key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 962 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表单项' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_project_theme
--- ----------------------------
-DROP TABLE IF EXISTS `pr_project_theme`;
-CREATE TABLE `pr_project_theme` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主题名称',
- `style` json NOT NULL COMMENT '主题风格\r\n',
- `head_img_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '头部图片',
- `color` json NOT NULL COMMENT '颜色代码',
- `btns_color` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '按钮颜色',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 216 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目主题外观模板' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_user_project
--- ----------------------------
-DROP TABLE IF EXISTS `pr_user_project`;
-CREATE TABLE `pr_user_project` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目code',
- `source_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '来源Id',
- `source_type` tinyint(5) NULL DEFAULT NULL COMMENT '来源类型',
- `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目名称',
- `describe` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '项目描述',
- `user_id` bigint(20) NOT NULL COMMENT '用户ID',
- `type` tinyint(2) NULL DEFAULT NULL COMMENT '项目类型',
- `status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '状态',
- `is_deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `code`(`key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2319 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_user_project_item
--- ----------------------------
-DROP TABLE IF EXISTS `pr_user_project_item`;
-CREATE TABLE `pr_user_project_item` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `project_key` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目key',
- `form_item_id` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '表单项Id',
- `type` tinyint(5) NOT NULL COMMENT '表单项类型 ',
- `label` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '表单项标题',
- `show_label` tinyint(1) NOT NULL COMMENT '是否显示标签',
- `default_value` json NULL COMMENT '表单项默认值',
- `required` tinyint(1) NOT NULL COMMENT '是否必填',
- `placeholder` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '输入型提示文字',
- `sort` bigint(20) NULL DEFAULT 0 COMMENT '排序',
- `span` int(10) NOT NULL DEFAULT 24 COMMENT '栅格宽度',
- `expand` json NULL COMMENT '扩展字段 表单项独有字段',
- `reg_list` json NULL COMMENT '正则表达式 ',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- INDEX `project_key`(`project_key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 19287 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表单项' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_user_project_result
--- ----------------------------
-DROP TABLE IF EXISTS `pr_user_project_result`;
-CREATE TABLE `pr_user_project_result` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `project_key` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目key',
- `serial_number` int(11) NULL DEFAULT NULL COMMENT '序号',
- `original_data` json NULL COMMENT '填写结果',
- `process_data` json NULL COMMENT '填写结果',
- `submit_ua` json NULL COMMENT '提交ua',
- `submit_os` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交系统',
- `submit_browser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交浏览器',
- `submit_request_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '请求ip',
- `submit_address` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交地址',
- `complete_time` int(11) NULL DEFAULT NULL COMMENT '完成时间 毫秒',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- PRIMARY KEY (`id`) USING BTREE,
- INDEX `project_key`(`project_key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1822 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表单项' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_user_project_setting
--- ----------------------------
-DROP TABLE IF EXISTS `pr_user_project_setting`;
-CREATE TABLE `pr_user_project_setting` (
- `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(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交提示图片',
- `submit_prompt_text` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交提示文字',
- `submit_jump_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交跳转连接',
- `is_wx_write` tinyint(1) NULL DEFAULT NULL COMMENT '只在微信填写',
- `is_everyone_write_once` tinyint(1) NULL DEFAULT NULL COMMENT '每人只能填写一次',
- `is_everyone_day_write_once` tinyint(1) NULL DEFAULT NULL COMMENT '每人每天只能填写一次',
- `write_once_prompt_text` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '填写之后提示',
- `new_write_notify_email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '新反馈通知邮件',
- `new_write_notify_wx` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '新反馈通知微信',
- `is_record_wx_user` tinyint(1) NULL DEFAULT NULL COMMENT '记录微信用户个人信息',
- `timed_collection_begin_time` datetime NULL DEFAULT NULL COMMENT '定时收集开始时间',
- `timed_collection_end_time` datetime NULL DEFAULT NULL COMMENT '定时收集结束时间',
- `timed_not_enabled_prompt_text` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '定时未启动提示文字',
- `timed_deactivate_prompt_text` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '定时停用会提示文字',
- `timed_quantitative_quantity` int(100) NULL DEFAULT NULL COMMENT '定时定量数量',
- `timed_end_prompt_text` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '定时定量完成提示',
- `share_img` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享图片',
- `share_title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享标题',
- `share_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享描述',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `project_key`(`project_key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 348 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表单项' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for pr_user_project_theme
--- ----------------------------
-DROP TABLE IF EXISTS `pr_user_project_theme`;
-CREATE TABLE `pr_user_project_theme` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `project_key` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '项目key',
- `theme_id` bigint(20) NULL DEFAULT NULL COMMENT '主题Id',
- `submit_btn_text` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '提交按钮文字',
- `logo_img` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'logo图片',
- `logo_position` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'logo位置',
- `background_color` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '背景颜色',
- `background_img` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '背景图片',
- `show_title` tinyint(1) NULL DEFAULT 1 COMMENT '是否显示标题',
- `show_describe` tinyint(1) NULL DEFAULT 1 COMMENT '是否显示描述语',
- `show_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '显示序号',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `project_key`(`project_key`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 623 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '项目表单项' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for wx_mp_user
--- ----------------------------
-DROP TABLE IF EXISTS `wx_mp_user`;
-CREATE TABLE `wx_mp_user` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键',
- `appid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '公众号AppId',
- `nickname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称',
- `sex` tinyint(1) NULL DEFAULT NULL COMMENT '性别',
- `head_img_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '头像',
- `union_id` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
- `open_id` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `country` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '国家',
- `province` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省',
- `city` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '城市',
- `is_subscribe` tinyint(1) NULL DEFAULT 1 COMMENT '是否关注',
- `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户Id',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- PRIMARY KEY (`id`) USING BTREE,
- INDEX `wx_union_id`(`head_img_url`(191)) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 114 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '微信公众号用户 ' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-INSERT INTO `tduck`.`ac_user`(`name`, `avatar`, `gender`, `email`, `phone_number`, `password`, `reg_channel`, `last_login_channel`, `last_login_time`, `last_login_ip`, `deleted`, `create_time`, `update_time`) VALUES ( 'Tduck001', 'https://freebrio.oss-cn-shanghai.aliyuncs.com/t/avatar.jpg', 0, 'test@tduck.com', NULL, 'ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f', '1', 2, '2021-01-12 17:45:41', '58.39.239.51', 0, '2020-11-12 11:50:50', '2021-01-12 17:45:41');
diff --git a/tduck-api/src/main/resources/db/migration/V2.0_20210412_1234__update.sql b/tduck-api/src/main/resources/db/migration/V2.0_20210412_1234__update.sql
deleted file mode 100644
index 807a469..0000000
--- a/tduck-api/src/main/resources/db/migration/V2.0_20210412_1234__update.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `tduck`.`pr_user_project_item`
- MODIFY COLUMN `type` varchar(25) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '表单项类型 ' AFTER `form_item_id`;
\ No newline at end of file