diff --git a/src/main/java/com/yaoyuan/jiscuss/common/Node.java b/src/main/java/com/yaoyuan/jiscuss/common/Node.java index f49c3fc..b47e479 100644 --- a/src/main/java/com/yaoyuan/jiscuss/common/Node.java +++ b/src/main/java/com/yaoyuan/jiscuss/common/Node.java @@ -50,6 +50,14 @@ public class Node { private String ipAddress; + private String ipRegion; + + private String browser; + + private Integer likeCount; + + private Integer dislikeCount; + private String copyright; private Integer isApproved; diff --git a/src/main/java/com/yaoyuan/jiscuss/common/PostCommonUtil.java b/src/main/java/com/yaoyuan/jiscuss/common/PostCommonUtil.java index 5ce0626..d65ef49 100644 --- a/src/main/java/com/yaoyuan/jiscuss/common/PostCommonUtil.java +++ b/src/main/java/com/yaoyuan/jiscuss/common/PostCommonUtil.java @@ -52,6 +52,33 @@ public class PostCommonUtil { postCustom.setAvatar(avatar); postCustom.setUsername(mapObj.get("create_username") != null ? String.valueOf(mapObj.get("create_username")) : null); postCustom.setRealname(mapObj.get("create_realname") != null ? String.valueOf(mapObj.get("create_realname")) : null); + // floor number + if (mapObj.get("number") != null) { + postCustom.setNumber(Integer.parseInt(String.valueOf(mapObj.get("number")))); + } + // create user id + if (mapObj.get("create_id") != null) { + postCustom.setCreateId(Integer.parseInt(String.valueOf(mapObj.get("create_id")))); + } + // ip address + if (mapObj.get("ip_address") != null) { + postCustom.setIpAddress(String.valueOf(mapObj.get("ip_address"))); + } + // ip region (may be null if column not yet populated) + if (mapObj.get("ip_region") != null) { + postCustom.setIpRegion(String.valueOf(mapObj.get("ip_region"))); + } + // browser info (user_agent stored but only display-parsed browser is used) + if (mapObj.get("browser") != null) { + postCustom.setBrowser(String.valueOf(mapObj.get("browser"))); + } + // vote counters + if (mapObj.get("like_count") != null) { + postCustom.setLikeCount(Integer.parseInt(String.valueOf(mapObj.get("like_count")))); + } + if (mapObj.get("dislike_count") != null) { + postCustom.setDislikeCount(Integer.parseInt(String.valueOf(mapObj.get("dislike_count")))); + } String avatarReply = ""; if (mapObj.get("user_avatar") != null) { if (mapObj.get("user_avatar") instanceof Clob) { diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java index f4dbcfc..9a02f57 100644 --- a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java +++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java @@ -12,6 +12,9 @@ import com.yaoyuan.jiscuss.service.IDiscussionsTagsService; import com.yaoyuan.jiscuss.service.IPostsService; import com.yaoyuan.jiscuss.service.ITagsService; import com.yaoyuan.jiscuss.service.IUsersService; +import com.yaoyuan.jiscuss.service.IpRegionService; +import com.yaoyuan.jiscuss.util.IpUtils; +import com.yaoyuan.jiscuss.util.UserAgentUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -56,6 +59,9 @@ public class UserPostController extends BaseController { @Autowired private IUsersService usersService; + @Autowired + private IpRegionService ipRegionService; + /** * 首页查看主题列表（各种条件筛选，最热最新标签等） @@ -70,8 +76,10 @@ public class UserPostController extends BaseController { * @return */ @RequestMapping("/getdiscussionsbyid") - public String getDiscussionsById(HttpServletRequest request, ModelMap map, @RequestParam("id") Integer id) { - logger.info(">>> getDiscussionsById{}", id); + public String getDiscussionsById(HttpServletRequest request, ModelMap map, + @RequestParam("id") Integer id, + @RequestParam(defaultValue = "newest") String sort) { + logger.info(">>> getDiscussionsById{} sort={}", id, sort); // Atomically increment view count before loading the discussion discussionsService.incrementViewCount(id); @@ -96,10 +104,11 @@ public class UserPostController extends BaseController { } List tags = tagsService.findByDId(id); - List postsObj = postsService.findPostCustomById(id); + List postsObj = postsService.findPostCustomById(id, sort); map.put("tags", tags); map.put("discussions", newdd); map.put("posts", postsObj); + map.put("sort", sort); UserInfo user = getUserInfo(request); if (user != null) { map.put("username", user.getUsername()); @@ -183,6 +192,13 @@ public class UserPostController extends BaseController { post.setCreateId(user.getId()); } post.setCreateTime(new Date()); + + // Capture client IP, region, and browser + String clientIp = IpUtils.getClientIp(request); + post.setIpAddress(clientIp); + post.setIpRegion(ipRegionService.getRegion(clientIp)); + post.setBrowser(UserAgentUtils.parseBrowser(request.getHeader("User-Agent"))); + if (null != post.getParentId()) { Post temp = postsService.findOneByid(post.getParentId()); post.setUserId(temp.getCreateId()); diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java index 3a8872c..49a94eb 100644 --- a/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java +++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java @@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; @@ -50,6 +51,9 @@ public class UserSystemController extends BaseController { @Autowired private ITagsService tagsService; + @Autowired + private BCryptPasswordEncoder passwordEncoder; + /** * 首页index * @param tag @@ -113,6 +117,7 @@ public class UserSystemController extends BaseController { map.put("pageNum", pageNum); map.put("pageTotalPages", allDiscussionsPage.getTotalPages()); map.put("pageNumAll", allDiscussionsPage.getTotalPages()); + map.put("topUsers", usersService.getTopActiveUsers(10)); UserInfo user = getUserInfo(request); if (user != null) { map.put("username", user.getUsername()); @@ -251,7 +256,7 @@ public class UserSystemController extends BaseController { } else { User user = new User(); user.setEmail(email); - user.setPassword(password); + user.setPassword(passwordEncoder.encode(password)); user.setUsername(username); user.setRealname(username); user.setJoinTime(new Date()); diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/api/VoteController.java b/src/main/java/com/yaoyuan/jiscuss/controller/api/VoteController.java new file mode 100644 index 0000000..959313e --- /dev/null +++ b/src/main/java/com/yaoyuan/jiscuss/controller/api/VoteController.java @@ -0,0 +1,63 @@ +package com.yaoyuan.jiscuss.controller.api; + +import com.yaoyuan.jiscuss.controller.BaseController; +import com.yaoyuan.jiscuss.entity.UserInfo; +import com.yaoyuan.jiscuss.response.ApiResponse; +import com.yaoyuan.jiscuss.service.ILikeCollectService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import jakarta.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * REST API for voting (like / dislike) on discussions and posts. + */ +@Tag(name = "Vote API", description = "Like and dislike discussions and posts") +@RestController +@RequestMapping("/api") +public class VoteController extends BaseController { + + @Autowired + private ILikeCollectService likeCollectService; + + @Operation(summary = "Vote on a discussion") + @PostMapping("/discussions/{id}/vote") + public ApiResponse> voteDiscussion( + @PathVariable Integer id, + @RequestParam String action, + HttpServletRequest request) { + UserInfo user = getUserInfo(request); + if (user == null) { + return ApiResponse.fail(401, "请先登录"); + } + if (!"like".equals(action) && !"dislike".equals(action)) { + return ApiResponse.fail(400, "action 参数必须是 like 或 dislike"); + } + String result = likeCollectService.voteDiscussion(user.getId(), id, action); + return ApiResponse.ok(Map.of("action", result)); + } + + @Operation(summary = "Vote on a post (reply)") + @PostMapping("/posts/{id}/vote") + public ApiResponse> votePost( + @PathVariable Integer id, + @RequestParam String action, + HttpServletRequest request) { + UserInfo user = getUserInfo(request); + if (user == null) { + return ApiResponse.fail(401, "请先登录"); + } + if (!"like".equals(action) && !"dislike".equals(action)) { + return ApiResponse.fail(400, "action 参数必须是 like 或 dislike"); + } + String result = likeCollectService.votePost(user.getId(), id, action); + return ApiResponse.ok(Map.of("action", result)); + } +} diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/Discussion.java b/src/main/java/com/yaoyuan/jiscuss/entity/Discussion.java index 4758111..3306f6b 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/Discussion.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/Discussion.java @@ -68,6 +68,9 @@ public class Discussion implements Serializable { @Column(name = "like_count") private Integer likeCount; + @Column(name = "dislike_count") + private Integer dislikeCount; + /** IP is resolved server-side via IpUtils.getClientIp() — never trusted from X-Forwarded-For alone. */ @Column(name = "ip_address") private String ipAddress; diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/LikeCollect.java b/src/main/java/com/yaoyuan/jiscuss/entity/LikeCollect.java index 584ab13..b4028e0 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/LikeCollect.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/LikeCollect.java @@ -48,6 +48,10 @@ public class LikeCollect implements Serializable { @Column(name = "type") private String type; + /** Vote action: 'like' or 'dislike'. */ + @Column(name = "action") + private String action; + @Column(name = "like_type") private String likeType; diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/Post.java b/src/main/java/com/yaoyuan/jiscuss/entity/Post.java index c6eadda..de180a1 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/Post.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/Post.java @@ -54,12 +54,26 @@ public class Post implements Serializable { @Column(name = "ip_address") private String ipAddress; + /** Province/region derived from IP (e.g. "北京", "广东"). Stored on post creation. */ + @Column(name = "ip_region") + private String ipRegion; + + /** Parsed browser name+version (e.g. "Chrome 120"). Derived from User-Agent on post creation. */ + @Column(name = "browser") + private String browser; + @Column(name = "copyright") private String copyright; @Column(name = "is_approved") private Integer isApproved; + @Column(name = "like_count") + private Integer likeCount; + + @Column(name = "dislike_count") + private Integer dislikeCount; + @Column(name = "create_id") private Integer createId; diff --git a/src/main/java/com/yaoyuan/jiscuss/repository/DiscussionsRepository.java b/src/main/java/com/yaoyuan/jiscuss/repository/DiscussionsRepository.java index bccaef5..08e455d 100644 --- a/src/main/java/com/yaoyuan/jiscuss/repository/DiscussionsRepository.java +++ b/src/main/java/com/yaoyuan/jiscuss/repository/DiscussionsRepository.java @@ -9,6 +9,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; + @Repository public interface DiscussionsRepository extends JpaRepository { @@ -20,4 +22,24 @@ public interface DiscussionsRepository extends JpaRepository { + + /** Find an existing vote record for a user on a discussion. */ + @Query("FROM LikeCollect lc WHERE lc.userId = :userId AND lc.discussionId = :discussionId AND lc.type = 'discussion'") + Optional findDiscussionVote(@Param("userId") Integer userId, @Param("discussionId") Integer discussionId); + + /** Find an existing vote record for a user on a post. */ + @Query("FROM LikeCollect lc WHERE lc.userId = :userId AND lc.postId = :postId AND lc.type = 'post'") + Optional findPostVote(@Param("userId") Integer userId, @Param("postId") Integer postId); +} diff --git a/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java b/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java index fffe34c..531fb74 100644 --- a/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java +++ b/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java @@ -2,9 +2,11 @@ package com.yaoyuan.jiscuss.repository; import com.yaoyuan.jiscuss.entity.Post; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -21,6 +23,20 @@ public interface PostsRepository extends JpaRepository { @Query("from Post where discussionId = :dId") List findOneBy(@Param("dId") Integer dId); + /** Returns the current max floor number for a discussion (0 if no posts yet). */ + @Query("SELECT COALESCE(MAX(p.number), 0) FROM Post p WHERE p.discussionId = :dId") + int findMaxNumberByDiscussionId(@Param("dId") Integer dId); + + @Modifying + @Transactional + @Query("UPDATE Post p SET p.likeCount = COALESCE(p.likeCount, 0) + :delta WHERE p.id = :id") + void adjustLikeCount(@Param("id") Integer id, @Param("delta") int delta); + + @Modifying + @Transactional + @Query("UPDATE Post p SET p.dislikeCount = COALESCE(p.dislikeCount, 0) + :delta WHERE p.id = :id") + void adjustDislikeCount(@Param("id") Integer id, @Param("delta") int delta); + @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" + @@ -31,6 +47,15 @@ public interface PostsRepository extends JpaRepository { List> findPostCustomById(@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" + + "where p.discussion_id = :dId and p.parent_id is null order by p.create_time asc" + , nativeQuery = true) + List> findAllByDIdAndparentIdNullOldest(@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" + @@ -38,7 +63,16 @@ public interface PostsRepository extends JpaRepository { "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); + List> findAllByDIdAndparentIdNullNewest(@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" + + "where p.discussion_id = :dId and p.parent_id is null order by p.like_count desc, p.create_time desc" + , nativeQuery = true) + List> findAllByDIdAndparentIdNullHot(@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" + diff --git a/src/main/java/com/yaoyuan/jiscuss/repository/UsersRepository.java b/src/main/java/com/yaoyuan/jiscuss/repository/UsersRepository.java index 35bd596..347d6db 100644 --- a/src/main/java/com/yaoyuan/jiscuss/repository/UsersRepository.java +++ b/src/main/java/com/yaoyuan/jiscuss/repository/UsersRepository.java @@ -2,9 +2,11 @@ package com.yaoyuan.jiscuss.repository; import com.yaoyuan.jiscuss.entity.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -32,4 +34,18 @@ public interface UsersRepository extends JpaRepository { // REMOVED: checkByUsernameAndPassword — never compare passwords at the SQL layer. // Password validation must go through BCryptPasswordEncoder.matches() in the service/security layer. + + @Modifying + @Transactional + @Query("UPDATE User u SET u.commentsCount = COALESCE(u.commentsCount, 0) + 1 WHERE u.id = :id") + void incrementCommentCount(@Param("id") Integer id); + + @Modifying + @Transactional + @Query("UPDATE User u SET u.discussionsCount = COALESCE(u.discussionsCount, 0) + 1 WHERE u.id = :id") + void incrementDiscussionCount(@Param("id") Integer id); + + /** Top active users by comment count (for the ranking sidebar). Shows all users if counts are 0. */ + @Query("FROM User u ORDER BY COALESCE(u.commentsCount, 0) DESC") + List findTop10ActiveUsers(org.springframework.data.domain.Pageable pageable); } diff --git a/src/main/java/com/yaoyuan/jiscuss/response/ApiResponse.java b/src/main/java/com/yaoyuan/jiscuss/response/ApiResponse.java index 24cebe7..503a2a8 100644 --- a/src/main/java/com/yaoyuan/jiscuss/response/ApiResponse.java +++ b/src/main/java/com/yaoyuan/jiscuss/response/ApiResponse.java @@ -15,6 +15,10 @@ public record ApiResponse(int code, String msg, T data) { return new ApiResponse<>(responseCode.getCode(), responseCode.getMsg(), null); } + public static ApiResponse fail(int code, String msg) { + return new ApiResponse<>(code, msg, null); + } + public static ApiResponse error(String message) { return new ApiResponse<>(ResponseCode.SERVICE_ERROR.getCode(), message, null); } diff --git a/src/main/java/com/yaoyuan/jiscuss/service/ILikeCollectService.java b/src/main/java/com/yaoyuan/jiscuss/service/ILikeCollectService.java new file mode 100644 index 0000000..9efeec2 --- /dev/null +++ b/src/main/java/com/yaoyuan/jiscuss/service/ILikeCollectService.java @@ -0,0 +1,22 @@ +package com.yaoyuan.jiscuss.service; + +/** + * Vote (like / dislike) service for discussions and posts. + * + *

Toggle semantics: + *

    + *
  • If the user has not voted → create a new vote with the requested action.
    • + *
  • If the user voted with the same action → cancel the vote (toggle off).
    • + *
  • If the user voted with a different action → switch the vote.
    • + *
+ * + * @return the user's current action after the operation: "like", "dislike", or "none" (cancelled) + */ +public interface ILikeCollectService { + + /** Vote on a discussion. {@code action} must be "like" or "dislike". */ + String voteDiscussion(Integer userId, Integer discussionId, String action); + + /** Vote on a post (reply). {@code action} must be "like" or "dislike". */ + String votePost(Integer userId, Integer postId, String action); +} diff --git a/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java b/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java index b58772c..def6cfe 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java @@ -12,7 +12,7 @@ public interface IPostsService { List findOneBy(Integer id); - List findPostCustomById(Integer id); + List findPostCustomById(Integer id, String sort); Post findOneByid(Integer parentId); } diff --git a/src/main/java/com/yaoyuan/jiscuss/service/IUsersService.java b/src/main/java/com/yaoyuan/jiscuss/service/IUsersService.java index f4708e8..c9c36ea 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/IUsersService.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/IUsersService.java @@ -27,4 +27,6 @@ public interface IUsersService { List findAllById(Iterable ids); User update(User user, Integer id); + + List getTopActiveUsers(int limit); } diff --git a/src/main/java/com/yaoyuan/jiscuss/service/IpRegionService.java b/src/main/java/com/yaoyuan/jiscuss/service/IpRegionService.java new file mode 100644 index 0000000..05c4ecf --- /dev/null +++ b/src/main/java/com/yaoyuan/jiscuss/service/IpRegionService.java @@ -0,0 +1,71 @@ +package com.yaoyuan.jiscuss.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.Set; + +/** + * Lightweight IP region service. + * + *

Current implementation distinguishes local/private addresses from external ones. + * To display accurate province-level location (e.g. "北京", "广东"), replace the + * {@code lookupExternal} method with an ip2region XDB lookup or similar offline database. + * + *

Upgrade path: + *

    + *
  1. Add {@code org.lionsoul:ip2region:2.7.0} to pom.xml
    2. + *
  2. Place {@code ip2region.xdb} (from the ip2region GitHub release) under + * {@code src/main/resources/}
    3. + *
  3. Replace {@code lookupExternal()} with: + * {@code Searcher.newWithFileOnly(xdbPath).searchByStr(ip)}
    4. + *
+ */ +@Service +public class IpRegionService { + + private static final Logger log = LoggerFactory.getLogger(IpRegionService.class); + + private static final Set LOCAL_PREFIXES = Set.of( + "127.", "0.", "::1", "0:0:0:0:0:0:0:1" + ); + + private static final Set PRIVATE_PREFIXES = Set.of( + "10.", "192.168.", "172.16.", "172.17.", "172.18.", "172.19.", + "172.20.", "172.21.", "172.22.", "172.23.", "172.24.", "172.25.", + "172.26.", "172.27.", "172.28.", "172.29.", "172.30.", "172.31." + ); + + /** + * Returns a display-friendly region label for the given IP address. + * + * @param ip client IP string (IPv4 or IPv6) + * @return region label, e.g. "本地", "局域网", or "未知地区" + */ + public String getRegion(String ip) { + if (ip == null || ip.isBlank()) { + return ""; + } + for (String prefix : LOCAL_PREFIXES) { + if (ip.startsWith(prefix)) { + return "本地"; + } + } + for (String prefix : PRIVATE_PREFIXES) { + if (ip.startsWith(prefix)) { + return "局域网"; + } + } + return lookupExternal(ip); + } + + /** + * Override this method to integrate an offline IP database (e.g. ip2region). + * Default implementation returns "未知地区" as a placeholder. + */ + protected String lookupExternal(String ip) { + // TODO: integrate ip2region XDB for accurate province-level lookup + return "未知地区"; + } +} diff --git a/src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java b/src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java index c75f582..33c14c6 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java @@ -2,6 +2,7 @@ package com.yaoyuan.jiscuss.service.impl; import com.yaoyuan.jiscuss.entity.Discussion; import com.yaoyuan.jiscuss.repository.DiscussionsRepository; +import com.yaoyuan.jiscuss.repository.UsersRepository; import com.yaoyuan.jiscuss.service.IDiscussionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; @@ -20,6 +21,9 @@ public class DiscussionsServiceImpl implements IDiscussionsService { @Autowired private DiscussionsRepository discussionsRepository; + @Autowired + private UsersRepository usersRepository; + @Transactional(readOnly = true) @Override public List getAllList() { @@ -29,7 +33,12 @@ public class DiscussionsServiceImpl implements IDiscussionsService { @Transactional @Override public Discussion insert(Discussion discussion) { - return discussionsRepository.save(discussion); + Discussion saved = discussionsRepository.save(discussion); + // Maintain user discussions count + if (discussion.getCreateId() != null) { + usersRepository.incrementDiscussionCount(discussion.getCreateId()); + } + return saved; } @Transactional(readOnly = true) diff --git a/src/main/java/com/yaoyuan/jiscuss/service/impl/LikeCollectServiceImpl.java b/src/main/java/com/yaoyuan/jiscuss/service/impl/LikeCollectServiceImpl.java new file mode 100644 index 0000000..d233e34 --- /dev/null +++ b/src/main/java/com/yaoyuan/jiscuss/service/impl/LikeCollectServiceImpl.java @@ -0,0 +1,107 @@ +package com.yaoyuan.jiscuss.service.impl; + +import com.yaoyuan.jiscuss.entity.LikeCollect; +import com.yaoyuan.jiscuss.repository.DiscussionsRepository; +import com.yaoyuan.jiscuss.repository.LikeCollectRepository; +import com.yaoyuan.jiscuss.repository.PostsRepository; +import com.yaoyuan.jiscuss.service.ILikeCollectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.Optional; + +@Service +public class LikeCollectServiceImpl implements ILikeCollectService { + + @Autowired + private LikeCollectRepository likeCollectRepository; + + @Autowired + private DiscussionsRepository discussionsRepository; + + @Autowired + private PostsRepository postsRepository; + + @Transactional + @Override + public String voteDiscussion(Integer userId, Integer discussionId, String action) { + Optional existing = likeCollectRepository.findDiscussionVote(userId, discussionId); + if (existing.isPresent()) { + LikeCollect vote = existing.get(); + if (vote.getAction().equals(action)) { + // Toggle off: cancel the same action + likeCollectRepository.delete(vote); + adjustDiscussion(discussionId, action, -1); + return "none"; + } else { + // Switch action: undo old, apply new + adjustDiscussion(discussionId, vote.getAction(), -1); + vote.setAction(action); + likeCollectRepository.save(vote); + adjustDiscussion(discussionId, action, +1); + return action; + } + } else { + // New vote + LikeCollect vote = new LikeCollect(); + vote.setUserId(userId); + vote.setDiscussionId(discussionId); + vote.setType("discussion"); + vote.setAction(action); + vote.setCreateId(userId); + vote.setCreateTime(new Date()); + likeCollectRepository.save(vote); + adjustDiscussion(discussionId, action, +1); + return action; + } + } + + @Transactional + @Override + public String votePost(Integer userId, Integer postId, String action) { + Optional existing = likeCollectRepository.findPostVote(userId, postId); + if (existing.isPresent()) { + LikeCollect vote = existing.get(); + if (vote.getAction().equals(action)) { + likeCollectRepository.delete(vote); + adjustPost(postId, action, -1); + return "none"; + } else { + adjustPost(postId, vote.getAction(), -1); + vote.setAction(action); + likeCollectRepository.save(vote); + adjustPost(postId, action, +1); + return action; + } + } else { + LikeCollect vote = new LikeCollect(); + vote.setUserId(userId); + vote.setPostId(postId); + vote.setType("post"); + vote.setAction(action); + vote.setCreateId(userId); + vote.setCreateTime(new Date()); + likeCollectRepository.save(vote); + adjustPost(postId, action, +1); + return action; + } + } + + private void adjustDiscussion(Integer id, String action, int delta) { + if ("like".equals(action)) { + discussionsRepository.adjustLikeCount(id, delta); + } else { + discussionsRepository.adjustDislikeCount(id, delta); + } + } + + private void adjustPost(Integer id, String action, int delta) { + if ("like".equals(action)) { + postsRepository.adjustLikeCount(id, delta); + } else { + postsRepository.adjustDislikeCount(id, delta); + } + } +} diff --git a/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java b/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java index d975c6c..0790ea9 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java @@ -4,7 +4,9 @@ import com.yaoyuan.jiscuss.common.Node; import com.yaoyuan.jiscuss.common.PostCommonUtil; import com.yaoyuan.jiscuss.entity.Post; import com.yaoyuan.jiscuss.entity.custom.PostCustom; +import com.yaoyuan.jiscuss.repository.DiscussionsRepository; import com.yaoyuan.jiscuss.repository.PostsRepository; +import com.yaoyuan.jiscuss.repository.UsersRepository; import com.yaoyuan.jiscuss.service.IPostsService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; @@ -23,6 +26,12 @@ public class PostsServiceImpl implements IPostsService { @Autowired private PostsRepository postsRepository; + @Autowired + private DiscussionsRepository discussionsRepository; + + @Autowired + private UsersRepository usersRepository; + @Transactional(readOnly = true) @Override public List getAllList() { @@ -48,17 +57,19 @@ public class PostsServiceImpl implements IPostsService { @Transactional(readOnly = true) @Override - public List findPostCustomById(Integer id) { - //查询id为1且parentId为null的评论 - List> firstposts = postsRepository.findAllByDIdAndparentIdNull(id); + public List findPostCustomById(Integer id, String sort) { + // Choose sort order for top-level posts + List> firstposts = switch (sort == null ? "newest" : sort) { + case "oldest" -> postsRepository.findAllByDIdAndparentIdNullOldest(id); + case "hot" -> postsRepository.findAllByDIdAndparentIdNullHot(id); + default -> postsRepository.findAllByDIdAndparentIdNullNewest(id); // newest (root only, create_time desc) + }; List firstpostCustomList = PostCommonUtil.getNewPostsObjMap(firstposts); -// List firstpostCustomListNew = PostCommonUtil.getNewPostsObjCustom(firstpostCustomList); //查询id为1且parentId不为null的评论 List> thenposts = postsRepository.findAllByDIdAndparentIdNotNull(id); List thenpostCustomList = PostCommonUtil.getNewPostsObjMap(thenposts); -// List thenpostCustomListNew = PostCommonUtil.getNewPostsObjCustom(thenpostCustomList); //新建一个Node集合。 ArrayList nodes = new ArrayList<>(); //将第一层评论都添加都Node集合中 @@ -72,15 +83,27 @@ public class PostsServiceImpl implements IPostsService { //打印回复链表 Node.show(list); -// List> posts = postsRepository.findPostCustomById(id); -// List postCustomList = PostCommonUtil.getNewPostsObjMap(posts); -// List postCustomListNew = PostCommonUtil.getNewPostsObjCustom(postCustomList); return list; } @Transactional @Override public Post insert(Post post) { - return postsRepository.save(post); + // Auto-assign floor number within the same transaction to ensure consistency + if (post.getDiscussionId() != null) { + int nextNumber = postsRepository.findMaxNumberByDiscussionId(post.getDiscussionId()) + 1; + post.setNumber(nextNumber); + } + Post saved = postsRepository.save(post); + + // Maintain discussion comment count and last activity + if (post.getDiscussionId() != null) { + discussionsRepository.incrementCommentCount(post.getDiscussionId(), post.getCreateId(), new Date()); + } + // Maintain user comment count + if (post.getCreateId() != null) { + usersRepository.incrementCommentCount(post.getCreateId()); + } + return saved; } } diff --git a/src/main/java/com/yaoyuan/jiscuss/service/impl/UsersServiceImpl.java b/src/main/java/com/yaoyuan/jiscuss/service/impl/UsersServiceImpl.java index 132761c..1a8cadf 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/impl/UsersServiceImpl.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/impl/UsersServiceImpl.java @@ -146,6 +146,13 @@ public class UsersServiceImpl implements IUsersService { return usersRepository.findAllById(ids); } + @Transactional(readOnly = true) + @Override + public List getTopActiveUsers(int limit) { + return usersRepository.findTop10ActiveUsers( + org.springframework.data.domain.PageRequest.of(0, limit)); + } + } diff --git a/src/main/java/com/yaoyuan/jiscuss/util/UserAgentUtils.java b/src/main/java/com/yaoyuan/jiscuss/util/UserAgentUtils.java new file mode 100644 index 0000000..54c4a21 --- /dev/null +++ b/src/main/java/com/yaoyuan/jiscuss/util/UserAgentUtils.java @@ -0,0 +1,58 @@ +package com.yaoyuan.jiscuss.util; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Lightweight User-Agent parser. + * Extracts a human-readable browser name and major version without + * importing a heavy third-party library. + * + *

Detection order matters: Edge must be checked before Chrome, and + * Chrome before Safari, because UA strings commonly contain multiple tokens. + */ +public final class UserAgentUtils { + + private UserAgentUtils() {} + + private static final Pattern EDGE = Pattern.compile("Edg(?:e|A|iOS)?/([\\d.]+)", Pattern.CASE_INSENSITIVE); + private static final Pattern FIREFOX = Pattern.compile("Firefox/([\\d.]+)", Pattern.CASE_INSENSITIVE); + private static final Pattern CHROME = Pattern.compile("Chrome/([\\d.]+)", Pattern.CASE_INSENSITIVE); + private static final Pattern SAFARI = Pattern.compile("Version/([\\d.]+).*Safari", Pattern.CASE_INSENSITIVE); + private static final Pattern OPERA = Pattern.compile("OPR/([\\d.]+)", Pattern.CASE_INSENSITIVE); + private static final Pattern IE = Pattern.compile("(?:MSIE |Trident/.*rv:)([\\d.]+)", Pattern.CASE_INSENSITIVE); + + /** + * Returns a short browser description, e.g. "Chrome 120", "Firefox 121", "Safari 17". + * Returns "未知浏览器" when detection fails. + * + * @param userAgent the raw User-Agent header value + * @return display string, never null + */ + public static String parseBrowser(String userAgent) { + if (userAgent == null || userAgent.isBlank()) { + return "未知浏览器"; + } + // Order matters: Edge contains 'Chrome', Chrome contains 'Safari' + String r; + if ((r = match(EDGE, userAgent, "Edge")) != null) return r; + if ((r = match(OPERA, userAgent, "Opera")) != null) return r; + if ((r = match(FIREFOX, userAgent, "Firefox")) != null) return r; + if ((r = match(CHROME, userAgent, "Chrome")) != null) return r; + if ((r = match(SAFARI, userAgent, "Safari")) != null) return r; + if ((r = match(IE, userAgent, "IE")) != null) return r; + return "未知浏览器"; + } + + private static String match(Pattern pattern, String ua, String name) { + Matcher m = pattern.matcher(ua); + if (m.find()) { + String version = m.group(1); + // Only keep major version number + int dotIdx = version.indexOf('.'); + String major = dotIdx > 0 ? version.substring(0, dotIdx) : version; + return name + " " + major; + } + return null; + } +} diff --git a/src/main/resources/db/migration/V8__vote_fields.sql b/src/main/resources/db/migration/V8__vote_fields.sql new file mode 100644 index 0000000..f827d61 --- /dev/null +++ b/src/main/resources/db/migration/V8__vote_fields.sql @@ -0,0 +1,19 @@ +-- V8: Add vote (like/dislike) support and IP/browser meta to posts + +-- likecollect: add explicit action column ('like' or 'dislike') +ALTER TABLE likecollect ADD COLUMN action VARCHAR(20); + +-- discussion: add dislike counter +ALTER TABLE discussion ADD COLUMN dislike_count INTEGER DEFAULT 0; + +-- post: add per-post vote counters +ALTER TABLE post ADD COLUMN like_count INTEGER DEFAULT 0; +ALTER TABLE post ADD COLUMN dislike_count INTEGER DEFAULT 0; + +-- indexes for vote lookup +CREATE INDEX IF NOT EXISTS idx_likecollect_user_discussion ON likecollect(user_id, discussion_id); +CREATE INDEX IF NOT EXISTS idx_likecollect_user_post ON likecollect(user_id, post_id); + +-- post: add IP region and parsed browser name +ALTER TABLE post ADD COLUMN ip_region VARCHAR(100); +ALTER TABLE post ADD COLUMN browser VARCHAR(200); diff --git a/src/main/resources/static/lib/jquery.min.js b/src/main/resources/static/lib/jquery.min.js new file mode 100644 index 0000000..a1c07fd --- /dev/null +++ b/src/main/resources/static/lib/jquery.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="

",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0n?e:n>t?t:n}function e(n){return 100*(-1+n)}function t(n,t,r){var i;return i="translate3d"===c.positionUsing?{transform:"translate3d("+e(n)+"%,0,0)"}:"translate"===c.positionUsing?{transform:"translate("+e(n)+"%,0)"}:{"margin-left":e(n)+"%"},i.transition="all "+t+"ms "+r,i}function r(n,e){var t="string"==typeof n?n:o(n);return t.indexOf(" "+e+" ")>=0}function i(n,e){var t=o(n),i=t+e;r(t,e)||(n.className=i.substring(1))}function s(n,e){var t,i=o(n);r(n,e)&&(t=i.replace(" "+e+" "," "),n.className=t.substring(1,t.length-1))}function o(n){return(" "+(n.className||"")+" ").replace(/\s+/gi," ")}function a(n){n&&n.parentNode&&n.parentNode.removeChild(n)}var u={};u.version="0.2.0";var c=u.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'
'};u.configure=function(n){var e,t;for(e in n)t=n[e],void 0!==t&&n.hasOwnProperty(e)&&(c[e]=t);return this},u.status=null,u.set=function(e){var r=u.isStarted();e=n(e,c.minimum,1),u.status=1===e?null:e;var i=u.render(!r),s=i.querySelector(c.barSelector),o=c.speed,a=c.easing;return i.offsetWidth,l(function(n){""===c.positionUsing&&(c.positionUsing=u.getPositioningCSS()),f(s,t(e,o,a)),1===e?(f(i,{transition:"none",opacity:1}),i.offsetWidth,setTimeout(function(){f(i,{transition:"all "+o+"ms linear",opacity:0}),setTimeout(function(){u.remove(),n()},o)},o)):setTimeout(n,o)}),this},u.isStarted=function(){return"number"==typeof u.status},u.start=function(){u.status||u.set(0);var n=function(){setTimeout(function(){u.status&&(u.trickle(),n())},c.trickleSpeed)};return c.trickle&&n(),this},u.done=function(n){return n||u.status?u.inc(.3+.5*Math.random()).set(1):this},u.inc=function(e){var t=u.status;return t?("number"!=typeof e&&(e=(1-t)*n(Math.random()*t,.1,.95)),t=n(t+e,0,.994),u.set(t)):u.start()},u.trickle=function(){return u.inc(Math.random()*c.trickleRate)},function(){var n=0,e=0;u.promise=function(t){return t&&"resolved"!==t.state()?(0===e&&u.start(),n++,e++,t.always(function(){e--,0===e?(n=0,u.done()):u.set((n-e)/n)}),this):this}}(),u.render=function(n){if(u.isRendered())return document.getElementById("nprogress");i(document.documentElement,"nprogress-busy");var t=document.createElement("div");t.id="nprogress",t.innerHTML=c.template;var r,s=t.querySelector(c.barSelector),o=n?"-100":e(u.status||0),l=document.querySelector(c.parent);return f(s,{transition:"all 0 linear",transform:"translate3d("+o+"%,0,0)"}),c.showSpinner||(r=t.querySelector(c.spinnerSelector),r&&a(r)),l!=document.body&&i(l,"nprogress-custom-parent"),l.appendChild(t),t},u.remove=function(){s(document.documentElement,"nprogress-busy"),s(document.querySelector(c.parent),"nprogress-custom-parent");var n=document.getElementById("nprogress");n&&a(n)},u.isRendered=function(){return!!document.getElementById("nprogress")},u.getPositioningCSS=function(){var n=document.body.style,e="WebkitTransform"in n?"Webkit":"MozTransform"in n?"Moz":"msTransform"in n?"ms":"OTransform"in n?"O":"";return e+"Perspective"in n?"translate3d":e+"Transform"in n?"translate":"margin"};var l=function(){function n(){var t=e.shift();t&&t(n)}var e=[];return function(t){e.push(t),1==e.length&&n()}}(),f=function(){function n(n){return n.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,function(n,e){return e.toUpperCase()})}function e(n){var e=document.body.style;if(n in e)return n;for(var t,r=i.length,s=n.charAt(0).toUpperCase()+n.slice(1);r--;)if(t=i[r]+s,t in e)return t;return n}function t(t){return t=n(t),s[t]||(s[t]=e(t))}function r(n,e,r){e=t(e),n.style[e]=r}var i=["Webkit","O","Moz","ms"],s={};return function(n,e){var t,i,s=arguments;if(2==s.length)for(t in e)i=e[t],void 0!==i&&e.hasOwnProperty(t)&&r(n,t,i);else r(n,s[1],s[2])}}();return u}); \ No newline at end of file diff --git a/src/main/resources/static/semanticui/my.css b/src/main/resources/static/semanticui/my.css index 9731253..37e389e 100644 --- a/src/main/resources/static/semanticui/my.css +++ b/src/main/resources/static/semanticui/my.css @@ -1,3 +1,36 @@ +/* ── CSS custom properties for theme switching ────────────────────────────── */ +:root { + --bg-page: #f7f8fa; + --bg-card: #ffffff; + --text-primary: #333333; + --text-secondary: #888888; + --accent: #2185d0; + --border: rgba(34, 36, 38, 0.15); +} + +[data-theme="dark"] { + --bg-page: #1b1c1d; + --bg-card: #2d2d2d; + --text-primary: #e0e0e0; + --text-secondary: #999999; + --accent: #6435c9; + --border: rgba(255, 255, 255, 0.1); +} + +body { background-color: var(--bg-page) !important; color: var(--text-primary); } + +/* Apply card background where Semantic UI uses white */ +[data-theme="dark"] .ui.card, +[data-theme="dark"] .ui.segment, +[data-theme="dark"] #context2, +[data-theme="dark"] .ui.menu { background-color: var(--bg-card) !important; color: var(--text-primary) !important; } + +[data-theme="dark"] .ui.header, +[data-theme="dark"] .ui.dividing.header { color: var(--text-primary) !important; border-bottom-color: var(--border) !important; } + +[data-theme="dark"] a { color: var(--accent) !important; } + +/* ── Layout helpers ───────────────────────────────────────────────────────── */ .nullright { float: right; } \ No newline at end of file diff --git a/src/main/resources/templates/comm/commjs.ftl b/src/main/resources/templates/comm/commjs.ftl index 3751591..dc169ee 100644 --- a/src/main/resources/templates/comm/commjs.ftl +++ b/src/main/resources/templates/comm/commjs.ftl @@ -1,30 +1,25 @@ -<#--jquery--> +<#--NProgress - page load progress bar (local first)--> + + + + +<#--jquery (local first, CDN fallback)--> - + + <#--semantic-ui--> -<#-- --> -<#-- -<#-- href="https://lib.baomitu.com/semantic-ui/2.4.1/semantic.min.css" rel="stylesheet">--> -<#----> - -<#--tinymce--> - +<#--tinymce (CDN)--> + <#--layx--> - - - diff --git a/src/main/resources/templates/comm/footer.ftl b/src/main/resources/templates/comm/footer.ftl index 228d316..1b4f1fc 100644 --- a/src/main/resources/templates/comm/footer.ftl +++ b/src/main/resources/templates/comm/footer.ftl @@ -45,4 +45,5 @@ + diff --git a/src/main/resources/templates/comm/header.ftl b/src/main/resources/templates/comm/header.ftl index 2bbedba..1bc8e77 100644 --- a/src/main/resources/templates/comm/header.ftl +++ b/src/main/resources/templates/comm/header.ftl @@ -24,6 +24,11 @@ +
+ + 主题 + +
<#if username??>
- \ No newline at end of file + + \ No newline at end of file diff --git a/src/main/resources/templates/discussions.ftl b/src/main/resources/templates/discussions.ftl index cf4dfb1..0973dcd 100644 --- a/src/main/resources/templates/discussions.ftl +++ b/src/main/resources/templates/discussions.ftl @@ -45,13 +45,21 @@
-
+
赞这个主题
- + ${discussions.likeCount!0}
+
+
+ 踩 +
+ + ${discussions.dislikeCount!0} + +
${discussions.viewCount!0} 浏览    ${discussions.commentsCount!0} 回复 @@ -90,7 +98,14 @@
-

评论区

+

+ 评论区 +
+ 最早 + 最新 + 最热 +
+

@@ -105,15 +120,20 @@
- ${post.username} + ${post.username} + #${post.number!''}
${post.createTime} + <#if post.ipRegion?? && post.ipRegion != "">${post.ipRegion} + <#if post.browser?? && post.browser != "">${post.browser}
${post.content}
回复 + ${(post.likeCount!0)?c} + ${(post.dislikeCount!0)?c}
@@ -127,15 +147,20 @@
- ${post.username} + ${post.username} + #${post.number!''}
${post.createTime} + <#if post.ipRegion?? && post.ipRegion != "">${post.ipRegion} + <#if post.browser?? && post.browser != "">${post.browser}
${post.content}
回复 + ${(post.likeCount!0)?c} + ${(post.dislikeCount!0)?c}
@@ -263,28 +288,23 @@
-
Jiscuss手机可见，内容正在编写中，pc端可正常访问
-
-
+
-
预留功能
+
🏆 活跃用户排行
-

Jiscuss

-
-
-
-
- Jiscuss 会持续更新， Jiscuss 将一直更新完善，感谢支持！ +
+ <#if topUsers?? && topUsers?size gt 0> + <#list topUsers as u> +
+ +
+ ${u.username} +
${u.commentsCount!0} 回复
-
- -
-
-
- 2019 测试内容 -
-
-
+ + <#else> +
暂无数据
+
-
- -