diff --git a/pom.xml b/pom.xml
index 0816680b..e20e83e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,6 +282,12 @@
itextpdf
5.5.13.2
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java
index 15372e9b..b167f4b6 100644
--- a/src/main/java/com/ai/da/common/constant/CommonConstant.java
+++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java
@@ -59,4 +59,10 @@ public class CommonConstant {
public static final List IS_SUBSCRIBE = Arrays.asList("yes", "no");
+ public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.jpg";
+
+ /* 截止至2024/08/26，在Code-Create DB中pmr_users表中最大的用户id */
+ public static final Long MAXIMUM_USER_ID = 704L;
+// public static final Long MAXIMUM_USER_ID = 225L;
+
}
diff --git a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
index 0f61d591..bc6071c8 100644
--- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
+++ b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
@@ -1,133 +1,134 @@
-package com.ai.da.common.security.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.ai.da.common.context.UserContext;
-import com.ai.da.common.security.config.SecurityProperties;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
-import com.ai.da.common.utils.LocalCacheUtils;
-import com.ai.da.common.utils.MultiReadHttpServletRequest;
-import com.ai.da.common.utils.MultiReadHttpServletResponse;
-import com.ai.da.common.utils.RequestInfoUtil;
-import com.ai.da.model.vo.AuthPrincipalVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.lang.NonNull;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.annotation.Resource;
-import javax.security.sasl.AuthenticationException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author: dangweijian
- * @description: 认证拦截器
- * @create: 2020-07-10 16:50
- **/
-@Slf4j
-@Configuration
-public class AuthenticationFilter extends OncePerRequestFilter {
-
- @Resource
- private JWTTokenHelper jwtTokenHelper;
- @Resource
- private SecurityProperties properties;
-
- private static final List FILTER_URL =
- Arrays.asList("/favicon.ico", "/doc.html", "api/account/login", "api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
- "/webjars/", "/swagger-resources", "/v2/api-docs", "api/account/resetPwd",
- "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
- "/api/third/party/addUser","/api/third/party/addTrialUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile",
- "/api/third/party/addNoLoginRequiredNew","/api/third/party/deleteNoLoginRequiredNew",
- "/api/third/party/existNoLoginRequired","/api/third/party/getRedirectUrl",
- "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back","/api/alipay-hk/trade/notify",
- "/api/portfolio/page", "/api/portfolio/detail", "/api/portfolio/commentPage", "/api/portfolio/viewsIncrease",
- "/api/account/designWorksRegister","/api/account/questionnaire","/api/stripe/trade/notify"
- );
-
- @Override
- protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
- String requestURI = httpServletRequest.getRequestURI();
-
- if (calculateUrl(requestURI) || hasAuthorizationToken(httpServletRequest)) {
- StopWatch stopWatch = new StopWatch();
- HttpServletRequest wrappedRequest = httpServletRequest;
- HttpServletResponse wrappedResponse = httpServletResponse;
- try {
- stopWatch.start();
- if ((httpServletRequest.getContentType() == null && httpServletRequest.getContentLength() > 0) || (httpServletRequest.getContentType() != null && !httpServletRequest.getContentType().contains("application/json"))) {
- extracted(wrappedRequest);
- filterChain.doFilter(wrappedRequest, wrappedResponse);
- } else {
- wrappedRequest = new MultiReadHttpServletRequest(httpServletRequest);
- wrappedResponse = new MultiReadHttpServletResponse(httpServletResponse);
- extracted(wrappedRequest);
- filterChain.doFilter(wrappedRequest, wrappedResponse);
- }
- } catch (Exception e) {
- SecurityContextHolder.clearContext();
- throw e;
- } finally {
- stopWatch.stop();
- }
- } else {
- filterChain.doFilter(httpServletRequest, httpServletResponse);
- }
- }
-
- private Boolean calculateUrl(String requestURI) {
- String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
- return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
- }
-
- private boolean hasAuthorizationToken(HttpServletRequest request) {
- String authorizationHeader = request.getHeader("Authorization");
- return authorizationHeader != null && authorizationHeader.startsWith("Bearer");
- }
-
- private void extracted(HttpServletRequest request) throws AuthenticationException {
- String jwtToken = request.getHeader(properties.getJwtTokenHeader());
-// log.debug("后台检查令牌:{}", jwtToken);
-
- if (StrUtil.isBlank(jwtToken)) {
- String ipAddress = RequestInfoUtil.getIpAddress(request);
- log.info("本次请求的ip为 ： " + ipAddress);
- throw new RuntimeException("请传入token！");
- }
- if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
- //写死 暂时放行
- return;
- }
- // 检查token
- boolean validate = jwtTokenHelper.validateToken(jwtToken);
- if (validate) {
- AuthPrincipalVo principal = jwtTokenHelper.parserToUser(jwtToken);
- if (principal == null) {
- throw new RuntimeException("TOKEN已过期，请重新登录！");
- }
- //先清空当前线程变量,防止上一个线程遗留
- UserContext.delete();
- //存取用户信息到缓存
- UserContext.setUserHolder(principal);
- //校验token
- String cacheToken = LocalCacheUtils.getTokenCache(String.valueOf(principal.getId()));
-
- if(StringUtils.isEmpty(cacheToken)){
- throw new RuntimeException("TOKEN已过期，请重新登录！");
- }
- if(!cacheToken.equals(jwtToken) ){
- throw new RuntimeException("TOKEN已过期，请重新登录！");
- }
-// UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(null, null);
-// SecurityContextHolder.getContext().setAuthentication(authentication);
- }
- }
-}
+package com.ai.da.common.security.filter;
+
+import cn.hutool.core.util.StrUtil;
+import com.ai.da.common.context.UserContext;
+import com.ai.da.common.security.config.SecurityProperties;
+import com.ai.da.common.security.jwt.JWTTokenHelper;
+import com.ai.da.common.utils.LocalCacheUtils;
+import com.ai.da.common.utils.MultiReadHttpServletRequest;
+import com.ai.da.common.utils.MultiReadHttpServletResponse;
+import com.ai.da.common.utils.RequestInfoUtil;
+import com.ai.da.model.vo.AuthPrincipalVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.StopWatch;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.annotation.Resource;
+import javax.security.sasl.AuthenticationException;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author: dangweijian
+ * @description: 认证拦截器
+ * @create: 2020-07-10 16:50
+ **/
+@Slf4j
+@Configuration
+public class AuthenticationFilter extends OncePerRequestFilter {
+
+ @Resource
+ private JWTTokenHelper jwtTokenHelper;
+ @Resource
+ private SecurityProperties properties;
+
+ private static final List FILTER_URL =
+ Arrays.asList("/favicon.ico", "/doc.html", "api/account/login", "api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
+ "/webjars/", "/swagger-resources", "/v2/api-docs", "api/account/resetPwd",
+ "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
+ "/api/third/party/addUser","/api/third/party/addTrialUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile",
+ "/api/third/party/addNoLoginRequiredNew","/api/third/party/deleteNoLoginRequiredNew",
+ "/api/third/party/existNoLoginRequired","/api/third/party/getRedirectUrl",
+ "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back","/api/alipay-hk/trade/notify",
+ "/api/portfolio/page", "/api/portfolio/detail", "/api/portfolio/commentPage", "/api/portfolio/viewsIncrease",
+ "/api/account/designWorksRegister","/api/account/questionnaire","/api/stripe/trade/notify",
+ "/notification"
+ );
+
+ @Override
+ protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
+ String requestURI = httpServletRequest.getRequestURI();
+
+ if (calculateUrl(requestURI) || hasAuthorizationToken(httpServletRequest)) {
+ StopWatch stopWatch = new StopWatch();
+ HttpServletRequest wrappedRequest = httpServletRequest;
+ HttpServletResponse wrappedResponse = httpServletResponse;
+ try {
+ stopWatch.start();
+ if ((httpServletRequest.getContentType() == null && httpServletRequest.getContentLength() > 0) || (httpServletRequest.getContentType() != null && !httpServletRequest.getContentType().contains("application/json"))) {
+ extracted(wrappedRequest);
+ filterChain.doFilter(wrappedRequest, wrappedResponse);
+ } else {
+ wrappedRequest = new MultiReadHttpServletRequest(httpServletRequest);
+ wrappedResponse = new MultiReadHttpServletResponse(httpServletResponse);
+ extracted(wrappedRequest);
+ filterChain.doFilter(wrappedRequest, wrappedResponse);
+ }
+ } catch (Exception e) {
+ SecurityContextHolder.clearContext();
+ throw e;
+ } finally {
+ stopWatch.stop();
+ }
+ } else {
+ filterChain.doFilter(httpServletRequest, httpServletResponse);
+ }
+ }
+
+ private Boolean calculateUrl(String requestURI) {
+ String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
+ return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+ private boolean hasAuthorizationToken(HttpServletRequest request) {
+ String authorizationHeader = request.getHeader("Authorization");
+ return authorizationHeader != null && authorizationHeader.startsWith("Bearer");
+ }
+
+ private void extracted(HttpServletRequest request) throws AuthenticationException {
+ String jwtToken = request.getHeader(properties.getJwtTokenHeader());
+// log.debug("后台检查令牌:{}", jwtToken);
+
+ if (StrUtil.isBlank(jwtToken)) {
+ String ipAddress = RequestInfoUtil.getIpAddress(request);
+ log.info("本次请求的ip为 ： " + ipAddress);
+ throw new RuntimeException("请传入token！");
+ }
+ if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
+ //写死 暂时放行
+ return;
+ }
+ // 检查token
+ boolean validate = jwtTokenHelper.validateToken(jwtToken);
+ if (validate) {
+ AuthPrincipalVo principal = jwtTokenHelper.parserToUser(jwtToken);
+ if (principal == null) {
+ throw new RuntimeException("TOKEN已过期，请重新登录！");
+ }
+ //先清空当前线程变量,防止上一个线程遗留
+ UserContext.delete();
+ //存取用户信息到缓存
+ UserContext.setUserHolder(principal);
+ //校验token
+ String cacheToken = LocalCacheUtils.getTokenCache(String.valueOf(principal.getId()));
+
+ if(StringUtils.isEmpty(cacheToken)){
+ throw new RuntimeException("TOKEN已过期，请重新登录！");
+ }
+ if(!cacheToken.equals(jwtToken) ){
+ throw new RuntimeException("TOKEN已过期，请重新登录！");
+ }
+// UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(null, null);
+// SecurityContextHolder.getContext().setAuthentication(authentication);
+ }
+ }
+}
diff --git a/src/main/java/com/ai/da/common/task/AccountTask.java b/src/main/java/com/ai/da/common/task/AccountTask.java
index 9e232d83..da5764b4 100644
--- a/src/main/java/com/ai/da/common/task/AccountTask.java
+++ b/src/main/java/com/ai/da/common/task/AccountTask.java
@@ -57,4 +57,12 @@ public class AccountTask {
accountService.toVisitor(account);
}
}
+
+ /**
+ * 将Code-Create上注册的用户添加为AiDA的游客
+ */
+ // @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+ public void registerUserToVisitor(){
+ accountService.registerUserToVisitor();
+ }
}
diff --git a/src/main/java/com/ai/da/common/utils/RedisUtil.java b/src/main/java/com/ai/da/common/utils/RedisUtil.java
index 0d5c6153..ffb0f424 100644
--- a/src/main/java/com/ai/da/common/utils/RedisUtil.java
+++ b/src/main/java/com/ai/da/common/utils/RedisUtil.java
@@ -216,4 +216,17 @@ public class RedisUtil {
return redisTemplate.opsForValue().increment(key, 0);
}
+ public final static String PERSONAL_HOMEPAGE_VIEW_KEY = "PersonalHomepage:view:";
+
+ public void increasePersonalHomepageViewCount(Long accountId) {
+ String key = PERSONAL_HOMEPAGE_VIEW_KEY + accountId;
+ redisTemplate.opsForValue().increment(key);
+ }
+
+ public Long getPersonalHomepageViewCount(Long accountId) {
+ String key = PERSONAL_HOMEPAGE_VIEW_KEY + accountId;
+ return redisTemplate.opsForValue().increment(key, 0);
+ }
+
+
}
diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
index 7f6706cc..16fcfe21 100644
--- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
+++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
@@ -590,4 +590,40 @@ public class SendEmailUtil {
throw new BusinessException("failed.to.send.mail");
}
}
+
+ private final static Long NEW_USER_REGISTER_NOTIFICATION_EN = 126919L;
+
+ public static void notificationForRegisterUser(String receiverAddress){
+ try{
+ // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
+ // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
+ // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
+ Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+ // 实例化一个http选项，可选的，没有特殊需求可以跳过
+ HttpProfile httpProfile = new HttpProfile();
+ httpProfile.setEndpoint("ses.tencentcloudapi.com");
+ // 实例化一个client选项，可选的，没有特殊需求可以跳过
+ ClientProfile clientProfile = new ClientProfile();
+ clientProfile.setHttpProfile(httpProfile);
+ // 实例化要请求产品的client对象,clientProfile是可选的
+ SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+ // 实例化一个请求对象,每个接口都会对应一个request对象
+ SendEmailRequest req = new SendEmailRequest();
+ req.setFromEmailAddress(SEND_ADDRESS);
+ req.setDestination(new String[]{receiverAddress});
+
+ req.setSubject("Welcome to AiDa");
+ Template template = new Template();
+ template.setTemplateID(NEW_USER_REGISTER_NOTIFICATION_EN);
+ template.setTemplateData("{\"email\":\" " + receiverAddress + "\"}");
+ req.setTemplate(template);
+
+ // 返回的resp是一个SendEmailResponse的实例，与请求对象对应
+ SendEmailResponse resp = client.SendEmail(req);
+ log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+ } catch (TencentCloudSDKException e) {
+ log.info("邮件发送失败###{}", e.toString());
+ throw new BusinessException("failed.to.send.mail");
+ }
+ }
}
diff --git a/src/main/java/com/ai/da/common/websocket/NotificationConnection.java b/src/main/java/com/ai/da/common/websocket/NotificationConnection.java
new file mode 100644
index 00000000..f9a9cb52
--- /dev/null
+++ b/src/main/java/com/ai/da/common/websocket/NotificationConnection.java
@@ -0,0 +1,43 @@
+package com.ai.da.common.websocket;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+@ServerEndpoint(value = "/notification")
+@Component
+@Slf4j
+public class NotificationConnection {
+
+ static Map sessionMap = new ConcurrentHashMap<>();
+ //连接建立时执行的操作
+ @OnOpen
+ public void onOpen(Session session){
+ sessionMap.put(session.getId(),session);
+ log.info("websocket is open");
+ }
+ //收到了客户端消息执行的操作
+ @OnMessage
+ public void onMessage(String text){
+ log.info("收到了一条消息："+text);
+// return "已收到你的消息";
+ }
+ //连接关闭的时候执行的操作
+ @OnClose
+ public void onClose(Session session){
+ sessionMap.remove(session.getId());
+ log.info("websocket is close");
+ }
+
+ public void sendMsg(String message) throws IOException {
+ for(String key:sessionMap.keySet()){
+ sessionMap.get(key).getBasicRemote().sendText(message);
+ }
+ }
+}
diff --git a/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java b/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
new file mode 100644
index 00000000..df5b252b
--- /dev/null
+++ b/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
@@ -0,0 +1,18 @@
+package com.ai.da.common.websocket.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * Configuration of WebSocket
+ *
+ * @author db1995
+ */
+@Configuration
+public class WebSocketConfig {
+ @Bean
+ public ServerEndpointExporter serverEndpointExporter() {
+ return new ServerEndpointExporter();
+ }
+}
diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java
index 4dadaf3d..8cf6a5a9 100644
--- a/src/main/java/com/ai/da/controller/AccountController.java
+++ b/src/main/java/com/ai/da/controller/AccountController.java
@@ -1,18 +1,21 @@
package com.ai.da.controller;
+import com.ai.da.common.config.exception.BusinessException;
import com.ai.da.common.response.PageBaseResponse;
import com.ai.da.common.response.Response;
-import com.ai.da.mapper.primary.entity.Account;
import com.ai.da.mapper.primary.entity.TrialOrder;
import com.ai.da.model.dto.*;
import com.ai.da.model.vo.AccountLoginVO;
import com.ai.da.model.vo.AccountPreLoginVO;
+import com.ai.da.model.vo.PersonalHomepageVO;
import com.ai.da.service.AccountService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -194,4 +197,26 @@ public class AccountController {
public Response> setUserValidToDayEnd(){
return Response.success(accountService.setUserValidToDayEnd());
}
+
+ // 用户上传头像
+ @ApiOperation(value = "上传头像")
+ @PostMapping(path = "/uploadAvatar")
+ public Response uploadAvatar(@RequestParam("file") MultipartFile file) {
+ if (null == file || StringUtils.isEmpty(file.getOriginalFilename())) {
+ throw new BusinessException("file.cannot.be.empty");
+ }
+ return Response.success(accountService.uploadAvatar(file));
+ }
+
+ @ApiOperation(value = "个人主页浏览量增加")
+ @GetMapping("/viewsIncrease")
+ public Response viewsGet(@RequestParam("id") Long id) {
+ return Response.success(accountService.viewsIncrease(id));
+ }
+
+ @ApiOperation(value = "获取个人主页信息")
+ @GetMapping("/personalHomepage")
+ public Response getPersonalHomepage(@RequestParam("id") Long id){
+ return Response.success(accountService.getPersonalHomepage(id));
+ }
}
diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
index 119baa5a..7953b74a 100644
--- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
+++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
@@ -51,7 +51,8 @@ public class ConvenientInquiryController {
@ApiOperation("获取指定时间区间内所有用户design的使用情况")
@GetMapping("/getDesignStatistic")
- public Response> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime) {
+ public Response> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime,
+ @RequestParam(required = false) List ids, @RequestParam(required = false) String email) {
Long accountId = UserContext.getUserHolder().getId();
if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00";
@@ -60,7 +61,10 @@ public class ConvenientInquiryController {
Date date = new Date();
endTime = simpleDateFormat.format(date);
}
- List designStatistic = designMapper.getDesignStatistic(startTime, endTime);
+ if (!StringUtil.isNullOrEmpty(email)){
+ email = email.trim();
+ }
+ List designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email);
return Response.success(designStatistic);
} else {
return Response.fail("Sorry, you don't have permission");
diff --git a/src/main/java/com/ai/da/controller/MessageCenterController.java b/src/main/java/com/ai/da/controller/MessageCenterController.java
new file mode 100644
index 00000000..3f625cb8
--- /dev/null
+++ b/src/main/java/com/ai/da/controller/MessageCenterController.java
@@ -0,0 +1,63 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.GetNotificationDTO;
+import com.ai.da.model.vo.NotificationVO;
+import com.ai.da.model.dto.PublishSysNotificationDTO;
+import com.ai.da.service.MessageCenterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "消息中心模块")
+@Slf4j
+@RestController
+@RequestMapping("/api/message")
+public class MessageCenterController {
+
+ @Resource
+ private MessageCenterService messageCenterService;
+
+ // 获取未读消息总数
+ @ApiOperation(value = "获取未读消息数")
+ @GetMapping("/getUnreadCount")
+ public Response> getUnreadMessage(){
+ return Response.success(messageCenterService.getAllTypeMessageUnreadCount());
+ }
+
+ // 获取历史消息
+ @ApiOperation(value = "获取历史消息")
+ @PostMapping("/getHistoryNotification")
+ public Response> getHistoryNotification(@Valid @RequestBody GetNotificationDTO getNotificationDTO) {
+ return Response.success(messageCenterService.getHistoryNotification(getNotificationDTO));
+ }
+
+ // 已读消息
+ @ApiOperation(value = "设置消息状态为已读")
+ @PostMapping("/setReadStatus")
+ public Response setReadStatus(@RequestParam("notificationIdList") List notificationIdList, @RequestParam("type") String type) {
+ return Response.success(messageCenterService.setReadStatus(notificationIdList, type));
+ }
+
+ // 发布系统消息
+ @ApiOperation(value = "发布系统消息")
+ @PostMapping("/publishSysMessage")
+ public Response publishSysMessage(@Valid @RequestBody PublishSysNotificationDTO message) {
+ messageCenterService.publishSystemNotification(message);
+ return Response.success("success");
+ }
+
+ @ApiOperation(value = "一键已读")
+ @PostMapping("/oneClickRead")
+ public Response setReadAll(@RequestParam("type") String type) {
+ messageCenterService.setReadAll(type);
+ return Response.success("success");
+ }
+}
diff --git a/src/main/java/com/ai/da/controller/PortfolioController.java b/src/main/java/com/ai/da/controller/PortfolioController.java
index 09e8bd39..1ad6d81d 100644
--- a/src/main/java/com/ai/da/controller/PortfolioController.java
+++ b/src/main/java/com/ai/da/controller/PortfolioController.java
@@ -1,12 +1,11 @@
package com.ai.da.controller;
+import com.ai.da.common.config.exception.BusinessException;
import com.ai.da.common.response.PageBaseResponse;
import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.Account;
import com.ai.da.model.dto.*;
-import com.ai.da.model.vo.CommentVO;
-import com.ai.da.model.vo.PortfolioVO;
-import com.ai.da.model.vo.UserLikeChooseVO;
-import com.ai.da.model.vo.UserLikeGroupVO;
+import com.ai.da.model.vo.*;
import com.ai.da.service.PortfolioService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.validation.Valid;
+import java.util.List;
@Api(tags = "Portfolio模块")
@Slf4j
@@ -117,4 +117,31 @@ public class PortfolioController {
public Response commentDelete(@Valid @RequestBody CommentDTO commentDTO) {
return Response.success(portfolioService.commentDelete(commentDTO));
}
+
+ @ApiOperation(value = "关注")
+ @GetMapping("/follow")
+ public Response follow(@RequestParam("followeeId") Long followeeId) {
+ portfolioService.follow(followeeId);
+ return Response.success(BusinessException.getMessageFromResource("subscription.success"));
+ }
+
+ @ApiOperation(value = "取消关注")
+ @GetMapping("/cancelFollow")
+ public Response cancelFollow(@RequestParam("followeeId") Long followeeId) {
+ portfolioService.cancelFollow(followeeId);
+ return Response.success(BusinessException.getMessageFromResource("unsubscribe.success"));
+ }
+
+ @ApiOperation(value = "获取关注列表")
+ @PostMapping("/getFolloweeList")
+ public Response> getFolloweeList(@Valid @RequestBody GetFollowListDTO getFollowListDTO) {
+ return Response.success(portfolioService.getFolloweeList(getFollowListDTO));
+ }
+
+ @ApiOperation(value = "获取粉丝列表")
+ @PostMapping("/getFollowerList")
+ public Response> getFollowerList(@Valid @RequestBody GetFollowListDTO getFollowListDTO) {
+ return Response.success(portfolioService.getFollowerList(getFollowListDTO));
+ }
+
}
diff --git a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
index e6b1aa58..ece90931 100644
--- a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
@@ -18,5 +18,5 @@ public interface DesignMapper extends CommonMapper {
//返回插入数据后生成的主键
Long insertDesign(Design design);
- List getDesignStatistic(String startTime, String endTime);
+ List getDesignStatistic(String startTime, String endTime, List ids, String email);
}
diff --git a/src/main/java/com/ai/da/mapper/primary/NotificationMapper.java b/src/main/java/com/ai/da/mapper/primary/NotificationMapper.java
new file mode 100644
index 00000000..bdce12a3
--- /dev/null
+++ b/src/main/java/com/ai/da/mapper/primary/NotificationMapper.java
@@ -0,0 +1,24 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Notification;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+public interface NotificationMapper extends CommonMapper {
+
+ List> getTypeCount(Long receiverId);
+
+ /** 解决mybatis-plus自动过滤 is_deleted为1的数据 问题 */
+ Notification getUniqueLikeAndFollow(String type, Long senderId, Long receiverId, Long portfolioId);
+
+ void updateUniqueLikeAndFollow(Long id, LocalDateTime time);
+
+ void deleteNotification(Long id, LocalDateTime time);
+
+ void setPersonalNotificationAllRead(String type, Long receiverId, LocalDateTime time);
+
+ List getUnreadSysNotification(Long accountId);
+}
diff --git a/src/main/java/com/ai/da/mapper/primary/SysNotificationReadStatusMapper.java b/src/main/java/com/ai/da/mapper/primary/SysNotificationReadStatusMapper.java
new file mode 100644
index 00000000..fedf035f
--- /dev/null
+++ b/src/main/java/com/ai/da/mapper/primary/SysNotificationReadStatusMapper.java
@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.SysNotificationReadStatus;
+
+public interface SysNotificationReadStatusMapper extends CommonMapper {
+}
diff --git a/src/main/java/com/ai/da/mapper/primary/UserFollowMapper.java b/src/main/java/com/ai/da/mapper/primary/UserFollowMapper.java
new file mode 100644
index 00000000..ff45177c
--- /dev/null
+++ b/src/main/java/com/ai/da/mapper/primary/UserFollowMapper.java
@@ -0,0 +1,19 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.UserFollow;
+import com.ai.da.model.vo.AccountFollowVO;
+
+import java.util.List;
+
+
+public interface UserFollowMapper extends CommonMapper {
+ List getFolloweeListByFollower(Long followerAccountId, Integer limit, Integer offset, String order);
+
+ List getFollowerListByFollowee(Long followeeAccountId, Integer limit, Integer offset, String order);
+
+ List getFolloweeListByName(String name, Long followerId);
+
+ List getFollowerListByName(String name, Long followeeId);
+
+}
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Account.java b/src/main/java/com/ai/da/mapper/primary/entity/Account.java
index 8e39896b..285acd90 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/Account.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Account.java
@@ -99,4 +99,9 @@ public class Account implements Serializable {
* 4 ： 参加活动获取30天有效期和6000个积分的用户
*/
private Integer systemUser;
+
+ /**
+ * 头像
+ */
+ private String avatar;
}
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/Notification.java b/src/main/java/com/ai/da/mapper/primary/entity/Notification.java
new file mode 100644
index 00000000..12242ad3
--- /dev/null
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Notification.java
@@ -0,0 +1,73 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_notification")
+@Data
+public class Notification extends BaseEntity{
+ /**
+ * 操作类型 system/like/comment/follow
+ */
+ private String type;
+ /**
+ * 发起操作者用户id
+ */
+ private Long senderId;
+ /**
+ * 被操作对象用户id
+ */
+ private Long receiverId;
+ /**
+ * 点赞评论时的作品id
+ */
+ private Long portfolioId;
+ /**
+ * 消息内容
+ */
+ private String content;
+ /**
+ * 评论id
+ */
+ private Long commentId;
+ /**
+ * 个人消息已读状态
+ */
+ private Integer isRead;
+ /**
+ * 系统消息发布状态
+ */
+ private Integer publishFlag;
+
+ /**
+ * 是否被删除
+ */
+ private Integer isDeleted;
+
+ public Notification() {
+ }
+
+ public Notification(String type, Long senderId, Long receiverId) {
+ this.type = type;
+ this.senderId = senderId;
+ this.receiverId = receiverId;
+ }
+
+ public Notification(String type, Long senderId, Long receiverId, Long portfolioId) {
+ this.type = type;
+ this.senderId = senderId;
+ this.receiverId = receiverId;
+ this.portfolioId = portfolioId;
+ }
+
+ public Notification(String type, Long senderId, Long receiverId, Long portfolioId, String content, Long commentId) {
+ this.type = type;
+ this.senderId = senderId;
+ this.receiverId = receiverId;
+ this.portfolioId = portfolioId;
+ this.content = content;
+ this.commentId = commentId;
+ }
+}
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/SysNotificationReadStatus.java b/src/main/java/com/ai/da/mapper/primary/entity/SysNotificationReadStatus.java
new file mode 100644
index 00000000..4e0537dc
--- /dev/null
+++ b/src/main/java/com/ai/da/mapper/primary/entity/SysNotificationReadStatus.java
@@ -0,0 +1,26 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_sys_notification_read_status")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysNotificationReadStatus extends BaseEntity{
+ /**
+ * 系统消息id
+ */
+ private Long system_notification_id;
+
+ /**
+ * 已读当前消息的用户id将被存储
+ */
+ private Long account_id;
+}
diff --git a/src/main/java/com/ai/da/mapper/primary/entity/UserFollow.java b/src/main/java/com/ai/da/mapper/primary/entity/UserFollow.java
new file mode 100644
index 00000000..82e7a810
--- /dev/null
+++ b/src/main/java/com/ai/da/mapper/primary/entity/UserFollow.java
@@ -0,0 +1,26 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_user_follow")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserFollow extends BaseEntity{
+
+ /**
+ * 被关注者用户id
+ */
+ private Long followeeId;
+ /**
+ * 关注者用户id
+ */
+ private Long followerId;
+
+
+}
diff --git a/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java b/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java
new file mode 100644
index 00000000..c2878ecb
--- /dev/null
+++ b/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java
@@ -0,0 +1,19 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("按条件分页查询关注列表")
+public class GetFollowListDTO extends PageQueryBaseVo {
+
+ @ApiModelProperty("查找指定用户名")
+ private String searchByName;
+
+ @ApiModelProperty("按关注时间排序 DESC 降序 || ASC 升序")
+ private String order;
+}
diff --git a/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java b/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java
new file mode 100644
index 00000000..a5ff536c
--- /dev/null
+++ b/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java
@@ -0,0 +1,16 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class GetNotificationDTO extends PageQueryBaseVo {
+
+ @ApiModelProperty("system/like/comment/follow/newPosted")
+ private String type;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java b/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java
new file mode 100644
index 00000000..11a0c56b
--- /dev/null
+++ b/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java
@@ -0,0 +1,19 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("发布系统消息")
+public class PublishSysNotificationDTO {
+
+ @ApiModelProperty("系统消息标题")
+ private String title;
+
+ @ApiModelProperty("系统消息内容")
+ private String content;
+
+ @ApiModelProperty("系统消息 活动链接")
+ private String link;
+}
diff --git a/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java b/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
index 8176ba00..71e2c3d3 100644
--- a/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
+++ b/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
@@ -14,4 +14,6 @@ public class QueryPortfolioPageDTO extends PageQueryBaseVo {
private Integer getMyPortfolio;
private Integer getLikePortfolio;
+
+ private Long accountId;
}
diff --git a/src/main/java/com/ai/da/model/vo/AccountFollowVO.java b/src/main/java/com/ai/da/model/vo/AccountFollowVO.java
new file mode 100644
index 00000000..39a4e708
--- /dev/null
+++ b/src/main/java/com/ai/da/model/vo/AccountFollowVO.java
@@ -0,0 +1,33 @@
+package com.ai.da.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AccountFollowVO {
+ /**
+ * userId
+ */
+ private Long senderId;
+
+ private String userName;
+
+ private String avatar;
+
+ /**
+ * followTime
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * mutualFollowing 互粉
+ */
+ private Integer isFollow;
+}
diff --git a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
index 15b28c89..ab23b872 100644
--- a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
+++ b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
@@ -34,4 +34,10 @@ public class AccountLoginVO {
private Integer systemUser;
+ private String avatar;
+
+ private Long followeeCount;
+
+ private Long followerCount;
+
}
diff --git a/src/main/java/com/ai/da/model/vo/NotificationVO.java b/src/main/java/com/ai/da/model/vo/NotificationVO.java
new file mode 100644
index 00000000..b54bb4ec
--- /dev/null
+++ b/src/main/java/com/ai/da/model/vo/NotificationVO.java
@@ -0,0 +1,29 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.Notification;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class NotificationVO extends Notification {
+
+ /**
+ * senderUserName
+ */
+ private String userName;
+
+// private String senderUserAvatar;
+
+ private String portfolioName;
+
+ /**
+ * sender头像
+ */
+ private String avatar;
+
+ private Integer isFollow;
+
+ private String canvas;
+
+}
diff --git a/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java b/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java
new file mode 100644
index 00000000..b6f0f058
--- /dev/null
+++ b/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java
@@ -0,0 +1,31 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("个人主页返回信息")
+public class PersonalHomepageVO {
+
+ @ApiModelProperty("用户名")
+ private String userName;
+
+ @ApiModelProperty("用户头像")
+ private String avatar;
+
+ @ApiModelProperty("用户作品总数")
+ private Long portfolioCount;
+
+ @ApiModelProperty("粉丝总数")
+ private Long followerCount;
+
+ @ApiModelProperty("关注者总数")
+ private Long followeeCount;
+
+ @ApiModelProperty("个人主页总浏览量")
+ private Long homepageViewCount;
+
+ @ApiModelProperty("是否关注了主页用户")
+ private Integer isFollow;
+}
diff --git a/src/main/java/com/ai/da/model/vo/PortfolioVO.java b/src/main/java/com/ai/da/model/vo/PortfolioVO.java
index c7c0a088..a7610898 100644
--- a/src/main/java/com/ai/da/model/vo/PortfolioVO.java
+++ b/src/main/java/com/ai/da/model/vo/PortfolioVO.java
@@ -28,4 +28,8 @@ public class PortfolioVO extends Portfolio {
private Integer selected;
private Integer jumpable;
+
+ private Integer isFollow;
+
+ private String avatar;
}
diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index 789866e5..386af382 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -3369,6 +3369,7 @@ public class PythonService {
}
} catch (IOException e) {
log.error("promptTranslation 用户输入翻译失败; error message => " + e.getMessage());
+ response.close();
throw new RuntimeException(e);
} finally {
diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java
index a6a39011..01b7d03e 100644
--- a/src/main/java/com/ai/da/service/AccountService.java
+++ b/src/main/java/com/ai/da/service/AccountService.java
@@ -5,8 +5,10 @@ import com.ai.da.mapper.primary.entity.TrialOrder;
import com.ai.da.model.dto.*;
import com.ai.da.model.vo.AccountLoginVO;
import com.ai.da.model.vo.AccountPreLoginVO;
+import com.ai.da.model.vo.PersonalHomepageVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -157,4 +159,12 @@ public interface AccountService extends IService {
IPage getPageByIds(List ids, int pageNum, int size);
List getByIds(List ids);
+
+ String uploadAvatar(MultipartFile file);
+
+ PersonalHomepageVO getPersonalHomepage(Long accountId);
+
+ Boolean viewsIncrease(Long id);
+
+ void registerUserToVisitor();
}
diff --git a/src/main/java/com/ai/da/service/MessageCenterService.java b/src/main/java/com/ai/da/service/MessageCenterService.java
new file mode 100644
index 00000000..84bb9cd1
--- /dev/null
+++ b/src/main/java/com/ai/da/service/MessageCenterService.java
@@ -0,0 +1,28 @@
+package com.ai.da.service;
+
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.mapper.primary.entity.Notification;
+import com.ai.da.model.dto.GetNotificationDTO;
+import com.ai.da.model.vo.NotificationVO;
+import com.ai.da.model.dto.PublishSysNotificationDTO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MessageCenterService extends IService {
+
+ Map getAllTypeMessageUnreadCount();
+
+ PageBaseResponse getHistoryNotification(GetNotificationDTO getNotificationDTO);
+
+ void prePushMessage(Notification notification);
+
+ void cancelPushMessage(String type, Long senderId, Long receiverId, Long portfolioId, Long commentId);
+
+ Boolean setReadStatus(List notificationIdList, String type);
+
+ void setReadAll(String type);
+
+ void publishSystemNotification(PublishSysNotificationDTO message);
+}
diff --git a/src/main/java/com/ai/da/service/PortfolioService.java b/src/main/java/com/ai/da/service/PortfolioService.java
index b809857c..bf551509 100644
--- a/src/main/java/com/ai/da/service/PortfolioService.java
+++ b/src/main/java/com/ai/da/service/PortfolioService.java
@@ -1,14 +1,15 @@
package com.ai.da.service;
import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.mapper.primary.entity.Account;
import com.ai.da.mapper.primary.entity.Portfolio;
import com.ai.da.model.dto.*;
-import com.ai.da.model.vo.CommentVO;
-import com.ai.da.model.vo.PortfolioVO;
-import com.ai.da.model.vo.UserLikeChooseVO;
+import com.ai.da.model.vo.*;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+
public interface PortfolioService extends IService {
Boolean publish(MultipartFile canvas, String data);
@@ -41,4 +42,22 @@ public interface PortfolioService extends IService {
Boolean delete(Long id);
Portfolio getByIdAll(Long originalPortfolioId);
+
+ void follow(Long followeeId);
+
+ void cancelFollow(Long followeeId);
+
+ Long getFolloweeCount(Long accountId);
+
+ List getFolloweeList(GetFollowListDTO getFollowListDTO);
+
+ Long getFollowerCount(Long accountId);
+
+ List getFollowerList(GetFollowListDTO getFollowListDTO);
+
+ Integer getIfFollowed(Long followeeId, Long followerId);
+
+ Long getPortfolioCount(Long accountId);
+
+ List getFolloweeList(Long accountId);
}
diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
index eec39d47..d135060b 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -2,6 +2,7 @@ package com.ai.da.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.common.constant.CommonConstant;
import com.ai.da.common.context.UserContext;
import com.ai.da.common.enums.AuthenticationOperationTypeEnum;
import com.ai.da.common.enums.CreditsEventsEnum;
@@ -16,10 +17,7 @@ import com.ai.da.mapper.primary.entity.*;
import com.ai.da.model.dto.*;
import com.ai.da.model.enums.AutoApproved;
import com.ai.da.model.enums.Language;
-import com.ai.da.model.vo.AccountLoginVO;
-import com.ai.da.model.vo.AccountPreLoginVO;
-import com.ai.da.model.vo.AuthPrincipalVo;
-import com.ai.da.model.vo.QuestionnaireVO;
+import com.ai.da.model.vo.*;
import com.ai.da.service.*;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -32,9 +30,11 @@ import com.zaxxer.hikari.HikariDataSource;
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -83,6 +83,15 @@ public class AccountServiceImpl extends ServiceImpl impl
@Resource
private CreditsService creditsService;
+ @Resource
+ private MinioUtil minioUtil;
+
+ @Value("${minio.bucketName.users}")
+ private String userBucket;
+
+ @Resource
+ private RedisUtil redisUtil;
+
@Override
@Transactional(rollbackFor = Exception.class)
public AccountPreLoginVO preLogin(AccountPreLoginDTO accountDTO) {
@@ -137,6 +146,9 @@ public class AccountServiceImpl extends ServiceImpl impl
return new AccountPreLoginVO(account.getId());
}
+ @Resource
+ private PortfolioService portfolioService;
+
@Transactional(rollbackFor = Exception.class)
@Override
public AccountLoginVO login(AccountLoginDTO accountLoginDTO, HttpServletRequest request) {
@@ -189,6 +201,16 @@ public class AccountServiceImpl extends ServiceImpl impl
}
response.setUserId(account.getId());
response.setSystemUser(account.getSystemUser());
+ // 设置头像
+ String avatar;
+ if (StringUtil.isNullOrEmpty(account.getAvatar())){
+ avatar = CommonConstant.DEFAULT_AVATAR;
+ }else {
+ avatar = account.getAvatar();
+ }
+ response.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+ response.setFolloweeCount(portfolioService.getFolloweeCount(account.getId()));
+ response.setFollowerCount(portfolioService.getFollowerCount(account.getId()));
//判断是否常用ip 不是则发邮件提示
calculateExceptionIp(RequestInfoUtil.getIpAddress(request), account);
return response;
@@ -300,6 +322,19 @@ public class AccountServiceImpl extends ServiceImpl impl
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("BINARY user_email", email);
List accountList = accountMapper.selectList(queryWrapper);
+ log.info(accountList.toString());
+ if (CollectionUtil.isEmpty(accountList)) {
+ throw new BusinessException("email.does.not.exist", ResultEnum.PROMPT.getCode());
+ }
+ return accountList.get(0);
+ }
+
+ // 忽略大小写
+ private Account getAccountByEmail(String email) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_email", email);
+ List accountList = accountMapper.selectList(queryWrapper);
+ log.info(accountList.toString());
if (CollectionUtil.isEmpty(accountList)) {
throw new BusinessException("email.does.not.exist", ResultEnum.PROMPT.getCode());
}
@@ -1011,7 +1046,7 @@ public class AccountServiceImpl extends ServiceImpl impl
account.setIsTrial(1);
account.setIsBeginner(1);
account.setCreateDate(new Date());
- account.setCredits(BigDecimal.valueOf(500));
+ account.setCredits(BigDecimal.valueOf(100));
accountMapper.insert(account);
AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class);
response.setEmail(account.getUserEmail());
@@ -1044,6 +1079,9 @@ public class AccountServiceImpl extends ServiceImpl impl
config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8");
config.setUsername("uafqtz4gsvfrw");
config.setPassword("aida123456.");
+// config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC");
+// config.setUsername("root");
+// config.setPassword("root");
config.addDataSourceProperty("cachePrepStmts", "true");
config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
@@ -1068,6 +1106,7 @@ public class AccountServiceImpl extends ServiceImpl impl
int orderId = queryOrderResultSet.getInt("order_id");
int customerId = queryOrderResultSet.getInt("customer_id");
double totalSales = queryOrderResultSet.getDouble("total_sales");
+ log.info("Code-Create 订单:{}， 顾客id:{}, 付款金额:{}",orderId, customerId, totalSales);
String email = "";
String userName = "";
// 为什么一般没有值
@@ -1094,7 +1133,7 @@ public class AccountServiceImpl extends ServiceImpl impl
Boolean flag = Boolean.FALSE;
try {
// 不是新用户 直接延长使用期限
- userInfo = getOneByEmail(email);
+ userInfo = getAccountByEmail(email);
} catch (BusinessException e) {
// 通过邮箱找不到用户 说明是新用户 => 创建用户
flag = Boolean.TRUE;
@@ -1106,23 +1145,24 @@ public class AccountServiceImpl extends ServiceImpl impl
Account account = extendValidity(validEndTime, totalSales);
int systemUserType = 0;
+
+ // 不管是不是新用户 都要更新用户角色和积分
+ String credits = "0";
+ if (totalSales == 5000.0){
+ log.info("年付用户，初始积分6000");
+ credits = CreditsEventsEnum.INIT_MONTHLY.getValue();
+ systemUserType = 1;
+ }else if (totalSales == 500.0){
+ log.info("月付用户，初始积分5000");
+ credits = CreditsEventsEnum.INIT_MONTHLY.getValue();
+ systemUserType = 2;
+ }else if (totalSales == 0.0){
+ log.info("测试用户，初始积分10");
+ credits = "10";
+ systemUserType = 3;
+ }
if (flag) {
// 是新用户 => 新增一条数据
- String credits = "0";
- if (totalSales == 5000.0){
- log.info("年付用户，初始积分6000");
- credits = CreditsEventsEnum.INIT_MONTHLY.getValue();
- systemUserType = 1;
- }else if (totalSales == 500.0){
- log.info("月付用户，初始积分5000");
- credits = CreditsEventsEnum.INIT_MONTHLY.getValue();
- systemUserType = 2;
- }else if (totalSales == 0.0){
- log.info("测试用户，初始积分10");
- credits = "10";
- systemUserType = 3;
- }
-
Boolean b = addUser(new AccountAddDTO(email,
StringUtil.isNullOrEmpty(userName) ? email.substring(0, email.indexOf("@")) : userName,
country,
@@ -1131,6 +1171,8 @@ public class AccountServiceImpl extends ServiceImpl impl
if (b) log.info("付费新用户 {} 新增成功！", email);
} else {
userInfo.setValidEndTime(toDayEnd(account.getValidEndTime()));
+ userInfo.setCredits(new BigDecimal(credits));
+ userInfo.setSystemUser(systemUserType);
baseMapper.updateById(userInfo);
log.info("付费用户 {} 续订成功", email);
}
@@ -1196,6 +1238,86 @@ public class AccountServiceImpl extends ServiceImpl impl
return account;
}
+ private static final String QUERY_MAXIMUM_USERID = "SELECT MAX(ID) AS max_id FROM pmr_users;";
+
+ private static final String QUERY_NEW_USER_EMAIL = "SELECT user_email FROM pmr_users " +
+ "WHERE ID > ? ";
+
+ @Value("${redis.key.maximumUserId}")
+ private String maximumUserIdKey;
+
+ /**
+ * 将Code-Create上注册的用户添加为AiDA的游客
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void registerUserToVisitor(){
+ ArrayList newUserEmails = new ArrayList<>();
+ long maxUserId = CommonConstant.MAXIMUM_USER_ID;
+ try (Connection connection = dataSource.getConnection();
+ PreparedStatement preparedStatement = connection.prepareStatement(QUERY_MAXIMUM_USERID)) {
+ try (ResultSet queryOrderResultSet = preparedStatement.executeQuery()) {
+ while (queryOrderResultSet.next()) {
+ // 获取最新的最大用户id
+ maxUserId = queryOrderResultSet.getLong("max_id");
+ // 获取历史最大用户id
+ long maxUserIdHistory = StringUtil.isNullOrEmpty(redisUtil.getFromString(maximumUserIdKey)) ? CommonConstant.MAXIMUM_USER_ID : Long.parseLong(redisUtil.getFromString(maximumUserIdKey));
+ if (maxUserId > maxUserIdHistory){
+ // 查出新增用户的邮箱
+ PreparedStatement newUserEmail = connection.prepareStatement(QUERY_NEW_USER_EMAIL);
+ // 填充参数 - 历史最大用户ID
+ newUserEmail.setLong(1, maxUserIdHistory);
+ try (ResultSet queryEmailResultSet = newUserEmail.executeQuery()) {
+ if (queryEmailResultSet.next()) {
+ String email = queryEmailResultSet.getString("user_email");
+ newUserEmails.add(email);
+ } /*else {
+ log.error("未知错误。code-create的用户表中没有付费用户的信息");
+ throw new BusinessException("user info missing");
+ }*/
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ // 记录异常并处理
+ e.printStackTrace();
+// return null;
+ }
+
+ if (!newUserEmails.isEmpty()){
+ // 查询这些邮箱在aida上是否有账号
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("user_email", newUserEmails).select("user_email");
+
+ List collect = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ // 移除Code-Create新增用户中在AiDA已有账号的邮箱
+ newUserEmails.removeAll(collect);
+ }
+ // 将新增用户添加到AiDA，身份为游客
+ if (!newUserEmails.isEmpty()){
+ newUserEmails.forEach(email -> {
+ Account account = new Account();
+ account.setUserEmail(email);
+ account.setUserName(email);
+ account.setUserPassword("Third-000000");
+ account.setLanguage(Language.ENGLISH.name());
+ account.setCreateDate(new Date());
+ account.setIsTrial(0);
+ account.setIsBeginner(1);
+ account.setCredits(new BigDecimal(0));
+ account.setSystemUser(0);
+ baseMapper.insert(account);
+ // 邮件通知用户
+ SendEmailUtil.notificationForRegisterUser(email);
+ });
+ }
+ // 记录当前最大的用户id
+ redisUtil.addToString(maximumUserIdKey, String.valueOf(maxUserId));
+ }
+ }
+
// 收集调查问卷的信息
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1404,7 +1526,63 @@ public class AccountServiceImpl extends ServiceImpl impl
return baseMapper.selectList(queryWrapper);
}
+ public String uploadAvatar(MultipartFile file){
+ Long accountId = UserContext.getUserHolder().getId();
+ // 1、上传图片到minio
+ String avatarPath = minioUtil.upload(userBucket, accountId.toString() + "/avatar", file);
+ // 2、查询该用户之前的头像
+ String avatar = baseMapper.selectById(accountId).getAvatar();
+ if (!StringUtil.isNullOrEmpty(avatar) && !avatar.equals(CommonConstant.DEFAULT_AVATAR)){
+ minioUtil.deleteObject(avatar);
+ }
+
+ // 3、替换新的头像
+ Account account = new Account();
+ account.setId(accountId);
+ account.setAvatar(avatarPath);
+ baseMapper.updateById(account);
+
+ return minioUtil.getPreSignedUrl(avatarPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME);
+ }
+
+ public PersonalHomepageVO getPersonalHomepage(Long accountId){
+ // 需要返回 用户头像 用户名 作品总量 粉丝量 关注量 主页访问量 当前用户是否被查看者关注
+ Long currentUserId = UserContext.getUserHolder().getId();
+ PersonalHomepageVO personalHomepageVO = new PersonalHomepageVO();
+
+ Account account = baseMapper.selectById(accountId);
+ personalHomepageVO.setUserName(account.getUserName());
+ String avatar = StringUtil.isNullOrEmpty(account.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : account.getAvatar();
+ personalHomepageVO.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+
+ personalHomepageVO.setPortfolioCount(portfolioService.getPortfolioCount(accountId));
+ personalHomepageVO.setFolloweeCount(portfolioService.getFolloweeCount(accountId));
+ personalHomepageVO.setFollowerCount(portfolioService.getFollowerCount(accountId));
+ personalHomepageVO.setHomepageViewCount(viewPersonalHomepageCount(0L));
+ if (accountId.equals(currentUserId)){
+ personalHomepageVO.setIsFollow(0);
+ Long viewCount = viewPersonalHomepageCount(accountId);
+ // 只有本人才能看到个人主页浏览量
+ personalHomepageVO.setHomepageViewCount(viewCount == null ? 0 : viewCount);
+ }else {
+ personalHomepageVO.setIsFollow(portfolioService.getIfFollowed(accountId, currentUserId));
+ // 非本人浏览主页时增加浏览量
+ viewsIncrease(accountId);
+ }
+ return personalHomepageVO;
+ }
+
+ @Override
+ public Boolean viewsIncrease(Long id) {
+ redisUtil.increasePersonalHomepageViewCount(id);
+ return Boolean.TRUE;
+ }
+
+ private Long viewPersonalHomepageCount(Long accountId) {
+ redisUtil.getPersonalHomepageViewCount(accountId);
+ return null;
+ }
}
diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
index b664ed21..2bad5969 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -27,6 +27,7 @@ import com.mysql.cj.util.StringUtils;
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -434,11 +435,20 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_email", account.getUserEmail());
+
+ Account existsAccount = accountMapper.selectOne(queryWrapper);
+ if (!Objects.isNull(existsAccount)){
+ throw new BusinessException("The email address already exists. One email address can only register one AiDA account");
+ }
// 添加正式用户
+ assert accountAddDTO != null;
if (Objects.isNull(accountAddDTO.getSystemUser())) {
throw new BusinessException("you have to choose user type");
} else {
diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
index 1a12f6e4..52d589d9 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -401,6 +401,7 @@ public class DesignItemServiceImpl extends ServiceImpl i
redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
Long accountId = Long.parseLong(taskId.substring(taskId.lastIndexOf("-") + 1));
- if (!status.equals("Invalid")){
+ if (!status.equals("Invalid")) {
// 4、扣除积分
Boolean b = creditsService.taskCreditsDeduction(accountId, taskId);
// 3、记录积分变更
diff --git a/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
new file mode 100644
index 00000000..ff53737e
--- /dev/null
+++ b/src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
@@ -0,0 +1,358 @@
+package com.ai.da.service.impl;
+
+import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.common.constant.CommonConstant;
+import com.ai.da.common.context.UserContext;
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.utils.CopyUtil;
+import com.ai.da.common.utils.MinioUtil;
+import com.ai.da.common.utils.RedisUtil;
+import com.ai.da.common.websocket.NotificationConnection;
+import com.ai.da.mapper.primary.CanvasMapper;
+import com.ai.da.mapper.primary.NotificationMapper;
+import com.ai.da.mapper.primary.SysNotificationReadStatusMapper;
+import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.Notification;
+import com.ai.da.mapper.primary.entity.Portfolio;
+import com.ai.da.mapper.primary.entity.SysNotificationReadStatus;
+import com.ai.da.model.dto.GetNotificationDTO;
+import com.ai.da.model.dto.PublishSysNotificationDTO;
+import com.ai.da.model.vo.NotificationVO;
+import com.ai.da.service.AccountService;
+import com.ai.da.service.MessageCenterService;
+import com.ai.da.service.PortfolioService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
+import com.mysql.cj.util.StringUtils;
+import io.netty.util.internal.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+@Service
+@Slf4j
+public class MessageCenterServiceImpl extends ServiceImpl implements MessageCenterService {
+
+ @Resource
+ private NotificationConnection notificationConnection;
+ @Resource
+ private SysNotificationReadStatusMapper sysNotificationReadStatusMapper;
+ @Resource
+ private AccountService accountService;
+ @Resource
+ private MinioUtil minioUtil;
+ @Resource
+ private PortfolioService portfolioService;
+ @Resource
+ private CanvasMapper canvasMapper;
+ @Resource
+ private RedisUtil redisUtil;
+ @Value("${redis.key.newPosted}")
+ private String lastViewNewPostedTimeKey;
+
+
+ @Override
+ public Map getAllTypeMessageUnreadCount() {
+ Long accountId = UserContext.getUserHolder().getId();
+ List> typeCount = baseMapper.getTypeCount(accountId);
+ Map msgTypeCount = typeCount.stream()
+ .collect(Collectors.toMap(
+ map -> (String) map.get("type"),
+ map -> Objects.isNull(map.get("count")) ? 0L : (Long) map.get("count")));
+ msgTypeCount.put("system", getUnreadSystemNotification());
+ msgTypeCount.put("newPosted", getNewPostedCount(accountId));
+ log.info(msgTypeCount.toString());
+ // 整理数据 加上系统消息未读数
+ return msgTypeCount;
+ }
+
+ // 获取历史消息 可指定消息类型 分页查询
+ @Override
+ public PageBaseResponse getHistoryNotification(GetNotificationDTO getNotificationDTO) {
+ log.info("获取历史消息：parameter => {}", getNotificationDTO);
+ if (StringUtil.isNullOrEmpty(getNotificationDTO.getType())){
+ throw new BusinessException("type cannot be empty");
+ }
+ Long accountId = UserContext.getUserHolder().getId();
+ // 查动态
+ if (!StringUtils.isNullOrEmpty(getNotificationDTO.getType()) && getNotificationDTO.getType().equals("newPosted")){
+ return getNewPosted(accountId, getNotificationDTO.getPage(), getNotificationDTO.getSize());
+ }
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ if (!StringUtils.isNullOrEmpty(getNotificationDTO.getType())) {
+ queryWrapper.eq("type", getNotificationDTO.getType());
+ }
+ if (!getNotificationDTO.getType().equals("system")){
+ queryWrapper.eq("receiver_id", accountId);
+ }
+ Page notificationPage = baseMapper.selectPage(new Page<>(getNotificationDTO.getPage(), getNotificationDTO.getSize()), queryWrapper);
+
+ List unreadSysNotificationIds = baseMapper.getUnreadSysNotification(accountId);
+ IPage convert = notificationPage.convert(o -> {
+ NotificationVO notificationVO = CopyUtil.copyObject(o, NotificationVO.class);
+ Account senderAccount = accountService.getById(notificationVO.getSenderId());
+ notificationVO.setUserName(senderAccount.getUserName());
+// notificationVO.setSenderUserAvatar(StringUtils.isNullOrEmpty(senderAccount.getAvatar()) ? null : minioUtil.getPreSignedUrl(senderAccount.getAvatar(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+ notificationVO.setPortfolioName(Objects.isNull(notificationVO.getPortfolioId()) ? null : portfolioService.getById(notificationVO.getPortfolioId()).getPortfolioName());
+ // 设置单个人 系统消息是否已读
+ if (notificationVO.getType().equals("system")){
+ if (unreadSysNotificationIds.contains(notificationVO.getId())){
+ notificationVO.setIsRead(0);
+ }else {
+ notificationVO.setIsRead(1);
+ }
+ }else {
+ String avatar = StringUtil.isNullOrEmpty(senderAccount.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : senderAccount.getAvatar();
+ notificationVO.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+ }
+ return notificationVO;
+ });
+ return PageBaseResponse.success(convert);
+ }
+
+ public void prePushMessage(Notification notification){
+ // 先判断点赞、关注记录是不是唯一
+ if (!getUniqueLikeAndFollow(notification)){
+ // 1、将数据存数据库
+ if (!notification.getType().equals("system")) {
+ notification.setIsRead(0);
+ }
+ notification.setIsDeleted(0);
+ notification.setCreateTime(LocalDateTime.now());
+ save(notification);
+ }
+ // 推送消息
+ pushMessage(notification.getType(), notification.getSenderId());
+ }
+
+ /**
+ * 只记录唯一点赞和关注
+ * 重复点赞、关注只会记录最新的一次操作
+ * @param notification
+ * @return
+ */
+ public Boolean getUniqueLikeAndFollow(Notification notification){
+ Notification existNotification= null;
+ // 对单个作品的点赞和对某个人的关注 具有唯一性
+ if (notification.getType().equals("like") || notification.getType().equals("follow")){
+ existNotification = baseMapper.getUniqueLikeAndFollow(notification.getType(), notification.getSenderId(),
+ notification.getReceiverId(), notification.getPortfolioId());
+ }
+
+ if (!Objects.isNull(existNotification)){
+ // 有记录，则更新 1、删除状态 为0 2、已读状态 为0 3、创建时间 为最新时间 4、更新时间 为最新时间
+ baseMapper.updateUniqueLikeAndFollow(existNotification.getId(), LocalDateTime.now());
+ return Boolean.TRUE;
+ }
+
+ return Boolean.FALSE;
+ }
+
+ // 消息推送 只需要返回当前操作类型和该操作未读消息数量
+ public void pushMessage(String type, Long receiverId) {
+ // 推送消息到前端
+ ArrayList> resp = new ArrayList<>();
+ HashMap data = new HashMap<>();
+ Long count;
+ if (!type.equals("system")) {
+ // 个人未读消息
+ count = getUnreadCountByType(type, receiverId);
+ } else {
+ // 系统未读消息
+ count = getUnreadSystemNotification();
+ }
+
+ data.put(type, count);
+ resp.add(data);
+ String jsonString = JSON.toJSONString(resp);
+ log.info("消息推送 ： {}", jsonString);
+
+ try {
+ notificationConnection.sendMsg(jsonString);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // 取消点赞、删除评论、取消关注
+ public void cancelPushMessage(String type, Long senderId, Long receiverId, Long portfolioId, Long commentId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", type)
+ .eq("sender_id", senderId)
+ .eq("receiver_id", receiverId)
+ .eq("is_deleted", 0);
+
+ if (!type.equals("follow")){
+ queryWrapper.eq("portfolio_id", portfolioId);
+ }
+ if (type.equals("comment")) {
+ queryWrapper.eq("comment_id", commentId);
+ }
+ Notification notification = baseMapper.selectOne(queryWrapper);
+ if (!Objects.isNull(notification)) {
+ baseMapper.deleteNotification(notification.getId(), LocalDateTime.now());
+ }
+ // 推送消息
+ pushMessage(type, senderId);
+ }
+
+ // 获取个人指定消息类型未读消息数量
+ private Long getUnreadCountByType(String type, Long receiverId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", type)
+ .eq("is_read", 0)
+ .eq("receiver_id", receiverId);
+
+ return baseMapper.selectCount(queryWrapper);
+ }
+
+ private Long getUnreadSystemNotification() {
+ // 计算总的系统通知数量
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", "system");
+ Long totalSysCount = baseMapper.selectCount(queryWrapper);
+
+ // 计算单个用户读了多少条系统数据
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("account_id", UserContext.getUserHolder().getId());
+ Long readCount = sysNotificationReadStatusMapper.selectCount(wrapper);
+
+ // 计算差
+ return totalSysCount - readCount > 0 ? totalSysCount - readCount : 0;
+ }
+
+ // 设置个人消息的已读状态 （允许一次已读多条个人消息）
+ public Boolean setReadStatus(List notificationIdList, String type) {
+ if (type.equals("system")) {
+ setReadStatusSystem(notificationIdList);
+ } else {
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("id", notificationIdList)
+// .eq("type", type)
+ .set("is_read", 1)
+ .set("update_time", LocalDateTime.now());
+
+ baseMapper.update(null, updateWrapper);
+ }
+ pushMessage(type, UserContext.getUserHolder().getId());
+ return Boolean.TRUE;
+ }
+
+ // 设置系统消息的已读状态 （允许一次已读多条系统消息）
+ public void setReadStatusSystem(List notificationIdList) {
+ Long id = UserContext.getUserHolder().getId();
+ for (Long notificationId : notificationIdList) {
+ SysNotificationReadStatus sysNotificationReadStatus = new SysNotificationReadStatus(notificationId, id);
+ sysNotificationReadStatus.setCreateTime(LocalDateTime.now());
+ sysNotificationReadStatusMapper.insert(sysNotificationReadStatus);
+ }
+ }
+
+ // 一键已读
+ public void setReadAll(String type){
+ Long accountId = UserContext.getUserHolder().getId();
+ // 指定某个用户的某种类型的数据，将未读数据全部已读
+ if (!type.equals("system")){
+ // 个人消息已读
+ baseMapper.setPersonalNotificationAllRead(type, accountId, LocalDateTime.now());
+ }else {
+ // 系统消息已读
+ // 1、先确定当前用户未读的系统消息有哪些
+ List unreadSysNotificationIds = baseMapper.getUnreadSysNotification(accountId);
+ // 2、将未读的设为已读
+ if (!unreadSysNotificationIds.isEmpty()) setReadStatusSystem(unreadSysNotificationIds);
+ }
+ pushMessage(type, accountId);
+ }
+
+ // 发布系统消息
+ public void publishSystemNotification(PublishSysNotificationDTO message) {
+ Notification notification = new Notification();
+ notification.setType("system");
+ notification.setSenderId(UserContext.getUserHolder().getId());
+ notification.setContent(new Gson().toJson(message));
+ // todo 是否需要定时发送系统通知
+ prePushMessage(notification);
+ }
+
+ public Long getNewPostedCount(Long accountId){
+ // 1.1 获取我关注的所有用户
+ List followeeList = portfolioService.getFolloweeList(accountId);
+ // 1.2 查询我关注的用户在我上次查看动态之后发布的作品数量
+ String lastViewTime = redisUtil.getFromString(lastViewNewPostedTimeKey + ":" + accountId);
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ if (!followeeList.isEmpty()){
+ queryWrapper.in("account_id", followeeList);
+ }else {
+ return 0L;
+ }
+
+ if (!StringUtil.isNullOrEmpty(lastViewTime)){
+ queryWrapper.gt("create_date", lastViewTime);
+ }else {
+ return 0L;
+ }
+ return portfolioService.getBaseMapper().selectCount(queryWrapper);
+ }
+
+ /**
+ * 获取关注用户发布的新作品 分页查询
+ */
+ public PageBaseResponse getNewPosted(Long accountId, Integer page, Integer size){
+
+ // 1、获取关注用户发布的所有作品
+ // 1.1 获取我关注的所有用户
+ List followeeList = portfolioService.getFolloweeList(accountId);
+ // 1.2 分页查询我关注的用户发布的作品
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ if (!followeeList.isEmpty()){
+ queryWrapper.in("account_id", followeeList);
+ }else {
+ return new PageBaseResponse<>(new ArrayList<>(), page, size, 0, 0);
+ }
+ queryWrapper.orderByDesc("create_date");
+ Page portfolioPage = portfolioService.getBaseMapper().selectPage(new Page<>(page, size), queryWrapper);
+ // 2、组装返回的数据
+
+ IPage convert = portfolioPage.convert(o -> {
+ NotificationVO notificationVO = CopyUtil.copyObject(o, NotificationVO.class);
+ notificationVO.setPortfolioId(o.getId());
+ notificationVO.setSenderId(o.getAccountId());
+ notificationVO.setReceiverId(accountId);
+ notificationVO.setCreateTime(o.getCreateDate());
+ notificationVO.setType("newPosted");
+ Account account = accountService.getById(o.getAccountId());
+ notificationVO.setUserName(account.getUserName());
+ String avatar = StringUtil.isNullOrEmpty(account.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : account.getAvatar();
+ notificationVO.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+
+ notificationVO.setPortfolioName(o.getPortfolioName());
+ String canvas = canvasMapper.selectById(o.getCanvasId()).getUrl();
+ notificationVO.setCanvas(minioUtil.getPreSignedUrl(canvas, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+
+ String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // 增加访问时间记录
+ redisUtil.addToString(lastViewNewPostedTimeKey + ":" + accountId, format);
+
+ return notificationVO;
+ });
+
+ return PageBaseResponse.success(convert);
+ }
+
+}
diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
index a002c37d..04948a34 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -1,6 +1,7 @@
package com.ai.da.service.impl;
import com.ai.da.common.config.exception.BusinessException;
+import com.ai.da.common.constant.CommonConstant;
import com.ai.da.common.context.UserContext;
import com.ai.da.common.response.PageBaseResponse;
import com.ai.da.common.utils.CopyUtil;
@@ -8,6 +9,7 @@ import com.ai.da.common.utils.MinioUtil;
import com.ai.da.common.utils.RedisUtil;
import com.ai.da.mapper.primary.*;
import com.ai.da.mapper.primary.entity.*;
+import com.ai.da.mapper.primary.entity.Collection;
import com.ai.da.model.dto.*;
import com.ai.da.model.enums.Position;
import com.ai.da.model.enums.Sex;
@@ -20,20 +22,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Function;
+import io.netty.util.internal.StringUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
-import sun.security.krb5.internal.crypto.Des;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class PortfolioServiceImpl extends ServiceImpl implements PortfolioService {
@@ -60,8 +60,8 @@ public class PortfolioServiceImpl extends ServiceImpl qw = new QueryWrapper<>();
if (query.getGetMyPortfolio() == 1) {
qw.lambda().eq(Portfolio::getAccountId, userHolder.getId());
+ } else if (!Objects.isNull(query.getAccountId())) {
+ qw.lambda().eq(Portfolio::getAccountId, query.getAccountId());
}
if (query.getGetLikePortfolio() == 1) {
List likedPortfolioIdList = redisUtil.getLikedPortfolios(userHolder.getId());
if (!CollectionUtils.isEmpty(likedPortfolioIdList)) {
qw.lambda().in(Portfolio::getId, likedPortfolioIdList);
- }else {
+ } else {
return PageBaseResponse.success(new Page<>());
}
}
qw.lambda().orderByDesc(Portfolio::getUpdateDate);
- IPage page = portfolioMapper.selectPage(new Page<>(query.getPage(), query.getSize()),qw);
+ IPage page = portfolioMapper.selectPage(new Page<>(query.getPage(), query.getSize()), qw);
IPage convert = page.convert((Function) portfolio -> {
if (portfolio != null) {
PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
@@ -479,19 +483,28 @@ public class PortfolioServiceImpl extends ServiceImpl getSelectedQw = new QueryWrapper<>();
getSelectedQw.lambda().eq(UserLikeGroup::getAccountId, userHolder.getId());
@@ -520,7 +533,7 @@ public class PortfolioServiceImpl extends ServiceImpl userLikeGroups = userLikeGroupMapper.selectList(getSelectedQw);
if (CollectionUtils.isEmpty(userLikeGroups)) {
vo.setSelected(0);
- }else {
+ } else {
vo.setSelected(1);
}
}
@@ -547,12 +560,12 @@ public class PortfolioServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("followee_id", followeeId).eq("follower_id", accountId);
+ UserFollow userFollow = userFollowMapper.selectOne(queryWrapper);
+ if (!Objects.isNull(userFollow)) {
+ throw new BusinessException("you.have.already.followed.this.user", 1);
+ }
+ // 3、添加新follower到关注列表
+ UserFollow newFollower = new UserFollow(followeeId, accountId);
+ newFollower.setCreateTime(LocalDateTime.now());
+ userFollowMapper.insert(newFollower);
+ // 4、推送消息
+ messageCenterService.prePushMessage(new Notification("follow", accountId, followeeId));
+ }
+
+ // 取消关注
+ public void cancelFollow(Long followeeId) {
+ Long accountId = UserContext.getUserHolder().getId();
+ // 1、确定是否关注了该用户
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("followee_id", followeeId).eq("follower_id", accountId);
+ UserFollow userFollow = userFollowMapper.selectOne(queryWrapper);
+ // 2、删除关注记录
+ if (!Objects.isNull(userFollow)) {
+ userFollowMapper.deleteById(userFollow.getId());
+ // 3、逻辑删除关注消息
+ messageCenterService.cancelPushMessage("follow", accountId, followeeId, null, null);
+ } else {
+ throw new BusinessException("you.have.not.followed.the.current.user", 1);
+ }
+ }
+
+ public Long getFolloweeCount(Long accountId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("follower_id", accountId).select("followee_id");
+ return userFollowMapper.selectCount(queryWrapper);
+ }
+
+ // 获取某个用户的关注列表 + 按名字查询
+ public List getFolloweeList(GetFollowListDTO getFollowListDTO) {
+ Long accountId = UserContext.getUserHolder().getId();
+ // 1、判断是否有按用户名查询
+ List followeeList;
+ if (!StringUtil.isNullOrEmpty(getFollowListDTO.getSearchByName())) {
+ followeeList = userFollowMapper.getFolloweeListByName(getFollowListDTO.getSearchByName(), accountId);
+ }else {
+ // 2、查全部 分页查询
+ String order = StringUtil.isNullOrEmpty(getFollowListDTO.getOrder()) ? "DESC" : getFollowListDTO.getOrder().equals("DESC") ? "DESC" : "ASC";
+ Integer limit= getFollowListDTO.getSize() > 0 ? getFollowListDTO.getSize() : 20;
+ Integer offset = getFollowListDTO.getPage() > 0 ? (getFollowListDTO.getPage() - 1) * getFollowListDTO.getSize() : 0;
+ followeeList = userFollowMapper.getFolloweeListByFollower(accountId, limit, offset, order);
+ }
+
+ if (!followeeList.isEmpty()){
+ followeeList.forEach(followee -> {
+ String avatar = StringUtil.isNullOrEmpty(followee.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : followee.getAvatar();
+ followee.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+ });
+ return followeeList;
+ }
+ return new ArrayList<>();
+ }
+
+ public Long getFollowerCount(Long accountId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("followee_id", accountId).select("follower_id");
+ return userFollowMapper.selectCount(queryWrapper);
+ }
+
+ // 获取某个用户的粉丝列表 + 按名字查询 需返回是否关注该粉丝
+ public List getFollowerList(GetFollowListDTO getFollowListDTO) {
+ Long accountId = UserContext.getUserHolder().getId();
+
+ // 获取当前用户的所有粉丝
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("follower_id", accountId).select("followee_id","create_time");
+ List userFollows = userFollowMapper.selectList(qw);
+ Map followeeMap = userFollows.stream().collect(Collectors.toMap(UserFollow::getFolloweeId, UserFollow::getCreateTime));
+
+ List followerList;
+ // 1、判断是否有按用户名查询粉丝
+ if (!StringUtil.isNullOrEmpty(getFollowListDTO.getSearchByName())) {
+ followerList = userFollowMapper.getFollowerListByName(getFollowListDTO.getSearchByName(), accountId);
+ }else {
+ // 2、查全部 分页查询
+ String order = StringUtil.isNullOrEmpty(getFollowListDTO.getOrder()) ? "DESC" : getFollowListDTO.getOrder().equals("DESC") ? "DESC" : "ASC";
+ Integer limit= getFollowListDTO.getSize() > 0 ? getFollowListDTO.getSize() : 20;
+ Integer offset = getFollowListDTO.getPage() > 0 ? (getFollowListDTO.getPage() - 1) * getFollowListDTO.getSize() : 0;
+ followerList = userFollowMapper.getFollowerListByFollowee(accountId, limit,offset, order);
+ }
+
+ if (!followerList.isEmpty()){
+ // 判断当前用户是否与粉丝互关
+ followerList.forEach(follower -> {
+ String avatar = StringUtil.isNullOrEmpty(follower.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : follower.getAvatar();
+ follower.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+ follower.setIsFollow(Objects.isNull(followeeMap.get(follower.getSenderId())) ? 0 : 1);
+// follower.setFollowTime(followeeMap.get(follower.getUserId()));
+ });
+ return followerList;
+ }
+ return new ArrayList<>();
+ }
+
+ public Integer getIfFollowed(Long followeeId, Long followerId) {
+ // 设置当前用户是否关注了所查看作品的作者
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("followee_id", followeeId).eq("follower_id", followerId);
+ UserFollow userFollow = userFollowMapper.selectOne(queryWrapper);
+ return Objects.isNull(userFollow) ? 0 : 1;
+ }
+
+ public Long getPortfolioCount(Long accountId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("account_id", accountId);
+
+ return baseMapper.selectCount(queryWrapper);
+ }
+
+ /**
+ * 获取关注列表
+ * @param accountId
+ * @return
+ */
+ public List getFolloweeList(Long accountId){
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("follower_id", accountId).select("followee_id");
+
+ List userFollows = userFollowMapper.selectList(qw);
+ return userFollows.stream().map(UserFollow::getFolloweeId).collect(Collectors.toList());
+ }
+
}
diff --git a/src/main/resources/mapper/primary/DesignMapper.xml b/src/main/resources/mapper/primary/DesignMapper.xml
index 6fc69739..5d970145 100644
--- a/src/main/resources/mapper/primary/DesignMapper.xml
+++ b/src/main/resources/mapper/primary/DesignMapper.xml
@@ -39,6 +39,15 @@
and b.create_date not like '%:01'
and b.create_date not like '%:02'
+
+ and a.id in
+
+ #{id}
+
+
+
+ and a.user_email like CONCAT('%', #{email}, '%')
+
GROUP BY b.account_id
ORDER BY b.account_id asc) d
left join trial_order c on d.user_email = c.email
diff --git a/src/main/resources/mapper/primary/NotificationMapper.xml b/src/main/resources/mapper/primary/NotificationMapper.xml
new file mode 100644
index 00000000..27c59370
--- /dev/null
+++ b/src/main/resources/mapper/primary/NotificationMapper.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+ UPDATE `t_notification`
+ SET
+ is_read = 0,
+ create_time = #{time},
+ update_time = #{time},
+ is_deleted = 0
+ WHERE id = #{id}
+
+
+
+ UPDATE `t_notification`
+ SET
+ update_time = #{time},
+ is_deleted = 1
+ WHERE id = #{id}
+
+
+
+ update `t_notification`
+ SET
+ is_read = 1,
+ update_time = #{time}
+ WHERE type = #{type}
+ AND receiver_id = #{receiverId}
+ AND is_read = 0
+ AND is_deleted = 0
+
+
+
+
+
+
diff --git a/src/main/resources/mapper/primary/UserFollowMapper.xml b/src/main/resources/mapper/primary/UserFollowMapper.xml
new file mode 100644
index 00000000..60b7a588
--- /dev/null
+++ b/src/main/resources/mapper/primary/UserFollowMapper.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index aa36fa05..3e1f25ca 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -139,6 +139,11 @@ slogan.style.cannot.be.empty=Slogan style text cannot be empty.
slogan.image.cannot.be.empty=Slogan image cannot be empty.
questionnaire.filled.out=You have filled out the current questionnaire.
user.has.no.account=The current user has no account！
+you.cannot.follow.yourself=You cannot follow yourself
+you.have.already.followed.this.user=You have already followed this user
+subscription.success=Subscription Success
+unsubscribe.success=Unsubscribe Success
+you.have.not.followed.the.current.user=You have not followed the current user
# 可能会报异常
# Informative:
diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties
index f10a5235..1a5d4a6a 100644
--- a/src/main/resources/messages_zh.properties
+++ b/src/main/resources/messages_zh.properties
@@ -134,6 +134,11 @@ slogan.style.cannot.be.empty=标语风格文本不能为空。
slogan.image.cannot.be.empty=标语图片不能为空。
questionnaire.filled.out=您已填写过当前问卷。
user.has.no.account=当前用户没有账号。
+you.cannot.follow.yourself=您不能关注您自己
+you.have.already.followed.this.user=您已经关注当前用户
+subscription.success=关注成功
+unsubscribe.success=取消关注成功
+you.have.not.followed.the.current.user=您还未关注当前用户
# 可能会报异常
# Informative: