diff --git a/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java b/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java index 78178ac..11876f9 100644 --- a/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java +++ b/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java @@ -22,9 +22,9 @@ public interface PostsRepository extends JpaRepository { @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" + - "left join User u on p.user_id = u.id \n" + - "left join User u2 on p.create_id = u2.id \n" + + "from post p \n" + + "left join user u on p.user_id = u.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> findPostCustomById(@Param("dId") Integer dId); @@ -32,18 +32,18 @@ public interface PostsRepository extends JpaRepository { @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" + - "left join User u on p.user_id = u.id \n" + - "left join User u2 on p.create_id = u2.id \n" + + "from post p \n" + + "left join user u on p.user_id = u.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> 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" + - "left join User u on p.user_id = u.id \n" + - "left join User u2 on p.create_id = u2.id \n" + + "from post p \n" + + "left join user u on p.user_id = u.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> findAllByDIdAndparentIdNotNull(@Param("dId") Integer dId); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7ddbf18..12edfbf 100644 --- a/src/main/resources/application.yml +++ b/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 - h2: - console: - path: /h2-console - enabled: true - settings: - web-allow-others: true + ddl-auto: update datasource: - platform: h2 - url: jdbc:h2:~/testjiscuss - username: sa - password: - schema: classpath:schema.sql - data: classpath:data.sql - driver-class-name: org.h2.Driver + url: jdbc:mysql://101.200.164.179:3306/jiscuss?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false + username: jiscuss + password: jiscusscyy + driver-class-name: com.mysql.jdbc.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 # 监控过滤器 diff --git a/src/main/resources/templates/comm/header.ftl b/src/main/resources/templates/comm/header.ftl index 1a5ca40..93341cc 100644 --- a/src/main/resources/templates/comm/header.ftl +++ b/src/main/resources/templates/comm/header.ftl @@ -1,4 +1,4 @@ -
+