diff --git a/pom.xml b/pom.xml index e881359e817dcca3459246c5d3683b9614b78bcc..f69ce05aeaa54eb73c8e240291f349dd99ce7c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.fstack FStackForum - 1.1.0 + 1.1.1 jar FStackForum diff --git a/src/main/resources/_data_second.sql b/src/main/resources/_data_second.sql index 45e2685ee3d188a82c08acbc862a3fda41649147..7ea413f19c8e7824b194522d0546357f405ff3e8 100644 --- a/src/main/resources/_data_second.sql +++ b/src/main/resources/_data_second.sql @@ -1,10 +1,11 @@ -- init data -- User Data -INSERT INTO `T_USER` (username, password, email, activated, date_created, bio, roles) VALUES ('admin', '$2a$10$HiaJpKERbSfcZcuG5vcvlOZDG6Y/5SkDKi9RvKsSK3t3Spl9.7u6u', 'admin@admin.com', 1, '2017-11-02', 'admin bio', 'ADMIN,USER'); -INSERT INTO `T_USER` (username, password, email, activated, date_created, bio, roles) VALUES ('user', '$2a$10$Dr2lvPjmjiMuWf3mcMlyQeSbxFHI5LDLudHIB/fK/uygI1pnKk/3m', 'user@user.com', 1, '2017-11-02', 'user bio', 'USER'); +INSERT INTO `T_USER` (username, password, email, activated, date_created, bio, roles) VALUES ('admin', '$2a$10$TnjJUYkKUP0BMlcMlmJL9.xjb0W3Htl15h3crRtHOlM0.RYcCu/zi', 'admin@admin.com', 1, '2017-11-02', 'admin bio', 'ADMIN,USER'); +INSERT INTO `T_USER` (username, password, email, activated, date_created, bio, roles) VALUES ('user', '$2a$10$TnjJUYkKUP0BMlcMlmJL9.xjb0W3Htl15h3crRtHOlM0.RYcCu/zi', 'user@user.com', 1, '2017-11-02', 'user bio', 'USER'); -- Category Data +INSERT INTO `T_CATEGORY` (name, weight, display_name, username, date_created) VALUES ('default', 0, '默认', 'admin', '2017-11-02'); INSERT INTO `T_CATEGORY` (name, weight, display_name, username, date_created) VALUES ('java', 1, 'Java', 'admin', '2017-11-02'); INSERT INTO `T_CATEGORY` (name, weight, display_name, username, date_created) VALUES ('python', 2, 'Python', 'user', '2017-11-02'); INSERT INTO `T_CATEGORY` (name, weight, display_name, username, date_created) VALUES ('job-hunting', 3, '求职', 'user', '2017-11-02'); diff --git a/src/main/resources/_schema_first.sql b/src/main/resources/_schema_first.sql index da3c960625f530b52a001b3ed3ecd7546a710555..f2c3f328a252a042e64184efa695f1d52a93f29a 100644 --- a/src/main/resources/_schema_first.sql +++ b/src/main/resources/_schema_first.sql @@ -11,7 +11,7 @@ CREATE TABLE `T_USER` ( `email` VARCHAR(255) NOT NULL, `activated` TINYINT(1) NOT NULL DEFAULT 1, `date_created` DATETIME NOT NULL, - `avatar_location` VARCHAR(255) DEFAULT 'avatar/default_avatar.png', + `avatar_location` VARCHAR(255) DEFAULT '/avatar/default_avatar.png', `bio` VARCHAR(255), `roles` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2c807f08e53d440fad8d8bf62113b73b5548f8cd..fb8e6105e5b52169621535ad085ab048fc30c8a8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ server.port=9999 -spring.profiles.active= pro +spring.profiles.active= dev server.servlet.context-path= / spring.aop.proxy-target-class=true # ============================== @@ -31,8 +31,7 @@ pagehelper.reasonable=true pagehelper.supportMethodsArguments=true pagehelper.params=count=countSql # ============================== -# fsforum data directory +# spring # ============================== -#fs.forum.data-directory=D: spring.output.ansi.enabled=always logging.config=classpath:logback.xml \ No newline at end of file diff --git a/src/main/resources/static/default.jpg b/src/main/resources/static/default.jpg deleted file mode 100644 index 620bbfd7e5912609e81558b13ea255c00c0a5b98..0000000000000000000000000000000000000000 Binary files a/src/main/resources/static/default.jpg and /dev/null differ