Pārlūkot izejas kodu

[refactor] 包名从 com.fenzhitech.crrc 改为 com.sayu

简化包名结构,移除不必要的公司域名前缀。
wubinggen 8 stundas atpakaļ
vecāks
revīzija
3514c8e302
46 mainītis faili ar 152 papildinājumiem un 152 dzēšanām
  1. 1 1
      deliveries/team-a-requirement/constraints.md
  2. 5 5
      deliveries/team-b-architecture/design.md
  3. 20 20
      docs/multi-agent-git-workflow-v2.1.md
  4. 1 1
      service/src/main/java/com/sayu/CrrcApplication.java
  5. 2 2
      service/src/main/java/com/sayu/config/GlobalExceptionHandler.java
  6. 2 2
      service/src/main/java/com/sayu/config/MyBatisConfig.java
  7. 3 3
      service/src/main/java/com/sayu/config/WebMvcConfig.java
  8. 4 4
      service/src/main/java/com/sayu/controller/admin/AuditController.java
  9. 3 3
      service/src/main/java/com/sayu/controller/admin/AuthController.java
  10. 6 6
      service/src/main/java/com/sayu/controller/admin/SysController.java
  11. 3 3
      service/src/main/java/com/sayu/controller/wx/AuthController.java
  12. 2 2
      service/src/main/java/com/sayu/controller/wx/HomeController.java
  13. 1 1
      service/src/main/java/com/sayu/entity/AuditLog.java
  14. 1 1
      service/src/main/java/com/sayu/entity/OperationLog.java
  15. 1 1
      service/src/main/java/com/sayu/entity/SysDict.java
  16. 1 1
      service/src/main/java/com/sayu/entity/SysPermission.java
  17. 1 1
      service/src/main/java/com/sayu/entity/SysRole.java
  18. 1 1
      service/src/main/java/com/sayu/entity/SysUser.java
  19. 1 1
      service/src/main/java/com/sayu/entity/UserIdentity.java
  20. 2 2
      service/src/main/java/com/sayu/interceptor/AdminAuthInterceptor.java
  21. 2 2
      service/src/main/java/com/sayu/interceptor/JwtInterceptor.java
  22. 2 2
      service/src/main/java/com/sayu/mapper/AuditLogMapper.java
  23. 2 2
      service/src/main/java/com/sayu/mapper/OperationLogMapper.java
  24. 2 2
      service/src/main/java/com/sayu/mapper/SysDictMapper.java
  25. 2 2
      service/src/main/java/com/sayu/mapper/SysPermissionMapper.java
  26. 2 2
      service/src/main/java/com/sayu/mapper/SysRoleMapper.java
  27. 2 2
      service/src/main/java/com/sayu/mapper/SysUserMapper.java
  28. 2 2
      service/src/main/java/com/sayu/mapper/UserIdentityMapper.java
  29. 3 3
      service/src/main/java/com/sayu/service/AuditService.java
  30. 9 9
      service/src/main/java/com/sayu/service/AuthService.java
  31. 10 10
      service/src/main/java/com/sayu/service/SysService.java
  32. 1 1
      service/src/main/java/com/sayu/util/AesUtil.java
  33. 1 1
      service/src/main/java/com/sayu/util/JwtUtil.java
  34. 1 1
      service/src/main/java/com/sayu/util/ResultUtil.java
  35. 1 1
      service/src/main/java/com/sayu/util/Sha256Util.java
  36. 5 5
      service/src/main/resources/application.properties
  37. 3 3
      service/src/main/resources/mapper/AuditLogMapper.xml
  38. 3 3
      service/src/main/resources/mapper/OperationLogMapper.xml
  39. 4 4
      service/src/main/resources/mapper/SysDictMapper.xml
  40. 4 4
      service/src/main/resources/mapper/SysPermissionMapper.xml
  41. 4 4
      service/src/main/resources/mapper/SysRoleMapper.xml
  42. 4 4
      service/src/main/resources/mapper/SysUserMapper.xml
  43. 3 3
      service/src/main/resources/mapper/UserIdentityMapper.xml
  44. 3 3
      service/src/test/java/com/sayu/service/AuditServiceTest.java
  45. 8 8
      service/src/test/java/com/sayu/service/AuthServiceTest.java
  46. 8 8
      service/src/test/java/com/sayu/service/SysServiceTest.java

+ 1 - 1
deliveries/team-a-requirement/constraints.md

@@ -13,7 +13,7 @@
 - **ORM**: MyBatis(XML 映射)
 
 ### 1.2 代码规范
-- **包名**: com.fenzhitech.crrc
+- **包名**: com.sayu
 - **Controller 路径**: 
   - 小程序端: /api/wx/*
   - 后台管理端: /api/admin/*

+ 5 - 5
deliveries/team-b-architecture/design.md

@@ -56,11 +56,11 @@
 
 | 模块 | 包名 | 职责 |
 |------|------|------|
-| 用户模块 | com.fenzhitech.crrc.service | 用户认证、身份管理、权限控制 |
-| 系统模块 | com.fenzhitech.crrc.service | 角色管理、账号管理、字典管理、操作日志 |
-| 审核模块 | com.fenzhitech.crrc.service | 审核流程、审核列表、审核日志 |
-| 首页模块 | com.fenzhitech.crrc.service | 首页数据、行情展示 |
-| 通用模块 | com.fenzhitech.crrc.util | 工具类、常量、异常处理 |
+| 用户模块 | com.sayu.service | 用户认证、身份管理、权限控制 |
+| 系统模块 | com.sayu.service | 角色管理、账号管理、字典管理、操作日志 |
+| 审核模块 | com.sayu.service | 审核流程、审核列表、审核日志 |
+| 首页模块 | com.sayu.service | 首页数据、行情展示 |
+| 通用模块 | com.sayu.util | 工具类、常量、异常处理 |
 
 ### 1.3 分层架构
 

+ 20 - 20
docs/multi-agent-git-workflow-v2.1.md

@@ -306,11 +306,11 @@ repo/
 │       ├── test-report.md          # 测试报告
 │       └── bug-list.md             # Bug 清单
-├── com.fenzhitech.crrc.service-xxx/   # Team C 代码产物(各业务模块)
+├── com.sayu.service-xxx/   # Team C 代码产物(各业务模块)
 │   ├── src/main/java/...              #   业务代码
 │   ├── src/main/resources/...         #   配置 + MyBatis XML 映射
 │   └── src/test/java/...              #   Team D 自动化测试代码
-├── com.fenzhitech.crrc.service-common/ # 共享库模块(只读,修改需返工流程)
+├── com.sayu.service-common/ # 共享库模块(只读,修改需返工流程)
 ├── tests/                              # Team D 测试文档目录(deliveries 内的子目录备选)
 └── rework/                             # 返工请求
@@ -321,9 +321,9 @@ repo/
 
 - 每个团队只能在自己的 `deliveries/team-X-xxx/` 目录下提交交付产物
 - 跨目录修改需要通过返工流程
-- 各业务模块 `com.fenzhitech.crrc.service-*/src/main/java/` 由 Team C 产出
-- 各业务模块 `com.fenzhitech.crrc.service-*/src/test/java/` 由 Team D 产出
-- `com.fenzhitech.crrc.service-common/` 是共享库模块,修改需通过返工流程,且修改后需优先编译验证
+- 各业务模块 `com.sayu.service-*/src/main/java/` 由 Team C 产出
+- 各业务模块 `com.sayu.service-*/src/test/java/` 由 Team D 产出
+- `com.sayu.service-common/` 是共享库模块,修改需通过返工流程,且修改后需优先编译验证
 
 ---
 
@@ -992,12 +992,12 @@ CRRC 项目是约 20 个独立 Gradle 模块的集合,每个模块拥有独立
 
 ```bash
 # 验证 service-bill 模块编译
-cd com.fenzhitech.crrc.service-bill
+cd com.sayu.service-bill
 ./gradlew compileJava
 
 # 依赖链编译(先公共库,后业务模块)
-cd com.fenzhitech.crrc.service-common && ./gradlew compileJava
-cd com.fenzhitech.crrc.service-bill && ./gradlew compileJava
+cd com.sayu.service-common && ./gradlew compileJava
+cd com.sayu.service-bill && ./gradlew compileJava
 ```
 
 并行开发时,文件所有权按**模块粒度**划分(见 C.3)。
@@ -1006,7 +1006,7 @@ cd com.fenzhitech.crrc.service-bill && ./gradlew compileJava
 
 - 测试框架:Spring Boot 1.5.x Starter Test + JUnit 4
 - 测试目录:标准 `src/test/java/`(非 `src/main/test/`)
-- 已有测试样例:`com.fenzhitech.crrc.service-message/src/test/main/ServiceTest.java`
+- 已有测试样例:`com.sayu.service-message/src/test/main/ServiceTest.java`
 - Team D 不得在 `src/main/` 下创建测试文件
 - 项目当前测试覆盖极少 —— Team D 的策略是"核心接口优先",优先为业务领导指定的核心接口编写测试
 
@@ -1016,19 +1016,19 @@ cd com.fenzhitech.crrc.service-bill && ./gradlew compileJava
 
 ```
 Team C-User 负责:
-  - com.fenzhitech.crrc.service-user/src/main/java/**(全部 Java 代码)
-  - com.fenzhitech.crrc.service-user/src/main/resources/**(配置 + MyBatis XML)
+  - com.sayu.service-user/src/main/java/**(全部 Java 代码)
+  - com.sayu.service-user/src/main/resources/**(配置 + MyBatis XML)
 
 Team C-Bill 负责:
-  - com.fenzhitech.crrc.service-bill/src/main/java/**
-  - com.fenzhitech.crrc.service-bill/src/main/resources/**
+  - com.sayu.service-bill/src/main/java/**
+  - com.sayu.service-bill/src/main/resources/**
 
 Team C-Gateway 负责:
-  - com.fenzhitech.crrc.gateway-*/src/main/java/**
-  - com.fenzhitech.crrc.gateway-*/src/main/resources/**
+  - com.sayu.gateway-*/src/main/java/**
+  - com.sayu.gateway-*/src/main/resources/**
 
 共享库(任何 Team C 子团队不可擅自修改,需通过返工流程):
-  - com.fenzhitech.crrc.service-common/**
+  - com.sayu.service-common/**
 
 禁止修改的文件:
   - 各模块 build.gradle(由业务领导统一管理)
@@ -1067,14 +1067,14 @@ Grep pattern: \$\{[^#]
 
 | 目录类型 | 归属团队 | 说明 |
 |----------|---------|------|
-| `com.fenzhitech.crrc.*/src/main/java/` | Team C | 业务代码 |
-| `com.fenzhitech.crrc.*/src/main/resources/` | Team C | 配置 + MyBatis XML |
-| `com.fenzhitech.crrc.*/src/test/java/` | Team D | 自动化测试代码 |
+| `com.sayu.*/src/main/java/` | Team C | 业务代码 |
+| `com.sayu.*/src/main/resources/` | Team C | 配置 + MyBatis XML |
+| `com.sayu.*/src/test/java/` | Team D | 自动化测试代码 |
 | `deliveries/team-a-requirement/` | Team A | 需求文档 |
 | `deliveries/team-b-architecture/` | Team B | 架构文档 |
 | `deliveries/team-c-coding/` | Team C | 实现说明 |
 | `deliveries/team-d-testing/` | Team D | 测试文档 |
-| `com.fenzhitech.crrc.service-common/` | ALL(只读) | 共享库,修改需返工流程 |
+| `com.sayu.service-common/` | ALL(只读) | 共享库,修改需返工流程 |
 | `docs/` | 业务领导 | 项目文档 |
 
 ### C.6 CRRC 特有的安全注意

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/CrrcApplication.java → service/src/main/java/com/sayu/CrrcApplication.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc;
+package com.sayu;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/config/GlobalExceptionHandler.java → service/src/main/java/com/sayu/config/GlobalExceptionHandler.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.config;
+package com.sayu.config;
 
-import com.fenzhitech.crrc.util.ResultUtil;
+import com.sayu.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ExceptionHandler;

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/config/MyBatisConfig.java → service/src/main/java/com/sayu/config/MyBatisConfig.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.config;
+package com.sayu.config;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
@@ -7,6 +7,6 @@ import org.springframework.context.annotation.Configuration;
  * MyBatis 配置
  */
 @Configuration
-@MapperScan("com.fenzhitech.crrc.mapper")
+@MapperScan("com.sayu.mapper")
 public class MyBatisConfig {
 }

+ 3 - 3
service/src/main/java/com/fenzhitech/crrc/config/WebMvcConfig.java → service/src/main/java/com/sayu/config/WebMvcConfig.java

@@ -1,7 +1,7 @@
-package com.fenzhitech.crrc.config;
+package com.sayu.config;
 
-import com.fenzhitech.crrc.interceptor.AdminAuthInterceptor;
-import com.fenzhitech.crrc.interceptor.JwtInterceptor;
+import com.sayu.interceptor.AdminAuthInterceptor;
+import com.sayu.interceptor.JwtInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

+ 4 - 4
service/src/main/java/com/fenzhitech/crrc/controller/admin/AuditController.java → service/src/main/java/com/sayu/controller/admin/AuditController.java

@@ -1,8 +1,8 @@
-package com.fenzhitech.crrc.controller.admin;
+package com.sayu.controller.admin;
 
-import com.fenzhitech.crrc.entity.AuditLog;
-import com.fenzhitech.crrc.service.AuditService;
-import com.fenzhitech.crrc.util.ResultUtil;
+import com.sayu.entity.AuditLog;
+import com.sayu.service.AuditService;
+import com.sayu.util.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 3 - 3
service/src/main/java/com/fenzhitech/crrc/controller/admin/AuthController.java → service/src/main/java/com/sayu/controller/admin/AuthController.java

@@ -1,7 +1,7 @@
-package com.fenzhitech.crrc.controller.admin;
+package com.sayu.controller.admin;
 
-import com.fenzhitech.crrc.service.AuthService;
-import com.fenzhitech.crrc.util.ResultUtil;
+import com.sayu.service.AuthService;
+import com.sayu.util.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 6 - 6
service/src/main/java/com/fenzhitech/crrc/controller/admin/SysController.java → service/src/main/java/com/sayu/controller/admin/SysController.java

@@ -1,10 +1,10 @@
-package com.fenzhitech.crrc.controller.admin;
+package com.sayu.controller.admin;
 
-import com.fenzhitech.crrc.entity.SysDict;
-import com.fenzhitech.crrc.entity.SysPermission;
-import com.fenzhitech.crrc.entity.SysRole;
-import com.fenzhitech.crrc.service.SysService;
-import com.fenzhitech.crrc.util.ResultUtil;
+import com.sayu.entity.SysDict;
+import com.sayu.entity.SysPermission;
+import com.sayu.entity.SysRole;
+import com.sayu.service.SysService;
+import com.sayu.util.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 3 - 3
service/src/main/java/com/fenzhitech/crrc/controller/wx/AuthController.java → service/src/main/java/com/sayu/controller/wx/AuthController.java

@@ -1,7 +1,7 @@
-package com.fenzhitech.crrc.controller.wx;
+package com.sayu.controller.wx;
 
-import com.fenzhitech.crrc.service.AuthService;
-import com.fenzhitech.crrc.util.ResultUtil;
+import com.sayu.service.AuthService;
+import com.sayu.util.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/controller/wx/HomeController.java → service/src/main/java/com/sayu/controller/wx/HomeController.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.controller.wx;
+package com.sayu.controller.wx;
 
-import com.fenzhitech.crrc.util.ResultUtil;
+import com.sayu.util.ResultUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/AuditLog.java → service/src/main/java/com/sayu/entity/AuditLog.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/OperationLog.java → service/src/main/java/com/sayu/entity/OperationLog.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/SysDict.java → service/src/main/java/com/sayu/entity/SysDict.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/SysPermission.java → service/src/main/java/com/sayu/entity/SysPermission.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/SysRole.java → service/src/main/java/com/sayu/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/SysUser.java → service/src/main/java/com/sayu/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/entity/UserIdentity.java → service/src/main/java/com/sayu/entity/UserIdentity.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.entity;
+package com.sayu.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/interceptor/AdminAuthInterceptor.java → service/src/main/java/com/sayu/interceptor/AdminAuthInterceptor.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.interceptor;
+package com.sayu.interceptor;
 
-import com.fenzhitech.crrc.util.JwtUtil;
+import com.sayu.util.JwtUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/interceptor/JwtInterceptor.java → service/src/main/java/com/sayu/interceptor/JwtInterceptor.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.interceptor;
+package com.sayu.interceptor;
 
-import com.fenzhitech.crrc.util.JwtUtil;
+import com.sayu.util.JwtUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/AuditLogMapper.java → service/src/main/java/com/sayu/mapper/AuditLogMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.AuditLog;
+import com.sayu.entity.AuditLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/OperationLogMapper.java → service/src/main/java/com/sayu/mapper/OperationLogMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.OperationLog;
+import com.sayu.entity.OperationLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/SysDictMapper.java → service/src/main/java/com/sayu/mapper/SysDictMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.SysDict;
+import com.sayu.entity.SysDict;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/SysPermissionMapper.java → service/src/main/java/com/sayu/mapper/SysPermissionMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.SysPermission;
+import com.sayu.entity.SysPermission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/SysRoleMapper.java → service/src/main/java/com/sayu/mapper/SysRoleMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.SysRole;
+import com.sayu.entity.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/SysUserMapper.java → service/src/main/java/com/sayu/mapper/SysUserMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.SysUser;
+import com.sayu.entity.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
service/src/main/java/com/fenzhitech/crrc/mapper/UserIdentityMapper.java → service/src/main/java/com/sayu/mapper/UserIdentityMapper.java

@@ -1,6 +1,6 @@
-package com.fenzhitech.crrc.mapper;
+package com.sayu.mapper;
 
-import com.fenzhitech.crrc.entity.UserIdentity;
+import com.sayu.entity.UserIdentity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 3 - 3
service/src/main/java/com/fenzhitech/crrc/service/AuditService.java → service/src/main/java/com/sayu/service/AuditService.java

@@ -1,7 +1,7 @@
-package com.fenzhitech.crrc.service;
+package com.sayu.service;
 
-import com.fenzhitech.crrc.entity.AuditLog;
-import com.fenzhitech.crrc.mapper.AuditLogMapper;
+import com.sayu.entity.AuditLog;
+import com.sayu.mapper.AuditLogMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 9 - 9
service/src/main/java/com/fenzhitech/crrc/service/AuthService.java → service/src/main/java/com/sayu/service/AuthService.java

@@ -1,12 +1,12 @@
-package com.fenzhitech.crrc.service;
-
-import com.fenzhitech.crrc.entity.SysUser;
-import com.fenzhitech.crrc.entity.UserIdentity;
-import com.fenzhitech.crrc.mapper.SysUserMapper;
-import com.fenzhitech.crrc.mapper.UserIdentityMapper;
-import com.fenzhitech.crrc.util.JwtUtil;
-import com.fenzhitech.crrc.util.AesUtil;
-import com.fenzhitech.crrc.util.Sha256Util;
+package com.sayu.service;
+
+import com.sayu.entity.SysUser;
+import com.sayu.entity.UserIdentity;
+import com.sayu.mapper.SysUserMapper;
+import com.sayu.mapper.UserIdentityMapper;
+import com.sayu.util.JwtUtil;
+import com.sayu.util.AesUtil;
+import com.sayu.util.Sha256Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 10 - 10
service/src/main/java/com/fenzhitech/crrc/service/SysService.java → service/src/main/java/com/sayu/service/SysService.java

@@ -1,13 +1,13 @@
-package com.fenzhitech.crrc.service;
-
-import com.fenzhitech.crrc.entity.SysDict;
-import com.fenzhitech.crrc.entity.SysPermission;
-import com.fenzhitech.crrc.entity.SysRole;
-import com.fenzhitech.crrc.entity.OperationLog;
-import com.fenzhitech.crrc.mapper.SysDictMapper;
-import com.fenzhitech.crrc.mapper.SysPermissionMapper;
-import com.fenzhitech.crrc.mapper.SysRoleMapper;
-import com.fenzhitech.crrc.mapper.OperationLogMapper;
+package com.sayu.service;
+
+import com.sayu.entity.SysDict;
+import com.sayu.entity.SysPermission;
+import com.sayu.entity.SysRole;
+import com.sayu.entity.OperationLog;
+import com.sayu.mapper.SysDictMapper;
+import com.sayu.mapper.SysPermissionMapper;
+import com.sayu.mapper.SysRoleMapper;
+import com.sayu.mapper.OperationLogMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/util/AesUtil.java → service/src/main/java/com/sayu/util/AesUtil.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.util;
+package com.sayu.util;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/util/JwtUtil.java → service/src/main/java/com/sayu/util/JwtUtil.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.util;
+package com.sayu.util;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/util/ResultUtil.java → service/src/main/java/com/sayu/util/ResultUtil.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.util;
+package com.sayu.util;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
service/src/main/java/com/fenzhitech/crrc/util/Sha256Util.java → service/src/main/java/com/sayu/util/Sha256Util.java

@@ -1,4 +1,4 @@
-package com.fenzhitech.crrc.util;
+package com.sayu.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

+ 5 - 5
service/src/main/resources/application.properties

@@ -3,9 +3,9 @@ server.port=8080
 server.context-path=/
 
 # ===== 数据库配置 =====
-spring.datasource.url=jdbc:mysql://localhost:3306/crrc?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.url=jdbc:mysql://43.142.172.168:3306/syyg?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
 spring.datasource.username=root
-spring.datasource.password=
+spring.datasource.password=2017526652@Qq
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # ===== MyBatis 配置 =====
@@ -14,7 +14,7 @@ mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.type-aliases-package=com.fenzhitech.crrc.entity
 
 # ===== Redis 配置 =====
-spring.redis.host=localhost
+spring.redis.host=43.142.172.168
 spring.redis.port=6379
 spring.redis.password=
 
@@ -36,5 +36,5 @@ sms.template-code.apply=
 sms.template-code.audit=
 
 # ===== 微信小程序配置 =====
-wx.appid=
-wx.secret=
+wx.appid=wxcfb400c9f4bd6bd2
+wx.secret=8b7e709297a4cfcbfee75f6552c3c934

+ 3 - 3
service/src/main/resources/mapper/AuditLogMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.AuditLogMapper">
+<mapper namespace="com.sayu.mapper.AuditLogMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.AuditLog">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.AuditLog">
         <id column="id" property="id"/>
         <result column="target_type" property="targetType"/>
         <result column="target_id" property="targetId"/>
@@ -50,7 +50,7 @@
         </where>
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.AuditLog" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.AuditLog" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO audit_log (target_type, target_id, operator_id, action, reason, created_at)
         VALUES (#{targetType}, #{targetId}, #{operatorId}, #{action}, #{reason}, NOW())
     </insert>

+ 3 - 3
service/src/main/resources/mapper/OperationLogMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.OperationLogMapper">
+<mapper namespace="com.sayu.mapper.OperationLogMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.OperationLog">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.OperationLog">
         <id column="id" property="id"/>
         <result column="operator_id" property="operatorId"/>
         <result column="operator_name" property="operatorName"/>
@@ -59,7 +59,7 @@
         </where>
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.OperationLog" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.OperationLog" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO operation_log (operator_id, operator_name, operation_type, operation_module,
                                    operation_content, ip_address, result, created_at)
         VALUES (#{operatorId}, #{operatorName}, #{operationType}, #{operationModule},

+ 4 - 4
service/src/main/resources/mapper/SysDictMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.SysDictMapper">
+<mapper namespace="com.sayu.mapper.SysDictMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.SysDict">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.SysDict">
         <id column="id" property="id"/>
         <result column="dict_type" property="dictType"/>
         <result column="dict_code" property="dictCode"/>
@@ -42,12 +42,12 @@
         ORDER BY dict_type ASC
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.SysDict" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.SysDict" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO sys_dict (dict_type, dict_code, dict_name, sort_order, is_system, status, created_at)
         VALUES (#{dictType}, #{dictCode}, #{dictName}, #{sortOrder}, #{isSystem}, #{status}, NOW())
     </insert>
 
-    <update id="update" parameterType="com.fenzhitech.crrc.entity.SysDict">
+    <update id="update" parameterType="com.sayu.entity.SysDict">
         UPDATE sys_dict
         <set>
             <if test="dictType != null">dict_type = #{dictType},</if>

+ 4 - 4
service/src/main/resources/mapper/SysPermissionMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.SysPermissionMapper">
+<mapper namespace="com.sayu.mapper.SysPermissionMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.SysPermission">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.SysPermission">
         <id column="id" property="id"/>
         <result column="parent_id" property="parentId"/>
         <result column="perm_name" property="permName"/>
@@ -38,12 +38,12 @@
         ORDER BY p.sort_order ASC
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.SysPermission" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.SysPermission" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO sys_permission (parent_id, perm_name, perm_code, perm_type, path, icon, sort_order, status)
         VALUES (#{parentId}, #{permName}, #{permCode}, #{permType}, #{path}, #{icon}, #{sortOrder}, #{status})
     </insert>
 
-    <update id="update" parameterType="com.fenzhitech.crrc.entity.SysPermission">
+    <update id="update" parameterType="com.sayu.entity.SysPermission">
         UPDATE sys_permission
         <set>
             <if test="parentId != null">parent_id = #{parentId},</if>

+ 4 - 4
service/src/main/resources/mapper/SysRoleMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.SysRoleMapper">
+<mapper namespace="com.sayu.mapper.SysRoleMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.SysRole">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.SysRole">
         <id column="id" property="id"/>
         <result column="role_name" property="roleName"/>
         <result column="role_code" property="roleCode"/>
@@ -34,12 +34,12 @@
         ORDER BY created_at DESC
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.SysRole" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.SysRole" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO sys_role (role_name, role_code, description, status, is_system, created_at)
         VALUES (#{roleName}, #{roleCode}, #{description}, #{status}, #{isSystem}, NOW())
     </insert>
 
-    <update id="update" parameterType="com.fenzhitech.crrc.entity.SysRole">
+    <update id="update" parameterType="com.sayu.entity.SysRole">
         UPDATE sys_role
         <set>
             <if test="roleName != null">role_name = #{roleName},</if>

+ 4 - 4
service/src/main/resources/mapper/SysUserMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.SysUserMapper">
+<mapper namespace="com.sayu.mapper.SysUserMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.SysUser">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.SysUser">
         <id column="id" property="id"/>
         <result column="openid" property="openid"/>
         <result column="username" property="username"/>
@@ -61,14 +61,14 @@
         ORDER BY created_at DESC
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.SysUser" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.SysUser" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO sys_user (openid, username, password, phone, phone_hash, real_name, status,
                               lock_reason, login_fail_count, lock_time, created_at, updated_at)
         VALUES (#{openid}, #{username}, #{password}, #{phone}, #{phoneHash}, #{realName}, #{status},
                 #{lockReason}, #{loginFailCount}, #{lockTime}, NOW(), NOW())
     </insert>
 
-    <update id="update" parameterType="com.fenzhitech.crrc.entity.SysUser">
+    <update id="update" parameterType="com.sayu.entity.SysUser">
         UPDATE sys_user
         <set>
             <if test="openid != null">openid = #{openid},</if>

+ 3 - 3
service/src/main/resources/mapper/UserIdentityMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fenzhitech.crrc.mapper.UserIdentityMapper">
+<mapper namespace="com.sayu.mapper.UserIdentityMapper">
 
-    <resultMap id="BaseResultMap" type="com.fenzhitech.crrc.entity.UserIdentity">
+    <resultMap id="BaseResultMap" type="com.sayu.entity.UserIdentity">
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="identity_type" property="identityType"/>
@@ -33,7 +33,7 @@
         WHERE user_id = #{userId} AND identity_type = #{identityType}
     </select>
 
-    <insert id="insert" parameterType="com.fenzhitech.crrc.entity.UserIdentity" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert" parameterType="com.sayu.entity.UserIdentity" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO user_identity (user_id, identity_type, status, created_at)
         VALUES (#{userId}, #{identityType}, #{status}, NOW())
     </insert>

+ 3 - 3
service/src/test/java/com/fenzhitech/crrc/service/AuditServiceTest.java → service/src/test/java/com/sayu/service/AuditServiceTest.java

@@ -1,7 +1,7 @@
-package com.fenzhitech.crrc.service;
+package com.sayu.service;
 
-import com.fenzhitech.crrc.entity.AuditLog;
-import com.fenzhitech.crrc.mapper.AuditLogMapper;
+import com.sayu.entity.AuditLog;
+import com.sayu.mapper.AuditLogMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

+ 8 - 8
service/src/test/java/com/fenzhitech/crrc/service/AuthServiceTest.java → service/src/test/java/com/sayu/service/AuthServiceTest.java

@@ -1,11 +1,11 @@
-package com.fenzhitech.crrc.service;
-
-import com.fenzhitech.crrc.entity.SysUser;
-import com.fenzhitech.crrc.entity.UserIdentity;
-import com.fenzhitech.crrc.mapper.SysUserMapper;
-import com.fenzhitech.crrc.mapper.UserIdentityMapper;
-import com.fenzhitech.crrc.util.JwtUtil;
-import com.fenzhitech.crrc.util.AesUtil;
+package com.sayu.service;
+
+import com.sayu.entity.SysUser;
+import com.sayu.entity.UserIdentity;
+import com.sayu.mapper.SysUserMapper;
+import com.sayu.mapper.UserIdentityMapper;
+import com.sayu.util.JwtUtil;
+import com.sayu.util.AesUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

+ 8 - 8
service/src/test/java/com/fenzhitech/crrc/service/SysServiceTest.java → service/src/test/java/com/sayu/service/SysServiceTest.java

@@ -1,11 +1,11 @@
-package com.fenzhitech.crrc.service;
-
-import com.fenzhitech.crrc.entity.SysDict;
-import com.fenzhitech.crrc.entity.SysRole;
-import com.fenzhitech.crrc.mapper.SysDictMapper;
-import com.fenzhitech.crrc.mapper.SysPermissionMapper;
-import com.fenzhitech.crrc.mapper.SysRoleMapper;
-import com.fenzhitech.crrc.mapper.OperationLogMapper;
+package com.sayu.service;
+
+import com.sayu.entity.SysDict;
+import com.sayu.entity.SysRole;
+import com.sayu.mapper.SysDictMapper;
+import com.sayu.mapper.SysPermissionMapper;
+import com.sayu.mapper.SysRoleMapper;
+import com.sayu.mapper.OperationLogMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;