diff --git a/README.md b/README.md
index 2f3a465..bfedc01 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,62 @@
-# Jiscuss
-Jiscuss-基于java的简单论坛系统
+中文 | [English](./README.md)
+
+ Jiscuss
+基于java的简单论坛系统，Jiscuss = Java + Discuss
+
+---
+
+
+ 
+
+
+
+ Github 仓库 |
+ Gitee 仓库 |
+ 在线体验
+
+
+
+
+
+# 预览
+[](https://imgchr.com/i/sykhy4)
+
+
+# 简介
+基于JAVA，使用SpringBoot + H2 Database + Semantic-UI 构建，[[www.jiscuss.com]](http://www.jiscuss.com/)
+
+# 在线体验
+
+- [[DEMO地址]](http://demo.jiscuss.com/)
+
+# 部署
+## [一]、开发环境配置
+
+```
+// 需jdk 1.8+，maven
+```
+
+## [二]、下载代码
+
+
+
+## [三]、运行启动
+
+```
+// 1、代码导入IDE
+
+
+// 2、启动服务
+
+
+// 3、访问地址
+http://localhost
+```
+
+
+## [四]、开源协议
+
+[MIT](https://opensource.org/licenses/MIT)
+
+
+
diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/AdminSystemController.java b/src/main/java/com/yaoyuan/jiscuss/controller/AdminSystemController.java
index d2444c1..01e2b07 100644
--- a/src/main/java/com/yaoyuan/jiscuss/controller/AdminSystemController.java
+++ b/src/main/java/com/yaoyuan/jiscuss/controller/AdminSystemController.java
@@ -1,6 +1,12 @@
package com.yaoyuan.jiscuss.controller;
+import com.yaoyuan.jiscuss.entity.UserInfo;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 后台系统控制器
@@ -13,4 +19,15 @@ public class AdminSystemController {
//后台退出
//后台设置管理
+
+ /**
+ * 后台页面
+ *
+ * @return
+ */
+ @RequestMapping("/admin/home")
+ public String user(@RequestParam(defaultValue = "discussion") String type, HttpServletRequest request, ModelMap map) {
+
+ return "admin/home";
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e627583..7ddbf18 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,22 +1,29 @@
-#mysql 配置
+#h2 配置
spring:
cache:
type: ehcache
ehcache:
config: classpath:ehcache.xml
jpa:
- database: MYSQL
+ generate-ddl: false
show-sql: true
hibernate:
- ddl-auto: update
+ ddl-auto: none
+ h2:
+ console:
+ path: /h2-console
+ enabled: true
+ settings:
+ web-allow-others: true
datasource:
- url: jdbc:mysql://localhost:3306/jiscuss?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
- username: root
- password: 123456
- driver-class-name: com.mysql.jdbc.Driver
+ platform: h2
+ url: jdbc:h2:~/testjiscuss
+ username: sa
+ password:
+ schema: classpath:schema.sql
+ data: classpath:data.sql
+ driver-class-name: org.h2.Driver
type: com.alibaba.druid.pool.DruidDataSource
- tomcat:
- init-s-q-l: SET NAMES utf8mb4
druid:
min-idle: 2
initial-size: 5
@@ -27,7 +34,7 @@ spring:
filter:
stat:
enabled: true
- db-type: mysql
+ db-type: h2
log-slow-sql: true
slow-sql-millis: 2000
# 监控过滤器
diff --git a/src/main/resources/pic/diss-jiscuss.png b/src/main/resources/pic/diss-jiscuss.png
new file mode 100644
index 0000000..e003c86
Binary files /dev/null and b/src/main/resources/pic/diss-jiscuss.png differ
diff --git a/src/main/resources/pic/disscuss.png b/src/main/resources/pic/disscuss.png
deleted file mode 100644
index 3ff087e..0000000
Binary files a/src/main/resources/pic/disscuss.png and /dev/null differ
diff --git a/src/main/resources/pic/home-jiscuss.png b/src/main/resources/pic/home-jiscuss.png
new file mode 100644
index 0000000..d577c9f
Binary files /dev/null and b/src/main/resources/pic/home-jiscuss.png differ
diff --git a/src/main/resources/pic/home.png b/src/main/resources/pic/home.png
deleted file mode 100644
index 0acabb6..0000000
Binary files a/src/main/resources/pic/home.png and /dev/null differ
diff --git a/src/main/resources/pic/login-jiscuss.png b/src/main/resources/pic/login-jiscuss.png
new file mode 100644
index 0000000..6d44bf0
Binary files /dev/null and b/src/main/resources/pic/login-jiscuss.png differ
diff --git a/src/main/resources/pic/login.png b/src/main/resources/pic/login.png
deleted file mode 100644
index ca58e89..0000000
Binary files a/src/main/resources/pic/login.png and /dev/null differ
diff --git a/src/main/resources/pic/reg-jiscuss.png b/src/main/resources/pic/reg-jiscuss.png
new file mode 100644
index 0000000..9c89e26
Binary files /dev/null and b/src/main/resources/pic/reg-jiscuss.png differ
diff --git a/src/main/resources/pic/tag-jiscuss.png b/src/main/resources/pic/tag-jiscuss.png
new file mode 100644
index 0000000..5a2d27a
Binary files /dev/null and b/src/main/resources/pic/tag-jiscuss.png differ
diff --git a/src/main/resources/templates/admin/admin-commjs.ftl b/src/main/resources/templates/admin/admin-commjs.ftl
new file mode 100644
index 0000000..0dff638
--- /dev/null
+++ b/src/main/resources/templates/admin/admin-commjs.ftl
@@ -0,0 +1,29 @@
+<#--jquery-->
+
+
+<#--semantic-ui-->
+
+<#-- -->
+
+
+<#--
+<#-- href="https://lib.baomitu.com/semantic-ui/2.4.1/semantic.min.css" rel="stylesheet">-->
+
+<#---->
+
+<#--tinymce-->
+
+
+
+<#--layx-->
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/admin/home.ftl b/src/main/resources/templates/admin/home.ftl
new file mode 100644
index 0000000..161dc18
--- /dev/null
+++ b/src/main/resources/templates/admin/home.ftl
@@ -0,0 +1,338 @@
+
+
+后台管理首页
+
+
+
+
+ <#--jquery-->
+
+
+ <#--semantic-ui-->
+
+
+
+
+
+ <#--tinymce-->
+
+
+
+ <#--layx-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Label
+
Something else
+
+
+
+
Label
+
Something else
+
+
+
+
Label
+
Something else
+
+
+
+
Label
+
Something else
+
+
+
+
+
+
+
+
+
+
+ | # |
+ Header |
+ Header |
+ Header |
+ Header |
+
+
+
+
+ | 1,001 |
+ Lorem |
+ ipsum |
+ dolor |
+ sit |
+
+
+ | 1,002 |
+ amet |
+ consectetur |
+ adipiscing |
+ elit |
+
+
+ | 1,003 |
+ Integer |
+ nec |
+ odio |
+ Praesent |
+
+
+ | 1,003 |
+ libero |
+ Sed |
+ cursus |
+ ante |
+
+
+ | 1,004 |
+ dapibus |
+ diam |
+ Sed |
+ nisi |
+
+
+ | 1,005 |
+ Nulla |
+ quis |
+ sem |
+ at |
+
+
+ | 1,006 |
+ nibh |
+ elementum |
+ imperdiet |
+ Duis |
+
+
+ | 1,007 |
+ sagittis |
+ ipsum |
+ Praesent |
+ mauris |
+
+
+ | 1,008 |
+ Fusce |
+ nec |
+ tellus |
+ sed |
+
+
+ | 1,009 |
+ augue |
+ semper |
+ porta |
+ Mauris |
+
+
+ | 1,010 |
+ massa |
+ Vestibulum |
+ lacinia |
+ arcu |
+
+
+ | 1,011 |
+ eget |
+ nulla |
+ Class |
+ aptent |
+
+
+ | 1,012 |
+ taciti |
+ sociosqu |
+ ad |
+ litora |
+
+
+ | 1,013 |
+ torquent |
+ per |
+ conubia |
+ nostra |
+
+
+ | 1,014 |
+ per |
+ inceptos |
+ himenaeos |
+ Curabitur |
+
+
+ | 1,015 |
+ sodales |
+ ligula |
+ in |
+ libero |
+
+
+
+
+
+
+