diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 834a40e96..af2e2b855 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -92,7 +92,7 @@ shiro: # 权限认证失败地址 unauthorizedUrl: /unauth # 首页地址 - indexUrl: /index + indexUrl: /web/index # 验证码开关 captchaEnabled: true # 验证码类型 math 数组计算 char 字符 diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java index bb4a050d5..f1396b1f9 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import javax.servlet.http.HttpServletRequest; @@ -18,14 +19,17 @@ import java.net.URLEncoder; * @author ruoyi */ @Controller +@RequestMapping("/web") public class CmsController { private static final Logger log = LoggerFactory.getLogger(CmsController.class); - @RequestMapping("common/download") - public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) - { + private String prefix = "web"; + @RequestMapping("/index") + @GetMapping() + public String user() { + return prefix + "/index"; } } diff --git a/ruoyi-cms/src/main/resources/templates/web/case/case.html b/ruoyi-cms/src/main/resources/templates/web/case/case.html new file mode 100644 index 000000000..7d25bd4b8 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/case/case.html @@ -0,0 +1,272 @@ + + + + + + + + + + + + 发现 Layui 2017 年度最佳案例 + + + + + + +
+
+ + + + +
+
+ +
+

2017

+ + 发现 Layui 年度最佳案例 + +
+ 提交案例 + 我的案例 + + 案例要求 +
+
+ +
+ +
+ + 2017年度 + 2016年度 + +
+
+ +
+ + + + + +
+
+ 1 + 23 + 4 + 5 + + 尾页 + 下一页 +
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/catalog.html b/ruoyi-cms/src/main/resources/templates/web/catalog.html new file mode 100644 index 000000000..cce649f2f --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/catalog.html @@ -0,0 +1,124 @@ + + + + + + + Fly Template v3.0 所有页面目录 + + + + + + + + +

+ 基于 layui 的极简社区页面模版:Fly Template v3.0 所有页面目录 +

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
页面目录
首页index.html
帖子相关
列表jie/index.html
详情jie/detail.html
发帖/编辑jie/add.html
用户相关
注册user/reg.html
登入user/login.html
找回密码user/forget.html
我的主页user/home.html
用户中心user/index.html
基本设置user/set.html
我的消息user/message.html
邮箱激活user/activate.html
其它
案例case/case.html
提示other/tips.html
公告other/notice.html
404other/404.html
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/common/column.html b/ruoyi-cms/src/main/resources/templates/web/common/column.html new file mode 100644 index 000000000..65d855a49 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/common/column.html @@ -0,0 +1,26 @@ +
+
+ + +
+ + 发表新帖 +
+ +
+
\ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/common/filter.html b/ruoyi-cms/src/main/resources/templates/web/common/filter.html new file mode 100644 index 000000000..f2611ee3f --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/common/filter.html @@ -0,0 +1,14 @@ +
+ 综合 + + 未结 + + 已结 + + 精华 + + 按最新 + + 按热议 + +
\ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/common/footer.html b/ruoyi-cms/src/main/resources/templates/web/common/footer.html new file mode 100644 index 000000000..c7b88849e --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/common/footer.html @@ -0,0 +1,26 @@ + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/common/header.html b/ruoyi-cms/src/main/resources/templates/web/common/header.html new file mode 100644 index 000000000..e2cda6140 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/common/header.html @@ -0,0 +1,58 @@ +
+
+ + + + +
+
\ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/common/link.html b/ruoyi-cms/src/main/resources/templates/web/common/link.html new file mode 100644 index 000000000..e7c7bf499 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/common/link.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/common/user-nav.html b/ruoyi-cms/src/main/resources/templates/web/common/user-nav.html new file mode 100644 index 000000000..a743d314f --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/common/user-nav.html @@ -0,0 +1,36 @@ + + +
+ +
+
+ +
+ +
+
\ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html new file mode 100644 index 000000000..92a125572 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -0,0 +1,808 @@ + + + + + + + + +
+
+ + + + +
+
+ +
+
+ + +
+ + 发表新帖 +
+ +
+
+ +
+
+
+
+ + +
+ +
+ +
+ 综合 + + 未结 + + 已结 + + 精华 + + 按最新 + + 按热议 + +
+ + +
+ +
+ +
+
+
+ + + + + + + + +
+
本周热议
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+
+ 基于 layui 的极简社区页面模版 + 16 +
+ + + +
+ +
+
+ 这里可作为广告区域 +
+ +
+ + + +
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/jie/add.html b/ruoyi-cms/src/main/resources/templates/web/jie/add.html new file mode 100644 index 000000000..7d8cb3918 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/jie/add.html @@ -0,0 +1,202 @@ + + + + + + 发表问题 编辑问题 公用 + + + + + + + + +
+
+ + + + +
+
+ +
+
+ +
+
+
    +
  • 发表新帖
  • +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+ +
+ +
+
发表后无法更改飞吻
+
+
+
+ +
+ +
+
+ 1+1=? +
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/jie/detail.html b/ruoyi-cms/src/main/resources/templates/web/jie/detail.html new file mode 100644 index 000000000..d9a98f89f --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/jie/detail.html @@ -0,0 +1,388 @@ + + + + + + + Fly Template v3.0,基于 layui 的极简社区页面模版 + + + + + + + + +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+
+
+

Fly Template v3.0,基于 layui 的极简社区页面模版

+
+ + 动态 + + 未结 + + + 置顶 + 精帖 + +
+ 删除 + + 置顶 + + + 加精 + +
+ + 66 + 99999 + +
+
+ + 贤心 + +
+ + 贤心 + + VIP3 + + 2017-11-30 +
+
+ 悬赏:60飞吻 + 编辑此贴 +
+
+
+

+ 该模版由 layui官方社区(fly.layui.com)倾情提供,只为表明我们对 layui 执着的信念、以及对未来持续加强的承诺。该模版基于 layui 搭建而成,可作为极简通用型社区的页面支撑。 +

+

更新日志:

+
+# v3.0 2017-11-30
+* 采用 layui 2.2.3 作为 UI 支撑
+* 全面同步最新的 Fly 社区风格,各种细节得到大幅优化
+* 更友好的响应式适配能力
+
+ + 下载
+

+ 官网:http://www.layui.com/template/fly/
+ 码云:https://gitee.com/sentsin/fly/
+ GitHub:https://github.com/layui/fly +

+ 封面
+

+ Fly社区 +

+
+
+ +
+
+ 回帖 +
+ +
    +
  • + +
    + +  + +
    + + 贤心 + + VIP3 + + + (楼主) + +
    + +
    + 2017-11-30 +
    + + +
    +
    +

    香菇那个蓝瘦,这是一条被采纳的回帖

    +
    +
    + + + 66 + + + + 回复 + +
    + 编辑 + 删除 + +
    +
    +
  • + +
  • + +
    + +  + + +
    + 2017-11-30 +
    +
    +
    +

    蓝瘦那个香菇,这是一条没被采纳的回帖

    +
    +
    + + + 0 + + + + 回复 + +
    + 编辑 + 删除 + 采纳 +
    +
    +
  • + + + +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+
+
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/jie/index.html b/ruoyi-cms/src/main/resources/templates/web/jie/index.html new file mode 100644 index 000000000..7711a6117 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/jie/index.html @@ -0,0 +1,457 @@ + + + + + + + 基于 layui 的极简社区页面模版 + + + + + + + + +
+
+ + + + +
+
+ +
+
+ + +
+ + 发表新帖 +
+ +
+
+ +
+
+
+
+ +
+ 综合 + + 未结 + + 已结 + + 精华 + + 按最新 + + 按热议 + +
+ + + + + +
+ +
+ +
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/other/404.html b/ruoyi-cms/src/main/resources/templates/web/other/404.html new file mode 100644 index 000000000..8124e3886 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/other/404.html @@ -0,0 +1,138 @@ + + + + + + + 404 - Fly社区 + + + + + + + + +
+
+ + + + +
+
+ +
+
+ + +
+ + 发表新帖 +
+ +
+
+ +
+
+
+

+

页面或者数据被 纸飞机 运到火星了,啥都看不到了…

+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/other/notice.html b/ruoyi-cms/src/main/resources/templates/web/other/notice.html new file mode 100644 index 000000000..fccbd59b9 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/other/notice.html @@ -0,0 +1,38 @@ + + + + + + + + 故障公告页 + + + + + + + + + + + + + +
+ +
+ +
+ 非常抱歉,社区正在维护,稍后恢复
文档 示例 +
+ + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/other/tips.html b/ruoyi-cms/src/main/resources/templates/web/other/tips.html new file mode 100644 index 000000000..6d7dde348 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/other/tips.html @@ -0,0 +1,138 @@ + + + + + + + 提示页面 + + + + + + + + +
+
+ + + + +
+
+ +
+
+ + +
+ + 发表新帖 +
+ +
+
+ +
+
+
+

+

这是一个基于 layui 的极简通用型社区页面模版

+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/activate.html b/ruoyi-cms/src/main/resources/templates/web/user/activate.html new file mode 100644 index 000000000..92a882ff7 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/activate.html @@ -0,0 +1,157 @@ + + + + + + + 激活邮箱 + + + + + + + + +
+
+ + + + +
+
+ +
+ + +
+ +
+
+ +
+ +
+
+ + +
+
+
    +
  • + 激活邮箱 +
  • +
+
+
    +
  • + + xx@xx.com + + (尚未激活) + +
  • +
  • +
    + 1. 如果您未收到邮件,或激活链接失效,您可以 + 重新发送邮件,或者 + 更换邮箱; +
    +
    + 2. 如果您始终没有收到 Fly 发送的邮件,请注意查看您邮箱中的垃圾邮件; +
    +
    + 3. 如果你实在无法激活邮件,您还可以联系:admin@xx.com +
    +
  • +
+
+
+
+ +
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/forget.html b/ruoyi-cms/src/main/resources/templates/web/user/forget.html new file mode 100644 index 000000000..c526e867a --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/forget.html @@ -0,0 +1,161 @@ + + + + + + 找回密码/重置密码 + + + + + + + + +
+
+ + + + +
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {{d.vercode}} +
+
+
+ +
+
+
+ +
+
+
+
+ + +
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/home.html b/ruoyi-cms/src/main/resources/templates/web/user/home.html new file mode 100644 index 000000000..1c418a857 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/home.html @@ -0,0 +1,194 @@ + + + + + + 用户主页 + + + + + + + + +
+
+ + + + +
+
+ +
+ 贤心 + +

+ 贤心 + + + VIP3 + +

+ +

认证信息:layui 作者

+ +

+ 66666 飞吻 + 2015-6-17 加入 + 来自杭州 +

+ +

(人生仿若一场修行)

+ +
+ 加为好友 + 发起会话 +
+ +
+ +
+
+
+
+

贤心 最近的提问

+ +
+
+ +
+
+

贤心 最近的回答

+ +
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/index.html b/ruoyi-cms/src/main/resources/templates/web/user/index.html new file mode 100644 index 000000000..bd0ee2cc6 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/index.html @@ -0,0 +1,168 @@ + + + + + + 用户中心 + + + + + + + + +
+
+ + + + +
+
+ +
+ + +
+ +
+
+ +
+ +
+
+ + +
+ +
+
    +
  • 我发的帖(89
  • +
  • 我收藏的帖(16
  • +
+
+
+ +
+
+
+ +
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/login.html b/ruoyi-cms/src/main/resources/templates/web/user/login.html new file mode 100644 index 000000000..75808d1fd --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/login.html @@ -0,0 +1,132 @@ + + + + + + 登入 + + + + + + + + +
+
+ + + + +
+
+ +
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {{d.vercode}} +
+
+
+ + + 忘记密码? + +
+
+ 或者使用社交账号登入 + + +
+
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/message.html b/ruoyi-cms/src/main/resources/templates/web/user/message.html new file mode 100644 index 000000000..3b4733533 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/message.html @@ -0,0 +1,146 @@ + + + + + + 我的消息 + + + + + + + + +
+
+ + + + +
+
+ +
+ + +
+ +
+
+ +
+ +
+
+ + +
+
+ +
+ + +
+
+
+ +
+ + + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/reg.html b/ruoyi-cms/src/main/resources/templates/web/user/reg.html new file mode 100644 index 000000000..bf67ba174 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/reg.html @@ -0,0 +1,144 @@ + + + + + + 注册 + + + + + + + + +
+
+ + + + +
+
+ +
+
+
+ +
+
+
+
+
+ +
+ +
+
将会成为您唯一的登入名
+
+
+ +
+ +
+
+
+ +
+ +
+
6到16个字符
+
+
+ +
+ +
+
+
+ +
+ +
+
+ {{d.vercode}} +
+
+
+ +
+
+ 或者直接使用社交账号快捷注册 + + +
+
+
+
+
+
+
+ +
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/set.html b/ruoyi-cms/src/main/resources/templates/web/user/set.html new file mode 100644 index 000000000..731fbeac5 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/set.html @@ -0,0 +1,234 @@ + + + + + + 帐号设置 + + + + + + + + +
+
+ + + + +
+
+ +
+ + +
+ +
+
+ +
+ +
+
+ + +
+
+
    +
  • 我的资料
  • +
  • 头像
  • +
  • 密码
  • +
  • 帐号绑定
  • +
+
+
+
+
+ +
+ +
+
如果您在邮箱已激活的情况下,变更了邮箱,需重新验证邮箱
+
+
+ +
+ +
+
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+

建议尺寸168*168,支持jpg、png、gif,最大不能超过50KB

+ + + +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
6到16个字符
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+
    +
  • + + 已成功绑定,您可以使用QQ帐号直接登录Fly社区,当然,您也可以 + 解除绑定 + + +
  • +
  • + + + + 立即绑定 + ,即可使用微博帐号登录Fly社区 +
  • +
+
+
+ +
+
+
+ + + + + + + + + \ No newline at end of file