Compare commits

...

40 Commits

Author SHA1 Message Date
91a7c9f58f 删除无用,初始化项目 2024-11-18 18:09:30 +08:00
e45e84c53a revert :取消合并用户管理,因为那是旧的版本
revert Merge remote-tracking branch 'origin/personal/lsd/UserManagement'

# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
#	src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
#	src/main/java/org/cmh/backend/authentication/service/UserService.java
2024-07-05 16:34:34 +08:00
3c8eb52ac0 Merge remote-tracking branch 'origin/personal/lsd/UserManagement'
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
#	src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
#	src/main/java/org/cmh/backend/authentication/service/UserService.java
2024-07-05 15:11:13 +08:00
05ed80d460 Merge branch 'personal/heshunme/news' 2024-07-05 15:07:21 +08:00
33f811e6b7 GPT牛逼,搜索搞成了 2024-07-05 06:20:30 +08:00
9e03bb3873 能搜了,就是有点问题,范围太广,啥都搜到了 2024-07-05 06:11:11 +08:00
f104c89d08 初步添加了用户权限区别对待。 2024-07-05 02:21:59 +08:00
aa8ca4e274 solve conflict 2024-07-04 17:26:39 +08:00
d2e3443c40 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/UserController.java
2024-07-04 17:16:30 +08:00
2c12fc075f getNewsPage加了jwtVerify 2024-07-04 16:42:06 +08:00
ed0cde6968 添加了漏加的service中保存租户的逻辑 2024-07-04 16:41:36 +08:00
e66695cbff 为了适应前端的列表动态加载,添加了getNewsByRange及其相关内容。 2024-07-04 12:20:04 +08:00
9de8c77764 Merge branch 'main' into personal/heshunme/news 2024-07-04 00:36:19 +08:00
30344b2162 添加了图片上传的后端支持 2024-07-04 00:33:49 +08:00
431ef62c12 添加了getById的请求方法 2024-07-04 00:33:32 +08:00
9056250574 添加租户字段,在联系上外键之前暂且设为字符串 2024-07-04 00:33:06 +08:00
a15f407c13 全局修改上传文件大小上限 2024-07-04 00:31:58 +08:00
173b507361 删除了service中delete throw exception的message 2024-07-03 14:52:48 +08:00
fdb9dc6daf Merge branch 'main' into personal/heshunme/news 2024-07-03 14:50:24 +08:00
a38fd92801 给HttpMessageNotReadableException和MissingServletRequestParameterException指定了全局错误处理器,现在当前端发送给后端的参数不对的时候也能正确返回401错误了 2024-07-03 14:49:28 +08:00
df34d7cb28 给@JwtVerify添加了校验字符串参数的用法,现在只要有任意一个字符串参数的内容是JWT就也能校验了。 2024-07-03 14:40:25 +08:00
a4713648a2 完成了delete,尝试@JwtVerify校验字符串参数的用法 2024-07-03 14:39:05 +08:00
e4a11a8a53 Merge branch 'main' into personal/heshunme/news 2024-07-03 14:14:06 +08:00
a532eaa89c 尝试@JwtVerify的新用法 2024-07-03 14:13:05 +08:00
c4f0b2348f bugfix@JwtVerify 2024-07-03 14:12:42 +08:00
3a7b6ee605 Merge branch 'main' into personal/heshunme/news 2024-07-03 13:58:57 +08:00
a5aac1199d 升级了@JwtVerify的能力,现在被修饰的方法的任意一个参数是继承于JwtRequest的对象即可,不再强制为第一个参 2024-07-03 13:58:09 +08:00
6c36552c2f 重写了getNewsPage方法,取消了DTO,改用url参数 2024-07-03 13:53:16 +08:00
e6ba8c9a12 updateNews已完成 2024-07-03 13:48:10 +08:00
65f15eb9a9 createNews已完成 2024-07-03 13:41:01 +08:00
b4bdd2fc83 给news实体类添加自动生成时间戳 2024-07-03 13:17:41 +08:00
961a17efef 给news实体类添加约束 2024-07-03 13:08:55 +08:00
e56db8a92e Revert "根据warning修改为pagedModel"
This reverts commit 64d7ae8c59.
2024-07-03 13:02:40 +08:00
64d7ae8c59 根据warning修改为pagedModel 2024-07-03 13:02:32 +08:00
3579f93c0d 完成了/news/getNewsList全数据流程 2024-07-03 12:45:39 +08:00
f9a6a3c481 初步建立了NewsRepository 2024-07-03 11:06:54 +08:00
2505b63b88 Merge branch 'main' into personal/heshunme/news
# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/UserController.java
2024-07-03 02:02:04 +08:00
97d2ba60f5 chat设计了newsController,待完善 2024-07-03 01:58:41 +08:00
df51dac024 创建了news实体类 2024-07-03 01:43:37 +08:00
b173b37329 租户管理完成增和改 2024-06-30 15:40:23 +08:00
33 changed files with 25 additions and 25 deletions

View File

@ -1,12 +1,12 @@
package org.cmh.backend.authentication.controller; package org.cmh.backend.Authentication.controller;
import org.cmh.backend.Utils.JwtUtil; import org.cmh.backend.Utils.JwtUtil;
import org.cmh.backend.Utils.JwtVerify; import org.cmh.backend.Utils.JwtVerify;
import org.cmh.backend.authentication.dto.*; import org.cmh.backend.Authentication.dto.*;
import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.Authentication.model.UserHS;
import org.cmh.backend.authentication.service.UserService; import org.cmh.backend.Authentication.service.UserService;
import org.cmh.backend.authentication.service.VerificationCodeService; import org.cmh.backend.Authentication.service.VerificationCodeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.dto; package org.cmh.backend.Authentication.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package org.cmh.backend.authentication.model; package org.cmh.backend.Authentication.model;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue; import jakarta.persistence.GeneratedValue;

View File

@ -1,6 +1,6 @@
package org.cmh.backend.authentication.repository; package org.cmh.backend.Authentication.repository;
import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.Authentication.model.UserHS;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
public interface UserRepository extends JpaRepository<UserHS, Long> { public interface UserRepository extends JpaRepository<UserHS, Long> {

View File

@ -1,10 +1,10 @@
package org.cmh.backend.authentication.service; package org.cmh.backend.Authentication.service;
import org.cmh.backend.authentication.dto.ChangePasswordRequest; import org.cmh.backend.Authentication.dto.ChangePasswordRequest;
import org.cmh.backend.authentication.dto.ManageUserProfileRequest; import org.cmh.backend.Authentication.dto.ManageUserProfileRequest;
import org.cmh.backend.authentication.dto.RegisterRequest; import org.cmh.backend.Authentication.dto.RegisterRequest;
import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.Authentication.model.UserHS;
import org.cmh.backend.authentication.repository.UserRepository; import org.cmh.backend.Authentication.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;

View File

@ -1,8 +1,8 @@
package org.cmh.backend.authentication.service; package org.cmh.backend.Authentication.service;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import lombok.Getter; import lombok.Getter;
import org.cmh.backend.authentication.dto.VerificationCodeResponse; import org.cmh.backend.Authentication.dto.VerificationCodeResponse;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,6 +1,6 @@
package org.cmh.backend.Utils; package org.cmh.backend.Utils;
import org.cmh.backend.authentication.service.UserService; import org.cmh.backend.Authentication.service.UserService;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;