diff --git a/.gitignore b/.gitignore
index a39caa15..9a85d8d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@
 build/
 .idea/
 logs/
-*.map
\ No newline at end of file
+*.map
+files/
+.settings
+bin/
\ No newline at end of file
diff --git a/api/build.gradle b/api/build.gradle
index 7adc007d..74ef1400 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,8 +1,7 @@
 plugins {
+    id 'maven-publish'
 }
 
-group = 'cn.surveyking'
-version = '0.0.1-release'
 sourceCompatibility = '1.8'
 project.archivesBaseName = 'surveyking'
 
diff --git a/api/src/main/resources/scripts/init.sql b/api/src/main/resources/scripts/init.sql
deleted file mode 100644
index 10f05df1..00000000
--- a/api/src/main/resources/scripts/init.sql
+++ /dev/null
@@ -1,84 +0,0 @@
-create table if not exists t_user(
-  id varchar(64),
-  full_name varchar,
-  avatar varchar,
-  gender varchar,
-  username varchar,
-  phone varchar,
-  password varchar,
-  salt varchar,
-  status int default 1,
-  create_by varchar,
-  create_at timestamp,
-  update_by varchar,
-  update_at timestamp,
-  deleted int default 0,
-  PRIMARY KEY(id),
-  UNIQUE KEY t_user_username_UK(username)
-);
-
-create table if not exists t_project(
-  id varchar(64) NOT NULL,
-  short_id varchar(32),
-  name varchar(64) comment '项目名称',
-  survey CLOB comment '问卷',
-  setting varchar comment '问卷设置',
-  status int default 0 comment '0未发布 1已发布',
-  create_by varchar,
-  create_at timestamp,
-  update_by varchar,
-  belong_group varchar,
-  update_at timestamp,
-  deleted int default 0,
-  PRIMARY KEY(id),
-  UNIQUE KEY t_project_short_id_UK(short_id)
-);
-
-create table if not exists t_answer(
-  id varchar(64),
-  short_id varchar(64),
-  answer CLOB comment '问卷答案',
-  attachment varchar comment '问卷元数据',
-  meta_info varchar comment '问卷元数据',
-  temp_save int comment '0暂存 1已完成',
-  create_by varchar,
-  create_at timestamp,
-  update_by varchar,
-  update_at timestamp,
-  deleted int default 0,
-  PRIMARY KEY(id)
-);
-
-create table if not exists t_file(
-    id varchar(64),
-    original_name varchar(256),
-    file_name  varchar(256),
-    file_path varchar(512),
-    thumb_file_path varchar(512),
-    storage_type int,
-    create_by varchar,
-    create_at timestamp,
-    update_by varchar,
-    update_at timestamp,
-    shared int default 0,
-    deleted int default 0,
-    PRIMARY KEY(id)
-);
-
-create table if not exists t_template(
-    id varchar(64),
-    name varchar(64) comment '模板标题',
-    question_type varchar(64) comment '问题类型',
-    template CLOB comment '模板',
-    category varchar(256)  comment '模板分类',
-    tag varchar(512)  comment '标签',
-    priority int comment '排序优先级',
-    preview_url varchar(512) comment '预览地址',
-    create_at timestamp,
-    create_by varchar,
-    update_at timestamp,
-    update_by varchar,
-    shared int default 0,
-    deleted int default 0,
-    PRIMARY KEY(id)
-);
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b209415a..66a82dbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,11 @@ repositories {
 	mavenCentral()
 }
 
+allprojects {
+    group = 'cn.surveyking'
+    version = 'v0.1.0'
+}
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'org.springframework.boot'
diff --git a/rdbms/build.gradle b/rdbms/build.gradle
index c59692f0..1f5b138e 100644
--- a/rdbms/build.gradle
+++ b/rdbms/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
     implementation 'com.h2database:h2:1.4.200'
+//    implementation 'mysql:mysql-connector-java:8.0.26'
 }
 
 test {
diff --git a/rdbms/src/main/java/cn/surveyking/server/impl/TemplateServiceImpl.java b/rdbms/src/main/java/cn/surveyking/server/impl/TemplateServiceImpl.java
index 0997a693..cacea95b 100644
--- a/rdbms/src/main/java/cn/surveyking/server/impl/TemplateServiceImpl.java
+++ b/rdbms/src/main/java/cn/surveyking/server/impl/TemplateServiceImpl.java
@@ -37,15 +37,17 @@ public class TemplateServiceImpl extends BaseService<TemplateMapper, Template> i
 
 	@Override
 	public PaginationResponse<TemplateView> listTemplate(TemplateQuery query) {
-		Page<Template> templatePage = pageByQuery(query,
-				Wrappers.<Template>lambdaQuery().like(isNotEmpty(query.getName()), Template::getName, query.getName())
-						.eq(query.getQuestionType() != null, Template::getQuestionType, query.getQuestionType())
-						.in(query.getCategories().size() > 0, Template::getCategory, query.getCategories())
-						.eq(Template::getShared, query.getShared())
-						.eq(query.getShared() == 0, Template::getCreateBy, SecurityContextUtils.getUserId())
-						.and(query.getTags().size() > 0, i -> query.getTags().forEach(tag -> {
-							i.or(j -> j.like(Template::getTag, tag));
-						})).orderByAsc(Template::getPriority));
+		Page<Template> templatePage = pageByQuery(query, Wrappers.<Template>lambdaQuery()
+				.like(isNotEmpty(query.getName()), Template::getName, query.getName())
+				.eq(query.getQuestionType() != null, Template::getQuestionType, query.getQuestionType())
+				// 默认查询额是普通题型
+				.ne(query.getQuestionType() == null, Template::getQuestionType, SurveySchemaType.QuestionType.Survey)
+				.in(query.getCategories().size() > 0, Template::getCategory, query.getCategories())
+				.eq(Template::getShared, query.getShared())
+				.eq(query.getShared() == 0, Template::getCreateBy, SecurityContextUtils.getUserId())
+				.and(query.getTags().size() > 0, i -> query.getTags().forEach(tag -> {
+					i.or(j -> j.like(Template::getTag, tag));
+				})).orderByAsc(Template::getPriority));
 		return new PaginationResponse<>(templatePage.getTotal(),
 				templatePage.getRecords().stream().map(x -> templateViewMapper.toView(x)).collect(Collectors.toList()));
 	}
diff --git a/rdbms/src/main/java/cn/surveyking/server/impl/UserServiceImpl.java b/rdbms/src/main/java/cn/surveyking/server/impl/UserServiceImpl.java
index 9ed4d7db..317588aa 100644
--- a/rdbms/src/main/java/cn/surveyking/server/impl/UserServiceImpl.java
+++ b/rdbms/src/main/java/cn/surveyking/server/impl/UserServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.surveyking.server.core.common.PaginationResponse;
 import cn.surveyking.server.core.constant.AppConsts;
+import cn.surveyking.server.core.security.PreAuthorizeAnnotationExtractor;
 import cn.surveyking.server.domain.dto.UserInfo;
 import cn.surveyking.server.domain.dto.UserQuery;
 import cn.surveyking.server.domain.dto.UserRequest;
@@ -13,7 +14,6 @@
 import cn.surveyking.server.domain.model.User;
 import cn.surveyking.server.domain.model.UserRole;
 import cn.surveyking.server.mapper.AccountMapper;
-import cn.surveyking.server.mapper.RoleMapper;
 import cn.surveyking.server.mapper.UserMapper;
 import cn.surveyking.server.mapper.UserRoleMapper;
 import cn.surveyking.server.service.BaseService;
@@ -22,6 +22,7 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.GrantedAuthority;
@@ -46,6 +47,7 @@
 @Service
 @Transactional
 @RequiredArgsConstructor
+@Slf4j
 public class UserServiceImpl extends BaseService<UserMapper, User> implements UserService {
 
 	private final AccountMapper accountMapper;
@@ -58,7 +60,7 @@ public class UserServiceImpl extends BaseService<UserMapper, User> implements Us
 
 	private final UserRoleMapper userRoleMapper;
 
-	private final RoleMapper roleMapper;
+	private final RoleServiceImpl roleService;
 
 	/**
 	 * @param username 账号密码登录认证使用
@@ -87,7 +89,7 @@ public UserInfo currentUser(String userId) {
 		UserInfo userInfo = userViewMapper.toUserInfo(user);
 		List<Role> roles = userRoleMapper
 				.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, user.getId())).stream()
-				.map(ur -> roleMapper.selectById(ur.getRoleId())).collect(Collectors.toList());
+				.map(ur -> roleService.getById(ur.getRoleId())).collect(Collectors.toList());
 		Set<String> authorities = new HashSet<>();
 		roles.forEach(role -> {
 			authorities.add("ROLE_" + role.getCode());
@@ -108,10 +110,10 @@ public PaginationResponse<UserView> getUsers(UserQuery query) {
 			UserView userView = userViewMapper.toUserView(x);
 			userView.setUsername(accountMapper
 					.selectOne(Wrappers.<Account>lambdaQuery().eq(Account::getUserId, x.getId())).getAuthAccount());
-			userView.setRoles(userRoleMapper
-					.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, x.getId())).stream()
-					.map(userRole -> roleViewMapper.toView(roleMapper.selectById(userRole.getRoleId())))
-					.collect(Collectors.toList()));
+			userView.setRoles(
+					userRoleMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, x.getId()))
+							.stream().map(userRole -> roleViewMapper.toView(roleService.getById(userRole.getRoleId())))
+							.collect(Collectors.toList()));
 			return userView;
 		}).collect(Collectors.toList()));
 	}
@@ -181,4 +183,43 @@ public boolean checkUsernameExist(String username) {
 		return false;
 	}
 
+	@Override
+	public void init() {
+		if (count() > 0) {
+			return;
+		}
+		log.info("开始初始化系统用户");
+		// 创建角色
+		Role role = new Role();
+		role.setName("Admin");
+		role.setCode("admin");
+		role.setRemark("系统初始化角色");
+		role.setAuthority(String.join(",", PreAuthorizeAnnotationExtractor.extractAllApiPermissions()));
+		roleService.save(role);
+
+		// 创建用户
+		User user = new User();
+		user.setName("Admin");
+		user.setGender("M");
+		user.setStatus(AppConsts.USER_STATUS.VALID.getStatus());
+		save(user);
+
+		// 绑定用户角色
+		UserRole userRole = new UserRole();
+		userRole.setUserId(user.getId());
+		userRole.setRoleId(role.getId());
+		userRole.setUserType(AppConsts.USER_TYPE.SysUser.name());
+		userRoleMapper.insert(userRole);
+
+		// 创建账号
+		Account account = new Account();
+		account.setAuthAccount("admin");
+		account.setAuthSecret(passwordEncoder.encode("surveyking"));
+		account.setUserId(user.getId());
+		account.setUserType(AppConsts.USER_TYPE.SysUser.name());
+		account.setStatus(AppConsts.USER_STATUS.VALID.getStatus());
+		accountMapper.insert(account);
+		log.info("系统用户初始化完成(admin/surveyking)");
+	}
+
 }
diff --git a/rdbms/src/main/resources/config/application-pro.yml b/rdbms/src/main/resources/config/application-pro.yml
index 9ba71c80..745cadf2 100644
--- a/rdbms/src/main/resources/config/application-pro.yml
+++ b/rdbms/src/main/resources/config/application-pro.yml
@@ -5,7 +5,7 @@ spring:
   datasource:
     username: sa
     password: sa
-    url: jdbc:h2:./survey;INIT=runscript from 'classpath:scripts/init.sql'
+    url: jdbc:h2:./survey;INIT=runscript from 'classpath:scripts/init-h2.sql'
     driver-class-name: org.h2.Driver
 mybatis-plus:
   configuration:
diff --git a/rdbms/src/main/resources/scripts/init-h2.sql b/rdbms/src/main/resources/scripts/init-h2.sql
new file mode 100644
index 00000000..500e0abb
--- /dev/null
+++ b/rdbms/src/main/resources/scripts/init-h2.sql
@@ -0,0 +1,169 @@
+-- ----------------------------
+-- Table structure for t_account
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_account` (
+  `id` varchar(64) NOT NULL COMMENT 'ID',
+  `user_type` varchar(100) NOT NULL DEFAULT 'SysUser' COMMENT '用户类型',
+  `user_id` varchar(64) NOT NULL COMMENT '用户ID',
+  `auth_type` varchar(20) NOT NULL DEFAULT 'PWD' COMMENT '认证方式',
+  `auth_account` varchar(100) NOT NULL COMMENT '用户名',
+  `auth_secret` varchar(64) DEFAULT NULL COMMENT '密码',
+  `secret_salt` varchar(32) DEFAULT NULL COMMENT '加密盐',
+  `status` int(11) NOT NULL DEFAULT '1' COMMENT '用户状态',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256) DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ;
+COMMENT ON TABLE `t_account` IS '登录账号';
+
+-- ----------------------------
+-- Table structure for t_answer
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_answer` (
+  `id` varchar(64)  NOT NULL,
+  `short_id` varchar(64)  DEFAULT NULL,
+  `answer` text  COMMENT '问卷答案',
+  `attachment` varchar(1024)  DEFAULT NULL COMMENT '问卷元数据',
+  `meta_info` text  COMMENT '问卷元数据',
+  `temp_save` int(11) DEFAULT NULL COMMENT '0暂存 1已完成',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256)  DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256)  DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+COMMENT ON TABLE `t_answer` IS '答案';
+-- ----------------------------
+-- Table structure for t_file
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_file` (
+  `id` varchar(64)  NOT NULL,
+  `original_name` varchar(256)  DEFAULT NULL,
+  `file_name` varchar(256)  DEFAULT NULL,
+  `file_path` varchar(512)  DEFAULT NULL,
+  `thumb_file_path` varchar(512)  DEFAULT NULL,
+  `storage_type` int(11) DEFAULT NULL,
+  `shared` int(11) DEFAULT '0',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256)  DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256)  DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+COMMENT ON TABLE `t_file` IS '附件';
+-- ----------------------------
+-- Records of t_file
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for t_project
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_project` (
+  `id` varchar(64)  NOT NULL,
+  `short_id` varchar(32)  DEFAULT NULL,
+  `name` varchar(64)  DEFAULT NULL COMMENT '项目名称',
+  `survey` longtext  COMMENT '问卷',
+  `setting` varchar(256)  DEFAULT NULL COMMENT '问卷设置',
+  `status` int(11) DEFAULT '0' COMMENT '0未发布 1已发布',
+  `belong_group` varchar(256)  DEFAULT NULL,
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256)  DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256)  DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `short_id` (`short_id`)
+) ;
+COMMENT ON TABLE `t_project` IS '项目';
+-- ----------------------------
+-- Table structure for t_role
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `name` varchar(50) NOT NULL COMMENT '名称',
+  `code` varchar(50) NOT NULL COMMENT '编码',
+  `remark` varchar(100) DEFAULT NULL COMMENT '备注',
+  `authority` varchar(3000) DEFAULT NULL COMMENT '权限列表',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256) DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+COMMENT ON TABLE `t_role` IS '角色';
+-- ----------------------------
+-- ----------------------------
+-- Table structure for t_template
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_template` (
+  `id` varchar(64)  NOT NULL,
+  `name` varchar(64)  DEFAULT NULL COMMENT '模板标题',
+  `question_type` varchar(64)  DEFAULT NULL COMMENT '问题类型',
+  `template` longtext  COMMENT '模板',
+  `category` varchar(256)  DEFAULT NULL COMMENT '模板分类',
+  `tag` varchar(512)  DEFAULT NULL COMMENT '标签',
+  `priority` int(11) DEFAULT NULL COMMENT '排序优先级',
+  `preview_url` varchar(512)  DEFAULT NULL COMMENT '预览地址',
+  `shared` int(11) DEFAULT '0',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256)  DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256)  DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+COMMENT ON TABLE `t_template` IS '模板';
+-- ----------------------------
+-- Records of t_template
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for t_user
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_user` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `name` varchar(50) NOT NULL COMMENT '真实姓名',
+  `gender` varchar(10) NOT NULL COMMENT '性别',
+  `birthday` date DEFAULT NULL COMMENT '出生日期',
+  `phone` varchar(20) DEFAULT NULL COMMENT '手机号',
+  `email` varchar(50) DEFAULT NULL COMMENT 'Email',
+  `avatar_url` varchar(200) DEFAULT NULL COMMENT '头像地址',
+  `status` int(11) NOT NULL DEFAULT '1' COMMENT '用户状态',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256) DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+COMMENT ON TABLE `t_user` IS '系统用户';
+-- ----------------------------
+-- Records of t_user
+-- ----------------------------
+-- ----------------------------
+-- Table structure for t_user_role
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS `t_user_role` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `user_type` varchar(100) NOT NULL DEFAULT 'SysUser' COMMENT '用户类型',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `role_id` bigint(20) NOT NULL COMMENT '角色ID',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+  `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by` varchar(256) DEFAULT NULL,
+  `update_at` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `update_by` varchar(256) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+);
+COMMENT ON TABLE `t_user_role` IS '用户角色关联';
+-- ----------------------------
\ No newline at end of file
diff --git a/rdbms/src/main/resources/scripts/mysql.sql b/rdbms/src/main/resources/scripts/init-mysql.sql
similarity index 84%
rename from rdbms/src/main/resources/scripts/mysql.sql
rename to rdbms/src/main/resources/scripts/init-mysql.sql
index cc012ee1..25bd2809 100644
--- a/rdbms/src/main/resources/scripts/mysql.sql
+++ b/rdbms/src/main/resources/scripts/init-mysql.sql
@@ -37,13 +37,6 @@ CREATE TABLE `t_account` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='登录账号';
 
--- ----------------------------
--- Records of t_account
--- ----------------------------
-BEGIN;
-INSERT INTO `t_account` VALUES ('1448313054600114177', 'SysUser', '1448313054205849601', 'PWD', 'admin', '$2a$10$1guxYQ160K0ws39KU2IdSObp8ziRTg1Xh7TwPmalSO0xfZfLQ/rhm', NULL, 1, 0, '2021-10-13 23:41:55', 'guest', '2021-10-13 23:44:57', NULL);
-COMMIT;
-
 -- ----------------------------
 -- Table structure for t_answer
 -- ----------------------------
@@ -97,7 +90,7 @@ CREATE TABLE `t_project` (
   `id` varchar(64) COLLATE utf8mb4_bin NOT NULL,
   `short_id` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
   `name` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '项目名称',
-  `survey` text COLLATE utf8mb4_bin COMMENT '问卷',
+  `survey` longtext COLLATE utf8mb4_bin COMMENT '问卷',
   `setting` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '问卷设置',
   `status` int(11) DEFAULT '0' COMMENT '0未发布 1已发布',
   `belong_group` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL,
@@ -128,13 +121,6 @@ CREATE TABLE `t_role` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1448917371220783106 DEFAULT CHARSET=utf8 COMMENT='角色';
 
--- ----------------------------
--- Records of t_role
--- ----------------------------
-BEGIN;
-INSERT INTO `t_role` VALUES (1448313054675611649, '管理员', 'admin', NULL, 'template,template:update,template:category,template:tag,system,system:role,system:role:create,system:role:update,project,project:list,project:detail,project:create,project:update,project:delete,project:report,answer,answer:export,answer:list,answer:detail,answer:create,answer:update,answer:delete,file,file:detail,file:import,file:list,file:delete,template:create,template:delete,system:role:delete', 0, '2021-10-13 23:41:55', 'guest', '2021-10-15 15:57:11', '1448313054205849601');
-COMMIT;
-
 -- ----------------------------
 -- Table structure for t_template
 -- ----------------------------
@@ -143,7 +129,7 @@ CREATE TABLE `t_template` (
   `id` varchar(64) COLLATE utf8mb4_bin NOT NULL,
   `name` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '模板标题',
   `question_type` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '问题类型',
-  `template` text COLLATE utf8mb4_bin COMMENT '模板',
+  `template` longtext COLLATE utf8mb4_bin COMMENT '模板',
   `category` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '模板分类',
   `tag` varchar(512) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '标签',
   `priority` int(11) DEFAULT NULL COMMENT '排序优先级',
@@ -184,13 +170,6 @@ CREATE TABLE `t_user` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1448313054205849602 DEFAULT CHARSET=utf8 COMMENT='系统用户';
 
--- ----------------------------
--- Records of t_user
--- ----------------------------
-BEGIN;
-INSERT INTO `t_user` VALUES (1448313054205849601, 'Admin', '男', NULL, '13800138000', NULL, NULL, 1, 0, '2021-10-13 23:41:55', 'guest', NULL, NULL);
-COMMIT;
-
 -- ----------------------------
 -- Table structure for t_user_role
 -- ----------------------------
@@ -209,11 +188,4 @@ CREATE TABLE `t_user_role` (
   KEY `idx_t_user_role` (`user_type`,`user_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1448313054692388867 DEFAULT CHARSET=utf8 COMMENT='用户角色关联';
 
--- ----------------------------
--- Records of t_user_role
--- ----------------------------
-BEGIN;
-INSERT INTO `t_user_role` VALUES (1448313054692388866, 'SysUser', 1448313054205849601, 1448313054675611649, 0, '2021-10-13 23:41:55', 'guest', NULL, NULL);
-COMMIT;
-
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/shared/src/main/java/cn/surveyking/server/core/config/AppConfig.java b/shared/src/main/java/cn/surveyking/server/core/config/AppConfig.java
new file mode 100644
index 00000000..8d824c0e
--- /dev/null
+++ b/shared/src/main/java/cn/surveyking/server/core/config/AppConfig.java
@@ -0,0 +1,31 @@
+package cn.surveyking.server.core.config;
+
+import cn.surveyking.server.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+
+/**
+ * @author javahuang
+ * @date 2021/10/19
+ */
+@Configuration
+public class AppConfig {
+
+	private UserService userService;
+
+	@Autowired
+	public void setUserService(UserService userService) {
+		this.userService = userService;
+	}
+
+	/**
+	 * 系统用户初始化
+	 */
+	@EventListener(ApplicationReadyEvent.class)
+	public void initAfterStartup() {
+		userService.init();
+	}
+
+}
diff --git a/shared/src/main/java/cn/surveyking/server/core/security/PreAuthorizeAnnotationExtractor.java b/shared/src/main/java/cn/surveyking/server/core/security/PreAuthorizeAnnotationExtractor.java
index b06cefa9..ab540f2a 100644
--- a/shared/src/main/java/cn/surveyking/server/core/security/PreAuthorizeAnnotationExtractor.java
+++ b/shared/src/main/java/cn/surveyking/server/core/security/PreAuthorizeAnnotationExtractor.java
@@ -65,12 +65,17 @@ private static void parseAnnotationValue(String value) {
 		}
 		String authorityCode = StringUtils.substringBetween(value, "'");
 		if (StringUtils.isNotBlank(authorityCode)) {
-			permissions.add(authorityCode.trim());
+			String[] authorityHierarchy = authorityCode.split(":");
+			String current = authorityHierarchy[0];
+			permissions.add(current.trim());
+			for (int i = 1; i < authorityHierarchy.length; i++) {
+				current = current + ":" + authorityHierarchy[i];
+				permissions.add(current);
+			}
 		}
 		else {
 			log.warn("检测到权限码未配置 {}", value);
 		}
-
 	}
 
 	/**
diff --git a/shared/src/main/java/cn/surveyking/server/core/uitls/SchemaParser.java b/shared/src/main/java/cn/surveyking/server/core/uitls/SchemaParser.java
index 8177d0aa..006f275a 100644
--- a/shared/src/main/java/cn/surveyking/server/core/uitls/SchemaParser.java
+++ b/shared/src/main/java/cn/surveyking/server/core/uitls/SchemaParser.java
@@ -81,9 +81,19 @@ public static List<Object> parseRowData(AnswerView answerInfo, List<SurveySchema
 				}).collect(Collectors.joining(",")));
 			}
 			else if (!questionType.name().startsWith("Matrix")) {
-				Map mapValue = (Map) valueObj;
 				// 需要将数字类型转换成字符串
-				rowData.add(mapValue.values().stream().map(x -> x + "").collect(Collectors.joining(",")));
+				List<String> result = new ArrayList<>();
+				((Map<?, ?>) valueObj).forEach((optionId, v) -> {
+					if (v != null && v instanceof Boolean) {
+						// 单选、多选题，选中的话，答案会是 true，需要转换成标题
+						result.add(trimHtmlTag(schemaType.getChildren().stream().filter(x -> x.getId().equals(optionId))
+								.findFirst().get().getTitle()));
+					}
+					else {
+						result.add(v + "");
+					}
+				});
+				rowData.add(String.join(",", result));
 			}
 			else {
 				// TODO: 矩阵题如何展示答案
diff --git a/shared/src/main/java/cn/surveyking/server/domain/dto/ProjectQuery.java b/shared/src/main/java/cn/surveyking/server/domain/dto/ProjectQuery.java
index b23eb020..e84f6c8d 100644
--- a/shared/src/main/java/cn/surveyking/server/domain/dto/ProjectQuery.java
+++ b/shared/src/main/java/cn/surveyking/server/domain/dto/ProjectQuery.java
@@ -1,12 +1,14 @@
 package cn.surveyking.server.domain.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author javahuang
  * @date 2021/8/31
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class ProjectQuery extends PageQuery {
 
 	private String shortId;
diff --git a/shared/src/main/java/cn/surveyking/server/domain/dto/TemplateQuery.java b/shared/src/main/java/cn/surveyking/server/domain/dto/TemplateQuery.java
index 151ec482..d447bd11 100644
--- a/shared/src/main/java/cn/surveyking/server/domain/dto/TemplateQuery.java
+++ b/shared/src/main/java/cn/surveyking/server/domain/dto/TemplateQuery.java
@@ -1,6 +1,7 @@
 package cn.surveyking.server.domain.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,9 +11,13 @@
  * @date 2021/9/23
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TemplateQuery extends PageQuery {
 
-	SurveySchemaType.QuestionType questionType = SurveySchemaType.QuestionType.Survey;
+	/**
+	 * 如果为空则查询普通的题型
+	 */
+	SurveySchemaType.QuestionType questionType;
 
 	private String name;
 
diff --git a/shared/src/main/java/cn/surveyking/server/service/AnswerService.java b/shared/src/main/java/cn/surveyking/server/service/AnswerService.java
index e0418861..c8e73cbf 100644
--- a/shared/src/main/java/cn/surveyking/server/service/AnswerService.java
+++ b/shared/src/main/java/cn/surveyking/server/service/AnswerService.java
@@ -59,8 +59,7 @@ else if (query.getType() == DownloadQuery.DownloadType.ANSWER_ATTACHMENT) {
 					.contentType(download.getMediaType()).body(download.getResource());
 		}
 		catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-			throw new InternalServerError("下载失败");
+			throw new InternalServerError("下载失败", e);
 		}
 
 	}
diff --git a/shared/src/main/java/cn/surveyking/server/service/UserService.java b/shared/src/main/java/cn/surveyking/server/service/UserService.java
index 553d5193..56a26091 100644
--- a/shared/src/main/java/cn/surveyking/server/service/UserService.java
+++ b/shared/src/main/java/cn/surveyking/server/service/UserService.java
@@ -22,4 +22,9 @@ public interface UserService extends UserDetailsService {
 
 	boolean checkUsernameExist(String username);
 
+	/**
+	 * 系统用户初始化
+	 */
+	void init();
+
 }