页面优化

src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java

@@ -22,9 +22,9 @@ public interface PostsRepository extends JpaRepository<Post, Integer> {
 
     @Query(value = "select p.*,u.avatar as user_avatar ,u.username as user_username ,u.realname as user_realname ," +
             "u2.avatar as create_avatar ,u2.username as create_username ,u2.realname as create_realname  \n" +
-            "from Post p  \n" +
+            "from post p  \n" +
-            "left join User u on p.user_id = u.id \n" +
+            "left join user u on p.user_id = u.id \n" +
-            "left join User u2 on p.create_id = u2.id \n" +
+            "left join user u2 on p.create_id = u2.id \n" +
             "where p.discussion_id = :dId order by p.create_time desc"
             , nativeQuery = true)
     List<Map<String, Object>> findPostCustomById(@Param("dId") Integer dId);
@@ -32,18 +32,18 @@ public interface PostsRepository extends JpaRepository<Post, Integer> {
 
     @Query(value = "select p.*,u.avatar as user_avatar ,u.username as user_username ,u.realname as user_realname ," +
             "u2.avatar as create_avatar ,u2.username as create_username ,u2.realname as create_realname  \n" +
-            "from Post p  \n" +
+            "from post p  \n" +
-            "left join User u on p.user_id = u.id \n" +
+            "left join user u on p.user_id = u.id \n" +
-            "left join User u2 on p.create_id = u2.id \n" +
+            "left join user u2 on p.create_id = u2.id \n" +
             "where p.discussion_id = :dId and p.parent_id is null order by p.create_time desc"
             , nativeQuery = true)
     List<Map<String, Object>> findAllByDIdAndparentIdNull(@Param("dId") Integer dId);
 
     @Query(value = "select p.*,u.avatar as user_avatar ,u.username as user_username ,u.realname as user_realname ," +
             "u2.avatar as create_avatar ,u2.username as create_username ,u2.realname as create_realname  \n" +
-            "from Post p  \n" +
+            "from post p  \n" +
-            "left join User u on p.user_id = u.id \n" +
+            "left join user u on p.user_id = u.id \n" +
-            "left join User u2 on p.create_id = u2.id \n" +
+            "left join user u2 on p.create_id = u2.id \n" +
             "where p.discussion_id = :dId and p.parent_id is not null order by p.create_time desc"
             , nativeQuery = true)
     List<Map<String, Object>> findAllByDIdAndparentIdNotNull(@Param("dId") Integer dId);

src/main/resources/application.yml

@@ -1,29 +1,22 @@
-#h2 配置
+#mysql 配置
 spring:
   cache:
     type: ehcache
     ehcache:
       config: classpath:ehcache.xml
   jpa:
-    generate-ddl: false
+    database: MYSQL
     show-sql: true
     hibernate:
-      ddl-auto: none
+      ddl-auto: update
-  h2:
-    console:
-      path: /h2-console
-      enabled: true
-      settings:
-        web-allow-others: true
   datasource:
-    platform: h2
+    url: jdbc:mysql://101.200.164.179:3306/jiscuss?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
-    url: jdbc:h2:~/testjiscuss
+    username: jiscuss
-    username: sa
+    password: jiscusscyy
-    password:
+    driver-class-name: com.mysql.jdbc.Driver
-    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
@@ -34,7 +27,7 @@ spring:
       filter:
         stat:
         enabled: true
-        db-type: h2
+        db-type: mysql
         log-slow-sql: true
         slow-sql-millis: 2000
       # 监控过滤器

src/main/resources/templates/comm/header.ftl

@@ -1,4 +1,4 @@
-<div class="ui main  menu" id="menu">
+<div class="ui fixed menu" id="menu">
     <div class="ui container">
         <div href="/" class="header borderless item">
             <img class="logo" src="static/assets/images/logo.png">

src/main/resources/templates/discussions.ftl

@@ -12,7 +12,7 @@
 
     <#include "comm/commjs.ftl"/>
 </head>
-<body>
+<body style="  background: #f7f8fa;">
 <#include "comm/header.ftl"/>
 
 <div class="ui container" id="container">
@@ -28,8 +28,8 @@
 
     <h3 class="ui center aligned header"></h3>
     <div class="ui four column grid">
-        <div class="widescreen  large screen computer tablet only twelve wide column">
+        <div class="ui widescreen  large screen computer tablet only twelve wide column segment">
-            <div id="context2">
+            <div id="context2" >
 
                 <h2 class="ui header">
                     <i class="edit outline icon"></i>

src/main/resources/templates/index.ftl

@@ -9,7 +9,7 @@
     <#include "comm/commjs.ftl"/>
 
 </head>
-<body>
+<body style="  background: #f7f8fa;">
 <#include "comm/header.ftl"/>
 
 <div class="ui container" id="container">

src/main/resources/templates/login.ftl

@@ -6,7 +6,7 @@
 
     <style type="text/css">
         body {
-            background-color: #DADADA;
+            background-color: #f7f8fa;
         }
 
         body > .grid {

src/main/resources/templates/user.ftl

@@ -9,7 +9,7 @@
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <#include "comm/commjs.ftl"/>
 </head>
-<body>
+<body style="  background: #f7f8fa;">
 <#include "comm/header.ftl"/>
 
 <div class="ui container" id="container">