mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-06 23:21:16 +08:00
Compare commits
120 Commits
feature/ar
...
codex/fix-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
abbdb224e0 | ||
|
|
37bef0b2d7 | ||
|
|
3519a41a2e | ||
|
|
ab04a8b6b1 | ||
|
|
ea079e8b8a | ||
|
|
519656359f | ||
|
|
dc64785279 | ||
|
|
9421d004d4 | ||
|
|
90bd41e740 | ||
|
|
7d5c864f64 | ||
|
|
3f35add587 | ||
|
|
1e284e15df | ||
|
|
9d76926b8a | ||
|
|
d2ce203236 | ||
|
|
b2228296af | ||
|
|
7020ae19d0 | ||
|
|
227fb6f6cc | ||
|
|
0e46a67ea6 | ||
|
|
b20b705e46 | ||
|
|
4b3ffbab99 | ||
|
|
74039c89f9 | ||
|
|
10dca73d2f | ||
|
|
e37ed1b70b | ||
|
|
8500a7a914 | ||
|
|
3adf722b3b | ||
|
|
791e5a4daf | ||
|
|
7d25e87fbc | ||
|
|
d02c316a70 | ||
|
|
c189c80c05 | ||
|
|
07db73c9c7 | ||
|
|
c296e25927 | ||
|
|
61fc9d799d | ||
|
|
20c6c73f8c | ||
|
|
81d1f79aae | ||
|
|
4ff76d2586 | ||
|
|
f24bc239cc | ||
|
|
143691206d | ||
|
|
15ad85e6f1 | ||
|
|
843e53143d | ||
|
|
16c94690bd | ||
|
|
5be00e7013 | ||
|
|
1e0f62b421 | ||
|
|
a3201f05fb | ||
|
|
62cccb794d | ||
|
|
afa0c7fb8f | ||
|
|
da311806c1 | ||
|
|
1852f87341 | ||
|
|
7010e8a058 | ||
|
|
38ee37d5be | ||
|
|
e398d8e989 | ||
|
|
85e77c265e | ||
|
|
8abdc73497 | ||
|
|
747d9c07d1 | ||
|
|
09cefbedbf | ||
|
|
d772bc182f | ||
|
|
358c53338d | ||
|
|
2110980797 | ||
|
|
1cd89eaa54 | ||
|
|
1d2e7eb96e | ||
|
|
4428e06f1d | ||
|
|
dddff54556 | ||
|
|
e7f7bbac22 | ||
|
|
37aae4ba5c | ||
|
|
54cfc98336 | ||
|
|
d42d38ff7a | ||
|
|
2b4601bd4b | ||
|
|
5071d9c6d5 | ||
|
|
cfaa4cd094 | ||
|
|
fc414794ff | ||
|
|
d8264956c3 | ||
|
|
effa7f25ca | ||
|
|
9b19fae69a | ||
|
|
ec04f64ce1 | ||
|
|
50bea76c0e | ||
|
|
05522fcdc7 | ||
|
|
3820eaa774 | ||
|
|
7effaf920a | ||
|
|
e40a6a3ca9 | ||
|
|
7c9475cfe2 | ||
|
|
17929dd95d | ||
|
|
f478b55538 | ||
|
|
c58c14f9b7 | ||
|
|
990d7cfbf9 | ||
|
|
43fa408f46 | ||
|
|
eb860a74af | ||
|
|
b3d050b42e | ||
|
|
db678a95c6 | ||
|
|
6d66cb48dc | ||
|
|
1fe2994743 | ||
|
|
126b10ce45 | ||
|
|
3b1843b6dd | ||
|
|
6a5d00f086 | ||
|
|
06368a6cf1 | ||
|
|
c38e4bc44c | ||
|
|
e9f25d3b1a | ||
|
|
fe167aa0b9 | ||
|
|
f3421265d2 | ||
|
|
f4817cd6d1 | ||
|
|
5ae0f9311c | ||
|
|
567452f570 | ||
|
|
bb4e866bd0 | ||
|
|
24d0da0864 | ||
|
|
9b53479ab6 | ||
|
|
039d482517 | ||
|
|
7cc32c36b1 | ||
|
|
2288522372 | ||
|
|
a2b72d7c00 | ||
|
|
a6d8add5fa | ||
|
|
ad481cffca | ||
|
|
ce213d4c24 | ||
|
|
68a82fa2ec | ||
|
|
cab8cd06dc | ||
|
|
b77a96938a | ||
|
|
df4a707e3a | ||
|
|
14ee5faa1f | ||
|
|
2eebc1c004 | ||
|
|
135a6b8c51 | ||
|
|
c43e4b85bc | ||
|
|
fb3a2839db | ||
|
|
5534573a19 |
9
.github/workflows/deploy-docs.yml
vendored
9
.github/workflows/deploy-docs.yml
vendored
@@ -1,7 +1,11 @@
|
||||
name: Deploy Documentation
|
||||
|
||||
on:
|
||||
push:
|
||||
workflow_call:
|
||||
inputs:
|
||||
build-id:
|
||||
required: false
|
||||
type: string
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
@@ -16,6 +20,9 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Log build
|
||||
run: echo "Running documentation deployment from build ${{ inputs.build-id }}"
|
||||
|
||||
- name: Setup Bun
|
||||
uses: oven-sh/setup-bun@v1
|
||||
with:
|
||||
|
||||
11
.github/workflows/deploy-staging.yml
vendored
11
.github/workflows/deploy-staging.yml
vendored
@@ -5,6 +5,9 @@ on:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -21,3 +24,11 @@ jobs:
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
script: bash /opt/openisle/deploy-staging.sh
|
||||
|
||||
deploy-docs:
|
||||
needs: build-and-deploy
|
||||
if: ${{ success() }}
|
||||
uses: ./.github/workflows/deploy-docs.yml
|
||||
secrets: inherit
|
||||
with:
|
||||
build-id: ${{ github.run_id }}
|
||||
|
||||
|
||||
@@ -246,3 +246,9 @@ https://resend.com/emails 创建账号并登录
|
||||
`RESEND_FROM_EMAIL`: **noreply@域名**
|
||||
`RESEND_API_KEY`:**刚刚复制的 Key**
|
||||

|
||||
|
||||
## 开源共建和API文档
|
||||
|
||||
- API文档: https://docs.open-isle.com/openapi
|
||||
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
高效的开源社区前后端平台
|
||||
<br><br><br>
|
||||
<img alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200">
|
||||
<br><br><br>
|
||||
<a href="https://hellogithub.com/repository/nagisa77/OpenIsle" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=8605546658d94cbab45182af2a02e4c8&claim_uid=p5GNFTtZl6HBAYQ" alt="Featured|HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
|
||||
</p>
|
||||
|
||||
## 💡 简介
|
||||
|
||||
@@ -40,6 +40,12 @@ public class CachingConfig {
|
||||
public static final String CATEGORY_CACHE_NAME="openisle_categories";
|
||||
// 在线人数缓存名
|
||||
public static final String ONLINE_CACHE_NAME="openisle_online";
|
||||
// 注册验证码
|
||||
public static final String VERIFY_CACHE_NAME="openisle_verify";
|
||||
// 发帖频率限制
|
||||
public static final String LIMIT_CACHE_NAME="openisle_limit";
|
||||
// 用户访问统计
|
||||
public static final String VISIT_CACHE_NAME="openisle_visit";
|
||||
|
||||
/**
|
||||
* 自定义Redis的序列化器
|
||||
|
||||
@@ -5,13 +5,21 @@ import io.swagger.v3.oas.models.OpenAPI;
|
||||
import io.swagger.v3.oas.models.info.Info;
|
||||
import io.swagger.v3.oas.models.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.models.security.SecurityScheme;
|
||||
import io.swagger.v3.oas.models.servers.Server;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
@RequiredArgsConstructor
|
||||
public class OpenApiConfig {
|
||||
|
||||
private final SpringDocProperties springDocProperties;
|
||||
|
||||
@Value("${springdoc.info.title}")
|
||||
private String title;
|
||||
|
||||
@@ -30,19 +38,23 @@ public class OpenApiConfig {
|
||||
@Bean
|
||||
public OpenAPI openAPI() {
|
||||
SecurityScheme securityScheme = new SecurityScheme()
|
||||
.type(SecurityScheme.Type.HTTP)
|
||||
.scheme(scheme.toLowerCase())
|
||||
.bearerFormat("JWT")
|
||||
.in(SecurityScheme.In.HEADER)
|
||||
.name(header);
|
||||
.type(SecurityScheme.Type.HTTP)
|
||||
.scheme(scheme.toLowerCase())
|
||||
.bearerFormat("JWT")
|
||||
.in(SecurityScheme.In.HEADER)
|
||||
.name(header);
|
||||
|
||||
List<Server> servers = springDocProperties.getServers().stream()
|
||||
.map(s -> new Server().url(s.getUrl()).description(s.getDescription()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new OpenAPI()
|
||||
.servers(servers)
|
||||
.info(new Info()
|
||||
.title(title)
|
||||
.description(description)
|
||||
.version(version))
|
||||
.components(new Components()
|
||||
.addSecuritySchemes("JWT", securityScheme))
|
||||
.title(title)
|
||||
.description(description)
|
||||
.version(version))
|
||||
.components(new Components().addSecuritySchemes("JWT", securityScheme))
|
||||
.addSecurityItem(new SecurityRequirement().addList("JWT"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.openisle.config;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.amqp.core.Binding;
|
||||
import org.springframework.amqp.core.BindingBuilder;
|
||||
import org.springframework.amqp.core.Queue;
|
||||
@@ -23,6 +24,7 @@ import java.util.List;
|
||||
|
||||
@Configuration
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class RabbitMQConfig {
|
||||
|
||||
public static final String EXCHANGE_NAME = "openisle-exchange";
|
||||
@@ -38,7 +40,7 @@ public class RabbitMQConfig {
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
System.out.println("RabbitMQ配置初始化: 队列数量=" + queueCount + ", 持久化=" + queueDurable);
|
||||
log.info("RabbitMQ配置初始化: 队列数量={}, 持久化={}", queueCount, queueDurable);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@@ -51,7 +53,7 @@ public class RabbitMQConfig {
|
||||
*/
|
||||
@Bean
|
||||
public List<Queue> shardedQueues() {
|
||||
System.out.println("开始创建分片队列 Bean...");
|
||||
log.info("开始创建分片队列 Bean...");
|
||||
|
||||
List<Queue> queues = new ArrayList<>();
|
||||
for (int i = 0; i < queueCount; i++) {
|
||||
@@ -61,7 +63,7 @@ public class RabbitMQConfig {
|
||||
queues.add(queue);
|
||||
}
|
||||
|
||||
System.out.println("分片队列 Bean 创建完成,总数: " + queues.size());
|
||||
log.info("分片队列 Bean 创建完成,总数: {}", queues.size());
|
||||
return queues;
|
||||
}
|
||||
|
||||
@@ -70,7 +72,7 @@ public class RabbitMQConfig {
|
||||
*/
|
||||
@Bean
|
||||
public List<Binding> shardedBindings(TopicExchange exchange, @Qualifier("shardedQueues") List<Queue> shardedQueues) {
|
||||
System.out.println("开始创建分片绑定 Bean...");
|
||||
log.info("开始创建分片绑定 Bean...");
|
||||
List<Binding> bindings = new ArrayList<>();
|
||||
if (shardedQueues != null) {
|
||||
for (Queue queue : shardedQueues) {
|
||||
@@ -82,7 +84,7 @@ public class RabbitMQConfig {
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("分片绑定 Bean 创建完成,总数: " + bindings.size());
|
||||
log.info("分片绑定 Bean 创建完成,总数: {}", bindings.size());
|
||||
return bindings;
|
||||
}
|
||||
|
||||
@@ -135,14 +137,14 @@ public class RabbitMQConfig {
|
||||
@Qualifier("shardedBindings") List<Binding> shardedBindings,
|
||||
Binding legacyBinding) {
|
||||
return args -> {
|
||||
System.out.println("=== 开始主动声明 RabbitMQ 组件 ===");
|
||||
log.info("=== 开始主动声明 RabbitMQ 组件 ===");
|
||||
|
||||
try {
|
||||
// 声明交换
|
||||
rabbitAdmin.declareExchange(exchange);
|
||||
|
||||
// 声明分片队列 - 检查存在性
|
||||
System.out.println("开始检查并声明 " + shardedQueues.size() + " 个分片队列...");
|
||||
log.info("开始检查并声明 {} 个分片队列...", shardedQueues.size());
|
||||
int successCount = 0;
|
||||
int skippedCount = 0;
|
||||
|
||||
@@ -159,45 +161,44 @@ public class RabbitMQConfig {
|
||||
skippedCount++;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.err.println("队列声明失败: " + queueName + ", 错误: " + e.getMessage());
|
||||
log.error("队列声明失败: {}, 错误: {}", queueName, e.getMessage());
|
||||
}
|
||||
}
|
||||
System.out.println("分片队列处理完成: 成功 " + successCount + ", 跳过 " + skippedCount + ", 总数 " + shardedQueues.size());
|
||||
log.info("分片队列处理完成: 成功 {}, 跳过 {}, 总数 {}", successCount, skippedCount, shardedQueues.size());
|
||||
|
||||
// 声明分片绑定
|
||||
System.out.println("开始声明 " + shardedBindings.size() + " 个分片绑定...");
|
||||
log.info("开始声明 {} 个分片绑定...", shardedBindings.size());
|
||||
int bindingSuccessCount = 0;
|
||||
for (Binding binding : shardedBindings) {
|
||||
try {
|
||||
rabbitAdmin.declareBinding(binding);
|
||||
bindingSuccessCount++;
|
||||
} catch (Exception e) {
|
||||
System.err.println("绑定声明失败: " + e.getMessage());
|
||||
log.error("绑定声明失败: {}", e.getMessage());
|
||||
}
|
||||
}
|
||||
System.out.println("分片绑定声明完成: 成功 " + bindingSuccessCount + "/" + shardedBindings.size());
|
||||
log.info("分片绑定声明完成: 成功 {}/{}", bindingSuccessCount, shardedBindings.size());
|
||||
|
||||
// 声明遗留队列和绑定 - 检查存在性
|
||||
try {
|
||||
rabbitAdmin.declareQueue(legacyQueue);
|
||||
rabbitAdmin.declareBinding(legacyBinding);
|
||||
System.out.println("遗留队列和绑定就绪: " + QUEUE_NAME + " (已存在或新创建)");
|
||||
log.info("遗留队列和绑定就绪: {} (已存在或新创建)", QUEUE_NAME);
|
||||
} catch (org.springframework.amqp.AmqpIOException e) {
|
||||
if (e.getMessage().contains("PRECONDITION_FAILED") && e.getMessage().contains("durable")) {
|
||||
System.out.println("遗留队列已存在但 durable 设置不匹配: " + QUEUE_NAME + ", 保持现有队列");
|
||||
log.warn("遗留队列已存在但 durable 设置不匹配: {}, 保持现有队列", QUEUE_NAME);
|
||||
} else {
|
||||
System.err.println("遗留队列声明失败: " + QUEUE_NAME + ", 错误: " + e.getMessage());
|
||||
log.error("遗留队列声明失败: {}, 错误: {}", QUEUE_NAME, e.getMessage());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.err.println("遗留队列声明失败: " + QUEUE_NAME + ", 错误: " + e.getMessage());
|
||||
log.error("遗留队列声明失败: {}, 错误: {}", QUEUE_NAME, e.getMessage());
|
||||
}
|
||||
|
||||
System.out.println("=== RabbitMQ 组件声明完成 ===");
|
||||
System.out.println("请检查 RabbitMQ 管理界面确认队列已正确创建");
|
||||
log.info("=== RabbitMQ 组件声明完成 ===");
|
||||
log.info("请检查 RabbitMQ 管理界面确认队列已正确创建");
|
||||
|
||||
} catch (Exception e) {
|
||||
System.err.println("RabbitMQ 组件声明过程中发生严重错误:");
|
||||
e.printStackTrace();
|
||||
log.error("RabbitMQ 组件声明过程中发生严重错误", e);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.openisle.repository.UserRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.security.authentication.AuthenticationManager;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
@@ -26,6 +27,8 @@ import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.CorsConfigurationSource;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.servlet.FilterChain;
|
||||
@@ -44,6 +47,8 @@ public class SecurityConfig {
|
||||
@Value("${app.website-url}")
|
||||
private String websiteUrl;
|
||||
|
||||
private final RedisTemplate redisTemplate;
|
||||
|
||||
@Bean
|
||||
public PasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
@@ -90,6 +95,9 @@ public class SecurityConfig {
|
||||
"http://192.168.7.98",
|
||||
"http://192.168.7.98:3000",
|
||||
"https://petstore.swagger.io",
|
||||
// 允许自建OpenAPI地址
|
||||
"https://docs.open-isle.com",
|
||||
"https://www.docs.open-isle.com",
|
||||
websiteUrl,
|
||||
websiteUrl.replace("://www.", "://")
|
||||
));
|
||||
@@ -205,7 +213,8 @@ public class SecurityConfig {
|
||||
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
|
||||
var auth = org.springframework.security.core.context.SecurityContextHolder.getContext().getAuthentication();
|
||||
if (auth != null && auth.isAuthenticated() && !(auth instanceof org.springframework.security.authentication.AnonymousAuthenticationToken)) {
|
||||
userVisitService.recordVisit(auth.getName());
|
||||
String key = CachingConfig.VISIT_CACHE_NAME+":"+ LocalDate.now();
|
||||
redisTemplate.opsForSet().add(key, auth.getName());
|
||||
}
|
||||
filterChain.doFilter(request, response);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.openisle.config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Data
|
||||
@Component
|
||||
@ConfigurationProperties(prefix = "springdoc.api-docs")
|
||||
public class SpringDocProperties {
|
||||
private List<ServerConfig> servers = new ArrayList<>();
|
||||
|
||||
@Data
|
||||
public static class ServerConfig {
|
||||
private String url;
|
||||
private String description;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.openisle.config;
|
||||
|
||||
import com.openisle.model.Role;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* Ensure a dedicated "system" user exists for internal operations.
|
||||
*/
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class SystemUserInitializer implements CommandLineRunner {
|
||||
private final UserRepository userRepository;
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
@Override
|
||||
public void run(String... args) {
|
||||
userRepository.findByUsername("system").orElseGet(() -> {
|
||||
User system = new User();
|
||||
system.setUsername("system");
|
||||
system.setEmail("system@openisle.local");
|
||||
// todo(tim): raw password 采用环境变量
|
||||
system.setPassword(passwordEncoder.encode("system"));
|
||||
system.setRole(Role.USER);
|
||||
system.setVerified(true);
|
||||
system.setApproved(true);
|
||||
system.setAvatar("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png");
|
||||
return userRepository.save(system);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,12 @@ import com.openisle.service.UserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -25,6 +31,9 @@ public class ActivityController {
|
||||
private final ActivityMapper activityMapper;
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List activities", description = "Retrieve all activities")
|
||||
@ApiResponse(responseCode = "200", description = "List of activities",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = ActivityDto.class))))
|
||||
public List<ActivityDto> list() {
|
||||
return activityService.list().stream()
|
||||
.map(activityMapper::toDto)
|
||||
@@ -32,6 +41,9 @@ public class ActivityController {
|
||||
}
|
||||
|
||||
@GetMapping("/milk-tea")
|
||||
@Operation(summary = "Milk tea info", description = "Get milk tea activity information")
|
||||
@ApiResponse(responseCode = "200", description = "Milk tea info",
|
||||
content = @Content(schema = @Schema(implementation = MilkTeaInfoDto.class)))
|
||||
public MilkTeaInfoDto milkTea() {
|
||||
Activity a = activityService.getByType(ActivityType.MILK_TEA);
|
||||
long count = activityService.countParticipants(a);
|
||||
@@ -45,6 +57,10 @@ public class ActivityController {
|
||||
}
|
||||
|
||||
@PostMapping("/milk-tea/redeem")
|
||||
@Operation(summary = "Redeem milk tea", description = "Redeem milk tea activity reward")
|
||||
@ApiResponse(responseCode = "200", description = "Redeem result",
|
||||
content = @Content(schema = @Schema(implementation = java.util.Map.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public java.util.Map<String, String> redeemMilkTea(@RequestBody MilkTeaRedeemRequest req, Authentication auth) {
|
||||
User user = userService.findByIdentifier(auth.getName()).orElseThrow();
|
||||
Activity a = activityService.getByType(ActivityType.MILK_TEA);
|
||||
|
||||
@@ -3,6 +3,11 @@ package com.openisle.controller;
|
||||
import com.openisle.dto.CommentDto;
|
||||
import com.openisle.mapper.CommentMapper;
|
||||
import com.openisle.service.CommentService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -18,11 +23,19 @@ public class AdminCommentController {
|
||||
private final CommentMapper commentMapper;
|
||||
|
||||
@PostMapping("/{id}/pin")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Pin comment", description = "Pin a comment by its id")
|
||||
@ApiResponse(responseCode = "200", description = "Pinned comment",
|
||||
content = @Content(schema = @Schema(implementation = CommentDto.class)))
|
||||
public CommentDto pin(@PathVariable Long id, Authentication auth) {
|
||||
return commentMapper.toDto(commentService.pinComment(auth.getName(), id));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/unpin")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Unpin comment", description = "Remove pin from a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Unpinned comment",
|
||||
content = @Content(schema = @Schema(implementation = CommentDto.class)))
|
||||
public CommentDto unpin(@PathVariable Long id, Authentication auth) {
|
||||
return commentMapper.toDto(commentService.unpinComment(auth.getName(), id));
|
||||
}
|
||||
|
||||
@@ -5,6 +5,11 @@ import com.openisle.service.AiUsageService;
|
||||
import com.openisle.service.PasswordValidator;
|
||||
import com.openisle.service.PostService;
|
||||
import com.openisle.service.RegisterModeService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -18,6 +23,10 @@ public class AdminConfigController {
|
||||
private final RegisterModeService registerModeService;
|
||||
|
||||
@GetMapping
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Get configuration", description = "Retrieve application configuration settings")
|
||||
@ApiResponse(responseCode = "200", description = "Current configuration",
|
||||
content = @Content(schema = @Schema(implementation = ConfigDto.class)))
|
||||
public ConfigDto getConfig() {
|
||||
ConfigDto dto = new ConfigDto();
|
||||
dto.setPublishMode(postService.getPublishMode());
|
||||
@@ -28,6 +37,10 @@ public class AdminConfigController {
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Update configuration", description = "Update application configuration settings")
|
||||
@ApiResponse(responseCode = "200", description = "Updated configuration",
|
||||
content = @Content(schema = @Schema(implementation = ConfigDto.class)))
|
||||
public ConfigDto updateConfig(@RequestBody ConfigDto dto) {
|
||||
if (dto.getPublishMode() != null) {
|
||||
postService.setPublishMode(dto.getPublishMode());
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
package com.openisle.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import java.util.Map;
|
||||
@@ -10,6 +15,10 @@ import java.util.Map;
|
||||
@RestController
|
||||
public class AdminController {
|
||||
@GetMapping("/api/admin/hello")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Admin greeting", description = "Returns a greeting for admin users")
|
||||
@ApiResponse(responseCode = "200", description = "Greeting payload",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public Map<String, String> adminHello() {
|
||||
return Map.of("message", "Hello, Admin User");
|
||||
}
|
||||
|
||||
@@ -3,6 +3,12 @@ package com.openisle.controller;
|
||||
import com.openisle.dto.PostSummaryDto;
|
||||
import com.openisle.mapper.PostMapper;
|
||||
import com.openisle.service.PostService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -20,6 +26,10 @@ public class AdminPostController {
|
||||
private final PostMapper postMapper;
|
||||
|
||||
@GetMapping("/pending")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "List pending posts", description = "Retrieve posts awaiting approval")
|
||||
@ApiResponse(responseCode = "200", description = "Pending posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> pendingPosts() {
|
||||
return postService.listPendingPosts().stream()
|
||||
.map(postMapper::toSummaryDto)
|
||||
@@ -27,32 +37,56 @@ public class AdminPostController {
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/approve")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Approve post", description = "Approve a pending post")
|
||||
@ApiResponse(responseCode = "200", description = "Approved post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto approve(@PathVariable Long id) {
|
||||
return postMapper.toSummaryDto(postService.approvePost(id));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/reject")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Reject post", description = "Reject a pending post")
|
||||
@ApiResponse(responseCode = "200", description = "Rejected post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto reject(@PathVariable Long id) {
|
||||
return postMapper.toSummaryDto(postService.rejectPost(id));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/pin")
|
||||
public PostSummaryDto pin(@PathVariable Long id) {
|
||||
return postMapper.toSummaryDto(postService.pinPost(id));
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Pin post", description = "Pin a post to the top")
|
||||
@ApiResponse(responseCode = "200", description = "Pinned post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto pin(@PathVariable Long id, org.springframework.security.core.Authentication auth) {
|
||||
return postMapper.toSummaryDto(postService.pinPost(id, auth.getName()));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/unpin")
|
||||
public PostSummaryDto unpin(@PathVariable Long id) {
|
||||
return postMapper.toSummaryDto(postService.unpinPost(id));
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Unpin post", description = "Remove a post from the top")
|
||||
@ApiResponse(responseCode = "200", description = "Unpinned post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto unpin(@PathVariable Long id, org.springframework.security.core.Authentication auth) {
|
||||
return postMapper.toSummaryDto(postService.unpinPost(id, auth.getName()));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/rss-exclude")
|
||||
public PostSummaryDto excludeFromRss(@PathVariable Long id) {
|
||||
return postMapper.toSummaryDto(postService.excludeFromRss(id));
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Exclude from RSS", description = "Exclude a post from RSS feed")
|
||||
@ApiResponse(responseCode = "200", description = "Updated post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto excludeFromRss(@PathVariable Long id, org.springframework.security.core.Authentication auth) {
|
||||
return postMapper.toSummaryDto(postService.excludeFromRss(id, auth.getName()));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/rss-include")
|
||||
public PostSummaryDto includeInRss(@PathVariable Long id) {
|
||||
return postMapper.toSummaryDto(postService.includeInRss(id));
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Include in RSS", description = "Include a post in the RSS feed")
|
||||
@ApiResponse(responseCode = "200", description = "Updated post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto includeInRss(@PathVariable Long id, org.springframework.security.core.Authentication auth) {
|
||||
return postMapper.toSummaryDto(postService.includeInRss(id, auth.getName()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,12 @@ import com.openisle.mapper.TagMapper;
|
||||
import com.openisle.model.Tag;
|
||||
import com.openisle.service.PostService;
|
||||
import com.openisle.service.TagService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -20,6 +26,10 @@ public class AdminTagController {
|
||||
private final TagMapper tagMapper;
|
||||
|
||||
@GetMapping("/pending")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "List pending tags", description = "Retrieve tags awaiting approval")
|
||||
@ApiResponse(responseCode = "200", description = "Pending tags",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = TagDto.class))))
|
||||
public List<TagDto> pendingTags() {
|
||||
return tagService.listPendingTags().stream()
|
||||
.map(t -> tagMapper.toDto(t, postService.countPostsByTag(t.getId())))
|
||||
@@ -27,6 +37,10 @@ public class AdminTagController {
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/approve")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Approve tag", description = "Approve a pending tag")
|
||||
@ApiResponse(responseCode = "200", description = "Approved tag",
|
||||
content = @Content(schema = @Schema(implementation = TagDto.class)))
|
||||
public TagDto approve(@PathVariable Long id) {
|
||||
Tag tag = tagService.approveTag(id);
|
||||
long count = postService.countPostsByTag(tag.getId());
|
||||
|
||||
@@ -6,6 +6,9 @@ import com.openisle.model.User;
|
||||
import com.openisle.service.EmailSender;
|
||||
import com.openisle.repository.NotificationRepository;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -22,6 +25,9 @@ public class AdminUserController {
|
||||
private String websiteUrl;
|
||||
|
||||
@PostMapping("/{id}/approve")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Approve user", description = "Approve a pending user registration")
|
||||
@ApiResponse(responseCode = "200", description = "User approved")
|
||||
public ResponseEntity<?> approve(@PathVariable Long id) {
|
||||
User user = userRepository.findById(id).orElseThrow();
|
||||
user.setApproved(true);
|
||||
@@ -33,6 +39,9 @@ public class AdminUserController {
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/reject")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Reject user", description = "Reject a pending user registration")
|
||||
@ApiResponse(responseCode = "200", description = "User rejected")
|
||||
public ResponseEntity<?> reject(@PathVariable Long id) {
|
||||
User user = userRepository.findById(id).orElseThrow();
|
||||
user.setApproved(false);
|
||||
|
||||
@@ -9,6 +9,11 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@@ -21,6 +26,10 @@ public class AiController {
|
||||
private final AiUsageService aiUsageService;
|
||||
|
||||
@PostMapping("/format")
|
||||
@Operation(summary = "Format markdown", description = "Format text via AI")
|
||||
@ApiResponse(responseCode = "200", description = "Formatted content",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<Map<String, String>> format(@RequestBody Map<String, String> req,
|
||||
Authentication auth) {
|
||||
String text = req.get("text");
|
||||
|
||||
@@ -1,18 +1,27 @@
|
||||
package com.openisle.controller;
|
||||
|
||||
import com.openisle.config.CachingConfig;
|
||||
import com.openisle.dto.*;
|
||||
import com.openisle.exception.FieldException;
|
||||
import com.openisle.model.RegisterMode;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.service.*;
|
||||
import com.openisle.util.VerifyType;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/auth")
|
||||
@@ -43,6 +52,9 @@ public class AuthController {
|
||||
private boolean loginCaptchaEnabled;
|
||||
|
||||
@PostMapping("/register")
|
||||
@Operation(summary = "Register user", description = "Register a new user account")
|
||||
@ApiResponse(responseCode = "200", description = "Registration result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> register(@RequestBody RegisterRequest req) {
|
||||
if (captchaEnabled && registerCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
|
||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
|
||||
@@ -56,7 +68,8 @@ public class AuthController {
|
||||
User user = userService.registerWithInvite(
|
||||
req.getUsername(), req.getEmail(), req.getPassword());
|
||||
inviteService.consume(req.getInviteToken(), user.getUsername());
|
||||
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
|
||||
// 发送确认邮件
|
||||
userService.sendVerifyMail(user, VerifyType.REGISTER);
|
||||
return ResponseEntity.ok(Map.of(
|
||||
"token", jwtService.generateToken(user.getUsername()),
|
||||
"reason_code", "INVITE_APPROVED"
|
||||
@@ -70,7 +83,8 @@ public class AuthController {
|
||||
}
|
||||
User user = userService.register(
|
||||
req.getUsername(), req.getEmail(), req.getPassword(), "", registerModeService.getRegisterMode());
|
||||
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
|
||||
// 发送确认邮件
|
||||
userService.sendVerifyMail(user, VerifyType.REGISTER);
|
||||
if (!user.isApproved()) {
|
||||
notificationService.createRegisterRequestNotifications(user, user.getRegisterReason());
|
||||
}
|
||||
@@ -78,14 +92,16 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/verify")
|
||||
@Operation(summary = "Verify account", description = "Verify registration code")
|
||||
@ApiResponse(responseCode = "200", description = "Verification result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> verify(@RequestBody VerifyRequest req) {
|
||||
boolean ok = userService.verifyCode(req.getUsername(), req.getCode());
|
||||
Optional<User> userOpt = userService.findByUsername(req.getUsername());
|
||||
if (userOpt.isEmpty()) {
|
||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid credentials"));
|
||||
}
|
||||
boolean ok = userService.verifyCode(userOpt.get(), req.getCode(), VerifyType.REGISTER);
|
||||
if (ok) {
|
||||
Optional<User> userOpt = userService.findByUsername(req.getUsername());
|
||||
if (userOpt.isEmpty()) {
|
||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid credentials"));
|
||||
}
|
||||
|
||||
User user = userOpt.get();
|
||||
|
||||
if (user.isApproved()) {
|
||||
@@ -106,6 +122,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/login")
|
||||
@Operation(summary = "Login", description = "Authenticate with username/email and password")
|
||||
@ApiResponse(responseCode = "200", description = "Authentication result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> login(@RequestBody LoginRequest req) {
|
||||
if (captchaEnabled && loginCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
|
||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
|
||||
@@ -122,7 +141,7 @@ public class AuthController {
|
||||
User user = userOpt.get();
|
||||
if (!user.isVerified()) {
|
||||
user = userService.register(user.getUsername(), user.getEmail(), user.getPassword(), user.getRegisterReason(), registerModeService.getRegisterMode());
|
||||
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
|
||||
userService.sendVerifyMail(user, VerifyType.REGISTER);
|
||||
return ResponseEntity.badRequest().body(Map.of(
|
||||
"error", "User not verified",
|
||||
"reason_code", "NOT_VERIFIED",
|
||||
@@ -144,6 +163,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/google")
|
||||
@Operation(summary = "Login with Google", description = "Authenticate using Google account")
|
||||
@ApiResponse(responseCode = "200", description = "Authentication result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> loginWithGoogle(@RequestBody GoogleLoginRequest req) {
|
||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||
@@ -191,6 +213,9 @@ public class AuthController {
|
||||
|
||||
|
||||
@PostMapping("/reason")
|
||||
@Operation(summary = "Submit register reason", description = "Submit registration reason for approval")
|
||||
@ApiResponse(responseCode = "200", description = "Submission result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> reason(@RequestBody MakeReasonRequest req) {
|
||||
String username = jwtService.validateAndGetSubjectForReason(req.getToken());
|
||||
Optional<User> userOpt = userService.findByUsername(username);
|
||||
@@ -219,6 +244,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/github")
|
||||
@Operation(summary = "Login with GitHub", description = "Authenticate using GitHub account")
|
||||
@ApiResponse(responseCode = "200", description = "Authentication result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> loginWithGithub(@RequestBody GithubLoginRequest req) {
|
||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||
@@ -267,6 +295,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/discord")
|
||||
@Operation(summary = "Login with Discord", description = "Authenticate using Discord account")
|
||||
@ApiResponse(responseCode = "200", description = "Authentication result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> loginWithDiscord(@RequestBody DiscordLoginRequest req) {
|
||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||
@@ -314,6 +345,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/twitter")
|
||||
@Operation(summary = "Login with Twitter", description = "Authenticate using Twitter account")
|
||||
@ApiResponse(responseCode = "200", description = "Authentication result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> loginWithTwitter(@RequestBody TwitterLoginRequest req) {
|
||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||
@@ -362,6 +396,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/telegram")
|
||||
@Operation(summary = "Login with Telegram", description = "Authenticate using Telegram data")
|
||||
@ApiResponse(responseCode = "200", description = "Authentication result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> loginWithTelegram(@RequestBody TelegramLoginRequest req) {
|
||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||
@@ -407,24 +444,37 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@GetMapping("/check")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Check token", description = "Validate JWT token")
|
||||
@ApiResponse(responseCode = "200", description = "Token valid",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> checkToken() {
|
||||
return ResponseEntity.ok(Map.of("valid", true));
|
||||
}
|
||||
|
||||
@PostMapping("/forgot/send")
|
||||
@Operation(summary = "Send reset code", description = "Send verification code for password reset")
|
||||
@ApiResponse(responseCode = "200", description = "Sending result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> sendReset(@RequestBody ForgotPasswordRequest req) {
|
||||
Optional<User> userOpt = userService.findByEmail(req.getEmail());
|
||||
if (userOpt.isEmpty()) {
|
||||
return ResponseEntity.badRequest().body(Map.of("error", "User not found"));
|
||||
}
|
||||
String code = userService.generatePasswordResetCode(req.getEmail());
|
||||
emailService.sendEmail(req.getEmail(), "请填写验证码以重置密码", "您的验证码是" + code);
|
||||
userService.sendVerifyMail(userOpt.get(), VerifyType.RESET_PASSWORD);
|
||||
return ResponseEntity.ok(Map.of("message", "Verification code sent"));
|
||||
}
|
||||
|
||||
@PostMapping("/forgot/verify")
|
||||
@Operation(summary = "Verify reset code", description = "Verify password reset code")
|
||||
@ApiResponse(responseCode = "200", description = "Verification result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> verifyReset(@RequestBody VerifyForgotRequest req) {
|
||||
boolean ok = userService.verifyPasswordResetCode(req.getEmail(), req.getCode());
|
||||
Optional<User> userOpt = userService.findByEmail(req.getEmail());
|
||||
if (userOpt.isEmpty()) {
|
||||
return ResponseEntity.badRequest().body(Map.of("error", "User not found"));
|
||||
}
|
||||
boolean ok = userService.verifyCode(userOpt.get(), req.getCode(), VerifyType.RESET_PASSWORD);
|
||||
if (ok) {
|
||||
String username = userService.findByEmail(req.getEmail()).get().getUsername();
|
||||
return ResponseEntity.ok(Map.of("token", jwtService.generateResetToken(username)));
|
||||
@@ -433,6 +483,9 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/forgot/reset")
|
||||
@Operation(summary = "Reset password", description = "Reset user password after verification")
|
||||
@ApiResponse(responseCode = "200", description = "Reset result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> resetPassword(@RequestBody ResetPasswordRequest req) {
|
||||
String username = jwtService.validateAndGetSubjectForReset(req.getToken());
|
||||
try {
|
||||
|
||||
@@ -10,6 +10,11 @@ import com.openisle.service.CategoryService;
|
||||
import com.openisle.service.PostService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -25,6 +30,9 @@ public class CategoryController {
|
||||
private final CategoryMapper categoryMapper;
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Create category", description = "Create a new category")
|
||||
@ApiResponse(responseCode = "200", description = "Created category",
|
||||
content = @Content(schema = @Schema(implementation = CategoryDto.class)))
|
||||
public CategoryDto create(@RequestBody CategoryRequest req) {
|
||||
Category c = categoryService.createCategory(req.getName(), req.getDescription(), req.getIcon(), req.getSmallIcon());
|
||||
long count = postService.countPostsByCategory(c.getId());
|
||||
@@ -32,6 +40,9 @@ public class CategoryController {
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@Operation(summary = "Update category", description = "Update an existing category")
|
||||
@ApiResponse(responseCode = "200", description = "Updated category",
|
||||
content = @Content(schema = @Schema(implementation = CategoryDto.class)))
|
||||
public CategoryDto update(@PathVariable Long id, @RequestBody CategoryRequest req) {
|
||||
Category c = categoryService.updateCategory(id, req.getName(), req.getDescription(), req.getIcon(), req.getSmallIcon());
|
||||
long count = postService.countPostsByCategory(c.getId());
|
||||
@@ -39,11 +50,16 @@ public class CategoryController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@Operation(summary = "Delete category", description = "Remove a category by id")
|
||||
@ApiResponse(responseCode = "200", description = "Category deleted")
|
||||
public void delete(@PathVariable Long id) {
|
||||
categoryService.deleteCategory(id);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List categories", description = "Get all categories")
|
||||
@ApiResponse(responseCode = "200", description = "List of categories",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = CategoryDto.class))))
|
||||
public List<CategoryDto> list() {
|
||||
List<Category> all = categoryService.listCategories();
|
||||
List<Long> ids = all.stream().map(Category::getId).toList();
|
||||
@@ -55,6 +71,9 @@ public class CategoryController {
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "Get category", description = "Get category by id")
|
||||
@ApiResponse(responseCode = "200", description = "Category detail",
|
||||
content = @Content(schema = @Schema(implementation = CategoryDto.class)))
|
||||
public CategoryDto get(@PathVariable Long id) {
|
||||
Category c = categoryService.getCategory(id);
|
||||
long count = postService.countPostsByCategory(c.getId());
|
||||
@@ -62,6 +81,9 @@ public class CategoryController {
|
||||
}
|
||||
|
||||
@GetMapping("/{id}/posts")
|
||||
@Operation(summary = "List posts by category", description = "Get posts under a category")
|
||||
@ApiResponse(responseCode = "200", description = "List of posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> listPostsByCategory(@PathVariable Long id,
|
||||
@RequestParam(value = "page", required = false) Integer page,
|
||||
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
||||
|
||||
@@ -8,6 +8,12 @@ import com.openisle.service.MessageService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -26,16 +32,28 @@ public class ChannelController {
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List channels", description = "List channels for the current user")
|
||||
@ApiResponse(responseCode = "200", description = "Channels",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = ChannelDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<ChannelDto> listChannels(Authentication auth) {
|
||||
return channelService.listChannels(getCurrentUserId(auth));
|
||||
}
|
||||
|
||||
@PostMapping("/{channelId}/join")
|
||||
@Operation(summary = "Join channel", description = "Join a channel")
|
||||
@ApiResponse(responseCode = "200", description = "Joined channel",
|
||||
content = @Content(schema = @Schema(implementation = ChannelDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ChannelDto joinChannel(@PathVariable Long channelId, Authentication auth) {
|
||||
return channelService.joinChannel(channelId, getCurrentUserId(auth));
|
||||
}
|
||||
|
||||
@GetMapping("/unread-count")
|
||||
@Operation(summary = "Unread count", description = "Get unread channel count")
|
||||
@ApiResponse(responseCode = "200", description = "Unread count",
|
||||
content = @Content(schema = @Schema(implementation = Long.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public long unreadCount(Authentication auth) {
|
||||
return messageService.getUnreadChannelCount(getCurrentUserId(auth));
|
||||
}
|
||||
|
||||
@@ -14,6 +14,12 @@ import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -36,6 +42,10 @@ public class CommentController {
|
||||
private boolean commentCaptchaEnabled;
|
||||
|
||||
@PostMapping("/posts/{postId}/comments")
|
||||
@Operation(summary = "Create comment", description = "Add a comment to a post")
|
||||
@ApiResponse(responseCode = "200", description = "Created comment",
|
||||
content = @Content(schema = @Schema(implementation = CommentDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<CommentDto> createComment(@PathVariable Long postId,
|
||||
@RequestBody CommentRequest req,
|
||||
Authentication auth) {
|
||||
@@ -53,6 +63,10 @@ public class CommentController {
|
||||
}
|
||||
|
||||
@PostMapping("/comments/{commentId}/replies")
|
||||
@Operation(summary = "Reply to comment", description = "Reply to an existing comment")
|
||||
@ApiResponse(responseCode = "200", description = "Reply created",
|
||||
content = @Content(schema = @Schema(implementation = CommentDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<CommentDto> replyComment(@PathVariable Long commentId,
|
||||
@RequestBody CommentRequest req,
|
||||
Authentication auth) {
|
||||
@@ -69,6 +83,9 @@ public class CommentController {
|
||||
}
|
||||
|
||||
@GetMapping("/posts/{postId}/comments")
|
||||
@Operation(summary = "List comments", description = "List comments for a post")
|
||||
@ApiResponse(responseCode = "200", description = "Comments",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = CommentDto.class))))
|
||||
public List<CommentDto> listComments(@PathVariable Long postId,
|
||||
@RequestParam(value = "sort", required = false, defaultValue = "OLDEST") com.openisle.model.CommentSort sort) {
|
||||
log.debug("listComments called for post {} with sort {}", postId, sort);
|
||||
@@ -80,6 +97,9 @@ public class CommentController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/comments/{id}")
|
||||
@Operation(summary = "Delete comment", description = "Delete a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Deleted")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void deleteComment(@PathVariable Long id, Authentication auth) {
|
||||
log.debug("deleteComment called by user {} for comment {}", auth.getName(), id);
|
||||
commentService.deleteComment(auth.getName(), id);
|
||||
@@ -87,12 +107,20 @@ public class CommentController {
|
||||
}
|
||||
|
||||
@PostMapping("/comments/{id}/pin")
|
||||
@Operation(summary = "Pin comment", description = "Pin a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Pinned comment",
|
||||
content = @Content(schema = @Schema(implementation = CommentDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public CommentDto pinComment(@PathVariable Long id, Authentication auth) {
|
||||
log.debug("pinComment called by user {} for comment {}", auth.getName(), id);
|
||||
return commentMapper.toDto(commentService.pinComment(auth.getName(), id));
|
||||
}
|
||||
|
||||
@PostMapping("/comments/{id}/unpin")
|
||||
@Operation(summary = "Unpin comment", description = "Unpin a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Unpinned comment",
|
||||
content = @Content(schema = @Schema(implementation = CommentDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public CommentDto unpinComment(@PathVariable Long id, Authentication auth) {
|
||||
log.debug("unpinComment called by user {} for comment {}", auth.getName(), id);
|
||||
return commentMapper.toDto(commentService.unpinComment(auth.getName(), id));
|
||||
|
||||
@@ -6,6 +6,10 @@ import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api")
|
||||
@@ -33,6 +37,9 @@ public class ConfigController {
|
||||
private final RegisterModeService registerModeService;
|
||||
|
||||
@GetMapping("/config")
|
||||
@Operation(summary = "Site config", description = "Get site configuration")
|
||||
@ApiResponse(responseCode = "200", description = "Site configuration",
|
||||
content = @Content(schema = @Schema(implementation = SiteConfigDto.class)))
|
||||
public SiteConfigDto getConfig() {
|
||||
SiteConfigDto resp = new SiteConfigDto();
|
||||
resp.setCaptchaEnabled(captchaEnabled);
|
||||
|
||||
@@ -9,6 +9,11 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/drafts")
|
||||
@@ -18,12 +23,20 @@ public class DraftController {
|
||||
private final DraftMapper draftMapper;
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Save draft", description = "Save a draft for current user")
|
||||
@ApiResponse(responseCode = "200", description = "Draft saved",
|
||||
content = @Content(schema = @Schema(implementation = DraftDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<DraftDto> saveDraft(@RequestBody DraftRequest req, Authentication auth) {
|
||||
Draft draft = draftService.saveDraft(auth.getName(), req.getCategoryId(), req.getTitle(), req.getContent(), req.getTagIds());
|
||||
return ResponseEntity.ok(draftMapper.toDto(draft));
|
||||
}
|
||||
|
||||
@GetMapping("/me")
|
||||
@Operation(summary = "Get my draft", description = "Get current user's draft")
|
||||
@ApiResponse(responseCode = "200", description = "Draft details",
|
||||
content = @Content(schema = @Schema(implementation = DraftDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<DraftDto> getMyDraft(Authentication auth) {
|
||||
return draftService.getDraft(auth.getName())
|
||||
.map(d -> ResponseEntity.ok(draftMapper.toDto(d)))
|
||||
@@ -31,6 +44,9 @@ public class DraftController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/me")
|
||||
@Operation(summary = "Delete my draft", description = "Delete current user's draft")
|
||||
@ApiResponse(responseCode = "200", description = "Draft deleted")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<?> deleteMyDraft(Authentication auth) {
|
||||
draftService.deleteDraft(auth.getName());
|
||||
return ResponseEntity.ok().build();
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
package com.openisle.controller;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import java.util.Map;
|
||||
@@ -7,6 +12,10 @@ import java.util.Map;
|
||||
@RestController
|
||||
public class HelloController {
|
||||
@GetMapping("/api/hello")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Hello endpoint", description = "Returns a greeting for authenticated users")
|
||||
@ApiResponse(responseCode = "200", description = "Greeting payload",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public Map<String, String> hello() {
|
||||
return Map.of("message", "Hello, Authenticated User");
|
||||
}
|
||||
|
||||
@@ -6,6 +6,11 @@ import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@@ -16,6 +21,10 @@ public class InviteController {
|
||||
private final InviteService inviteService;
|
||||
|
||||
@PostMapping("/generate")
|
||||
@Operation(summary = "Generate invite", description = "Generate an invite token")
|
||||
@ApiResponse(responseCode = "200", description = "Invite token",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public Map<String, String> generate(Authentication auth) {
|
||||
String token = inviteService.generate(auth.getName());
|
||||
return Map.of("token", token);
|
||||
|
||||
@@ -7,6 +7,12 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -17,11 +23,17 @@ public class MedalController {
|
||||
private final MedalService medalService;
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List medals", description = "List medals for user or globally")
|
||||
@ApiResponse(responseCode = "200", description = "List of medals",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = MedalDto.class))))
|
||||
public List<MedalDto> getMedals(@RequestParam(value = "userId", required = false) Long userId) {
|
||||
return medalService.getMedals(userId);
|
||||
}
|
||||
|
||||
@PostMapping("/select")
|
||||
@Operation(summary = "Select medal", description = "Select a medal for current user")
|
||||
@ApiResponse(responseCode = "200", description = "Medal selected")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<Void> selectMedal(@RequestBody MedalSelectRequest req, Authentication auth) {
|
||||
try {
|
||||
medalService.selectMedal(auth.getName(), req.getType());
|
||||
|
||||
@@ -18,6 +18,12 @@ import org.springframework.data.domain.Sort;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -37,12 +43,20 @@ public class MessageController {
|
||||
}
|
||||
|
||||
@GetMapping("/conversations")
|
||||
@Operation(summary = "List conversations", description = "Get all conversations of current user")
|
||||
@ApiResponse(responseCode = "200", description = "List of conversations",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = ConversationDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<List<ConversationDto>> getConversations(Authentication auth) {
|
||||
List<ConversationDto> conversations = messageService.getConversations(getCurrentUserId(auth));
|
||||
return ResponseEntity.ok(conversations);
|
||||
}
|
||||
|
||||
@GetMapping("/conversations/{conversationId}")
|
||||
@Operation(summary = "Get conversation", description = "Get messages of a conversation")
|
||||
@ApiResponse(responseCode = "200", description = "Conversation detail",
|
||||
content = @Content(schema = @Schema(implementation = ConversationDetailDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<ConversationDetailDto> getMessages(@PathVariable Long conversationId,
|
||||
@RequestParam(defaultValue = "0") int page,
|
||||
@RequestParam(defaultValue = "20") int size,
|
||||
@@ -53,12 +67,20 @@ public class MessageController {
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Send message", description = "Send a direct message to a user")
|
||||
@ApiResponse(responseCode = "200", description = "Message sent",
|
||||
content = @Content(schema = @Schema(implementation = MessageDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<MessageDto> sendMessage(@RequestBody MessageRequest req, Authentication auth) {
|
||||
Message message = messageService.sendMessage(getCurrentUserId(auth), req.getRecipientId(), req.getContent(), req.getReplyToId());
|
||||
return ResponseEntity.ok(messageService.toDto(message));
|
||||
}
|
||||
|
||||
@PostMapping("/conversations/{conversationId}/messages")
|
||||
@Operation(summary = "Send message to conversation", description = "Reply within a conversation")
|
||||
@ApiResponse(responseCode = "200", description = "Message sent",
|
||||
content = @Content(schema = @Schema(implementation = MessageDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<MessageDto> sendMessageToConversation(@PathVariable Long conversationId,
|
||||
@RequestBody ChannelMessageRequest req,
|
||||
Authentication auth) {
|
||||
@@ -67,18 +89,29 @@ public class MessageController {
|
||||
}
|
||||
|
||||
@PostMapping("/conversations/{conversationId}/read")
|
||||
@Operation(summary = "Mark conversation read", description = "Mark messages in conversation as read")
|
||||
@ApiResponse(responseCode = "200", description = "Marked as read")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<Void> markAsRead(@PathVariable Long conversationId, Authentication auth) {
|
||||
messageService.markConversationAsRead(conversationId, getCurrentUserId(auth));
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
@PostMapping("/conversations")
|
||||
@Operation(summary = "Find or create conversation", description = "Find existing or create new conversation with recipient")
|
||||
@ApiResponse(responseCode = "200", description = "Conversation id",
|
||||
content = @Content(schema = @Schema(implementation = CreateConversationResponse.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<CreateConversationResponse> findOrCreateConversation(@RequestBody CreateConversationRequest req, Authentication auth) {
|
||||
MessageConversation conversation = messageService.findOrCreateConversation(getCurrentUserId(auth), req.getRecipientId());
|
||||
return ResponseEntity.ok(new CreateConversationResponse(conversation.getId()));
|
||||
}
|
||||
|
||||
@GetMapping("/unread-count")
|
||||
@Operation(summary = "Unread message count", description = "Get unread message count for current user")
|
||||
@ApiResponse(responseCode = "200", description = "Unread count",
|
||||
content = @Content(schema = @Schema(implementation = Long.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<Long> getUnreadCount(Authentication auth) {
|
||||
return ResponseEntity.ok(messageService.getUnreadMessageCount(getCurrentUserId(auth)));
|
||||
}
|
||||
|
||||
@@ -10,6 +10,12 @@ import com.openisle.service.NotificationService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -23,6 +29,10 @@ public class NotificationController {
|
||||
private final NotificationMapper notificationMapper;
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List notifications", description = "Retrieve notifications for the current user")
|
||||
@ApiResponse(responseCode = "200", description = "Notifications",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = NotificationDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
|
||||
@RequestParam(value = "size", defaultValue = "30") int size,
|
||||
Authentication auth) {
|
||||
@@ -32,6 +42,10 @@ public class NotificationController {
|
||||
}
|
||||
|
||||
@GetMapping("/unread")
|
||||
@Operation(summary = "List unread notifications", description = "Retrieve unread notifications for the current user")
|
||||
@ApiResponse(responseCode = "200", description = "Unread notifications",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = NotificationDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
|
||||
@RequestParam(value = "size", defaultValue = "30") int size,
|
||||
Authentication auth) {
|
||||
@@ -41,6 +55,10 @@ public class NotificationController {
|
||||
}
|
||||
|
||||
@GetMapping("/unread-count")
|
||||
@Operation(summary = "Unread count", description = "Get count of unread notifications")
|
||||
@ApiResponse(responseCode = "200", description = "Unread count",
|
||||
content = @Content(schema = @Schema(implementation = NotificationUnreadCountDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public NotificationUnreadCountDto unreadCount(Authentication auth) {
|
||||
long count = notificationService.countUnread(auth.getName());
|
||||
NotificationUnreadCountDto uc = new NotificationUnreadCountDto();
|
||||
@@ -49,26 +67,43 @@ public class NotificationController {
|
||||
}
|
||||
|
||||
@PostMapping("/read")
|
||||
@Operation(summary = "Mark notifications read", description = "Mark notifications as read")
|
||||
@ApiResponse(responseCode = "200", description = "Marked read")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void markRead(@RequestBody NotificationMarkReadRequest req, Authentication auth) {
|
||||
notificationService.markRead(auth.getName(), req.getIds());
|
||||
}
|
||||
|
||||
@GetMapping("/prefs")
|
||||
@Operation(summary = "List preferences", description = "List notification preferences")
|
||||
@ApiResponse(responseCode = "200", description = "Preferences",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = NotificationPreferenceDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<NotificationPreferenceDto> prefs(Authentication auth) {
|
||||
return notificationService.listPreferences(auth.getName());
|
||||
}
|
||||
|
||||
@PostMapping("/prefs")
|
||||
@Operation(summary = "Update preference", description = "Update notification preference")
|
||||
@ApiResponse(responseCode = "200", description = "Preference updated")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void updatePref(@RequestBody NotificationPreferenceUpdateRequest req, Authentication auth) {
|
||||
notificationService.updatePreference(auth.getName(), req.getType(), req.isEnabled());
|
||||
}
|
||||
|
||||
@GetMapping("/email-prefs")
|
||||
@Operation(summary = "List email preferences", description = "List email notification preferences")
|
||||
@ApiResponse(responseCode = "200", description = "Email preferences",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = NotificationPreferenceDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<NotificationPreferenceDto> emailPrefs(Authentication auth) {
|
||||
return notificationService.listEmailPreferences(auth.getName());
|
||||
}
|
||||
|
||||
@PostMapping("/email-prefs")
|
||||
@Operation(summary = "Update email preference", description = "Update email notification preference")
|
||||
@ApiResponse(responseCode = "200", description = "Email preference updated")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void updateEmailPref(@RequestBody NotificationPreferenceUpdateRequest req, Authentication auth) {
|
||||
notificationService.updateEmailPreference(auth.getName(), req.getType(), req.isEnabled());
|
||||
}
|
||||
|
||||
@@ -5,6 +5,10 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
@@ -22,11 +26,16 @@ public class OnlineController {
|
||||
private static final String ONLINE_KEY = CachingConfig.ONLINE_CACHE_NAME +":";
|
||||
|
||||
@PostMapping("/heartbeat")
|
||||
@Operation(summary = "Heartbeat", description = "Record user heartbeat")
|
||||
@ApiResponse(responseCode = "200", description = "Heartbeat recorded")
|
||||
public void ping(@RequestParam String userId){
|
||||
redisTemplate.opsForValue().set(ONLINE_KEY+userId,"1", Duration.ofSeconds(150));
|
||||
}
|
||||
|
||||
@GetMapping("/count")
|
||||
@Operation(summary = "Online count", description = "Get current online user count")
|
||||
@ApiResponse(responseCode = "200", description = "Online count",
|
||||
content = @Content(schema = @Schema(implementation = Long.class)))
|
||||
public long count(){
|
||||
return redisTemplate.keys(ONLINE_KEY+"*").size();
|
||||
}
|
||||
|
||||
@@ -9,6 +9,12 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -22,6 +28,10 @@ public class PointHistoryController {
|
||||
private final PointHistoryMapper pointHistoryMapper;
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "Point history", description = "List point history for current user")
|
||||
@ApiResponse(responseCode = "200", description = "List of point histories",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PointHistoryDto.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<PointHistoryDto> list(Authentication auth) {
|
||||
return pointService.listHistory(auth.getName()).stream()
|
||||
.map(pointHistoryMapper::toDto)
|
||||
@@ -29,6 +39,10 @@ public class PointHistoryController {
|
||||
}
|
||||
|
||||
@GetMapping("/trend")
|
||||
@Operation(summary = "Point trend", description = "Get point trend data for current user")
|
||||
@ApiResponse(responseCode = "200", description = "Trend data",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = java.util.Map.class))))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public List<Map<String, Object>> trend(Authentication auth,
|
||||
@RequestParam(value = "days", defaultValue = "30") int days) {
|
||||
return pointService.trend(auth.getName(), days);
|
||||
|
||||
@@ -9,6 +9,12 @@ import com.openisle.service.UserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -24,6 +30,9 @@ public class PointMallController {
|
||||
private final PointGoodMapper pointGoodMapper;
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List goods", description = "List all point goods")
|
||||
@ApiResponse(responseCode = "200", description = "List of goods",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PointGoodDto.class))))
|
||||
public List<PointGoodDto> list() {
|
||||
return pointMallService.listGoods().stream()
|
||||
.map(pointGoodMapper::toDto)
|
||||
@@ -31,6 +40,10 @@ public class PointMallController {
|
||||
}
|
||||
|
||||
@PostMapping("/redeem")
|
||||
@Operation(summary = "Redeem good", description = "Redeem a point good")
|
||||
@ApiResponse(responseCode = "200", description = "Remaining points",
|
||||
content = @Content(schema = @Schema(implementation = java.util.Map.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public Map<String, Integer> redeem(@RequestBody PointRedeemRequest req, Authentication auth) {
|
||||
User user = userService.findByIdentifier(auth.getName()).orElseThrow();
|
||||
int point = pointMallService.redeem(user, req.getGoodId(), req.getContact());
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.openisle.controller;
|
||||
|
||||
import com.openisle.dto.PostChangeLogDto;
|
||||
import com.openisle.mapper.PostChangeLogMapper;
|
||||
import com.openisle.service.PostChangeLogService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/posts")
|
||||
@RequiredArgsConstructor
|
||||
public class PostChangeLogController {
|
||||
private final PostChangeLogService changeLogService;
|
||||
private final PostChangeLogMapper mapper;
|
||||
|
||||
@GetMapping("/{id}/change-logs")
|
||||
@Operation(summary = "Post change logs", description = "List change logs for a post")
|
||||
@ApiResponse(responseCode = "200", description = "Change logs",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostChangeLogDto.class))))
|
||||
public List<PostChangeLogDto> listLogs(@PathVariable Long id) {
|
||||
return changeLogService.listLogs(id).stream()
|
||||
.map(mapper::toDto)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,12 @@ import com.openisle.dto.PollDto;
|
||||
import com.openisle.mapper.PostMapper;
|
||||
import com.openisle.model.Post;
|
||||
import com.openisle.service.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -35,6 +41,10 @@ public class PostController {
|
||||
private boolean postCaptchaEnabled;
|
||||
|
||||
@PostMapping
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Create post", description = "Create a new post")
|
||||
@ApiResponse(responseCode = "200", description = "Created post",
|
||||
content = @Content(schema = @Schema(implementation = PostDetailDto.class)))
|
||||
public ResponseEntity<PostDetailDto> createPost(@RequestBody PostRequest req, Authentication auth) {
|
||||
if (captchaEnabled && postCaptchaEnabled && !captchaService.verify(req.getCaptcha())) {
|
||||
return ResponseEntity.badRequest().build();
|
||||
@@ -53,6 +63,10 @@ public class PostController {
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Update post", description = "Update an existing post")
|
||||
@ApiResponse(responseCode = "200", description = "Updated post",
|
||||
content = @Content(schema = @Schema(implementation = PostDetailDto.class)))
|
||||
public ResponseEntity<PostDetailDto> updatePost(@PathVariable Long id, @RequestBody PostRequest req,
|
||||
Authentication auth) {
|
||||
Post post = postService.updatePost(id, auth.getName(), req.getCategoryId(),
|
||||
@@ -61,21 +75,35 @@ public class PostController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Delete post", description = "Delete a post")
|
||||
@ApiResponse(responseCode = "200", description = "Post deleted")
|
||||
public void deletePost(@PathVariable Long id, Authentication auth) {
|
||||
postService.deletePost(id, auth.getName());
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/close")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Close post", description = "Close a post to prevent further replies")
|
||||
@ApiResponse(responseCode = "200", description = "Closed post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto close(@PathVariable Long id, Authentication auth) {
|
||||
return postMapper.toSummaryDto(postService.closePost(id, auth.getName()));
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/reopen")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Reopen post", description = "Reopen a closed post")
|
||||
@ApiResponse(responseCode = "200", description = "Reopened post",
|
||||
content = @Content(schema = @Schema(implementation = PostSummaryDto.class)))
|
||||
public PostSummaryDto reopen(@PathVariable Long id, Authentication auth) {
|
||||
return postMapper.toSummaryDto(postService.reopenPost(id, auth.getName()));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "Get post", description = "Get post details by id")
|
||||
@ApiResponse(responseCode = "200", description = "Post detail",
|
||||
content = @Content(schema = @Schema(implementation = PostDetailDto.class)))
|
||||
public ResponseEntity<PostDetailDto> getPost(@PathVariable Long id, Authentication auth) {
|
||||
String viewer = auth != null ? auth.getName() : null;
|
||||
Post post = postService.viewPost(id, viewer);
|
||||
@@ -83,23 +111,35 @@ public class PostController {
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/lottery/join")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Join lottery", description = "Join a lottery for the post")
|
||||
@ApiResponse(responseCode = "200", description = "Joined lottery")
|
||||
public ResponseEntity<Void> joinLottery(@PathVariable Long id, Authentication auth) {
|
||||
postService.joinLottery(id, auth.getName());
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
@GetMapping("/{id}/poll/progress")
|
||||
@Operation(summary = "Poll progress", description = "Get poll progress for a post")
|
||||
@ApiResponse(responseCode = "200", description = "Poll progress",
|
||||
content = @Content(schema = @Schema(implementation = PollDto.class)))
|
||||
public ResponseEntity<PollDto> pollProgress(@PathVariable Long id) {
|
||||
return ResponseEntity.ok(postMapper.toSummaryDto(postService.getPoll(id)).getPoll());
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/poll/vote")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Vote poll", description = "Vote on a poll option")
|
||||
@ApiResponse(responseCode = "200", description = "Vote recorded")
|
||||
public ResponseEntity<Void> vote(@PathVariable Long id, @RequestParam("option") List<Integer> option, Authentication auth) {
|
||||
postService.votePoll(id, auth.getName(), option);
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List posts", description = "List posts by various filters")
|
||||
@ApiResponse(responseCode = "200", description = "List of posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> listPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
|
||||
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
|
||||
@RequestParam(value = "tagId", required = false) Long tagId,
|
||||
@@ -115,10 +155,10 @@ public class PostController {
|
||||
if (tagId != null) {
|
||||
tids = java.util.List.of(tagId);
|
||||
}
|
||||
|
||||
if (auth != null) {
|
||||
userVisitService.recordVisit(auth.getName());
|
||||
}
|
||||
// 只需要在请求的一开始统计一次
|
||||
// if (auth != null) {
|
||||
// userVisitService.recordVisit(auth.getName());
|
||||
// }
|
||||
|
||||
boolean hasCategories = ids != null && !ids.isEmpty();
|
||||
boolean hasTags = tids != null && !tids.isEmpty();
|
||||
@@ -137,6 +177,9 @@ public class PostController {
|
||||
}
|
||||
|
||||
@GetMapping("/ranking")
|
||||
@Operation(summary = "Ranking posts", description = "List posts by view rankings")
|
||||
@ApiResponse(responseCode = "200", description = "Ranked posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> rankingPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
|
||||
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
|
||||
@RequestParam(value = "tagId", required = false) Long tagId,
|
||||
@@ -152,16 +195,19 @@ public class PostController {
|
||||
if (tagId != null) {
|
||||
tids = java.util.List.of(tagId);
|
||||
}
|
||||
|
||||
if (auth != null) {
|
||||
userVisitService.recordVisit(auth.getName());
|
||||
}
|
||||
// 只需要在请求的一开始统计一次
|
||||
// if (auth != null) {
|
||||
// userVisitService.recordVisit(auth.getName());
|
||||
// }
|
||||
|
||||
return postService.listPostsByViews(ids, tids, page, pageSize)
|
||||
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@GetMapping("/latest-reply")
|
||||
@Operation(summary = "Latest reply posts", description = "List posts by latest replies")
|
||||
@ApiResponse(responseCode = "200", description = "Posts sorted by latest reply",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> latestReplyPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
|
||||
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
|
||||
@RequestParam(value = "tagId", required = false) Long tagId,
|
||||
@@ -177,16 +223,19 @@ public class PostController {
|
||||
if (tagId != null) {
|
||||
tids = java.util.List.of(tagId);
|
||||
}
|
||||
|
||||
if (auth != null) {
|
||||
userVisitService.recordVisit(auth.getName());
|
||||
}
|
||||
// 只需要在请求的一开始统计一次
|
||||
// if (auth != null) {
|
||||
// userVisitService.recordVisit(auth.getName());
|
||||
// }
|
||||
|
||||
return postService.listPostsByLatestReply(ids, tids, page, pageSize)
|
||||
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@GetMapping("/featured")
|
||||
@Operation(summary = "Featured posts", description = "List featured posts")
|
||||
@ApiResponse(responseCode = "200", description = "Featured posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> featuredPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
|
||||
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
|
||||
@RequestParam(value = "tagId", required = false) Long tagId,
|
||||
@@ -202,9 +251,10 @@ public class PostController {
|
||||
if (tagId != null) {
|
||||
tids = java.util.List.of(tagId);
|
||||
}
|
||||
if (auth != null) {
|
||||
userVisitService.recordVisit(auth.getName());
|
||||
}
|
||||
// 只需要在请求的一开始统计一次
|
||||
// if (auth != null) {
|
||||
// userVisitService.recordVisit(auth.getName());
|
||||
// }
|
||||
return postService.listFeaturedPosts(ids, tids, page, pageSize)
|
||||
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@@ -7,6 +7,11 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api/push")
|
||||
@@ -17,6 +22,9 @@ public class PushSubscriptionController {
|
||||
private String publicKey;
|
||||
|
||||
@GetMapping("/public-key")
|
||||
@Operation(summary = "Get public key", description = "Retrieve web push public key")
|
||||
@ApiResponse(responseCode = "200", description = "Public key",
|
||||
content = @Content(schema = @Schema(implementation = PushPublicKeyDto.class)))
|
||||
public PushPublicKeyDto getPublicKey() {
|
||||
PushPublicKeyDto r = new PushPublicKeyDto();
|
||||
r.setKey(publicKey);
|
||||
@@ -24,6 +32,9 @@ public class PushSubscriptionController {
|
||||
}
|
||||
|
||||
@PostMapping("/subscribe")
|
||||
@Operation(summary = "Subscribe", description = "Subscribe to push notifications")
|
||||
@ApiResponse(responseCode = "200", description = "Subscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void subscribe(@RequestBody PushSubscriptionRequest req, Authentication auth) {
|
||||
pushSubscriptionService.saveSubscription(auth.getName(), req.getEndpoint(), req.getP256dh(), req.getAuth());
|
||||
}
|
||||
|
||||
@@ -12,6 +12,11 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/api")
|
||||
@@ -26,11 +31,18 @@ public class ReactionController {
|
||||
* Get all available reaction types.
|
||||
*/
|
||||
@GetMapping("/reaction-types")
|
||||
@Operation(summary = "List reaction types", description = "Get all available reaction types")
|
||||
@ApiResponse(responseCode = "200", description = "Reaction types",
|
||||
content = @Content(schema = @Schema(implementation = ReactionType[].class)))
|
||||
public ReactionType[] listReactionTypes() {
|
||||
return ReactionType.values();
|
||||
}
|
||||
|
||||
@PostMapping("/posts/{postId}/reactions")
|
||||
@Operation(summary = "React to post", description = "React to a post")
|
||||
@ApiResponse(responseCode = "200", description = "Reaction result",
|
||||
content = @Content(schema = @Schema(implementation = ReactionDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<ReactionDto> reactToPost(@PathVariable Long postId,
|
||||
@RequestBody ReactionRequest req,
|
||||
Authentication auth) {
|
||||
@@ -46,6 +58,10 @@ public class ReactionController {
|
||||
}
|
||||
|
||||
@PostMapping("/comments/{commentId}/reactions")
|
||||
@Operation(summary = "React to comment", description = "React to a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Reaction result",
|
||||
content = @Content(schema = @Schema(implementation = ReactionDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<ReactionDto> reactToComment(@PathVariable Long commentId,
|
||||
@RequestBody ReactionRequest req,
|
||||
Authentication auth) {
|
||||
@@ -61,6 +77,10 @@ public class ReactionController {
|
||||
}
|
||||
|
||||
@PostMapping("/messages/{messageId}/reactions")
|
||||
@Operation(summary = "React to message", description = "React to a message")
|
||||
@ApiResponse(responseCode = "200", description = "Reaction result",
|
||||
content = @Content(schema = @Schema(implementation = ReactionDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public ResponseEntity<ReactionDto> reactToMessage(@PathVariable Long messageId,
|
||||
@RequestBody ReactionRequest req,
|
||||
Authentication auth) {
|
||||
|
||||
@@ -13,6 +13,10 @@ import org.jsoup.safety.Safelist;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
|
||||
import com.vladsch.flexmark.ext.tables.TablesExtension;
|
||||
@@ -63,6 +67,8 @@ public class RssController {
|
||||
}
|
||||
|
||||
@GetMapping(value = "/api/rss", produces = "application/rss+xml;charset=UTF-8")
|
||||
@Operation(summary = "RSS feed", description = "Generate RSS feed for latest posts")
|
||||
@ApiResponse(responseCode = "200", description = "RSS XML", content = @Content(schema = @Schema(implementation = String.class)))
|
||||
public String feed() {
|
||||
// 建议 20;你现在是 10,这里保留你的 10
|
||||
List<Post> posts = postService.listLatestRssPosts(10);
|
||||
|
||||
@@ -11,6 +11,11 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -24,6 +29,9 @@ public class SearchController {
|
||||
private final PostMapper postMapper;
|
||||
|
||||
@GetMapping("/users")
|
||||
@Operation(summary = "Search users", description = "Search users by keyword")
|
||||
@ApiResponse(responseCode = "200", description = "List of users",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = UserDto.class))))
|
||||
public List<UserDto> searchUsers(@RequestParam String keyword) {
|
||||
return searchService.searchUsers(keyword).stream()
|
||||
.map(userMapper::toDto)
|
||||
@@ -31,6 +39,9 @@ public class SearchController {
|
||||
}
|
||||
|
||||
@GetMapping("/posts")
|
||||
@Operation(summary = "Search posts", description = "Search posts by keyword")
|
||||
@ApiResponse(responseCode = "200", description = "List of posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> searchPosts(@RequestParam String keyword) {
|
||||
return searchService.searchPosts(keyword).stream()
|
||||
.map(postMapper::toSummaryDto)
|
||||
@@ -38,6 +49,9 @@ public class SearchController {
|
||||
}
|
||||
|
||||
@GetMapping("/posts/content")
|
||||
@Operation(summary = "Search posts by content", description = "Search posts by content keyword")
|
||||
@ApiResponse(responseCode = "200", description = "List of posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> searchPostsByContent(@RequestParam String keyword) {
|
||||
return searchService.searchPostsByContent(keyword).stream()
|
||||
.map(postMapper::toSummaryDto)
|
||||
@@ -45,6 +59,9 @@ public class SearchController {
|
||||
}
|
||||
|
||||
@GetMapping("/posts/title")
|
||||
@Operation(summary = "Search posts by title", description = "Search posts by title keyword")
|
||||
@ApiResponse(responseCode = "200", description = "List of posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> searchPostsByTitle(@RequestParam String keyword) {
|
||||
return searchService.searchPostsByTitle(keyword).stream()
|
||||
.map(postMapper::toSummaryDto)
|
||||
@@ -52,6 +69,9 @@ public class SearchController {
|
||||
}
|
||||
|
||||
@GetMapping("/global")
|
||||
@Operation(summary = "Global search", description = "Search users and posts globally")
|
||||
@ApiResponse(responseCode = "200", description = "Search results",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = SearchResultDto.class))))
|
||||
public List<SearchResultDto> global(@RequestParam String keyword) {
|
||||
return searchService.globalSearch(keyword).stream()
|
||||
.map(r -> {
|
||||
|
||||
@@ -10,6 +10,10 @@ import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -26,6 +30,9 @@ public class SitemapController {
|
||||
private String websiteUrl;
|
||||
|
||||
@GetMapping(value = "/sitemap.xml", produces = MediaType.APPLICATION_XML_VALUE)
|
||||
@Operation(summary = "Sitemap", description = "Generate sitemap xml")
|
||||
@ApiResponse(responseCode = "200", description = "Sitemap xml",
|
||||
content = @Content(schema = @Schema(implementation = String.class)))
|
||||
public ResponseEntity<String> sitemap() {
|
||||
List<Post> posts = postRepository.findByStatus(PostStatus.PUBLISHED);
|
||||
|
||||
|
||||
@@ -8,6 +8,11 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
@@ -21,6 +26,9 @@ public class StatController {
|
||||
private final StatService statService;
|
||||
|
||||
@GetMapping("/dau")
|
||||
@Operation(summary = "Daily active users", description = "Get daily active user count")
|
||||
@ApiResponse(responseCode = "200", description = "DAU count",
|
||||
content = @Content(schema = @Schema(implementation = java.util.Map.class)))
|
||||
public Map<String, Long> dau(@RequestParam(value = "date", required = false)
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
|
||||
long count = userVisitService.countDau(date);
|
||||
@@ -28,6 +36,9 @@ public class StatController {
|
||||
}
|
||||
|
||||
@GetMapping("/dau-range")
|
||||
@Operation(summary = "DAU range", description = "Get daily active users over range of days")
|
||||
@ApiResponse(responseCode = "200", description = "DAU data",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = java.util.Map.class))))
|
||||
public List<Map<String, Object>> dauRange(@RequestParam(value = "days", defaultValue = "30") int days) {
|
||||
if (days < 1) days = 1;
|
||||
LocalDate end = LocalDate.now();
|
||||
@@ -42,6 +53,9 @@ public class StatController {
|
||||
}
|
||||
|
||||
@GetMapping("/new-users-range")
|
||||
@Operation(summary = "New users range", description = "Get new users over range of days")
|
||||
@ApiResponse(responseCode = "200", description = "New user data",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = java.util.Map.class))))
|
||||
public List<Map<String, Object>> newUsersRange(@RequestParam(value = "days", defaultValue = "30") int days) {
|
||||
if (days < 1) days = 1;
|
||||
LocalDate end = LocalDate.now();
|
||||
@@ -56,6 +70,9 @@ public class StatController {
|
||||
}
|
||||
|
||||
@GetMapping("/posts-range")
|
||||
@Operation(summary = "Posts range", description = "Get posts count over range of days")
|
||||
@ApiResponse(responseCode = "200", description = "Post data",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = java.util.Map.class))))
|
||||
public List<Map<String, Object>> postsRange(@RequestParam(value = "days", defaultValue = "30") int days) {
|
||||
if (days < 1) days = 1;
|
||||
LocalDate end = LocalDate.now();
|
||||
@@ -70,6 +87,9 @@ public class StatController {
|
||||
}
|
||||
|
||||
@GetMapping("/comments-range")
|
||||
@Operation(summary = "Comments range", description = "Get comments count over range of days")
|
||||
@ApiResponse(responseCode = "200", description = "Comment data",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = java.util.Map.class))))
|
||||
public List<Map<String, Object>> commentsRange(@RequestParam(value = "days", defaultValue = "30") int days) {
|
||||
if (days < 1) days = 1;
|
||||
LocalDate end = LocalDate.now();
|
||||
|
||||
@@ -4,6 +4,9 @@ import com.openisle.service.SubscriptionService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
/** Endpoints for subscribing to posts, comments and users. */
|
||||
@RestController
|
||||
@@ -13,31 +16,49 @@ public class SubscriptionController {
|
||||
private final SubscriptionService subscriptionService;
|
||||
|
||||
@PostMapping("/posts/{postId}")
|
||||
@Operation(summary = "Subscribe post", description = "Subscribe to a post")
|
||||
@ApiResponse(responseCode = "200", description = "Subscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void subscribePost(@PathVariable Long postId, Authentication auth) {
|
||||
subscriptionService.subscribePost(auth.getName(), postId);
|
||||
}
|
||||
|
||||
@DeleteMapping("/posts/{postId}")
|
||||
@Operation(summary = "Unsubscribe post", description = "Unsubscribe from a post")
|
||||
@ApiResponse(responseCode = "200", description = "Unsubscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void unsubscribePost(@PathVariable Long postId, Authentication auth) {
|
||||
subscriptionService.unsubscribePost(auth.getName(), postId);
|
||||
}
|
||||
|
||||
@PostMapping("/comments/{commentId}")
|
||||
@Operation(summary = "Subscribe comment", description = "Subscribe to a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Subscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void subscribeComment(@PathVariable Long commentId, Authentication auth) {
|
||||
subscriptionService.subscribeComment(auth.getName(), commentId);
|
||||
}
|
||||
|
||||
@DeleteMapping("/comments/{commentId}")
|
||||
@Operation(summary = "Unsubscribe comment", description = "Unsubscribe from a comment")
|
||||
@ApiResponse(responseCode = "200", description = "Unsubscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void unsubscribeComment(@PathVariable Long commentId, Authentication auth) {
|
||||
subscriptionService.unsubscribeComment(auth.getName(), commentId);
|
||||
}
|
||||
|
||||
@PostMapping("/users/{username}")
|
||||
@Operation(summary = "Subscribe user", description = "Subscribe to a user")
|
||||
@ApiResponse(responseCode = "200", description = "Subscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void subscribeUser(@PathVariable String username, Authentication auth) {
|
||||
subscriptionService.subscribeUser(auth.getName(), username);
|
||||
}
|
||||
|
||||
@DeleteMapping("/users/{username}")
|
||||
@Operation(summary = "Unsubscribe user", description = "Unsubscribe from a user")
|
||||
@ApiResponse(responseCode = "200", description = "Unsubscribed")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public void unsubscribeUser(@PathVariable String username, Authentication auth) {
|
||||
subscriptionService.unsubscribeUser(auth.getName(), username);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,12 @@ import com.openisle.service.PostService;
|
||||
import com.openisle.service.TagService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -29,6 +35,10 @@ public class TagController {
|
||||
private final TagMapper tagMapper;
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Create tag", description = "Create a new tag")
|
||||
@ApiResponse(responseCode = "200", description = "Created tag",
|
||||
content = @Content(schema = @Schema(implementation = TagDto.class)))
|
||||
@SecurityRequirement(name = "JWT")
|
||||
public TagDto create(@RequestBody TagRequest req, org.springframework.security.core.Authentication auth) {
|
||||
boolean approved = true;
|
||||
if (postService.getPublishMode() == PublishMode.REVIEW && auth != null) {
|
||||
@@ -49,6 +59,9 @@ public class TagController {
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@Operation(summary = "Update tag", description = "Update an existing tag")
|
||||
@ApiResponse(responseCode = "200", description = "Updated tag",
|
||||
content = @Content(schema = @Schema(implementation = TagDto.class)))
|
||||
public TagDto update(@PathVariable Long id, @RequestBody TagRequest req) {
|
||||
Tag tag = tagService.updateTag(id, req.getName(), req.getDescription(), req.getIcon(), req.getSmallIcon());
|
||||
long count = postService.countPostsByTag(tag.getId());
|
||||
@@ -56,11 +69,16 @@ public class TagController {
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@Operation(summary = "Delete tag", description = "Delete a tag by id")
|
||||
@ApiResponse(responseCode = "200", description = "Tag deleted")
|
||||
public void delete(@PathVariable Long id) {
|
||||
tagService.deleteTag(id);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "List tags", description = "List tags with optional keyword")
|
||||
@ApiResponse(responseCode = "200", description = "List of tags",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = TagDto.class))))
|
||||
public List<TagDto> list(@RequestParam(value = "keyword", required = false) String keyword,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
List<Tag> tags = tagService.searchTags(keyword);
|
||||
@@ -77,6 +95,9 @@ public class TagController {
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "Get tag", description = "Get tag by id")
|
||||
@ApiResponse(responseCode = "200", description = "Tag detail",
|
||||
content = @Content(schema = @Schema(implementation = TagDto.class)))
|
||||
public TagDto get(@PathVariable Long id) {
|
||||
Tag tag = tagService.getTag(id);
|
||||
long count = postService.countPostsByTag(tag.getId());
|
||||
@@ -84,6 +105,9 @@ public class TagController {
|
||||
}
|
||||
|
||||
@GetMapping("/{id}/posts")
|
||||
@Operation(summary = "List posts by tag", description = "Get posts with specific tag")
|
||||
@ApiResponse(responseCode = "200", description = "List of posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostSummaryDto.class))))
|
||||
public List<PostSummaryDto> listPostsByTag(@PathVariable Long id,
|
||||
@RequestParam(value = "page", required = false) Integer page,
|
||||
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
||||
|
||||
@@ -6,6 +6,10 @@ import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
@@ -27,6 +31,9 @@ public class UploadController {
|
||||
private long maxUploadSize;
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Upload file", description = "Upload image file")
|
||||
@ApiResponse(responseCode = "200", description = "Upload result",
|
||||
content = @Content(schema = @Schema(implementation = java.util.Map.class)))
|
||||
public ResponseEntity<?> upload(@RequestParam("file") MultipartFile file) {
|
||||
if (checkImageType && (file.getContentType() == null || !file.getContentType().startsWith("image/"))) {
|
||||
return ResponseEntity.badRequest().body(Map.of("code", 1, "msg", "File is not an image"));
|
||||
@@ -48,6 +55,9 @@ public class UploadController {
|
||||
}
|
||||
|
||||
@PostMapping("/url")
|
||||
@Operation(summary = "Upload from URL", description = "Upload image from remote URL")
|
||||
@ApiResponse(responseCode = "200", description = "Upload result",
|
||||
content = @Content(schema = @Schema(implementation = java.util.Map.class)))
|
||||
public ResponseEntity<?> uploadUrl(@RequestBody Map<String, String> body) {
|
||||
String link = body.get("url");
|
||||
if (link == null || link.isBlank()) {
|
||||
@@ -76,6 +86,9 @@ public class UploadController {
|
||||
}
|
||||
|
||||
@GetMapping("/presign")
|
||||
@Operation(summary = "Presign upload", description = "Get presigned upload URL")
|
||||
@ApiResponse(responseCode = "200", description = "Presigned URL",
|
||||
content = @Content(schema = @Schema(implementation = java.util.Map.class)))
|
||||
public java.util.Map<String, String> presign(@RequestParam("filename") String filename) {
|
||||
return imageUploader.presignUpload(filename);
|
||||
}
|
||||
|
||||
@@ -6,6 +6,12 @@ import com.openisle.mapper.TagMapper;
|
||||
import com.openisle.mapper.UserMapper;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.service.*;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.media.ArraySchema;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -48,12 +54,20 @@ public class UserController {
|
||||
private int defaultTagsLimit;
|
||||
|
||||
@GetMapping("/me")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Current user", description = "Get current authenticated user information")
|
||||
@ApiResponse(responseCode = "200", description = "User detail",
|
||||
content = @Content(schema = @Schema(implementation = UserDto.class)))
|
||||
public ResponseEntity<UserDto> me(Authentication auth) {
|
||||
User user = userService.findByUsername(auth.getName()).orElseThrow();
|
||||
return ResponseEntity.ok(userMapper.toDto(user, auth));
|
||||
}
|
||||
|
||||
@PostMapping("/me/avatar")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Upload avatar", description = "Upload avatar for current user")
|
||||
@ApiResponse(responseCode = "200", description = "Upload result",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> uploadAvatar(@RequestParam("file") MultipartFile file,
|
||||
Authentication auth) {
|
||||
if (checkImageType && (file.getContentType() == null || !file.getContentType().startsWith("image/"))) {
|
||||
@@ -73,6 +87,10 @@ public class UserController {
|
||||
}
|
||||
|
||||
@PutMapping("/me")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Update profile", description = "Update current user's profile")
|
||||
@ApiResponse(responseCode = "200", description = "Updated profile",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public ResponseEntity<?> updateProfile(@RequestBody UpdateProfileDto dto,
|
||||
Authentication auth) {
|
||||
User user = userService.updateProfile(auth.getName(), dto.getUsername(), dto.getIntroduction());
|
||||
@@ -82,13 +100,21 @@ public class UserController {
|
||||
));
|
||||
}
|
||||
|
||||
// 这个方法似乎没有使用?
|
||||
@PostMapping("/me/signin")
|
||||
@SecurityRequirement(name = "JWT")
|
||||
@Operation(summary = "Daily sign in", description = "Sign in to receive rewards")
|
||||
@ApiResponse(responseCode = "200", description = "Sign in reward",
|
||||
content = @Content(schema = @Schema(implementation = Map.class)))
|
||||
public Map<String, Integer> signIn(Authentication auth) {
|
||||
int reward = levelService.awardForSignin(auth.getName());
|
||||
return Map.of("reward", reward);
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}")
|
||||
@Operation(summary = "Get user", description = "Get user by identifier")
|
||||
@ApiResponse(responseCode = "200", description = "User detail",
|
||||
content = @Content(schema = @Schema(implementation = UserDto.class)))
|
||||
public ResponseEntity<UserDto> getUser(@PathVariable("identifier") String identifier,
|
||||
Authentication auth) {
|
||||
User user = userService.findByIdentifier(identifier).orElseThrow(() -> new NotFoundException("User not found"));
|
||||
@@ -96,6 +122,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/posts")
|
||||
@Operation(summary = "User posts", description = "Get recent posts by user")
|
||||
@ApiResponse(responseCode = "200", description = "User posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostMetaDto.class))))
|
||||
public java.util.List<PostMetaDto> userPosts(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : defaultPostsLimit;
|
||||
@@ -106,6 +135,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/subscribed-posts")
|
||||
@Operation(summary = "Subscribed posts", description = "Get posts the user subscribed to")
|
||||
@ApiResponse(responseCode = "200", description = "Subscribed posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostMetaDto.class))))
|
||||
public java.util.List<PostMetaDto> subscribedPosts(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : defaultPostsLimit;
|
||||
@@ -117,6 +149,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/replies")
|
||||
@Operation(summary = "User replies", description = "Get recent replies by user")
|
||||
@ApiResponse(responseCode = "200", description = "User replies",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = CommentInfoDto.class))))
|
||||
public java.util.List<CommentInfoDto> userReplies(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : defaultRepliesLimit;
|
||||
@@ -127,6 +162,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/hot-posts")
|
||||
@Operation(summary = "User hot posts", description = "Get most reacted posts by user")
|
||||
@ApiResponse(responseCode = "200", description = "Hot posts",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = PostMetaDto.class))))
|
||||
public java.util.List<PostMetaDto> hotPosts(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : 10;
|
||||
@@ -138,6 +176,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/hot-replies")
|
||||
@Operation(summary = "User hot replies", description = "Get most reacted replies by user")
|
||||
@ApiResponse(responseCode = "200", description = "Hot replies",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = CommentInfoDto.class))))
|
||||
public java.util.List<CommentInfoDto> hotReplies(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : 10;
|
||||
@@ -149,6 +190,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/hot-tags")
|
||||
@Operation(summary = "User hot tags", description = "Get tags frequently used by user")
|
||||
@ApiResponse(responseCode = "200", description = "Hot tags",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = TagDto.class))))
|
||||
public java.util.List<TagDto> hotTags(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : 10;
|
||||
@@ -161,6 +205,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/tags")
|
||||
@Operation(summary = "User tags", description = "Get recent tags used by user")
|
||||
@ApiResponse(responseCode = "200", description = "User tags",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = TagDto.class))))
|
||||
public java.util.List<TagDto> userTags(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
int l = limit != null ? limit : defaultTagsLimit;
|
||||
@@ -171,6 +218,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/following")
|
||||
@Operation(summary = "Following users", description = "Get users that this user is following")
|
||||
@ApiResponse(responseCode = "200", description = "Following list",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = UserDto.class))))
|
||||
public java.util.List<UserDto> following(@PathVariable("identifier") String identifier) {
|
||||
User user = userService.findByIdentifier(identifier).orElseThrow();
|
||||
return subscriptionService.getSubscribedUsers(user.getUsername()).stream()
|
||||
@@ -179,6 +229,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/followers")
|
||||
@Operation(summary = "Followers", description = "Get followers of this user")
|
||||
@ApiResponse(responseCode = "200", description = "Followers list",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = UserDto.class))))
|
||||
public java.util.List<UserDto> followers(@PathVariable("identifier") String identifier) {
|
||||
User user = userService.findByIdentifier(identifier).orElseThrow();
|
||||
return subscriptionService.getSubscribers(user.getUsername()).stream()
|
||||
@@ -187,6 +240,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/admins")
|
||||
@Operation(summary = "Admin users", description = "List administrator users")
|
||||
@ApiResponse(responseCode = "200", description = "Admin users",
|
||||
content = @Content(array = @ArraySchema(schema = @Schema(implementation = UserDto.class))))
|
||||
public java.util.List<UserDto> admins() {
|
||||
return userService.getAdmins().stream()
|
||||
.map(userMapper::toDto)
|
||||
@@ -194,6 +250,9 @@ public class UserController {
|
||||
}
|
||||
|
||||
@GetMapping("/{identifier}/all")
|
||||
@Operation(summary = "User aggregate", description = "Get aggregate information for user")
|
||||
@ApiResponse(responseCode = "200", description = "User aggregate",
|
||||
content = @Content(schema = @Schema(implementation = UserAggregateDto.class)))
|
||||
public ResponseEntity<UserAggregateDto> userAggregate(@PathVariable("identifier") String identifier,
|
||||
@RequestParam(value = "postsLimit", required = false) Integer postsLimit,
|
||||
@RequestParam(value = "repliesLimit", required = false) Integer repliesLimit,
|
||||
|
||||
32
backend/src/main/java/com/openisle/dto/PostChangeLogDto.java
Normal file
32
backend/src/main/java/com/openisle/dto/PostChangeLogDto.java
Normal file
@@ -0,0 +1,32 @@
|
||||
package com.openisle.dto;
|
||||
|
||||
import com.openisle.model.PostChangeType;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class PostChangeLogDto {
|
||||
private Long id;
|
||||
private String username;
|
||||
private String userAvatar;
|
||||
private PostChangeType type;
|
||||
private LocalDateTime time;
|
||||
private String oldTitle;
|
||||
private String newTitle;
|
||||
private String oldContent;
|
||||
private String newContent;
|
||||
private CategoryDto oldCategory;
|
||||
private CategoryDto newCategory;
|
||||
private List<TagDto> oldTags;
|
||||
private List<TagDto> newTags;
|
||||
private Boolean oldClosed;
|
||||
private Boolean newClosed;
|
||||
private LocalDateTime oldPinnedAt;
|
||||
private LocalDateTime newPinnedAt;
|
||||
private Boolean oldFeatured;
|
||||
private Boolean newFeatured;
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package com.openisle.mapper;
|
||||
|
||||
import com.openisle.dto.CategoryDto;
|
||||
import com.openisle.dto.PostChangeLogDto;
|
||||
import com.openisle.dto.TagDto;
|
||||
import com.openisle.model.*;
|
||||
import com.openisle.repository.CategoryRepository;
|
||||
import com.openisle.repository.TagRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class PostChangeLogMapper {
|
||||
|
||||
private final CategoryRepository categoryRepository;
|
||||
private final TagRepository tagRepository;
|
||||
private final CategoryMapper categoryMapper;
|
||||
private final TagMapper tagMapper;
|
||||
|
||||
public PostChangeLogDto toDto(PostChangeLog log) {
|
||||
PostChangeLogDto dto = new PostChangeLogDto();
|
||||
dto.setId(log.getId());
|
||||
if (log.getUser() != null) {
|
||||
dto.setUsername(log.getUser().getUsername());
|
||||
dto.setUserAvatar(log.getUser().getAvatar());
|
||||
}
|
||||
dto.setType(log.getType());
|
||||
dto.setTime(log.getCreatedAt());
|
||||
if (log instanceof PostTitleChangeLog t) {
|
||||
dto.setOldTitle(t.getOldTitle());
|
||||
dto.setNewTitle(t.getNewTitle());
|
||||
} else if (log instanceof PostContentChangeLog c) {
|
||||
dto.setOldContent(c.getOldContent());
|
||||
dto.setNewContent(c.getNewContent());
|
||||
} else if (log instanceof PostCategoryChangeLog cat) {
|
||||
dto.setOldCategory(mapCategory(cat.getOldCategory()));
|
||||
dto.setNewCategory(mapCategory(cat.getNewCategory()));
|
||||
} else if (log instanceof PostTagChangeLog tag) {
|
||||
dto.setOldTags(mapTags(tag.getOldTags()));
|
||||
dto.setNewTags(mapTags(tag.getNewTags()));
|
||||
} else if (log instanceof PostClosedChangeLog cl) {
|
||||
dto.setOldClosed(cl.isOldClosed());
|
||||
dto.setNewClosed(cl.isNewClosed());
|
||||
} else if (log instanceof PostPinnedChangeLog p) {
|
||||
dto.setOldPinnedAt(p.getOldPinnedAt());
|
||||
dto.setNewPinnedAt(p.getNewPinnedAt());
|
||||
} else if (log instanceof PostFeaturedChangeLog f) {
|
||||
dto.setOldFeatured(f.isOldFeatured());
|
||||
dto.setNewFeatured(f.isNewFeatured());
|
||||
}
|
||||
return dto;
|
||||
}
|
||||
|
||||
private CategoryDto mapCategory(String name) {
|
||||
if (name == null) {
|
||||
return null;
|
||||
}
|
||||
return categoryRepository.findByName(name)
|
||||
.map(categoryMapper::toDto)
|
||||
.orElseGet(() -> {
|
||||
CategoryDto dto = new CategoryDto();
|
||||
dto.setName(name);
|
||||
return dto;
|
||||
});
|
||||
}
|
||||
|
||||
private List<TagDto> mapTags(String tags) {
|
||||
if (tags == null || tags.isBlank()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return Arrays.stream(tags.split(","))
|
||||
.map(String::trim)
|
||||
.map(this::mapTag)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private TagDto mapTag(String name) {
|
||||
return tagRepository.findByName(name)
|
||||
.map(tagMapper::toDto)
|
||||
.orElseGet(() -> {
|
||||
TagDto dto = new TagDto();
|
||||
dto.setName(name);
|
||||
return dto;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_category_change_logs")
|
||||
public class PostCategoryChangeLog extends PostChangeLog {
|
||||
private String oldCategory;
|
||||
private String newCategory;
|
||||
}
|
||||
37
backend/src/main/java/com/openisle/model/PostChangeLog.java
Normal file
37
backend/src/main/java/com/openisle/model/PostChangeLog.java
Normal file
@@ -0,0 +1,37 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.CreationTimestamp;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_change_logs")
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
public abstract class PostChangeLog {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
private Long id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "post_id")
|
||||
private Post post;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = true)
|
||||
@JoinColumn(name = "user_id")
|
||||
private User user;
|
||||
|
||||
@CreationTimestamp
|
||||
@Column(nullable = false, updatable = false)
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
@Column(nullable = false)
|
||||
private PostChangeType type;
|
||||
}
|
||||
13
backend/src/main/java/com/openisle/model/PostChangeType.java
Normal file
13
backend/src/main/java/com/openisle/model/PostChangeType.java
Normal file
@@ -0,0 +1,13 @@
|
||||
package com.openisle.model;
|
||||
|
||||
public enum PostChangeType {
|
||||
CONTENT,
|
||||
TITLE,
|
||||
CATEGORY,
|
||||
TAG,
|
||||
CLOSED,
|
||||
PINNED,
|
||||
FEATURED,
|
||||
VOTE_RESULT,
|
||||
LOTTERY_RESULT
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_closed_change_logs")
|
||||
public class PostClosedChangeLog extends PostChangeLog {
|
||||
private boolean oldClosed;
|
||||
private boolean newClosed;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_content_change_logs")
|
||||
public class PostContentChangeLog extends PostChangeLog {
|
||||
@Column(name = "old_content", columnDefinition = "LONGTEXT")
|
||||
private String oldContent;
|
||||
|
||||
@Column(name = "new_content", columnDefinition = "LONGTEXT")
|
||||
private String newContent;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_featured_change_logs")
|
||||
public class PostFeaturedChangeLog extends PostChangeLog {
|
||||
private boolean oldFeatured;
|
||||
private boolean newFeatured;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_lottery_result_change_logs")
|
||||
public class PostLotteryResultChangeLog extends PostChangeLog {
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_pinned_change_logs")
|
||||
public class PostPinnedChangeLog extends PostChangeLog {
|
||||
private LocalDateTime oldPinnedAt;
|
||||
private LocalDateTime newPinnedAt;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_tag_change_logs")
|
||||
public class PostTagChangeLog extends PostChangeLog {
|
||||
@Column(name = "old_tags")
|
||||
private String oldTags;
|
||||
|
||||
@Column(name = "new_tags")
|
||||
private String newTags;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_title_change_logs")
|
||||
public class PostTitleChangeLog extends PostChangeLog {
|
||||
private String oldTitle;
|
||||
private String newTitle;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.openisle.model;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@Table(name = "post_vote_result_change_logs")
|
||||
public class PostVoteResultChangeLog extends PostChangeLog {
|
||||
}
|
||||
|
||||
@@ -4,7 +4,10 @@ import com.openisle.model.Category;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface CategoryRepository extends JpaRepository<Category, Long> {
|
||||
List<Category> findByNameContainingIgnoreCase(String keyword);
|
||||
|
||||
Optional<Category> findByName(String name);
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import java.util.List;
|
||||
|
||||
public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> {
|
||||
List<PointHistory> findByUserOrderByIdDesc(User user);
|
||||
List<PointHistory> findByUserOrderByIdAsc(User user);
|
||||
long countByUser(User user);
|
||||
|
||||
List<PointHistory> findByUserAndCreatedAtAfterOrderByCreatedAtDesc(User user, LocalDateTime createdAt);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.openisle.repository;
|
||||
|
||||
import com.openisle.model.Post;
|
||||
import com.openisle.model.PostChangeLog;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface PostChangeLogRepository extends JpaRepository<PostChangeLog, Long> {
|
||||
List<PostChangeLog> findByPostOrderByCreatedAtAsc(Post post);
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface TagRepository extends JpaRepository<Tag, Long> {
|
||||
List<Tag> findByNameContainingIgnoreCase(String keyword);
|
||||
@@ -15,4 +16,6 @@ public interface TagRepository extends JpaRepository<Tag, Long> {
|
||||
|
||||
List<Tag> findByCreatorOrderByCreatedAtDesc(User creator, Pageable pageable);
|
||||
List<Tag> findByCreator(User creator);
|
||||
|
||||
Optional<Tag> findByName(String name);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.openisle.scheduler;
|
||||
|
||||
import com.openisle.config.CachingConfig;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.model.UserVisit;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.repository.UserVisitRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 执行计划
|
||||
* 将每天用户访问落库
|
||||
* @author smallclover
|
||||
* @since 2025-09-09
|
||||
*/
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class UserVisitScheduler {
|
||||
private final RedisTemplate redisTemplate;
|
||||
private final UserRepository userRepository;
|
||||
private final UserVisitRepository userVisitRepository;
|
||||
|
||||
@Scheduled(cron = "0 5 0 * * ?")// 每天 00:05 执行
|
||||
public void persistDailyVisits(){
|
||||
LocalDate yesterday = LocalDate.now().minusDays(1);
|
||||
String key = CachingConfig.VISIT_CACHE_NAME+":"+ yesterday;
|
||||
Set<String> usernames = redisTemplate.opsForSet().members(key);
|
||||
if(!CollectionUtils.isEmpty(usernames)){
|
||||
for(String username: usernames){
|
||||
User user = userRepository.findByUsername(username).orElse(null);
|
||||
if(user != null){
|
||||
UserVisit userVisit = new UserVisit();
|
||||
userVisit.setUser(user);
|
||||
userVisit.setVisitDate(yesterday);
|
||||
userVisitRepository.save(userVisit);
|
||||
}
|
||||
}
|
||||
redisTemplate.delete(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -225,17 +225,20 @@ public class PointService {
|
||||
*/
|
||||
public int recalculateUserPoints(User user) {
|
||||
// 获取用户所有的积分历史记录(由于@Where注解,已删除的记录会被自动过滤)
|
||||
List<PointHistory> histories = pointHistoryRepository.findByUserOrderByIdDesc(user);
|
||||
|
||||
List<PointHistory> histories = pointHistoryRepository.findByUserOrderByIdAsc(user);
|
||||
|
||||
int totalPoints = 0;
|
||||
for (PointHistory history : histories) {
|
||||
totalPoints += history.getAmount();
|
||||
// 重新计算每条历史记录的余额
|
||||
history.setBalance(totalPoints);
|
||||
}
|
||||
|
||||
// 更新用户积分
|
||||
|
||||
// 批量更新历史记录及用户积分
|
||||
pointHistoryRepository.saveAll(histories);
|
||||
user.setPoint(totalPoints);
|
||||
userRepository.save(user);
|
||||
|
||||
|
||||
return totalPoints;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.model.*;
|
||||
import com.openisle.repository.PostChangeLogRepository;
|
||||
import com.openisle.repository.PostRepository;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class PostChangeLogService {
|
||||
private final PostChangeLogRepository logRepository;
|
||||
private final PostRepository postRepository;
|
||||
private final UserRepository userRepository;
|
||||
|
||||
private User getSystemUser() {
|
||||
return userRepository.findByUsername("system")
|
||||
.orElseThrow(() -> new IllegalStateException("System user not found"));
|
||||
}
|
||||
|
||||
public void recordContentChange(Post post, User user, String oldContent, String newContent) {
|
||||
PostContentChangeLog log = new PostContentChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.CONTENT);
|
||||
log.setOldContent(oldContent);
|
||||
log.setNewContent(newContent);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordTitleChange(Post post, User user, String oldTitle, String newTitle) {
|
||||
PostTitleChangeLog log = new PostTitleChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.TITLE);
|
||||
log.setOldTitle(oldTitle);
|
||||
log.setNewTitle(newTitle);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordCategoryChange(Post post, User user, String oldCategory, String newCategory) {
|
||||
PostCategoryChangeLog log = new PostCategoryChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.CATEGORY);
|
||||
log.setOldCategory(oldCategory);
|
||||
log.setNewCategory(newCategory);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordTagChange(Post post, User user, Set<Tag> oldTags, Set<Tag> newTags) {
|
||||
PostTagChangeLog log = new PostTagChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.TAG);
|
||||
log.setOldTags(oldTags.stream().map(Tag::getName).collect(Collectors.joining(",")));
|
||||
log.setNewTags(newTags.stream().map(Tag::getName).collect(Collectors.joining(",")));
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordClosedChange(Post post, User user, boolean oldClosed, boolean newClosed) {
|
||||
PostClosedChangeLog log = new PostClosedChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.CLOSED);
|
||||
log.setOldClosed(oldClosed);
|
||||
log.setNewClosed(newClosed);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordPinnedChange(Post post, User user, java.time.LocalDateTime oldPinnedAt, java.time.LocalDateTime newPinnedAt) {
|
||||
PostPinnedChangeLog log = new PostPinnedChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.PINNED);
|
||||
log.setOldPinnedAt(oldPinnedAt);
|
||||
log.setNewPinnedAt(newPinnedAt);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordFeaturedChange(Post post, User user, boolean oldFeatured, boolean newFeatured) {
|
||||
PostFeaturedChangeLog log = new PostFeaturedChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(user);
|
||||
log.setType(PostChangeType.FEATURED);
|
||||
log.setOldFeatured(oldFeatured);
|
||||
log.setNewFeatured(newFeatured);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordVoteResult(Post post) {
|
||||
PostVoteResultChangeLog log = new PostVoteResultChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(getSystemUser());
|
||||
log.setType(PostChangeType.VOTE_RESULT);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public void recordLotteryResult(Post post) {
|
||||
PostLotteryResultChangeLog log = new PostLotteryResultChangeLog();
|
||||
log.setPost(post);
|
||||
log.setUser(getSystemUser());
|
||||
log.setType(PostChangeType.LOTTERY_RESULT);
|
||||
logRepository.save(log);
|
||||
}
|
||||
|
||||
public List<PostChangeLog> listLogs(Long postId) {
|
||||
Post post = postRepository.findById(postId)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
return logRepository.findByPostOrderByCreatedAtAsc(post);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.config.CachingConfig;
|
||||
import com.openisle.model.Post;
|
||||
import com.openisle.model.PostStatus;
|
||||
import com.openisle.model.PostType;
|
||||
@@ -19,6 +20,7 @@ import com.openisle.repository.CategoryRepository;
|
||||
import com.openisle.repository.TagRepository;
|
||||
import com.openisle.service.SubscriptionService;
|
||||
import com.openisle.service.CommentService;
|
||||
import com.openisle.service.PostChangeLogService;
|
||||
import com.openisle.repository.CommentRepository;
|
||||
import com.openisle.repository.ReactionRepository;
|
||||
import com.openisle.repository.PostSubscriptionRepository;
|
||||
@@ -27,12 +29,15 @@ import com.openisle.repository.PollVoteRepository;
|
||||
import com.openisle.model.Role;
|
||||
import com.openisle.exception.RateLimitException;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.scheduling.TaskScheduler;
|
||||
import com.openisle.service.EmailSender;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.*;
|
||||
@@ -74,10 +79,13 @@ public class PostService {
|
||||
private final EmailSender emailSender;
|
||||
private final ApplicationContext applicationContext;
|
||||
private final PointService pointService;
|
||||
private final PostChangeLogService postChangeLogService;
|
||||
private final ConcurrentMap<Long, ScheduledFuture<?>> scheduledFinalizations = new ConcurrentHashMap<>();
|
||||
@Value("${app.website-url:https://www.open-isle.com}")
|
||||
private String websiteUrl;
|
||||
|
||||
private final RedisTemplate redisTemplate;
|
||||
|
||||
@org.springframework.beans.factory.annotation.Autowired
|
||||
public PostService(PostRepository postRepository,
|
||||
UserRepository userRepository,
|
||||
@@ -99,7 +107,9 @@ public class PostService {
|
||||
EmailSender emailSender,
|
||||
ApplicationContext applicationContext,
|
||||
PointService pointService,
|
||||
@Value("${app.post.publish-mode:DIRECT}") PublishMode publishMode) {
|
||||
PostChangeLogService postChangeLogService,
|
||||
@Value("${app.post.publish-mode:DIRECT}") PublishMode publishMode,
|
||||
RedisTemplate redisTemplate) {
|
||||
this.postRepository = postRepository;
|
||||
this.userRepository = userRepository;
|
||||
this.categoryRepository = categoryRepository;
|
||||
@@ -120,7 +130,10 @@ public class PostService {
|
||||
this.emailSender = emailSender;
|
||||
this.applicationContext = applicationContext;
|
||||
this.pointService = pointService;
|
||||
this.postChangeLogService = postChangeLogService;
|
||||
this.publishMode = publishMode;
|
||||
|
||||
this.redisTemplate = redisTemplate;
|
||||
}
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
@@ -159,19 +172,28 @@ public class PostService {
|
||||
return postRepository.findByStatusAndRssExcludedFalseOrderByCreatedAtDesc(PostStatus.PUBLISHED, pageable);
|
||||
}
|
||||
|
||||
public Post excludeFromRss(Long id) {
|
||||
public Post excludeFromRss(Long id, String username) {
|
||||
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
User user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
boolean oldFeatured = !Boolean.TRUE.equals(post.getRssExcluded());
|
||||
post.setRssExcluded(true);
|
||||
return postRepository.save(post);
|
||||
Post saved = postRepository.save(post);
|
||||
postChangeLogService.recordFeaturedChange(saved, user, oldFeatured, false);
|
||||
return saved;
|
||||
}
|
||||
|
||||
public Post includeInRss(Long id) {
|
||||
public Post includeInRss(Long id, String username) {
|
||||
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
User user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
boolean oldFeatured = !Boolean.TRUE.equals(post.getRssExcluded());
|
||||
post.setRssExcluded(false);
|
||||
post = postRepository.save(post);
|
||||
notificationService.createNotification(post.getAuthor(), NotificationType.POST_FEATURED, post, null, null, null, null, null);
|
||||
pointService.awardForFeatured(post.getAuthor().getUsername(), post.getId());
|
||||
return post;
|
||||
Post saved = postRepository.save(post);
|
||||
postChangeLogService.recordFeaturedChange(saved, user, oldFeatured, true);
|
||||
notificationService.createNotification(saved.getAuthor(), NotificationType.POST_FEATURED, saved, null, null, null, null, null);
|
||||
pointService.awardForFeatured(saved.getAuthor().getUsername(), saved.getId());
|
||||
return saved;
|
||||
}
|
||||
|
||||
public Post createPost(String username,
|
||||
@@ -188,9 +210,9 @@ public class PostService {
|
||||
LocalDateTime endTime,
|
||||
java.util.List<String> options,
|
||||
Boolean multiple) {
|
||||
long recent = postRepository.countByAuthorAfter(username,
|
||||
java.time.LocalDateTime.now().minusMinutes(5));
|
||||
if (recent >= 1) {
|
||||
// 限制访问次数
|
||||
boolean limitResult = postRateLimit(username);
|
||||
if (!limitResult) {
|
||||
throw new RateLimitException("Too many posts");
|
||||
}
|
||||
if (tagIds == null || tagIds.isEmpty()) {
|
||||
@@ -287,6 +309,23 @@ public class PostService {
|
||||
return post;
|
||||
}
|
||||
|
||||
/**
|
||||
* 限制发帖频率
|
||||
* @param username
|
||||
* @return
|
||||
*/
|
||||
private boolean postRateLimit(String username){
|
||||
String key = CachingConfig.LIMIT_CACHE_NAME +":posts:"+username;
|
||||
String result = (String)redisTemplate.opsForValue().get(key);
|
||||
//最近没有创建过文章
|
||||
if(StringUtils.isEmpty(result)){
|
||||
// 限制频率为5分钟
|
||||
redisTemplate.opsForValue().set(key,"1", Duration.ofMinutes(5));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void joinLottery(Long postId, String username) {
|
||||
LotteryPost post = lotteryPostRepository.findById(postId)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
@@ -355,6 +394,7 @@ public class PostService {
|
||||
for (User participant : pp.getParticipants()) {
|
||||
notificationService.createNotification(participant, NotificationType.POLL_RESULT_PARTICIPANT, pp, null, null, null, null, null);
|
||||
}
|
||||
postChangeLogService.recordVoteResult(pp);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -389,6 +429,7 @@ public class PostService {
|
||||
notificationService.createNotification(lp.getAuthor(), NotificationType.LOTTERY_DRAW, lp, null, null, null, null, null);
|
||||
notificationService.sendCustomPush(lp.getAuthor(), "抽奖已开奖", String.format("%s/posts/%d", websiteUrl, lp.getId()));
|
||||
}
|
||||
postChangeLogService.recordLotteryResult(lp);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -638,18 +679,28 @@ public class PostService {
|
||||
return post;
|
||||
}
|
||||
|
||||
public Post pinPost(Long id) {
|
||||
public Post pinPost(Long id, String username) {
|
||||
Post post = postRepository.findById(id)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
User user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
java.time.LocalDateTime oldPinned = post.getPinnedAt();
|
||||
post.setPinnedAt(java.time.LocalDateTime.now());
|
||||
return postRepository.save(post);
|
||||
Post saved = postRepository.save(post);
|
||||
postChangeLogService.recordPinnedChange(saved, user, oldPinned, saved.getPinnedAt());
|
||||
return saved;
|
||||
}
|
||||
|
||||
public Post unpinPost(Long id) {
|
||||
public Post unpinPost(Long id, String username) {
|
||||
Post post = postRepository.findById(id)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||
User user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
java.time.LocalDateTime oldPinned = post.getPinnedAt();
|
||||
post.setPinnedAt(null);
|
||||
return postRepository.save(post);
|
||||
Post saved = postRepository.save(post);
|
||||
postChangeLogService.recordPinnedChange(saved, user, oldPinned, null);
|
||||
return saved;
|
||||
}
|
||||
|
||||
public Post closePost(Long id, String username) {
|
||||
@@ -660,8 +711,11 @@ public class PostService {
|
||||
if (!user.getId().equals(post.getAuthor().getId()) && user.getRole() != Role.ADMIN) {
|
||||
throw new IllegalArgumentException("Unauthorized");
|
||||
}
|
||||
boolean oldClosed = post.isClosed();
|
||||
post.setClosed(true);
|
||||
return postRepository.save(post);
|
||||
Post saved = postRepository.save(post);
|
||||
postChangeLogService.recordClosedChange(saved, user, oldClosed, true);
|
||||
return saved;
|
||||
}
|
||||
|
||||
public Post reopenPost(Long id, String username) {
|
||||
@@ -672,8 +726,11 @@ public class PostService {
|
||||
if (!user.getId().equals(post.getAuthor().getId()) && user.getRole() != Role.ADMIN) {
|
||||
throw new IllegalArgumentException("Unauthorized");
|
||||
}
|
||||
boolean oldClosed = post.isClosed();
|
||||
post.setClosed(false);
|
||||
return postRepository.save(post);
|
||||
Post saved = postRepository.save(post);
|
||||
postChangeLogService.recordClosedChange(saved, user, oldClosed, false);
|
||||
return saved;
|
||||
}
|
||||
|
||||
@org.springframework.transaction.annotation.Transactional
|
||||
@@ -702,14 +759,30 @@ public class PostService {
|
||||
if (tags.isEmpty()) {
|
||||
throw new IllegalArgumentException("Tag not found");
|
||||
}
|
||||
post.setTitle(title);
|
||||
String oldTitle = post.getTitle();
|
||||
String oldContent = post.getContent();
|
||||
Category oldCategory = post.getCategory();
|
||||
java.util.Set<com.openisle.model.Tag> oldTags = new java.util.HashSet<>(post.getTags());
|
||||
post.setTitle(title);
|
||||
post.setContent(content);
|
||||
post.setCategory(category);
|
||||
post.setTags(new java.util.HashSet<>(tags));
|
||||
Post updated = postRepository.save(post);
|
||||
imageUploader.adjustReferences(oldContent, content);
|
||||
notificationService.notifyMentions(content, user, updated, null);
|
||||
if (!java.util.Objects.equals(oldTitle, title)) {
|
||||
postChangeLogService.recordTitleChange(updated, user, oldTitle, title);
|
||||
}
|
||||
if (!java.util.Objects.equals(oldContent, content)) {
|
||||
postChangeLogService.recordContentChange(updated, user, oldContent, content);
|
||||
}
|
||||
if (!java.util.Objects.equals(oldCategory.getId(), category.getId())) {
|
||||
postChangeLogService.recordCategoryChange(updated, user, oldCategory.getName(), category.getName());
|
||||
}
|
||||
java.util.Set<com.openisle.model.Tag> newTags = new java.util.HashSet<>(tags);
|
||||
if (!oldTags.equals(newTags)) {
|
||||
postChangeLogService.recordTagChange(updated, user, oldTags, newTags);
|
||||
}
|
||||
return updated;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.config.CachingConfig;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.model.Role;
|
||||
import com.openisle.service.PasswordValidator;
|
||||
@@ -7,13 +8,18 @@ import com.openisle.service.UsernameValidator;
|
||||
import com.openisle.service.AvatarGenerator;
|
||||
import com.openisle.exception.FieldException;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.util.VerifyType;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -25,6 +31,10 @@ public class UserService {
|
||||
private final ImageUploader imageUploader;
|
||||
private final AvatarGenerator avatarGenerator;
|
||||
|
||||
private final RedisTemplate redisTemplate;
|
||||
|
||||
private final EmailSender emailService;
|
||||
|
||||
public User register(String username, String email, String password, String reason, com.openisle.model.RegisterMode mode) {
|
||||
usernameValidator.validate(username);
|
||||
passwordValidator.validate(password);
|
||||
@@ -38,7 +48,7 @@ public class UserService {
|
||||
// 未验证 → 允许“重注册”:覆盖必要字段并重新发验证码
|
||||
u.setEmail(email); // 若不允许改邮箱可去掉
|
||||
u.setPassword(passwordEncoder.encode(password));
|
||||
u.setVerificationCode(genCode());
|
||||
// u.setVerificationCode(genCode());
|
||||
u.setRegisterReason(reason);
|
||||
u.setApproved(mode == com.openisle.model.RegisterMode.DIRECT);
|
||||
return userRepository.save(u);
|
||||
@@ -54,7 +64,7 @@ public class UserService {
|
||||
// 未验证 → 允许“重注册”
|
||||
u.setUsername(username); // 若不允许改用户名可去掉
|
||||
u.setPassword(passwordEncoder.encode(password));
|
||||
u.setVerificationCode(genCode());
|
||||
// u.setVerificationCode(genCode());
|
||||
u.setRegisterReason(reason);
|
||||
u.setApproved(mode == com.openisle.model.RegisterMode.DIRECT);
|
||||
return userRepository.save(u);
|
||||
@@ -67,7 +77,7 @@ public class UserService {
|
||||
user.setPassword(passwordEncoder.encode(password));
|
||||
user.setRole(Role.USER);
|
||||
user.setVerified(false);
|
||||
user.setVerificationCode(genCode());
|
||||
// user.setVerificationCode(genCode());
|
||||
user.setAvatar(avatarGenerator.generate(username));
|
||||
user.setRegisterReason(reason);
|
||||
user.setApproved(mode == com.openisle.model.RegisterMode.DIRECT);
|
||||
@@ -77,7 +87,7 @@ public class UserService {
|
||||
public User registerWithInvite(String username, String email, String password) {
|
||||
User user = register(username, email, password, "", com.openisle.model.RegisterMode.DIRECT);
|
||||
user.setVerified(true);
|
||||
user.setVerificationCode(genCode());
|
||||
// user.setVerificationCode(genCode());
|
||||
return userRepository.save(user);
|
||||
}
|
||||
|
||||
@@ -85,16 +95,58 @@ public class UserService {
|
||||
return String.format("%06d", new Random().nextInt(1000000));
|
||||
}
|
||||
|
||||
public boolean verifyCode(String username, String code) {
|
||||
Optional<User> userOpt = userRepository.findByUsername(username);
|
||||
if (userOpt.isPresent() && code.equals(userOpt.get().getVerificationCode())) {
|
||||
User user = userOpt.get();
|
||||
user.setVerified(true);
|
||||
user.setVerificationCode(null);
|
||||
userRepository.save(user);
|
||||
return true;
|
||||
/**
|
||||
* 将验证码存入缓存,并发送邮件
|
||||
* @param user
|
||||
*/
|
||||
public void sendVerifyMail(User user, VerifyType verifyType){
|
||||
//缓存验证码
|
||||
String code = genCode();
|
||||
String key;
|
||||
String subject;
|
||||
String content = "您的验证码是:" + code;
|
||||
// 注册类型
|
||||
if(verifyType.equals(VerifyType.REGISTER)){
|
||||
key = CachingConfig.VERIFY_CACHE_NAME + ":register:code:" + user.getUsername();
|
||||
subject = "在网站填写验证码以验证(有效期为5分钟)";
|
||||
}else {
|
||||
// 重置密码
|
||||
key = CachingConfig.VERIFY_CACHE_NAME + ":reset_password:code:" + user.getUsername();
|
||||
subject = "请填写验证码以重置密码(有效期为5分钟)";
|
||||
}
|
||||
return false;
|
||||
|
||||
redisTemplate.opsForValue().set(key, code, 5, TimeUnit.MINUTES);// 五分钟后验证码过期
|
||||
emailService.sendEmail(user.getEmail(), subject, content);
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证code是否正确
|
||||
* @param user
|
||||
* @param code
|
||||
* @param verifyType
|
||||
* @return
|
||||
*/
|
||||
public boolean verifyCode(User user, String code, VerifyType verifyType) {
|
||||
// 生成key
|
||||
String key1 = VerifyType.REGISTER.equals(verifyType)?":register:code:":":reset_password:code:";
|
||||
String key = CachingConfig.VERIFY_CACHE_NAME + key1 + user.getUsername();
|
||||
// 这里不能使用getAndDelete,需要6.x版本
|
||||
String cachedCode = (String)redisTemplate.opsForValue().get(key);
|
||||
// 如果校验code过期或者不存在
|
||||
// 或者校验code不一致
|
||||
if(Objects.isNull(cachedCode)
|
||||
|| !cachedCode.equals(code)){
|
||||
return false;
|
||||
}
|
||||
// 注册模式需要设置已经确认
|
||||
if(VerifyType.REGISTER.equals(verifyType)){
|
||||
user.setVerified(true);
|
||||
userRepository.save(user);
|
||||
}
|
||||
// 走到这里说明验证成功删除验证码
|
||||
redisTemplate.delete(key);
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public Optional<User> authenticate(String username, String password) {
|
||||
@@ -165,26 +217,6 @@ public class UserService {
|
||||
return userRepository.save(user);
|
||||
}
|
||||
|
||||
public String generatePasswordResetCode(String email) {
|
||||
User user = userRepository.findByEmail(email)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
String code = genCode();
|
||||
user.setPasswordResetCode(code);
|
||||
userRepository.save(user);
|
||||
return code;
|
||||
}
|
||||
|
||||
public boolean verifyPasswordResetCode(String email, String code) {
|
||||
Optional<User> userOpt = userRepository.findByEmail(email);
|
||||
if (userOpt.isPresent() && code.equals(userOpt.get().getPasswordResetCode())) {
|
||||
User user = userOpt.get();
|
||||
user.setPasswordResetCode(null);
|
||||
userRepository.save(user);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public User updatePassword(String username, String newPassword) {
|
||||
passwordValidator.validate(newPassword);
|
||||
User user = userRepository.findByUsername(username)
|
||||
|
||||
@@ -1,15 +1,22 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.config.CachingConfig;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.model.UserVisit;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.repository.UserVisitRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -17,6 +24,8 @@ public class UserVisitService {
|
||||
private final UserVisitRepository userVisitRepository;
|
||||
private final UserRepository userRepository;
|
||||
|
||||
private final RedisTemplate redisTemplate;
|
||||
|
||||
public boolean recordVisit(String username) {
|
||||
User user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
@@ -30,10 +39,36 @@ public class UserVisitService {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计访问次数,改为从缓存获取/数据库获取
|
||||
* @param username
|
||||
* @return
|
||||
*/
|
||||
public long countVisits(String username) {
|
||||
User user = userRepository.findByUsername(username)
|
||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||
return userVisitRepository.countByUser(user);
|
||||
|
||||
// 如果缓存存在就返回
|
||||
String key1 = CachingConfig.VISIT_CACHE_NAME + ":"+LocalDate.now()+":count:"+username;
|
||||
Integer cached = (Integer) redisTemplate.opsForValue().get(key1);
|
||||
if(cached != null){
|
||||
return cached.longValue();
|
||||
}
|
||||
|
||||
// Redis Set 检查今天是否访问
|
||||
String todayKey = CachingConfig.VISIT_CACHE_NAME + ":" + LocalDate.now();
|
||||
boolean todayVisited = redisTemplate.opsForSet().isMember(todayKey, username);
|
||||
|
||||
Long visitCount = userVisitRepository.countByUser(user);
|
||||
if (todayVisited) visitCount += 1;
|
||||
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
LocalDateTime endOfDay = now.toLocalDate().atTime(23, 59, 59);
|
||||
long secondsUntilEndOfDay = Duration.between(now, endOfDay).getSeconds();
|
||||
|
||||
// 写入缓存,设置 TTL,当天剩余时间
|
||||
redisTemplate.opsForValue().set(key1, visitCount, Duration.ofSeconds(secondsUntilEndOfDay));
|
||||
return visitCount;
|
||||
}
|
||||
|
||||
public long countDau(LocalDate date) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.exception.FieldException;
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
@@ -17,6 +18,11 @@ public class UsernameValidator {
|
||||
if (username == null || username.isEmpty()) {
|
||||
throw new FieldException("username", "Username cannot be empty");
|
||||
}
|
||||
|
||||
if (NumberUtils.isDigits(username)) {
|
||||
throw new FieldException("username", "Username cannot be pure number");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
20
backend/src/main/java/com/openisle/util/VerifyType.java
Normal file
20
backend/src/main/java/com/openisle/util/VerifyType.java
Normal file
@@ -0,0 +1,20 @@
|
||||
package com.openisle.util;
|
||||
|
||||
/**
|
||||
* 验证码类型
|
||||
* @author smallclover
|
||||
* @since 2025-09-08
|
||||
*/
|
||||
public enum VerifyType {
|
||||
REGISTER(1),
|
||||
RESET_PASSWORD(2);
|
||||
private final int code;
|
||||
|
||||
VerifyType(int code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public int getCode() {
|
||||
return code;
|
||||
}
|
||||
}
|
||||
@@ -108,6 +108,10 @@ rabbitmq.sharding.enabled=true
|
||||
# see https://springdoc.org/#springdoc-openapi-core-properties
|
||||
springdoc.api-docs.path=/api/v3/api-docs
|
||||
springdoc.api-docs.enabled=true
|
||||
springdoc.api-docs.servers[0].url=https://www.open-isle.com
|
||||
springdoc.api-docs.servers[0].description=Production Environment
|
||||
springdoc.api-docs.servers[1].url=https://www.staging.open-isle.com
|
||||
springdoc.api-docs.servers[1].description=Staging Environment
|
||||
springdoc.info.title=OpenIsle
|
||||
springdoc.info.description=OpenIsle Open API Documentation
|
||||
springdoc.info.version=0.0.1
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.openisle.model.User;
|
||||
import com.openisle.service.*;
|
||||
import com.openisle.model.RegisterMode;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import com.openisle.util.VerifyType;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.Mockito;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -71,7 +72,9 @@ class AuthControllerTest {
|
||||
|
||||
@Test
|
||||
void verifyCodeEndpoint() throws Exception {
|
||||
Mockito.when(userService.verifyCode("u", "123")).thenReturn(true);
|
||||
User user = new User();
|
||||
user.setUsername("u");
|
||||
Mockito.when(userService.verifyCode(user, "123", VerifyType.REGISTER)).thenReturn(true);
|
||||
Mockito.when(jwtService.generateReasonToken("u")).thenReturn("reason_token");
|
||||
|
||||
mockMvc.perform(post("/api/auth/verify")
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.openisle.service;
|
||||
|
||||
import com.openisle.model.PointHistory;
|
||||
import com.openisle.model.PointHistoryType;
|
||||
import com.openisle.model.Role;
|
||||
import com.openisle.model.User;
|
||||
import com.openisle.repository.PointHistoryRepository;
|
||||
import com.openisle.repository.UserRepository;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
|
||||
import org.springframework.context.annotation.Import;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
@DataJpaTest
|
||||
@Import(PointService.class)
|
||||
class PointServiceRecalculateUserPointsTest {
|
||||
|
||||
@Autowired
|
||||
private PointService pointService;
|
||||
|
||||
@Autowired
|
||||
private UserRepository userRepository;
|
||||
|
||||
@Autowired
|
||||
private PointHistoryRepository pointHistoryRepository;
|
||||
|
||||
@Test
|
||||
void recalculatesBalanceAfterDeletion() {
|
||||
User user = new User();
|
||||
user.setUsername("u");
|
||||
user.setEmail("u@example.com");
|
||||
user.setPassword("p");
|
||||
user.setRole(Role.USER);
|
||||
userRepository.save(user);
|
||||
|
||||
PointHistory h1 = new PointHistory();
|
||||
h1.setUser(user);
|
||||
h1.setType(PointHistoryType.POST);
|
||||
h1.setAmount(30);
|
||||
h1.setBalance(30);
|
||||
h1.setCreatedAt(LocalDateTime.now().minusMinutes(2));
|
||||
pointHistoryRepository.save(h1);
|
||||
|
||||
PointHistory h2 = new PointHistory();
|
||||
h2.setUser(user);
|
||||
h2.setType(PointHistoryType.COMMENT);
|
||||
h2.setAmount(10);
|
||||
h2.setBalance(40);
|
||||
h2.setCreatedAt(LocalDateTime.now().minusMinutes(1));
|
||||
pointHistoryRepository.save(h2);
|
||||
|
||||
user.setPoint(40);
|
||||
userRepository.save(user);
|
||||
|
||||
pointHistoryRepository.delete(h1);
|
||||
|
||||
int total = pointService.recalculateUserPoints(user);
|
||||
|
||||
assertEquals(10, total);
|
||||
assertEquals(10, userRepository.findById(user.getId()).orElseThrow().getPoint());
|
||||
assertEquals(10, pointHistoryRepository.findById(h2.getId()).orElseThrow().getBalance());
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import com.openisle.exception.RateLimitException;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.scheduling.TaskScheduler;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
@@ -37,11 +38,13 @@ class PostServiceTest {
|
||||
EmailSender emailSender = mock(EmailSender.class);
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
Post post = new Post();
|
||||
@@ -86,11 +89,13 @@ class PostServiceTest {
|
||||
EmailSender emailSender = mock(EmailSender.class);
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
Post post = new Post();
|
||||
@@ -141,11 +146,13 @@ class PostServiceTest {
|
||||
EmailSender emailSender = mock(EmailSender.class);
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
when(postRepo.countByAuthorAfter(eq("alice"), any())).thenReturn(1L);
|
||||
@@ -177,11 +184,13 @@ class PostServiceTest {
|
||||
EmailSender emailSender = mock(EmailSender.class);
|
||||
ApplicationContext context = mock(ApplicationContext.class);
|
||||
PointService pointService = mock(PointService.class);
|
||||
PostChangeLogService postChangeLogService = mock(PostChangeLogService.class);
|
||||
RedisTemplate redisTemplate = mock(RedisTemplate.class);
|
||||
|
||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||
pollPostRepo, pollVoteRepo, notifService, subService, commentService, commentRepo,
|
||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||
imageUploader, taskScheduler, emailSender, context, pointService, postChangeLogService, PublishMode.DIRECT, redisTemplate);
|
||||
when(context.getBean(PostService.class)).thenReturn(service);
|
||||
|
||||
User author = new User();
|
||||
|
||||
@@ -16,6 +16,6 @@ bun dev
|
||||
|
||||
使用以下路由:
|
||||
|
||||
- `docs/frontend/` 前端技术文档
|
||||
- `docs/backend/` 后端技术文档
|
||||
- `docs/openapi/` 后端 API 文档
|
||||
- `frontend/` 前端技术文档
|
||||
- `backend/` 后端技术文档
|
||||
- `openapi/` 后端 API 文档
|
||||
|
||||
@@ -19,7 +19,7 @@ function DocsCategory({ url }: { url: string }) {
|
||||
);
|
||||
}
|
||||
|
||||
export default async function Page(props: PageProps<'/docs/[[...slug]]'>) {
|
||||
export default async function Page(props: PageProps<'/[[...slug]]'>) {
|
||||
const params = await props.params;
|
||||
const page = source.getPage(params.slug);
|
||||
if (!page) notFound();
|
||||
@@ -48,7 +48,7 @@ export async function generateStaticParams() {
|
||||
}
|
||||
|
||||
export async function generateMetadata(
|
||||
props: PageProps<'/docs/[[...slug]]'>
|
||||
props: PageProps<'/[[...slug]]'>
|
||||
): Promise<Metadata> {
|
||||
const params = await props.params;
|
||||
const page = source.getPage(params.slug);
|
||||
@@ -28,7 +28,7 @@ function TabTitle({ children }: { children: React.ReactNode }) {
|
||||
return <span className="text-[11px]">{children}</span>;
|
||||
}
|
||||
|
||||
export default function Layout({ children }: LayoutProps<'/docs'>) {
|
||||
export default function Layout({ children }: LayoutProps<'/'>) {
|
||||
return (
|
||||
// @ts-ignore
|
||||
<DocsLayout
|
||||
@@ -40,7 +40,7 @@ export default function Layout({ children }: LayoutProps<'/docs'>) {
|
||||
{
|
||||
title: 'OpenIsle 前端',
|
||||
description: <TabTitle>前端开发文档</TabTitle>,
|
||||
url: '/docs/frontend',
|
||||
url: '/frontend',
|
||||
icon: (
|
||||
<TabIcon color="#4ca154">
|
||||
<CompassIcon />
|
||||
@@ -50,7 +50,7 @@ export default function Layout({ children }: LayoutProps<'/docs'>) {
|
||||
{
|
||||
title: 'OpenIsle 后端',
|
||||
description: <TabTitle>后端开发文档</TabTitle>,
|
||||
url: '/docs/backend',
|
||||
url: '/backend',
|
||||
icon: (
|
||||
<TabIcon color="#1f66f4">
|
||||
<ServerIcon />
|
||||
@@ -60,7 +60,7 @@ export default function Layout({ children }: LayoutProps<'/docs'>) {
|
||||
{
|
||||
title: 'OpenIsle API',
|
||||
description: <TabTitle>后端 API 文档</TabTitle>,
|
||||
url: '/docs/openapi',
|
||||
url: '/openapi',
|
||||
icon: (
|
||||
<TabIcon color="#677489">
|
||||
<CodeXmlIcon />
|
||||
@@ -6,7 +6,7 @@ const inter = Inter({
|
||||
subsets: ['latin'],
|
||||
});
|
||||
|
||||
export default function Layout({ children }: LayoutProps<'/docs'>) {
|
||||
export default function Layout({ children }: LayoutProps<'/'>) {
|
||||
return (
|
||||
<html lang="zh" className={inter.className} suppressHydrationWarning>
|
||||
<body className="flex flex-col min-h-screen">
|
||||
|
||||
@@ -40,4 +40,4 @@ backend/
|
||||
|
||||
## API 接口
|
||||
|
||||
详细的 API 接口文档请查看 [API 文档](/docs/openapi)。
|
||||
详细的 API 接口文档请查看 [API 文档](/openapi)。
|
||||
|
||||
@@ -9,6 +9,6 @@ OpenIsle 是一个现代化的社区平台,提供完整的社交功能。
|
||||
|
||||
## 快速开始
|
||||
|
||||
- [后端开发指南](/docs/backend) - 了解后端架构和开发
|
||||
- [前端开发指南](/docs/frontend) - 了解前端技术栈和组件
|
||||
- [API 文档](/docs/openapi) - 查看完整的 API 接口文档
|
||||
- [后端开发指南](/backend) - 了解后端架构和开发
|
||||
- [前端开发指南](/frontend) - 了解前端技术栈和组件
|
||||
- [API 文档](/openapi) - 查看完整的 API 接口文档
|
||||
|
||||
@@ -8,7 +8,7 @@ export function baseOptions(): BaseLayoutProps {
|
||||
githubUrl: 'https://github.com/nagisa77/OpenIsle',
|
||||
nav: {
|
||||
title: 'OpenIsle Docs',
|
||||
url: '/docs',
|
||||
url: '/',
|
||||
},
|
||||
searchToggle: {
|
||||
enabled: false,
|
||||
|
||||
@@ -10,7 +10,7 @@ import * as ClientAdapters from './media-adapter.client';
|
||||
// See https://fumadocs.vercel.app/docs/headless/source-api for more info
|
||||
export const source = loader({
|
||||
// it assigns a URL to your pages
|
||||
baseUrl: '/docs',
|
||||
baseUrl: '/',
|
||||
source: docs.toFumadocsSource(),
|
||||
pageTree: {
|
||||
transformers: [transformerOpenAPI()],
|
||||
|
||||
@@ -4,7 +4,9 @@ NUXT_PUBLIC_WEBSOCKET_URL=https://127.0.0.1:8082
|
||||
NUXT_PUBLIC_WEBSITE_BASE_URL=http://localhost:3000
|
||||
|
||||
NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com
|
||||
NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ
|
||||
# NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ
|
||||
; 本地
|
||||
NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liOlrZnPKRF7s7NN
|
||||
NUXT_PUBLIC_DISCORD_CLIENT_ID=1394985417044000779
|
||||
NUXT_PUBLIC_TWITTER_CLIENT_ID=ZTRTU05KSk9KTTJrTTdrVC1tc1E6MTpjaQ
|
||||
NUXT_PUBLIC_TELEGRAM_BOT_ID=8450237135
|
||||
|
||||
@@ -17,8 +17,10 @@
|
||||
--background-color: white;
|
||||
--background-color-blur: rgba(255, 255, 255, 0.57);
|
||||
--menu-border-color: lightgray;
|
||||
--normal-border-color: lightgray;
|
||||
--menu-selected-background-color: rgba(242, 242, 242, 0.884);
|
||||
--normal-border-color: rgba(211, 211, 211, 0.63);
|
||||
--menu-selected-background-color: rgba(88, 241, 255, 0.166);
|
||||
--normal-light-background-color: rgba(242, 242, 242, 0.884);
|
||||
--menu-selected-background-color-hover: rgba(242, 242, 242, 0.884);
|
||||
--menu-text-color: rgb(99, 99, 99);
|
||||
--scroller-background-color: rgba(130, 175, 180, 0.5);
|
||||
/* --normal-background-color: rgb(241, 241, 241); */
|
||||
@@ -58,6 +60,8 @@
|
||||
--menu-border-color: #555;
|
||||
--normal-border-color: #555;
|
||||
--menu-selected-background-color: rgba(255, 255, 255, 0.1);
|
||||
--normal-light-background-color: rgba(255, 255, 255, 0.1);
|
||||
--menu-selected-background-color-hover: rgba(17, 182, 197, 0.082);
|
||||
--menu-text-color: rgb(173, 173, 173);
|
||||
/* --normal-background-color: #000000; */
|
||||
--normal-background-color: #333;
|
||||
@@ -162,7 +166,7 @@ body {
|
||||
padding-left: 1em;
|
||||
border-left: 4px solid #d0d7de;
|
||||
color: var(--blockquote-text-color);
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--normal-light-background-color);
|
||||
padding-top: 1px;
|
||||
padding-bottom: 1px;
|
||||
}
|
||||
@@ -235,8 +239,16 @@ body {
|
||||
}
|
||||
|
||||
.info-content-text img {
|
||||
max-width: 100%;
|
||||
max-width: min(800px, 100%);
|
||||
max-height: 600px;
|
||||
height: auto;
|
||||
cursor: pointer;
|
||||
box-shadow: 4px 12px 48px 0 rgba(0, 0, 0, 0.11);
|
||||
transition: box-shadow 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||
}
|
||||
|
||||
.info-content-text img:hover {
|
||||
box-shadow: 4px 12px 48px 0 rgba(0, 0, 0, 0.35);
|
||||
}
|
||||
|
||||
.info-content-text table {
|
||||
@@ -295,7 +307,7 @@ body {
|
||||
|
||||
/* 鼠标悬停行高亮 */
|
||||
.info-content-text tbody tr:hover {
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--normal-light-background-color);
|
||||
transition: background-color 0.2s ease;
|
||||
}
|
||||
|
||||
@@ -342,9 +354,41 @@ body {
|
||||
position: relative;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.d2h-file-name {
|
||||
font-size: 12px !important;
|
||||
}
|
||||
|
||||
.d2h-file-header {
|
||||
height: auto !important;
|
||||
}
|
||||
|
||||
.d2h-code-linenumber {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.d2h-code-line {
|
||||
padding-left: 10px !important;
|
||||
}
|
||||
|
||||
.d2h-diff-table {
|
||||
font-size: 6px !important;
|
||||
}
|
||||
|
||||
.d2h-code-line ins {
|
||||
height: 100%;
|
||||
font-size: 13px !important;
|
||||
}
|
||||
|
||||
/* .d2h-code-line {
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.d2h-code-line-ctn {
|
||||
font-size: 12px !important;
|
||||
} */
|
||||
}
|
||||
|
||||
/* Transition API */
|
||||
::view-transition-old(root),
|
||||
::view-transition-new(root) {
|
||||
animation: none;
|
||||
|
||||
@@ -100,7 +100,7 @@ export default {
|
||||
|
||||
.timeline-content {
|
||||
flex: 1;
|
||||
width: calc(100% - 32px);
|
||||
width: calc(100% - 42px);
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
|
||||
@@ -6,8 +6,15 @@
|
||||
</div>
|
||||
<div class="comment-bottom-container">
|
||||
<div class="comment-submit" :class="{ disabled: isDisabled }" @click="submit">
|
||||
<template v-if="!loading"> 发布评论 </template>
|
||||
<template v-else> <loading-four /> 发布中... </template>
|
||||
<template v-if="!loading">
|
||||
发布评论
|
||||
<span class="shortcut-icon" v-if="!isMobile">
|
||||
{{ isMac ? '⌘' : 'Ctrl' }} ⏎
|
||||
</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<loading-four /> 发布中...
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -24,6 +31,7 @@ import {
|
||||
} from '~/utils/vditor'
|
||||
import '~/assets/global.css'
|
||||
import LoginOverlay from '~/components/LoginOverlay.vue'
|
||||
import { useIsMobile } from '~/utils/screen'
|
||||
|
||||
export default {
|
||||
name: 'CommentEditor',
|
||||
@@ -52,12 +60,22 @@ export default {
|
||||
},
|
||||
components: { LoginOverlay },
|
||||
setup(props, { emit }) {
|
||||
const isMobile = useIsMobile()
|
||||
const vditorInstance = ref(null)
|
||||
const text = ref('')
|
||||
const editorId = ref(props.editorId)
|
||||
if (!editorId.value) {
|
||||
editorId.value = 'editor-' + useId()
|
||||
}
|
||||
|
||||
const isMac = ref(false)
|
||||
|
||||
if (navigator.userAgentData) {
|
||||
isMac.value = navigator.userAgentData.platform === 'macOS'
|
||||
} else {
|
||||
isMac.value = /Mac|iPhone|iPad|iPod/.test(navigator.userAgent)
|
||||
}
|
||||
|
||||
const getEditorTheme = getEditorThemeUtil
|
||||
const getPreviewTheme = getPreviewThemeUtil
|
||||
const applyTheme = () => {
|
||||
@@ -96,7 +114,27 @@ export default {
|
||||
applyTheme()
|
||||
},
|
||||
})
|
||||
// applyTheme()
|
||||
// 不是手机的情况下不添加快捷键
|
||||
if(!isMobile.value){
|
||||
// 添加快捷键监听 (Ctrl+Enter 或 Cmd+Enter)
|
||||
const handleKeydown = (e) => {
|
||||
if ((e.ctrlKey || e.metaKey) && e.key === 'Enter') {
|
||||
e.preventDefault()
|
||||
submit()
|
||||
}
|
||||
}
|
||||
|
||||
const el = document.getElementById(editorId.value)
|
||||
if (el) {
|
||||
el.addEventListener('keydown', handleKeydown)
|
||||
}
|
||||
|
||||
onUnmounted(() => {
|
||||
if (el) {
|
||||
el.removeEventListener('keydown', handleKeydown)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -134,7 +172,7 @@ export default {
|
||||
},
|
||||
)
|
||||
|
||||
return { submit, isDisabled, editorId }
|
||||
return { submit, isDisabled, editorId, isMac, isMobile}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@@ -174,10 +212,16 @@ export default {
|
||||
.comment-submit:hover {
|
||||
background-color: var(--primary-color-hover);
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.comment-editor-container {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
/** 评论按钮快捷键样式 */
|
||||
.shortcut-icon {
|
||||
padding: 2px 6px;
|
||||
border-radius: 6px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
line-height: 1.2;
|
||||
background-color: rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.comment-submit.disabled .shortcut-icon {
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -342,7 +342,7 @@ const copyCommentLink = () => {
|
||||
|
||||
const handleContentClick = (e) => {
|
||||
handleMarkdownClick(e)
|
||||
if (e.target.tagName === 'IMG') {
|
||||
if (e.target.tagName === 'IMG' && !e.target.classList.contains('emoji')) {
|
||||
const container = e.target.parentNode
|
||||
const imgs = [...container.querySelectorAll('img')].map((i) => i.src)
|
||||
lightboxImgs.value = imgs
|
||||
|
||||
@@ -314,6 +314,11 @@ const gotoTag = (t) => {
|
||||
border-radius: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
transition: background-color 0.5s ease;
|
||||
}
|
||||
|
||||
.menu-item:hover {
|
||||
background-color: var(--menu-selected-background-color-hover);
|
||||
}
|
||||
|
||||
.menu-item.selected {
|
||||
@@ -404,10 +409,11 @@ const gotoTag = (t) => {
|
||||
gap: 5px;
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.5s ease;
|
||||
}
|
||||
|
||||
.section-item:hover {
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--menu-selected-background-color-hover);
|
||||
}
|
||||
|
||||
.section-item-text-count {
|
||||
|
||||
@@ -5,7 +5,10 @@
|
||||
</div>
|
||||
<div class="message-bottom-container">
|
||||
<div class="message-submit" :class="{ disabled: isDisabled }" @click="submit">
|
||||
<template v-if="!loading"> 发送 </template>
|
||||
<template v-if="!loading">
|
||||
发送
|
||||
<span class="shortcut-icon" v-if="!isMobile"> {{ isMac ? '⌘' : 'Ctrl' }} ⏎ </span>
|
||||
</template>
|
||||
<template v-else> <loading-four /> 发送中... </template>
|
||||
</div>
|
||||
</div>
|
||||
@@ -21,6 +24,8 @@ import {
|
||||
getEditorTheme as getEditorThemeUtil,
|
||||
getPreviewTheme as getPreviewThemeUtil,
|
||||
} from '~/utils/vditor'
|
||||
import { useIsMobile } from '~/utils/screen'
|
||||
import { isMac } from '~/utils/device'
|
||||
import '~/assets/global.css'
|
||||
|
||||
export default {
|
||||
@@ -44,6 +49,7 @@ export default {
|
||||
const vditorInstance = ref(null)
|
||||
const text = ref('')
|
||||
const editorId = ref(props.editorId)
|
||||
const isMobile = useIsMobile()
|
||||
if (!editorId.value) {
|
||||
editorId.value = 'editor-' + useId()
|
||||
}
|
||||
@@ -70,23 +76,6 @@ export default {
|
||||
onMounted(() => {
|
||||
vditorInstance.value = createVditor(editorId.value, {
|
||||
placeholder: '输入消息...',
|
||||
height: 150,
|
||||
toolbar: [
|
||||
'emoji',
|
||||
'bold',
|
||||
'italic',
|
||||
'strike',
|
||||
'link',
|
||||
'|',
|
||||
'list',
|
||||
'|',
|
||||
'line',
|
||||
'quote',
|
||||
'code',
|
||||
'inline-code',
|
||||
'|',
|
||||
'upload',
|
||||
],
|
||||
preview: {
|
||||
actions: [],
|
||||
markdown: { toc: false },
|
||||
@@ -101,6 +90,28 @@ export default {
|
||||
applyTheme()
|
||||
},
|
||||
})
|
||||
|
||||
// 不是手机的情况下不添加快捷键
|
||||
if (!isMobile.value) {
|
||||
// 添加快捷键监听 (Ctrl+Enter 或 Cmd+Enter)
|
||||
const handleKeydown = (e) => {
|
||||
if ((e.ctrlKey || e.metaKey) && e.key === 'Enter') {
|
||||
e.preventDefault()
|
||||
submit()
|
||||
}
|
||||
}
|
||||
|
||||
const el = document.getElementById(editorId.value)
|
||||
if (el) {
|
||||
el.addEventListener('keydown', handleKeydown)
|
||||
}
|
||||
|
||||
onUnmounted(() => {
|
||||
if (el) {
|
||||
el.removeEventListener('keydown', handleKeydown)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -138,7 +149,7 @@ export default {
|
||||
},
|
||||
)
|
||||
|
||||
return { submit, isDisabled, editorId }
|
||||
return { submit, isDisabled, editorId, isMac, isMobile }
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@@ -149,11 +160,17 @@ export default {
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.vditor {
|
||||
min-height: 50px;
|
||||
max-height: 150px;
|
||||
}
|
||||
|
||||
.message-bottom-container {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-end;
|
||||
padding: 10px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
background-color: var(--bg-color-soft);
|
||||
border-top: 1px solid var(--border-color);
|
||||
border-bottom-left-radius: 8px;
|
||||
@@ -179,4 +196,17 @@ export default {
|
||||
.message-submit:not(.disabled):hover {
|
||||
background-color: var(--primary-color-hover);
|
||||
}
|
||||
|
||||
/** 评论按钮快捷键样式 */
|
||||
.shortcut-icon {
|
||||
padding: 2px 6px;
|
||||
border-radius: 6px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
line-height: 1.2;
|
||||
background-color: rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.comment-submit.disabled .shortcut-icon {
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
</style>
|
||||
|
||||
154
frontend_nuxt/components/PostChangeLogItem.vue
Normal file
154
frontend_nuxt/components/PostChangeLogItem.vue
Normal file
@@ -0,0 +1,154 @@
|
||||
<template>
|
||||
<div :id="`change-log-${log.id}`" class="change-log-container">
|
||||
<div class="change-log-text">
|
||||
<BaseImage
|
||||
v-if="log.userAvatar"
|
||||
class="change-log-avatar"
|
||||
:src="log.userAvatar"
|
||||
alt="avatar"
|
||||
@click="() => navigateTo(`/users/${log.username}`)"
|
||||
/>
|
||||
<span v-if="log.username" class="change-log-user">{{ log.username }}</span>
|
||||
<span v-if="log.type === 'CONTENT'" class="change-log-content">变更了文章内容</span>
|
||||
<span v-else-if="log.type === 'TITLE'" class="change-log-content">变更了文章标题</span>
|
||||
<template v-else-if="log.type === 'CATEGORY'">
|
||||
<div class="change-log-category-text">变更了文章分类, 从</div>
|
||||
<ArticleCategory :category="log.oldCategory" />
|
||||
<div class="change-log-category-text">修改为</div>
|
||||
<ArticleCategory :category="log.newCategory" />
|
||||
</template>
|
||||
<template v-else-if="log.type === 'TAG'">
|
||||
<div class="change-log-category-text">变更了文章标签, 从</div>
|
||||
<ArticleTags :tags="log.oldTags" />
|
||||
<div class="change-log-category-text">修改为</div>
|
||||
<ArticleTags :tags="log.newTags" />
|
||||
</template>
|
||||
<span v-else-if="log.type === 'CLOSED'" class="change-log-content">
|
||||
<template v-if="log.newClosed">关闭了文章</template>
|
||||
<template v-else>重新打开了文章</template>
|
||||
</span>
|
||||
<span v-else-if="log.type === 'PINNED'" class="change-log-content">
|
||||
<template v-if="log.newPinnedAt">置顶了文章</template>
|
||||
<template v-else>取消置顶文章</template>
|
||||
</span>
|
||||
<span v-else-if="log.type === 'FEATURED'" class="change-log-content">
|
||||
<template v-if="log.newFeatured">将文章设为精选</template>
|
||||
<template v-else>取消精选文章</template>
|
||||
</span>
|
||||
<span v-else-if="log.type === 'VOTE_RESULT'" class="change-log-content"
|
||||
>系统已计算投票结果</span
|
||||
>
|
||||
<span v-else-if="log.type === 'LOTTERY_RESULT'" class="change-log-content"
|
||||
>系统已「精密计算」抽奖结果 (=゚ω゚)ノ</span
|
||||
>
|
||||
</div>
|
||||
<div class="change-log-time">{{ log.time }}</div>
|
||||
<div
|
||||
v-if="log.type === 'CONTENT' || log.type === 'TITLE'"
|
||||
class="content-diff"
|
||||
v-html="diffHtml"
|
||||
></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed } from 'vue'
|
||||
import { html } from 'diff2html'
|
||||
import { createTwoFilesPatch } from 'diff'
|
||||
import { useIsMobile } from '~/utils/screen'
|
||||
import 'diff2html/bundles/css/diff2html.min.css'
|
||||
import BaseImage from '~/components/BaseImage.vue'
|
||||
import { navigateTo } from 'nuxt/app'
|
||||
import { themeState } from '~/utils/theme'
|
||||
import ArticleCategory from '~/components/ArticleCategory.vue'
|
||||
import ArticleTags from '~/components/ArticleTags.vue'
|
||||
const props = defineProps({
|
||||
log: Object,
|
||||
title: String,
|
||||
})
|
||||
|
||||
const diffHtml = computed(() => {
|
||||
// Track theme changes
|
||||
const isDark = import.meta.client && document.documentElement.dataset.theme === 'dark'
|
||||
themeState.mode
|
||||
const colorScheme = isDark ? 'dark' : 'light'
|
||||
|
||||
if (props.log.type === 'CONTENT') {
|
||||
const oldContent = props.log.oldContent ?? ''
|
||||
const newContent = props.log.newContent ?? ''
|
||||
const diff = createTwoFilesPatch(props.title, props.title, oldContent, newContent)
|
||||
return html(diff, {
|
||||
inputFormat: 'diff',
|
||||
showFiles: false,
|
||||
matching: 'lines',
|
||||
drawFileList: false,
|
||||
colorScheme,
|
||||
})
|
||||
} else if (props.log.type === 'TITLE') {
|
||||
const oldTitle = props.log.oldTitle ?? ''
|
||||
const newTitle = props.log.newTitle ?? ''
|
||||
const diff = createTwoFilesPatch(oldTitle, newTitle, '', '')
|
||||
return html(diff, {
|
||||
inputFormat: 'diff',
|
||||
showFiles: false,
|
||||
matching: 'lines',
|
||||
drawFileList: false,
|
||||
colorScheme,
|
||||
})
|
||||
}
|
||||
return ''
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.change-log-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
/* padding-top: 5px; */
|
||||
/* padding-bottom: 30px; */
|
||||
font-size: 14px;
|
||||
border-bottom: 1px solid var(--normal-border-color);
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.change-log-text {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.change-log-user {
|
||||
font-weight: bold;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.change-log-user,
|
||||
.change-log-content {
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.change-log-avatar {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 50%;
|
||||
margin-right: 4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.change-log-time {
|
||||
font-size: 12px;
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.content-diff {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.change-log-category {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 4px;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
</style>
|
||||
@@ -136,7 +136,7 @@ export default {
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: var(--menu-selected-background-color);
|
||||
background: var(--normal-light-background-color);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
@@ -331,11 +331,11 @@ onMounted(async () => {
|
||||
|
||||
.reactions-viewer-item.placeholder,
|
||||
.reactions-viewer-single-item.selected {
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--normal-light-background-color);
|
||||
}
|
||||
|
||||
.reaction-option.selected {
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--normal-light-background-color);
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
|
||||
96
frontend_nuxt/config/uploadConfig.js
Normal file
96
frontend_nuxt/config/uploadConfig.js
Normal file
@@ -0,0 +1,96 @@
|
||||
/**
|
||||
* 文件上传配置 - 简化版
|
||||
* 专注于 FFmpeg.wasm 视频压缩,支持 Chrome/Safari
|
||||
*/
|
||||
|
||||
export const UPLOAD_CONFIG = {
|
||||
// 视频文件配置 - 专为 FFmpeg.wasm 优化
|
||||
VIDEO: {
|
||||
// 文件大小限制 (字节)
|
||||
MAX_SIZE: 20 * 1024 * 1024,
|
||||
TARGET_SIZE: 5 * 1024 * 1024, // 5MB
|
||||
|
||||
// 支持的输入格式 (FFmpeg.wasm 支持更多格式)
|
||||
SUPPORTED_FORMATS: ['mp4', 'webm', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'm4v', 'ogv'],
|
||||
|
||||
// 输出格式 - MP4 (兼容性最好)
|
||||
OUTPUT_FORMAT: 'mp4',
|
||||
OUTPUT_CODEC: 'h264',
|
||||
},
|
||||
|
||||
// 图片文件配置
|
||||
IMAGE: {
|
||||
MAX_SIZE: 5 * 1024 * 1024, // 5MB
|
||||
TARGET_SIZE: 5 * 1024 * 1024, // 5MB
|
||||
SUPPORTED_FORMATS: ['jpg', 'jpeg', 'png', 'gif', 'webp', 'svg', 'bmp'],
|
||||
},
|
||||
|
||||
// 音频文件配置
|
||||
AUDIO: {
|
||||
MAX_SIZE: 5 * 1024 * 1024, // 5MB
|
||||
TARGET_SIZE: 5 * 1024 * 1024, // 5MB
|
||||
SUPPORTED_FORMATS: ['mp3', 'wav', 'ogg', 'aac', 'm4a'],
|
||||
},
|
||||
|
||||
// 通用文件配置
|
||||
GENERAL: {
|
||||
MAX_SIZE: 100 * 1024 * 1024, // 100MB
|
||||
CHUNK_SIZE: 5 * 1024 * 1024, // 5MB 分片大小
|
||||
},
|
||||
|
||||
// 用户体验配置
|
||||
UI: {
|
||||
SUCCESS_DURATION: 2000,
|
||||
ERROR_DURATION: 3000,
|
||||
WARNING_DURATION: 3000,
|
||||
},
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取文件类型配置
|
||||
*/
|
||||
export function getFileTypeConfig(filename) {
|
||||
const ext = filename.split('.').pop().toLowerCase()
|
||||
|
||||
if (UPLOAD_CONFIG.VIDEO.SUPPORTED_FORMATS.includes(ext)) {
|
||||
return { type: 'video', config: UPLOAD_CONFIG.VIDEO }
|
||||
}
|
||||
|
||||
if (UPLOAD_CONFIG.IMAGE.SUPPORTED_FORMATS.includes(ext)) {
|
||||
return { type: 'image', config: UPLOAD_CONFIG.IMAGE }
|
||||
}
|
||||
|
||||
if (UPLOAD_CONFIG.AUDIO.SUPPORTED_FORMATS.includes(ext)) {
|
||||
return { type: 'audio', config: UPLOAD_CONFIG.AUDIO }
|
||||
}
|
||||
|
||||
return { type: 'general', config: UPLOAD_CONFIG.GENERAL }
|
||||
}
|
||||
|
||||
/**
|
||||
* 格式化文件大小
|
||||
*/
|
||||
export function formatFileSize(bytes) {
|
||||
if (bytes === 0) return '0 B'
|
||||
const k = 1024
|
||||
const sizes = ['B', 'KB', 'MB', 'GB']
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k))
|
||||
return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i]
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算压缩节省的费用 (示例函数)
|
||||
*/
|
||||
export function calculateSavings(originalSize, compressedSize, costPerMB = 0.01) {
|
||||
const originalMB = originalSize / (1024 * 1024)
|
||||
const compressedMB = compressedSize / (1024 * 1024)
|
||||
const savedMB = originalMB - compressedMB
|
||||
const savedCost = savedMB * costPerMB
|
||||
|
||||
return {
|
||||
savedMB: savedMB.toFixed(2),
|
||||
savedCost: savedCost.toFixed(4),
|
||||
originalCost: (originalMB * costPerMB).toFixed(4),
|
||||
compressedCost: (compressedMB * costPerMB).toFixed(4),
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ import { defineNuxtConfig } from 'nuxt/config'
|
||||
export default defineNuxtConfig({
|
||||
devServer: {
|
||||
host: '0.0.0.0',
|
||||
port: 3000
|
||||
port: 3000,
|
||||
},
|
||||
ssr: true,
|
||||
modules: ['@nuxt/image'],
|
||||
@@ -97,26 +97,9 @@ export default defineNuxtConfig({
|
||||
},
|
||||
},
|
||||
vite: {
|
||||
build: {
|
||||
// increase warning limit and split large libraries into separate chunks
|
||||
// chunkSizeWarningLimit: 1024,
|
||||
// rollupOptions: {
|
||||
// output: {
|
||||
// manualChunks(id) {
|
||||
// if (id.includes('node_modules')) {
|
||||
// if (id.includes('vditor')) {
|
||||
// return 'vditor'
|
||||
// }
|
||||
// if (id.includes('echarts')) {
|
||||
// return 'echarts'
|
||||
// }
|
||||
// if (id.includes('highlight.js')) {
|
||||
// return 'highlight'
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
// },
|
||||
// },
|
||||
optimizeDeps: {
|
||||
exclude: ['@ffmpeg/ffmpeg', '@ffmpeg/util'],
|
||||
},
|
||||
build: {},
|
||||
},
|
||||
})
|
||||
|
||||
2523
frontend_nuxt/package-lock.json
generated
2523
frontend_nuxt/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -13,9 +13,13 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@icon-park/vue-next": "^1.4.2",
|
||||
"@ffmpeg/ffmpeg": "^0.12.2",
|
||||
"@ffmpeg/util": "^0.12.2",
|
||||
"@nuxt/image": "^1.11.0",
|
||||
"@stomp/stompjs": "^7.0.0",
|
||||
"cropperjs": "^1.6.2",
|
||||
"diff": "^8.0.2",
|
||||
"diff2html": "^3.4.52",
|
||||
"echarts": "^5.6.0",
|
||||
"flatpickr": "^4.6.13",
|
||||
"highlight.js": "^11.11.1",
|
||||
@@ -23,6 +27,7 @@
|
||||
"ldrs": "^1.0.0",
|
||||
"markdown-it": "^14.1.0",
|
||||
"mermaid": "^10.9.4",
|
||||
"nanoid": "^5.1.5",
|
||||
"nprogress": "^0.2.0",
|
||||
"nuxt": "latest",
|
||||
"sanitize-html": "^2.17.0",
|
||||
|
||||
@@ -1,23 +1,48 @@
|
||||
<template>
|
||||
<div class="about-page">
|
||||
<BaseTabs v-model="selectedTab" :tabs="tabs">
|
||||
<div class="about-loading" v-if="isFetching">
|
||||
<l-hatch-spinner size="100" stroke="10" speed="1" color="var(--primary-color)" />
|
||||
</div>
|
||||
<div
|
||||
v-else
|
||||
class="about-content"
|
||||
v-html="renderMarkdown(content)"
|
||||
@click="handleContentClick"
|
||||
></div>
|
||||
<template v-if="selectedTab === 'api'">
|
||||
<div class="about-api">
|
||||
<div class="about-api-title">调试Token</div>
|
||||
<div v-if="!authState.loggedIn" class="about-api-login">
|
||||
请<NuxtLink to="/login" class="about-api-login-link">登录</NuxtLink>后查看 Token
|
||||
</div>
|
||||
<div v-else class="about-api-token">
|
||||
<div class="token-row">
|
||||
<span class="token-text">{{ shortToken }}</span>
|
||||
<span @click="copyToken"><copy class="copy-icon" /></span>
|
||||
</div>
|
||||
<div class="warning-row">
|
||||
<info-icon class="warning-icon" />
|
||||
<div class="token-warning">请不要将 Token 泄露给他人</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="about-api-title">API文档和调试入口</div>
|
||||
<div class="about-api-link">API Playground <share /></div>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="about-loading" v-if="isFetching">
|
||||
<l-hatch-spinner size="100" stroke="10" speed="1" color="var(--primary-color)" />
|
||||
</div>
|
||||
<div
|
||||
v-else
|
||||
class="about-content"
|
||||
v-html="renderMarkdown(content)"
|
||||
@click="handleContentClick"
|
||||
></div>
|
||||
</template>
|
||||
</BaseTabs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { onMounted, ref, watch } from 'vue'
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { useRoute, useRouter } from '#imports'
|
||||
import { authState, getToken } from '~/utils/auth'
|
||||
import { handleMarkdownClick, renderMarkdown } from '~/utils/markdown'
|
||||
import BaseTabs from '~/components/BaseTabs.vue'
|
||||
import { toast } from '~/composables/useToast'
|
||||
|
||||
export default {
|
||||
name: 'AboutPageView',
|
||||
@@ -44,11 +69,25 @@ export default {
|
||||
label: '隐私政策',
|
||||
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/privacy.md',
|
||||
},
|
||||
{
|
||||
key: 'api',
|
||||
label: 'API与调试',
|
||||
},
|
||||
]
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const selectedTab = ref(tabs[0].key)
|
||||
const content = ref('')
|
||||
const token = computed(() => (authState.loggedIn ? getToken() : ''))
|
||||
|
||||
const shortToken = computed(() => {
|
||||
if (!token.value) return ''
|
||||
if (token.value.length <= 20) return token.value
|
||||
return `${token.value.slice(0, 20)}...${token.value.slice(-10)}`
|
||||
})
|
||||
|
||||
const loadContent = async (file) => {
|
||||
if (!file) return
|
||||
try {
|
||||
isFetching.value = true
|
||||
const res = await fetch(file)
|
||||
@@ -65,19 +104,58 @@ export default {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadContent(tabs[0].file)
|
||||
const initTab = route.query.tab
|
||||
if (initTab && tabs.find((t) => t.key === initTab)) {
|
||||
selectedTab.value = initTab
|
||||
const tab = tabs.find((t) => t.key === initTab)
|
||||
if (tab && tab.file) loadContent(tab.file)
|
||||
} else {
|
||||
loadContent(tabs[0].file)
|
||||
}
|
||||
})
|
||||
|
||||
watch(selectedTab, (name) => {
|
||||
const tab = tabs.find((t) => t.key === name)
|
||||
if (tab) loadContent(tab.file)
|
||||
if (tab && tab.file) loadContent(tab.file)
|
||||
router.replace({ query: { ...route.query, tab: name } })
|
||||
})
|
||||
|
||||
watch(
|
||||
() => route.query.tab,
|
||||
(name) => {
|
||||
if (name && name !== selectedTab.value && tabs.find((t) => t.key === name)) {
|
||||
selectedTab.value = name
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
const copyToken = async () => {
|
||||
if (import.meta.client && token.value) {
|
||||
try {
|
||||
await navigator.clipboard.writeText(token.value)
|
||||
toast.success('已复制 Token')
|
||||
} catch (e) {
|
||||
toast.error('复制失败')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const handleContentClick = (e) => {
|
||||
handleMarkdownClick(e)
|
||||
}
|
||||
|
||||
return { tabs, selectedTab, content, renderMarkdown, isFetching, handleContentClick }
|
||||
return {
|
||||
tabs,
|
||||
selectedTab,
|
||||
content,
|
||||
renderMarkdown,
|
||||
isFetching,
|
||||
handleContentClick,
|
||||
authState,
|
||||
token,
|
||||
copyToken,
|
||||
shortToken,
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@@ -101,6 +179,66 @@ export default {
|
||||
height: 200px;
|
||||
}
|
||||
|
||||
.about-api {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.about-api-title {
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 10px;
|
||||
margin-top: 30px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.about-api-login-link {
|
||||
color: var(--primary-color);
|
||||
cursor: pointer;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.about-api-login-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.warning-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.warning-icon {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.token-warning {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.token-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
font: 14px;
|
||||
margin-bottom: 10px;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.copy-btn {
|
||||
padding: 4px 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.about-api-link {
|
||||
color: var(--primary-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.about-api-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.about-tabs {
|
||||
width: 100vw;
|
||||
|
||||
@@ -65,16 +65,17 @@
|
||||
class="article-item"
|
||||
v-for="article in articles"
|
||||
:key="article.id"
|
||||
@click="navigateTo(`/posts/${article.id}`)"
|
||||
>
|
||||
<div class="article-main-container">
|
||||
<NuxtLink class="article-item-title main-item" :to="`/posts/${article.id}`">
|
||||
<NuxtLink class="article-item-title main-item">
|
||||
<pin v-if="article.pinned" theme="outline" class="pinned-icon" />
|
||||
<gift v-if="article.type === 'LOTTERY'" class="lottery-icon" />
|
||||
<ranking-list v-else-if="article.type === 'POLL'" class="poll-icon" />
|
||||
<star v-if="!article.rssExcluded" class="featured-icon" />
|
||||
{{ article.title }}
|
||||
</NuxtLink>
|
||||
<NuxtLink class="article-item-description main-item" :to="`/posts/${article.id}`">
|
||||
<NuxtLink class="article-item-description main-item">
|
||||
{{ sanitizeDescription(article.description) }}
|
||||
</NuxtLink>
|
||||
<div class="article-info-container main-item">
|
||||
@@ -423,7 +424,8 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
||||
|
||||
.topic-container {
|
||||
position: sticky;
|
||||
top: calc(var(--header-height) + 1px);
|
||||
top: var(--header-height);
|
||||
padding-top: 10px;
|
||||
z-index: 10;
|
||||
background-color: var(--background-color-blur);
|
||||
display: flex;
|
||||
@@ -431,12 +433,10 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
width: 100%;
|
||||
padding: 10px 0;
|
||||
backdrop-filter: var(--blur-10);
|
||||
}
|
||||
|
||||
.topic-item-container {
|
||||
margin-left: 20px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
@@ -477,6 +477,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
||||
width: 100%;
|
||||
color: gray;
|
||||
border-bottom: 1px solid var(--normal-border-color);
|
||||
padding-top: 30px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
@@ -486,6 +487,12 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
border-bottom: 1px solid var(--normal-border-color);
|
||||
transition: background-color 0.5s ease;
|
||||
}
|
||||
|
||||
.article-item:hover {
|
||||
background-color: var(--menu-selected-background-color-hover);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.article-main-container,
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
<template>
|
||||
<div class="chat-container" :class="{ float: isFloatMode }">
|
||||
<vue-easy-lightbox
|
||||
:visible="lightboxVisible"
|
||||
:index="lightboxIndex"
|
||||
:imgs="lightboxImgs"
|
||||
@hide="lightboxVisible = false"
|
||||
/>
|
||||
<div v-if="!loading" class="chat-header">
|
||||
<div class="header-main">
|
||||
<div class="back-button" @click="goBack">
|
||||
@@ -14,7 +20,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="messages-list" ref="messagesListEl">
|
||||
<div class="messages-list" ref="messagesListEl" @click="handleContentClick">
|
||||
<div v-if="loading" class="loading-container">
|
||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||
</div>
|
||||
@@ -36,7 +42,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="item.replyTo" class="reply-preview info-content-text">
|
||||
<div class="reply-author">{{ item.replyTo.sender.username }}</div>
|
||||
<div class="reply-header">
|
||||
<next class="reply-icon" />
|
||||
<BaseImage class="reply-avatar" :src="item.replyTo.sender.avatar" alt="avatar" />
|
||||
<div class="reply-author">{{ item.replyTo.sender.username }}:</div>
|
||||
</div>
|
||||
<div class="reply-content" v-html="renderMarkdown(item.replyTo.content)"></div>
|
||||
</div>
|
||||
<div class="message-content">
|
||||
@@ -48,7 +58,7 @@
|
||||
:content-id="item.id"
|
||||
@update:modelValue="(v) => (item.reactions = v)"
|
||||
>
|
||||
<div class="reply-btn"><next @click="setReply(item)" /> 写个回复...</div>
|
||||
<div @click="setReply(item)" class="reply-btn"><next /> 写个回复...</div>
|
||||
</ReactionsGroup>
|
||||
</template>
|
||||
</BaseTimeline>
|
||||
@@ -63,11 +73,21 @@
|
||||
</div>
|
||||
|
||||
<div class="message-input-area">
|
||||
<div
|
||||
v-if="newMessagesCount > 0 && !isUserNearBottom"
|
||||
class="new-message-container"
|
||||
@click="handleScrollToBottom"
|
||||
>
|
||||
<double-down />
|
||||
<div class="new-message-count">有{{ newMessagesCount }}条新消息</div>
|
||||
</div>
|
||||
|
||||
<div v-if="replyTo" class="active-reply">
|
||||
正在回复 {{ replyTo.sender.username }}:
|
||||
{{ stripMarkdownLength(replyTo.content, 50) }}
|
||||
<close-icon class="close-reply" @click="replyTo = null" />
|
||||
</div>
|
||||
|
||||
<MessageEditor :loading="sending" @submit="sendMessage" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -87,7 +107,7 @@ import {
|
||||
import { useRoute } from 'vue-router'
|
||||
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
||||
import { toast } from '~/main'
|
||||
import { renderMarkdown, stripMarkdownLength } from '~/utils/markdown'
|
||||
import { renderMarkdown, stripMarkdownLength, handleMarkdownClick } from '~/utils/markdown'
|
||||
import MessageEditor from '~/components/MessageEditor.vue'
|
||||
import ReactionsGroup from '~/components/ReactionsGroup.vue'
|
||||
import { useWebSocket } from '~/composables/useWebSocket'
|
||||
@@ -96,6 +116,7 @@ import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
|
||||
import TimeManager from '~/utils/time'
|
||||
import BaseTimeline from '~/components/BaseTimeline.vue'
|
||||
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||
import VueEasyLightbox from 'vue-easy-lightbox'
|
||||
|
||||
const config = useRuntimeConfig()
|
||||
const route = useRoute()
|
||||
@@ -120,6 +141,10 @@ const isChannel = ref(false)
|
||||
const isFloatMode = computed(() => route.query.float !== undefined)
|
||||
const floatRoute = useState('messageFloatRoute')
|
||||
const replyTo = ref(null)
|
||||
const newMessagesCount = ref(0)
|
||||
const lightboxVisible = ref(false)
|
||||
const lightboxIndex = ref(0)
|
||||
const lightboxImgs = ref([])
|
||||
|
||||
const isUserNearBottom = ref(true)
|
||||
function updateNearBottom() {
|
||||
@@ -127,6 +152,9 @@ function updateNearBottom() {
|
||||
if (!el) return
|
||||
const threshold = 40 // px
|
||||
isUserNearBottom.value = el.scrollHeight - el.scrollTop - el.clientHeight <= threshold
|
||||
if (isUserNearBottom.value) {
|
||||
newMessagesCount.value = 0
|
||||
}
|
||||
}
|
||||
|
||||
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
|
||||
@@ -170,6 +198,11 @@ function scrollToBottomInstant() {
|
||||
el.scrollTop = el.scrollHeight
|
||||
}
|
||||
|
||||
function handleScrollToBottom() {
|
||||
scrollToBottomSmooth()
|
||||
newMessagesCount.value = 0
|
||||
}
|
||||
|
||||
async function fetchMessages(page = 0) {
|
||||
if (page === 0) {
|
||||
loading.value = true
|
||||
@@ -301,6 +334,7 @@ async function sendMessage(content, clearInput) {
|
||||
await nextTick()
|
||||
// 仅“发送消息成功后”才平滑滚动到底部
|
||||
scrollToBottomSmooth()
|
||||
newMessagesCount.value = 0
|
||||
} catch (e) {
|
||||
toast.error(e.message)
|
||||
} finally {
|
||||
@@ -373,6 +407,8 @@ const subscribeToConversation = () => {
|
||||
|
||||
if (isUserNearBottom.value) {
|
||||
scrollToBottomSmooth()
|
||||
} else {
|
||||
newMessagesCount.value += 1
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to parse websocket message', e)
|
||||
@@ -425,6 +461,21 @@ function minimize() {
|
||||
navigateTo('/')
|
||||
}
|
||||
|
||||
function handleContentClick(e) {
|
||||
handleMarkdownClick(e)
|
||||
if (
|
||||
e.target.tagName === 'IMG' &&
|
||||
!e.target.classList.contains('emoji') &&
|
||||
!e.target.closest('.reactions-container')
|
||||
) {
|
||||
const container = e.target.parentNode
|
||||
const imgs = [...container.querySelectorAll('img')].map((i) => i.src)
|
||||
lightboxImgs.value = imgs
|
||||
lightboxIndex.value = imgs.indexOf(e.target.src)
|
||||
lightboxVisible.value = true
|
||||
}
|
||||
}
|
||||
|
||||
function openUser(id) {
|
||||
if (isFloatMode.value) {
|
||||
// 先不处理...
|
||||
@@ -555,6 +606,25 @@ function goBack() {
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.new-message-container {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
cursor: pointer;
|
||||
border: 1px solid var(--normal-border-color);
|
||||
border-radius: 20px;
|
||||
padding: 3px 6px;
|
||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
|
||||
width: fit-content;
|
||||
position: absolute;
|
||||
bottom: calc(100% + 20px);
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
z-index: 10;
|
||||
background-color: var(--background-color);
|
||||
}
|
||||
|
||||
.user-name {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
@@ -585,11 +655,6 @@ function goBack() {
|
||||
border-bottom-left-radius: 4px;
|
||||
}
|
||||
|
||||
.message-input-area {
|
||||
margin-left: 20px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.loading-container {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@@ -606,6 +671,19 @@ function goBack() {
|
||||
.message-input-area {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.reply-icon {
|
||||
color: var(--primary-color);
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.reply-avatar {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 50%;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.reply-preview {
|
||||
@@ -614,12 +692,19 @@ function goBack() {
|
||||
border-left: 5px solid var(--primary-color);
|
||||
margin-bottom: 5px;
|
||||
font-size: 13px;
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--normal-light-background-color);
|
||||
}
|
||||
|
||||
.reply-header {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.reply-author {
|
||||
font-weight: bold;
|
||||
margin-bottom: 2px;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.reply-btn {
|
||||
@@ -634,7 +719,7 @@ function goBack() {
|
||||
}
|
||||
|
||||
.active-reply {
|
||||
background-color: var(--bg-color-soft);
|
||||
background-color: var(--normal-light-background-color);
|
||||
padding: 5px 10px;
|
||||
border-left: 5px solid var(--primary-color);
|
||||
margin-bottom: 5px;
|
||||
|
||||
@@ -419,7 +419,7 @@ function minimize() {
|
||||
}
|
||||
|
||||
.conversation-item:hover {
|
||||
background-color: var(--menu-selected-background-color);
|
||||
background-color: var(--normal-light-background-color);
|
||||
}
|
||||
|
||||
.conversation-avatar {
|
||||
|
||||
@@ -122,9 +122,10 @@
|
||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||
</div>
|
||||
<div v-else class="comments-container">
|
||||
<BaseTimeline :items="comments">
|
||||
<BaseTimeline :items="timelineItems">
|
||||
<template #item="{ item }">
|
||||
<CommentItem
|
||||
v-if="item.kind === 'comment'"
|
||||
:key="item.id"
|
||||
:comment="item"
|
||||
:level="0"
|
||||
@@ -133,6 +134,7 @@
|
||||
:post-closed="closed"
|
||||
@deleted="onCommentDeleted"
|
||||
/>
|
||||
<PostChangeLogItem v-else :log="item" :title="title" />
|
||||
</template>
|
||||
</BaseTimeline>
|
||||
</div>
|
||||
@@ -182,6 +184,7 @@ import { useRoute } from 'vue-router'
|
||||
import CommentItem from '~/components/CommentItem.vue'
|
||||
import CommentEditor from '~/components/CommentEditor.vue'
|
||||
import BaseTimeline from '~/components/BaseTimeline.vue'
|
||||
import PostChangeLogItem from '~/components/PostChangeLogItem.vue'
|
||||
import ArticleTags from '~/components/ArticleTags.vue'
|
||||
import ArticleCategory from '~/components/ArticleCategory.vue'
|
||||
import ReactionsGroup from '~/components/ReactionsGroup.vue'
|
||||
@@ -212,6 +215,7 @@ const category = ref('')
|
||||
const tags = ref([])
|
||||
const postReactions = ref([])
|
||||
const comments = ref([])
|
||||
const changeLogs = ref([])
|
||||
const status = ref('PUBLISHED')
|
||||
const closed = ref(false)
|
||||
const pinnedAt = ref(null)
|
||||
@@ -225,6 +229,7 @@ const subscribed = ref(false)
|
||||
const commentSort = ref('NEWEST')
|
||||
const isFetchingComments = ref(false)
|
||||
const isMobile = useIsMobile()
|
||||
const timelineItems = ref([])
|
||||
|
||||
const headerHeight = import.meta.client
|
||||
? parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--header-height')) || 0
|
||||
@@ -290,8 +295,13 @@ const gatherPostItems = () => {
|
||||
const main = mainContainer.value.querySelector('.info-content-container')
|
||||
if (main) items.push({ el: main, top: getTop(main) })
|
||||
|
||||
for (const c of comments.value) {
|
||||
const el = document.getElementById('comment-' + c.id)
|
||||
for (const c of timelineItems.value) {
|
||||
let el
|
||||
if (c.kind === 'comment') {
|
||||
el = document.getElementById('comment-' + c.id)
|
||||
} else {
|
||||
el = document.getElementById('change-log-' + c.id)
|
||||
}
|
||||
if (el) {
|
||||
items.push({ el, top: getTop(el) })
|
||||
}
|
||||
@@ -323,12 +333,66 @@ const mapComment = (
|
||||
),
|
||||
openReplies: level === 0,
|
||||
src: c.author.avatar,
|
||||
createdAt: c.createdAt,
|
||||
iconClick: () => navigateTo(`/users/${c.author.id}`),
|
||||
parentUserName: parentUserName,
|
||||
parentUserAvatar: parentUserAvatar,
|
||||
parentUserClick: parentUserId ? () => navigateTo(`/users/${parentUserId}`) : null,
|
||||
})
|
||||
|
||||
const changeLogIcon = (l) => {
|
||||
if (l.type === 'CONTENT') {
|
||||
return 'edit'
|
||||
} else if (l.type === 'TITLE') {
|
||||
return 'hashtag-key'
|
||||
} else if (l.type === 'CATEGORY') {
|
||||
return 'tag-one'
|
||||
} else if (l.type === 'TAG') {
|
||||
return 'tag-one'
|
||||
} else if (l.type === 'CLOSED') {
|
||||
if (l.newClosed) {
|
||||
return 'lock-one'
|
||||
} else {
|
||||
return 'unlock'
|
||||
}
|
||||
} else if (l.type === 'PINNED') {
|
||||
return 'pin-icon'
|
||||
} else if (l.type === 'FEATURED') {
|
||||
if (l.newFeatured) {
|
||||
return 'star'
|
||||
} else {
|
||||
return 'dislike'
|
||||
}
|
||||
} else if (l.type === 'VOTE_RESULT') {
|
||||
return 'check-one'
|
||||
} else if (l.type === 'LOTTERY_RESULT') {
|
||||
return 'gift'
|
||||
} else {
|
||||
return 'info'
|
||||
}
|
||||
}
|
||||
|
||||
const mapChangeLog = (l) => ({
|
||||
id: l.id,
|
||||
username: l.username,
|
||||
userAvatar: l.userAvatar,
|
||||
type: l.type,
|
||||
createdAt: l.time,
|
||||
time: TimeManager.format(l.time),
|
||||
newClosed: l.newClosed,
|
||||
newPinnedAt: l.newPinnedAt,
|
||||
newFeatured: l.newFeatured,
|
||||
oldContent: l.oldContent,
|
||||
newContent: l.newContent,
|
||||
oldTitle: l.oldTitle,
|
||||
newTitle: l.newTitle,
|
||||
oldCategory: l.oldCategory,
|
||||
newCategory: l.newCategory,
|
||||
oldTags: l.oldTags,
|
||||
newTags: l.newTags,
|
||||
icon: changeLogIcon(l),
|
||||
})
|
||||
|
||||
const getTop = (el) => {
|
||||
return el.getBoundingClientRect().top + window.scrollY
|
||||
}
|
||||
@@ -370,7 +434,7 @@ const removeCommentFromList = (id, list) => {
|
||||
|
||||
const handleContentClick = (e) => {
|
||||
handleMarkdownClick(e)
|
||||
if (e.target.tagName === 'IMG') {
|
||||
if (e.target.tagName === 'IMG' && !e.target.classList.contains('emoji')) {
|
||||
const container = e.target.parentNode
|
||||
const imgs = [...container.querySelectorAll('img')].map((i) => i.src)
|
||||
lightboxImgs.value = imgs
|
||||
@@ -422,19 +486,21 @@ watchEffect(() => {
|
||||
// router.replace('/404')
|
||||
// }
|
||||
|
||||
const totalPosts = computed(() => comments.value.length + 1)
|
||||
const totalPosts = computed(() => timelineItems.value.length + 1)
|
||||
const lastReplyTime = computed(() =>
|
||||
comments.value.length ? comments.value[comments.value.length - 1].time : postTime.value,
|
||||
timelineItems.value.length
|
||||
? timelineItems.value[timelineItems.value.length - 1].time
|
||||
: postTime.value,
|
||||
)
|
||||
const firstReplyTime = computed(() =>
|
||||
comments.value.length ? comments.value[0].time : postTime.value,
|
||||
timelineItems.value.length ? timelineItems.value[0].time : postTime.value,
|
||||
)
|
||||
const scrollerTopTime = computed(() =>
|
||||
commentSort.value === 'OLDEST' ? postTime.value : firstReplyTime.value,
|
||||
)
|
||||
|
||||
watch(
|
||||
() => comments.value.length,
|
||||
() => timelineItems.value.length,
|
||||
async () => {
|
||||
await nextTick()
|
||||
gatherPostItems()
|
||||
@@ -546,6 +612,7 @@ const approvePost = async () => {
|
||||
status.value = 'PUBLISHED'
|
||||
toast.success('已通过审核')
|
||||
await refreshPost()
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -561,6 +628,7 @@ const pinPost = async () => {
|
||||
if (res.ok) {
|
||||
toast.success('已置顶')
|
||||
await refreshPost()
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -576,6 +644,7 @@ const unpinPost = async () => {
|
||||
if (res.ok) {
|
||||
toast.success('已取消置顶')
|
||||
await refreshPost()
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -591,6 +660,7 @@ const excludeRss = async () => {
|
||||
if (res.ok) {
|
||||
rssExcluded.value = true
|
||||
toast.success('已标记为rss不推荐')
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -606,6 +676,7 @@ const includeRss = async () => {
|
||||
if (res.ok) {
|
||||
rssExcluded.value = false
|
||||
toast.success('已标记为rss推荐')
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -622,6 +693,7 @@ const closePost = async () => {
|
||||
closed.value = true
|
||||
toast.success('已关闭')
|
||||
await refreshPost()
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -638,6 +710,7 @@ const reopenPost = async () => {
|
||||
closed.value = false
|
||||
toast.success('已重新打开')
|
||||
await refreshPost()
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -682,6 +755,7 @@ const rejectPost = async () => {
|
||||
status.value = 'REJECTED'
|
||||
toast.success('已驳回')
|
||||
await refreshPost()
|
||||
await fetchChangeLogs()
|
||||
} else {
|
||||
toast.error('操作失败')
|
||||
}
|
||||
@@ -740,7 +814,42 @@ const fetchComments = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
watch(commentSort, fetchComments)
|
||||
const fetchChangeLogs = async () => {
|
||||
try {
|
||||
const res = await fetch(`${API_BASE_URL}/api/posts/${postId}/change-logs`)
|
||||
if (res.ok) {
|
||||
const data = await res.json()
|
||||
changeLogs.value = data.map(mapChangeLog)
|
||||
await nextTick()
|
||||
gatherPostItems()
|
||||
}
|
||||
} catch (e) {
|
||||
console.debug('Fetch change logs error', e)
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// todo(tim): fetchComments, fetchChangeLogs 整合到一个请求,并且取消前端排序
|
||||
//
|
||||
const fetchTimeline = async () => {
|
||||
await Promise.all([fetchComments(), fetchChangeLogs()])
|
||||
const cs = comments.value.map((c) => ({ ...c, kind: 'comment' }))
|
||||
const ls = changeLogs.value.map((l) => ({ ...l, kind: 'log' }))
|
||||
|
||||
if (commentSort.value === 'NEWEST') {
|
||||
timelineItems.value = [...cs, ...ls].sort(
|
||||
(a, b) => new Date(b.createdAt) - new Date(a.createdAt),
|
||||
)
|
||||
} else {
|
||||
timelineItems.value = [...cs, ...ls].sort(
|
||||
(a, b) => new Date(a.createdAt) - new Date(b.createdAt),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
watch(commentSort, async () => {
|
||||
await fetchTimeline()
|
||||
})
|
||||
|
||||
const jumpToHashComment = async () => {
|
||||
const hash = location.hash
|
||||
@@ -763,7 +872,7 @@ const gotoProfile = () => {
|
||||
|
||||
const initPage = async () => {
|
||||
scrollTo(0, 0)
|
||||
await fetchComments()
|
||||
await fetchTimeline()
|
||||
const hash = location.hash
|
||||
const id = hash.startsWith('#comment-') ? hash.substring('#comment-'.length) : null
|
||||
if (id) expandCommentPath(id)
|
||||
@@ -1054,6 +1163,7 @@ onMounted(async () => {
|
||||
margin-top: 10px;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.info-content-container {
|
||||
@@ -1109,7 +1219,7 @@ onMounted(async () => {
|
||||
}
|
||||
|
||||
.post-time {
|
||||
font-size: 14px;
|
||||
font-size: 12px;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
@@ -1175,10 +1285,6 @@ onMounted(async () => {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.post-time {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.info-content-text {
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user