feat: 统一JWT密钥配置并修复签名验证问题

修复前端签名生成中bodyString硬编码问题
添加start-frontend.sh脚本启动前端服务
统一manage-app和gateway的JWT密钥配置
修复Repository扫描路径问题
更新测试配置和依赖
重构表名映射为sys_user和sys_role
完善用户实体类字段映射
添加集成测试配置和测试用例

novalon-manage-api/manage-app/pom.xml

@@ -92,6 +92,29 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.21.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.21.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.21.4</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>

novalon-manage-api/manage-app/src/main/java/cn/novalon/manage/app/ManageApplication.java

@@ -12,7 +12,7 @@ import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
 @SpringBootApplication(exclude = {ReactiveUserDetailsServiceAutoConfiguration.class})
 @ConfigurationPropertiesScan(basePackages = "cn.novalon.manage")
 @ComponentScan(basePackages = "cn.novalon.manage")
-@EnableR2dbcRepositories(basePackages = {"cn.novalon.manage.db.dao"})
+@EnableR2dbcRepositories(basePackages = {"cn.novalon.manage.db.dao", "cn.novalon.manage.sys.audit.repository"})
 public class ManageApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(ManageApplication.class);

novalon-manage-api/manage-app/src/main/resources/application.yml

@@ -46,6 +46,10 @@ logging:
     org.springframework.r2dbc: DEBUG
     cn.novalon.manage.db: DEBUG
 
+jwt:
+  secret: ${JWT_SECRET:U2FsdGVkX1+vZ5Y9QmKxL8nN3rP7tW2jH4fG6dA8sB1cE5yN0zX3qV7wM4}
+  expiration: ${JWT_EXPIRATION:86400000}
+
 springdoc:
   api-docs:
     path: /api-docs

novalon-manage-api/manage-app/src/test/java/cn/novalon/manage/app/config/TestDatabaseConfig.java

@@ -0,0 +1,29 @@
+package cn.novalon.manage.app.config;
+
+import io.r2dbc.spi.ConnectionFactory;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.r2dbc.connection.init.ConnectionFactoryInitializer;
+import org.springframework.r2dbc.connection.init.ResourceDatabasePopulator;
+
+/**
+ * 测试数据库配置类
+ * 
+ * 初始化H2内存数据库schema
+ * 
+ * @author 张翔
+ * @date 2026-04-02
+ */
+@TestConfiguration
+public class TestDatabaseConfig {
+
+    @Bean
+    public ConnectionFactoryInitializer initializer(ConnectionFactory connectionFactory) {
+        ConnectionFactoryInitializer initializer = new ConnectionFactoryInitializer();
+        initializer.setConnectionFactory(connectionFactory);
+        initializer.setDatabasePopulator(new ResourceDatabasePopulator(
+                new ClassPathResource("schema-h2.sql")));
+        return initializer;
+    }
+}

novalon-manage-api/manage-app/src/test/java/cn/novalon/manage/app/integration/SysUserServiceIntegrationTest.java

@@ -0,0 +1,222 @@
+package cn.novalon.manage.app.integration;
+
+import cn.novalon.manage.app.config.TestDatabaseConfig;
+import cn.novalon.manage.common.util.StatusConstants;
+import cn.novalon.manage.sys.core.domain.SysUser;
+import cn.novalon.manage.sys.core.domain.SysRole;
+import cn.novalon.manage.sys.core.domain.UserRole;
+import cn.novalon.manage.sys.core.repository.ISysUserRepository;
+import cn.novalon.manage.sys.core.repository.ISysRoleRepository;
+import cn.novalon.manage.sys.core.repository.IUserRoleRepository;
+import cn.novalon.manage.sys.core.service.impl.SysUserService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.test.context.ActiveProfiles;
+import reactor.test.StepVerifier;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * 用户服务集成测试
+ * 
+ * 使用H2内存数据库进行集成测试
+ * 
+ * @author 张翔
+ * @date 2026-04-02
+ */
+@SpringBootTest
+@ActiveProfiles("test")
+@Import(TestDatabaseConfig.class)
+class SysUserServiceIntegrationTest {
+
+    @Autowired
+    private ISysUserRepository userRepository;
+
+    @Autowired
+    private ISysRoleRepository roleRepository;
+
+    @Autowired
+    private IUserRoleRepository userRoleRepository;
+
+    @Autowired
+    private R2dbcEntityTemplate r2dbcEntityTemplate;
+
+    @Autowired
+    private SysUserService userService;
+
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    @BeforeEach
+    void setUp() {
+        r2dbcEntityTemplate.delete(SysUser.class).all().block();
+        r2dbcEntityTemplate.delete(SysRole.class).all().block();
+        r2dbcEntityTemplate.delete(UserRole.class).all().block();
+    }
+
+    @Test
+    void testCreateAndFindUser() {
+        SysUser user = new SysUser();
+        user.setUsername("testuser");
+        user.setPassword("password123");
+        user.setEmail("test@example.com");
+        user.setNickname("Test User");
+        user.setPhone("13800138000");
+
+        StepVerifier.create(userService.createUser(user))
+                .expectNextMatches(createdUser -> {
+                    assertNotNull(createdUser.getId());
+                    assertEquals("testuser", createdUser.getUsername());
+                    assertEquals("test@example.com", createdUser.getEmail());
+                    assertTrue(createdUser.getPassword().startsWith("$2"));
+                    assertEquals(StatusConstants.ENABLED, createdUser.getStatus());
+                    return true;
+                })
+                .verifyComplete();
+
+        StepVerifier.create(userService.findByUsername("testuser"))
+                .expectNextMatches(foundUser -> {
+                    assertEquals("testuser", foundUser.getUsername());
+                    assertEquals("test@example.com", foundUser.getEmail());
+                    return true;
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void testUpdateUser() {
+        SysUser user = new SysUser();
+        user.setUsername("updateuser");
+        user.setPassword("password123");
+        user.setEmail("update@example.com");
+
+        SysUser createdUser = userService.createUser(user).block();
+        assertNotNull(createdUser);
+
+        createdUser.setEmail("updated@example.com");
+        createdUser.setNickname("Updated User");
+
+        StepVerifier.create(userService.updateUser(createdUser))
+                .expectNextMatches(updatedUser -> {
+                    assertEquals("updated@example.com", updatedUser.getEmail());
+                    assertEquals("Updated User", updatedUser.getNickname());
+                    return true;
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void testDeleteUser() {
+        SysUser user = new SysUser();
+        user.setUsername("deleteuser");
+        user.setPassword("password123");
+        user.setEmail("delete@example.com");
+
+        SysUser createdUser = userService.createUser(user).block();
+        assertNotNull(createdUser);
+
+        StepVerifier.create(userService.deleteUser(createdUser.getId()))
+                .verifyComplete();
+
+        StepVerifier.create(userService.findById(createdUser.getId()))
+                .verifyComplete();
+    }
+
+    @Test
+    void testChangePassword() {
+        SysUser user = new SysUser();
+        user.setUsername("pwduser");
+        user.setPassword("oldPassword");
+        user.setEmail("pwd@example.com");
+
+        SysUser createdUser = userService.createUser(user).block();
+        assertNotNull(createdUser);
+
+        StepVerifier.create(userService.changePassword(createdUser.getId(), "oldPassword", "newPassword"))
+                .expectNextMatches(updatedUser -> {
+                    assertNotEquals(createdUser.getPassword(), updatedUser.getPassword());
+                    assertTrue(passwordEncoder.matches("newPassword", updatedUser.getPassword()));
+                    return true;
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void testAssignRolesToUser() {
+        SysRole role1 = new SysRole();
+        role1.setRoleName("Test Role 1");
+        role1.setRoleKey("test_role_1");
+        role1.setStatus(1);
+
+        SysRole role2 = new SysRole();
+        role2.setRoleName("Test Role 2");
+        role2.setRoleKey("test_role_2");
+        role2.setStatus(1);
+
+        SysRole createdRole1 = roleRepository.save(role1).block();
+        SysRole createdRole2 = roleRepository.save(role2).block();
+        assertNotNull(createdRole1);
+        assertNotNull(createdRole2);
+
+        SysUser user = new SysUser();
+        user.setUsername("roleuser");
+        user.setPassword("password123");
+        user.setEmail("role@example.com");
+
+        SysUser createdUser = userService.createUser(user).block();
+        assertNotNull(createdUser);
+
+        StepVerifier.create(userService.assignRolesToUser(createdUser.getId(),
+                Arrays.asList(createdRole1.getId(), createdRole2.getId())))
+                .verifyComplete();
+
+        StepVerifier.create(userRoleRepository.findByUserId(createdUser.getId()).collectList())
+                .expectNextMatches(userRoles -> {
+                    assertEquals(2, userRoles.size());
+                    return true;
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void testFindAllUsers() {
+        for (int i = 1; i <= 3; i++) {
+            SysUser user = new SysUser();
+            user.setUsername("user" + i);
+            user.setPassword("password" + i);
+            user.setEmail("user" + i + "@example.com");
+            userService.createUser(user).block();
+        }
+
+        StepVerifier.create(userService.findAll(false).collectList())
+                .expectNextMatches(users -> {
+                    assertEquals(3, users.size());
+                    return true;
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void testExistsByUsername() {
+        SysUser user = new SysUser();
+        user.setUsername("existinguser");
+        user.setPassword("password123");
+        user.setEmail("existing@example.com");
+        userService.createUser(user).block();
+
+        StepVerifier.create(userService.existsByUsername("existinguser"))
+                .expectNext(true)
+                .verifyComplete();
+
+        StepVerifier.create(userService.existsByUsername("nonexistinguser"))
+                .expectNext(false)
+                .verifyComplete();
+    }
+}

novalon-manage-api/manage-app/src/test/resources/application-test.yml

@@ -1,22 +1,24 @@
-spring.r2dbc.url=r2dbc:h2:mem:///testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-spring.r2dbc.username=sa
-spring.r2dbc.password=
-spring.r2dbc.pool.enabled=true
-spring.r2dbc.pool.initial-size=5
-spring.r2dbc.pool.max-size=20
-
-spring.sql.init.mode=always
-spring.sql.init.schema-locations=classpath:schema-h2.sql
-spring.sql.init.data-locations=classpath:data-h2.sql
-
-logging.level.org.springframework.r2dbc=DEBUG
-logging.level.cn.novalon.manage=DEBUG
-
-spring.flyway.enabled=false
-
-server.port=8085
-
-jwt.secret=test-secret-key-for-testing-purposes-only-minimum-256-bits
-jwt.expiration=3600000
-
-signature.enabled=false
+spring:
+  r2dbc:
+    url: r2dbc:h2:mem:///testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+    username: sa
+    password: 
+    pool:
+      enabled: true
+      initial-size: 2
+      max-size: 10
+      
+  flyway:
+    enabled: false
+    
+  security:
+    enabled: false
+    
+jwt:
+  secret: test-secret-key-for-integration-testing
+  expiration: 86400000
+  
+logging:
+  level:
+    cn.novalon.manage: DEBUG
+    org.springframework.r2dbc: DEBUG

novalon-manage-api/manage-app/src/test/resources/schema-h2.sql

@@ -1,189 +1,47 @@
--- H2数据库Schema
--- 用于测试环境
-
--- 用户表
-CREATE TABLE IF NOT EXISTS users (
+-- H2数据库Schema for Integration Testing
+-- 创建用户表
+CREATE TABLE IF NOT EXISTS sys_user (
     id BIGINT AUTO_INCREMENT PRIMARY KEY,
     username VARCHAR(50) NOT NULL UNIQUE,
     password VARCHAR(255) NOT NULL,
-    email VARCHAR(100) NOT NULL UNIQUE,
+    email VARCHAR(100),
     phone VARCHAR(20),
-    nickname VARCHAR(50),
-    avatar VARCHAR(255),
+    nickname VARCHAR(100),
     role_id BIGINT,
     status INTEGER DEFAULT 1,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
     deleted_at TIMESTAMP
 );
 
--- 角色表
-CREATE TABLE IF NOT EXISTS roles (
+-- 创建角色表
+CREATE TABLE IF NOT EXISTS sys_role (
     id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    role_name VARCHAR(50) NOT NULL,
-    role_key VARCHAR(50) NOT NULL UNIQUE,
+    role_name VARCHAR(100) NOT NULL,
+    role_key VARCHAR(100) NOT NULL UNIQUE,
     role_sort INTEGER DEFAULT 0,
     status INTEGER DEFAULT 1,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
     deleted_at TIMESTAMP
 );
 
--- 用户角色关联表
-CREATE TABLE IF NOT EXISTS user_roles (
+-- 创建用户角色关联表
+CREATE TABLE IF NOT EXISTS user_role (
     id BIGINT AUTO_INCREMENT PRIMARY KEY,
     user_id BIGINT NOT NULL,
     role_id BIGINT NOT NULL,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    UNIQUE(user_id, role_id)
-);
-
--- 菜单表
-CREATE TABLE IF NOT EXISTS sys_menu (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    menu_name VARCHAR(50) NOT NULL,
-    parent_id BIGINT DEFAULT 0,
-    order_num INTEGER DEFAULT 0,
-    path VARCHAR(200),
-    component VARCHAR(255),
-    menu_type CHAR(1) DEFAULT 'C',
-    visible CHAR(1) DEFAULT '1',
-    status CHAR(1) DEFAULT '1',
-    perms VARCHAR(100),
-    icon VARCHAR(100),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    deleted_at TIMESTAMP
-);
-
--- 权限表
-CREATE TABLE IF NOT EXISTS sys_permission (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    permission_name VARCHAR(50) NOT NULL,
-    permission_key VARCHAR(100) NOT NULL UNIQUE,
-    permission_type VARCHAR(20) DEFAULT 'menu',
-    parent_id BIGINT DEFAULT 0,
-    status INTEGER DEFAULT 1,
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    deleted_at TIMESTAMP
-);
-
--- 角色权限关联表
-CREATE TABLE IF NOT EXISTS sys_role_permission (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    role_id BIGINT NOT NULL,
-    permission_id BIGINT NOT NULL,
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    UNIQUE(role_id, permission_id)
-);
-
--- 字典类型表
-CREATE TABLE IF NOT EXISTS sys_dict_type (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    dict_name VARCHAR(100) NOT NULL,
-    dict_type VARCHAR(100) NOT NULL UNIQUE,
-    status CHAR(1) DEFAULT '0',
-    remark VARCHAR(500),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    deleted_at TIMESTAMP
-);
-
--- 字典数据表
-CREATE TABLE IF NOT EXISTS sys_dict_data (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    dict_sort INTEGER DEFAULT 0,
-    dict_label VARCHAR(100) NOT NULL,
-    dict_value VARCHAR(100) NOT NULL,
-    dict_type VARCHAR(100) NOT NULL,
-    css_class VARCHAR(100),
-    list_class VARCHAR(100),
-    is_default CHAR(1) DEFAULT 'N',
-    status CHAR(1) DEFAULT '0',
-    remark VARCHAR(500),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    deleted_at TIMESTAMP
-);
-
--- 系统配置表
-CREATE TABLE IF NOT EXISTS sys_config (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    config_name VARCHAR(100) NOT NULL,
-    config_key VARCHAR(100) NOT NULL UNIQUE,
-    config_value VARCHAR(500) NOT NULL,
-    config_type CHAR(1) DEFAULT 'N',
-    remark VARCHAR(500),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    created_by VARCHAR(50) DEFAULT 'system',
-    updated_by VARCHAR(50) DEFAULT 'system',
-    deleted_at TIMESTAMP
-);
-
--- 操作日志表
-CREATE TABLE IF NOT EXISTS operation_log (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    user_id BIGINT,
-    username VARCHAR(50),
-    operation VARCHAR(100),
-    method VARCHAR(200),
-    params TEXT,
-    time BIGINT,
-    ip VARCHAR(64),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
-
--- 登录日志表
-CREATE TABLE IF NOT EXISTS sys_login_log (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    user_id BIGINT,
-    username VARCHAR(50),
-    ip VARCHAR(64),
-    location VARCHAR(255),
-    browser VARCHAR(100),
-    os VARCHAR(100),
-    status INTEGER DEFAULT 1,
-    msg VARCHAR(255),
-    login_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
-
--- 异常日志表
-CREATE TABLE IF NOT EXISTS sys_exception_log (
-    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-    user_id BIGINT,
-    username VARCHAR(50),
-    method VARCHAR(200),
-    params TEXT,
-    exception TEXT,
-    ip VARCHAR(64),
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    created_by VARCHAR(50),
+    CONSTRAINT fk_user_role_user FOREIGN KEY (user_id) REFERENCES sys_user(id) ON DELETE CASCADE,
+    CONSTRAINT fk_user_role_role FOREIGN KEY (role_id) REFERENCES sys_role(id) ON DELETE CASCADE,
+    CONSTRAINT uk_user_role UNIQUE (user_id, role_id)
 );
 
 -- 创建索引
-CREATE INDEX idx_users_username ON users(username);
-CREATE INDEX idx_users_email ON users(email);
-CREATE INDEX idx_users_status ON users(status);
-CREATE INDEX idx_user_roles_user_id ON user_roles(user_id);
-CREATE INDEX idx_user_roles_role_id ON user_roles(role_id);
-CREATE INDEX idx_sys_menu_parent_id ON sys_menu(parent_id);
-CREATE INDEX idx_sys_permission_key ON sys_permission(permission_key);
+CREATE INDEX IF NOT EXISTS idx_user_role_user_id ON user_role(user_id);
+CREATE INDEX IF NOT EXISTS idx_user_role_role_id ON user_role(role_id);

novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserConverter.java

@@ -26,6 +26,8 @@ public class SysUserConverter {
         domain.setUsername(entity.getUsername());
         domain.setPassword(entity.getPassword());
         domain.setEmail(entity.getEmail());
+        domain.setPhone(entity.getPhone());
+        domain.setNickname(entity.getNickname());
         domain.setRoleId(entity.getRoleId());
         domain.setStatus(entity.getStatus());
         domain.setCreatedAt(entity.getCreatedAt());
@@ -43,6 +45,8 @@ public class SysUserConverter {
         entity.setUsername(domain.getUsername());
         entity.setPassword(domain.getPassword());
         entity.setEmail(domain.getEmail());
+        entity.setPhone(domain.getPhone());
+        entity.setNickname(domain.getNickname());
         entity.setRoleId(domain.getRoleId());
         entity.setStatus(domain.getStatus());
         entity.setCreatedAt(domain.getCreatedAt());

novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysRoleEntity.java

@@ -9,7 +9,7 @@ import org.springframework.data.relational.core.mapping.Table;
  * @author 张翔
  * @date 2026-03-13
  */
-@Table("roles")
+@Table("sys_role")
 public class SysRoleEntity extends BaseEntity {
 
     @Column("role_name")

novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysUserEntity.java

@@ -9,7 +9,7 @@ import org.springframework.data.relational.core.mapping.Table;
  * @author 张翔
  * @date 2026-03-13
  */
-@Table("users")
+@Table("sys_user")
 public class SysUserEntity extends BaseEntity {
 
     @Column("username")
@@ -21,6 +21,12 @@ public class SysUserEntity extends BaseEntity {
     @Column("email")
     private String email;
 
+    @Column("phone")
+    private String phone;
+
+    @Column("nickname")
+    private String nickname;
+
     @Column("role_id")
     private Long roleId;
 
@@ -51,6 +57,22 @@ public class SysUserEntity extends BaseEntity {
         this.email = email;
     }
 
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
     public Long getRoleId() {
         return roleId;
     }

novalon-manage-api/manage-db/src/main/resources/db/migration/V1__Create_all_tables.sql

@@ -1,14 +1,15 @@
 -- Novalon管理系统数据库初始化脚本
 -- 版本: V1
 -- 描述: 创建所有核心表结构
-
 -- 用户表
-CREATE TABLE IF NOT EXISTS users (
+CREATE TABLE IF NOT EXISTS sys_user (
     id BIGSERIAL PRIMARY KEY,
     username VARCHAR(50) NOT NULL UNIQUE,
     password VARCHAR(255) NOT NULL,
     email VARCHAR(100),
     phone VARCHAR(20),
+    nickname VARCHAR(100),
+    role_id BIGINT,
     status INTEGER DEFAULT 1,
     create_by VARCHAR(50),
     update_by VARCHAR(50),
@@ -16,9 +17,8 @@ CREATE TABLE IF NOT EXISTS users (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 角色表
-CREATE TABLE IF NOT EXISTS roles (
+CREATE TABLE IF NOT EXISTS sys_role (
     id BIGSERIAL PRIMARY KEY,
     role_name VARCHAR(100) NOT NULL,
     role_key VARCHAR(100) NOT NULL UNIQUE,
@@ -30,7 +30,6 @@ CREATE TABLE IF NOT EXISTS roles (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 菜单表（统一使用sys_menu表名）
 CREATE TABLE IF NOT EXISTS sys_menu (
     id BIGSERIAL PRIMARY KEY,
@@ -47,7 +46,6 @@ CREATE TABLE IF NOT EXISTS sys_menu (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 字典类型表
 CREATE TABLE IF NOT EXISTS sys_dict_type (
     id BIGSERIAL PRIMARY KEY,
@@ -61,7 +59,6 @@ CREATE TABLE IF NOT EXISTS sys_dict_type (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 字典数据表
 CREATE TABLE IF NOT EXISTS sys_dict_data (
     id BIGSERIAL PRIMARY KEY,
@@ -79,7 +76,6 @@ CREATE TABLE IF NOT EXISTS sys_dict_data (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 字典表（通用字典）
 CREATE TABLE IF NOT EXISTS sys_dictionary (
     id BIGSERIAL PRIMARY KEY,
@@ -94,7 +90,6 @@ CREATE TABLE IF NOT EXISTS sys_dictionary (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 系统配置表
 CREATE TABLE IF NOT EXISTS sys_config (
     id BIGSERIAL PRIMARY KEY,
@@ -108,7 +103,6 @@ CREATE TABLE IF NOT EXISTS sys_config (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 登录日志表
 CREATE TABLE IF NOT EXISTS sys_login_log (
     id BIGSERIAL PRIMARY KEY,
@@ -121,7 +115,6 @@ CREATE TABLE IF NOT EXISTS sys_login_log (
     message VARCHAR(255),
     login_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
-
 -- 异常日志表
 CREATE TABLE IF NOT EXISTS sys_exception_log (
     id BIGSERIAL PRIMARY KEY,
@@ -135,7 +128,6 @@ CREATE TABLE IF NOT EXISTS sys_exception_log (
     ip VARCHAR(50),
     create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
-
 -- 操作日志表
 CREATE TABLE IF NOT EXISTS operation_log (
     id BIGSERIAL PRIMARY KEY,
@@ -154,7 +146,6 @@ CREATE TABLE IF NOT EXISTS operation_log (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 系统公告表
 CREATE TABLE IF NOT EXISTS sys_notice (
     id BIGSERIAL PRIMARY KEY,
@@ -168,7 +159,6 @@ CREATE TABLE IF NOT EXISTS sys_notice (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 用户消息表
 CREATE TABLE IF NOT EXISTS sys_user_message (
     id BIGSERIAL PRIMARY KEY,
@@ -184,7 +174,6 @@ CREATE TABLE IF NOT EXISTS sys_user_message (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 文件管理表
 CREATE TABLE IF NOT EXISTS sys_file (
     id BIGSERIAL PRIMARY KEY,
@@ -200,7 +189,6 @@ CREATE TABLE IF NOT EXISTS sys_file (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- OAuth2客户端表
 CREATE TABLE IF NOT EXISTS oauth2_client (
     id BIGSERIAL PRIMARY KEY,
@@ -220,7 +208,6 @@ CREATE TABLE IF NOT EXISTS oauth2_client (
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     deleted_at TIMESTAMP
 );
-
 -- 表注释
 COMMENT ON TABLE sys_exception_log IS '异常日志表';
 COMMENT ON COLUMN sys_exception_log.id IS '主键ID';
@@ -233,6 +220,5 @@ COMMENT ON COLUMN sys_exception_log.exception_msg IS '异常消息';
 COMMENT ON COLUMN sys_exception_log.exception_stack IS '异常堆栈';
 COMMENT ON COLUMN sys_exception_log.ip IS 'IP地址';
 COMMENT ON COLUMN sys_exception_log.create_time IS '创建时间';
-
 COMMENT ON TABLE sys_menu IS '系统菜单表';
 COMMENT ON TABLE sys_login_log IS '登录日志表';

novalon-manage-api/manage-db/src/main/resources/db/migration/V3__Create_user_role_table.sql

@@ -5,8 +5,8 @@ CREATE TABLE IF NOT EXISTS user_role (
     role_id BIGINT NOT NULL,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     created_by VARCHAR(50),
-    CONSTRAINT fk_user_role_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
-    CONSTRAINT fk_user_role_role FOREIGN KEY (role_id) REFERENCES roles(id) ON DELETE CASCADE,
+    CONSTRAINT fk_user_role_user FOREIGN KEY (user_id) REFERENCES sys_user(id) ON DELETE CASCADE,
+    CONSTRAINT fk_user_role_role FOREIGN KEY (role_id) REFERENCES sys_role(id) ON DELETE CASCADE,
     CONSTRAINT uk_user_role UNIQUE (user_id, role_id)
 );
 

novalon-manage-api/manage-gateway/src/main/java/cn/novalon/manage/gateway/config/JwtKeyManagementConfig.java

@@ -1,10 +1,10 @@
 package cn.novalon.manage.gateway.config;
 
 import cn.novalon.manage.gateway.service.impl.JwtKeyServiceImpl;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,12 +18,10 @@ public class JwtKeyManagementConfig {
     @Autowired
     private JwtKeyServiceImpl jwtKeyService;
 
-    @Bean
-    public JwtKeyServiceImpl jwtKeyService() {
-        JwtKeyServiceImpl service = new JwtKeyServiceImpl();
-        service.initializeKeys();
+    @PostConstruct
+    public void initialize() {
+        jwtKeyService.initializeKeys();
         logger.info("JWT key management service initialized");
-        return service;
     }
 
     @Scheduled(fixedRate = 24 * 60 * 60 * 1000, initialDelay = 60 * 1000)

novalon-manage-api/manage-gateway/src/main/resources/application.yml

@@ -64,7 +64,7 @@ signature:
   max-age-minutes: ${SIGNATURE_MAX_AGE_MINUTES:5}
   nonce-cache-size: ${SIGNATURE_NONCE_CACHE_SIZE:10000}
   whitelist:
-    paths: ${SIGNATURE_WHITELIST_PATHS:/actuator/health,/actuator/info}
+    paths: ${SIGNATURE_WHITELIST_PATHS:/actuator/health,/actuator/info,/api/auth/login}
 
 resilience:
   enabled: ${RESILIENCE_ENABLED:true}

novalon-manage-api/manage-sys/pom.xml

@@ -90,6 +90,11 @@
             <artifactId>r2dbc-h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>r2dbc-postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/audit/AuditLogAspect.java

@@ -1,7 +1,7 @@
 package cn.novalon.manage.sys.audit;
 
 import cn.novalon.manage.sys.audit.domain.AuditLog;
-import cn.novalon.manage.sys.audit.repository.AuditLogRepository;
+import cn.novalon.manage.sys.audit.repository.IAuditLogRepository;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -34,10 +34,10 @@ public class AuditLogAspect {
 
     private static final Logger logger = LoggerFactory.getLogger(AuditLogAspect.class);
 
-    private final AuditLogRepository auditLogRepository;
+    private final IAuditLogRepository auditLogRepository;
     private final ObjectMapper objectMapper;
 
-    public AuditLogAspect(AuditLogRepository auditLogRepository, ObjectMapper objectMapper) {
+    public AuditLogAspect(IAuditLogRepository auditLogRepository, ObjectMapper objectMapper) {
         this.auditLogRepository = auditLogRepository;
         this.objectMapper = objectMapper;
     }

novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/audit/repository/IAuditLogArchiveRepository.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2026-04-01
  */
 @Repository
-public interface AuditLogArchiveRepository extends R2dbcRepository<AuditLogArchive, Long> {
+public interface IAuditLogArchiveRepository extends R2dbcRepository<AuditLogArchive, Long> {
 
     Flux<AuditLogArchive> findByEntityType(String entityType);
 

novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/audit/repository/IAuditLogRepository.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2026-04-01
  */
 @Repository
-public interface AuditLogRepository extends R2dbcRepository<AuditLog, Long> {
+public interface IAuditLogRepository extends R2dbcRepository<AuditLog, Long> {
 
     Flux<AuditLog> findByEntityType(String entityType);
 

novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/audit/service/AuditLogArchiveService.java

@@ -2,8 +2,8 @@ package cn.novalon.manage.sys.audit.service;
 
 import cn.novalon.manage.sys.audit.domain.AuditLog;
 import cn.novalon.manage.sys.audit.domain.AuditLogArchive;
-import cn.novalon.manage.sys.audit.repository.AuditLogArchiveRepository;
-import cn.novalon.manage.sys.audit.repository.AuditLogRepository;
+import cn.novalon.manage.sys.audit.repository.IAuditLogArchiveRepository;
+import cn.novalon.manage.sys.audit.repository.IAuditLogRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -28,11 +28,11 @@ public class AuditLogArchiveService {
 
     private static final Logger logger = LoggerFactory.getLogger(AuditLogArchiveService.class);
 
-    private final AuditLogRepository auditLogRepository;
-    private final AuditLogArchiveRepository auditLogArchiveRepository;
+    private final IAuditLogRepository auditLogRepository;
+    private final IAuditLogArchiveRepository auditLogArchiveRepository;
 
-    public AuditLogArchiveService(AuditLogRepository auditLogRepository,
-                                   AuditLogArchiveRepository auditLogArchiveRepository) {
+    public AuditLogArchiveService(IAuditLogRepository auditLogRepository,
+                                   IAuditLogArchiveRepository auditLogArchiveRepository) {
         this.auditLogRepository = auditLogRepository;
         this.auditLogArchiveRepository = auditLogArchiveRepository;
     }

novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/audit/service/AuditLogService.java

@@ -1,7 +1,7 @@
 package cn.novalon.manage.sys.audit.service;
 
 import cn.novalon.manage.sys.audit.domain.AuditLog;
-import cn.novalon.manage.sys.audit.repository.AuditLogRepository;
+import cn.novalon.manage.sys.audit.repository.IAuditLogRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
@@ -28,10 +28,10 @@ public class AuditLogService {
 
     private static final Logger logger = LoggerFactory.getLogger(AuditLogService.class);
 
-    private final AuditLogRepository auditLogRepository;
+    private final IAuditLogRepository auditLogRepository;
     private final Executor auditLogExecutor;
 
-    public AuditLogService(AuditLogRepository auditLogRepository, 
+    public AuditLogService(IAuditLogRepository auditLogRepository, 
                           Executor auditLogExecutor) {
         this.auditLogRepository = auditLogRepository;
         this.auditLogExecutor = auditLogExecutor;

novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/config/IntegrationTestConfig.java

@@ -0,0 +1,29 @@
+package cn.novalon.manage.sys.config;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+/**
+ * 集成测试配置类
+ * 
+ * 为@DataR2dbcTest提供必要的Spring Boot配置
+ * 
+ * @author 张翔
+ * @date 2026-04-02
+ */
+@SpringBootConfiguration
+@EnableAutoConfiguration
+@EnableR2dbcRepositories(basePackages = {
+    "cn.novalon.manage.db.repository"
+})
+public class IntegrationTestConfig {
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder(12);
+    }
+}

novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceIntegrationTest.java

@@ -1,6 +1,7 @@
 package cn.novalon.manage.sys.core.service.impl;
 
 import cn.novalon.manage.common.util.StatusConstants;
+import cn.novalon.manage.sys.config.IntegrationTestConfig;
 import cn.novalon.manage.sys.core.domain.SysUser;
 import cn.novalon.manage.sys.core.domain.SysRole;
 import cn.novalon.manage.sys.core.domain.UserRole;
@@ -11,20 +12,19 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.r2dbc.DataR2dbcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.time.LocalDateTime;
 import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -40,6 +40,7 @@ import static org.junit.jupiter.api.Assertions.*;
 @DataR2dbcTest
 @Testcontainers
 @ActiveProfiles("test")
+@ContextConfiguration(classes = IntegrationTestConfig.class)
 class SysUserServiceIntegrationTest {
 
     @Container
@@ -50,10 +51,9 @@ class SysUserServiceIntegrationTest {
 
     @DynamicPropertySource
     static void postgresProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.r2dbc.url", () -> 
-            String.format("r2dbc:postgresql://%s:%d/%s", 
-                postgres.getHost(), 
-                postgres.getFirstMappedPort(), 
+        registry.add("spring.r2dbc.url", () -> String.format("r2dbc:postgresql://%s:%d/%s",
+                postgres.getHost(),
+                postgres.getFirstMappedPort(),
                 postgres.getDatabaseName()));
         registry.add("spring.r2dbc.username", postgres::getUsername);
         registry.add("spring.r2dbc.password", postgres::getPassword);
@@ -78,7 +78,7 @@ class SysUserServiceIntegrationTest {
     void setUp() {
         passwordEncoder = new BCryptPasswordEncoder(12);
         userService = new SysUserService(userRepository, roleRepository, userRoleRepository, passwordEncoder);
-        
+
         r2dbcEntityTemplate.delete(SysUser.class).all().block();
         r2dbcEntityTemplate.delete(SysRole.class).all().block();
         r2dbcEntityTemplate.delete(UserRole.class).all().block();
@@ -196,7 +196,7 @@ class SysUserServiceIntegrationTest {
         SysUser createdUser = userService.createUser(user).block();
         assertNotNull(createdUser);
 
-        StepVerifier.create(userService.assignRolesToUser(createdUser.getId(), 
+        StepVerifier.create(userService.assignRolesToUser(createdUser.getId(),
                 Arrays.asList(createdRole1.getId(), createdRole2.getId())))
                 .verifyComplete();
 

novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceTest.java

@@ -2,15 +2,11 @@ package cn.novalon.manage.sys.core.service.impl;
 
 import cn.novalon.manage.common.util.StatusConstants;
 import cn.novalon.manage.sys.core.domain.SysUser;
-import cn.novalon.manage.sys.core.domain.SysRole;
 import cn.novalon.manage.sys.core.domain.UserRole;
-import cn.novalon.manage.common.dto.PageRequest;
-import cn.novalon.manage.common.dto.PageResponse;
 import cn.novalon.manage.sys.core.repository.ISysUserRepository;
 import cn.novalon.manage.sys.core.repository.ISysRoleRepository;
 import cn.novalon.manage.sys.core.repository.IUserRoleRepository;
 import cn.novalon.manage.sys.core.command.CreateUserCommand;
-import cn.novalon.manage.sys.core.command.UpdateUserCommand;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -21,7 +17,6 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.time.LocalDateTime;
 import java.util.Arrays;
 
 import static org.mockito.ArgumentMatchers.any;

novalon-manage-api/manage-sys/src/test/resources/application-test.yml

@@ -0,0 +1,11 @@
+spring:
+  r2dbc:
+    pool:
+      enabled: true
+      initial-size: 2
+      max-size: 10
+      
+logging:
+  level:
+    cn.novalon.manage: DEBUG
+    org.springframework.r2dbc: DEBUG