🎉 init

yxx-z · Aug 26, 2023 · 776f87e · 776f87e
1 parent 0b1ae04
commit 776f87e
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 19 deletions.
diff --git a/admin/src/main/java/com/yxx/admin/controller/AdminAuthController.java b/admin/src/main/java/com/yxx/admin/controller/AdminAuthController.java
@@ -18,8 +18,11 @@
 import jakarta.validation.Valid;
 
 /**
+ * 管理员身份验证控制器
+ *
  * @author yxx
- * @since 2023-05-17 10:02
+ * @classname AdminAuthController
+ * @since 2023/08/26
  */
 @Slf4j
 @Validated

diff --git a/admin/src/main/java/com/yxx/admin/controller/AdminUserController.java b/admin/src/main/java/com/yxx/admin/controller/AdminUserController.java
@@ -14,8 +14,11 @@
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * 管理用户控制器
+ *
  * @author yxx
- * @since 2022-11-12 02:07
+ * @classname AdminUserController
+ * @since 2023/08/26
  */
 @Slf4j
 @Validated

diff --git a/admin/src/main/java/com/yxx/admin/controller/OperateAdminLogController.java b/admin/src/main/java/com/yxx/admin/controller/OperateAdminLogController.java
@@ -17,19 +17,19 @@
 import jakarta.validation.Valid;
 
 /**
+ * 运营管理日志控制器
+ *
  * @author yxx
- * @description 注：@SaCheckRole("super_admin")
- * 表示只有 super_admin 角色的用户才可访问此controller。
- * 该注解亦可放在具体的方法上
- * @since 2023-05-17 15:39
+ * @classname OperateAdminLogController
+ * @since 2023/08/26
  */
 @Slf4j
 @Validated
 @ResponseResult
 @RestController
 @RequestMapping("/log")
 @RequiredArgsConstructor
-@SaAdminCheckRole("super_admin")
+@SaAdminCheckRole("super_admin1")
 public class OperateAdminLogController {
     private final OperateAdminLogService operateAdminLogService;
 

diff --git a/admin/src/main/resources/application-dev.yml b/admin/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ spring:
   # mysql 通用配置信息内容 使用HikariDataSource连接池
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/base_springboot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/cemetery?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     password: admin123
     type: com.zaxxer.hikari.HikariDataSource
@@ -29,7 +29,7 @@ spring:
   data:
     redis:
       # 设置初始数据库的数据为8
-      database: 14
+      database: 6
       host: 127.0.0.1
       port: 6379
       # password:
@@ -248,7 +248,7 @@ sa-token:
   # 登录逻辑缓存和业务逻辑缓存分离
   alone-redis:
     # Redis数据库索引（默认为0）
-    database: 13
+    database: 5
     # Redis服务器地址
     host: 127.0.0.1
     # Redis服务器连接端口

diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
@@ -1,5 +1,7 @@
 server:
   port: 6060
+  servlet:
+    context-path: /admin
 
 spring:
   profiles:

diff --git a/business/src/main/java/com/yxx/business/controller/AuthController.java b/business/src/main/java/com/yxx/business/controller/AuthController.java
@@ -18,8 +18,11 @@
 import jakarta.validation.Valid;
 
 /**
+ * 身份验证控制器
+ *
  * @author yxx
- * @since 2023-05-17 10:02
+ * @classname AuthController
+ * @since 2023/08/26
  */
 @Slf4j
 @Validated

diff --git a/business/src/main/java/com/yxx/business/controller/OperateLogController.java b/business/src/main/java/com/yxx/business/controller/OperateLogController.java
@@ -17,11 +17,11 @@
 import jakarta.validation.Valid;
 
 /**
+ * 操作日志控制器
+ *
  * @author yxx
- * @description 注：@SaCheckRole("super_admin")
- * 表示只有 super_admin 角色的用户才可访问此controller。
- * 该注解亦可放在具体的方法上
- * @since 2023-05-17 15:39
+ * @classname OperateLogController
+ * @since 2023/08/26
  */
 @Slf4j
 @Validated

diff --git a/business/src/main/java/com/yxx/business/controller/UserController.java b/business/src/main/java/com/yxx/business/controller/UserController.java
@@ -14,8 +14,11 @@
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * 用户控制器
+ *
  * @author yxx
- * @since 2022-11-12 02:07
+ * @classname UserController
+ * @since 2023/08/26
  */
 @Slf4j
 @Validated

diff --git a/business/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/business/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -39,6 +39,11 @@
       "name": "web.domain",
       "type": "java.lang.String",
       "description": "Description for web.domain."
+    },
+    {
+      "name": "app.name",
+      "type": "java.lang.String",
+      "description": "Description for app.name."
     }
   ]
-}
+}
diff --git a/business/src/main/resources/application-dev.yml b/business/src/main/resources/application-dev.yml
@@ -29,7 +29,7 @@ spring:
   data:
     redis:
       # 设置初始数据库的数据为8
-      database: 14
+      database: 6
       host: 127.0.0.1
       port: 6379
       # password:
@@ -309,7 +309,7 @@ sa-token:
   # 登录逻辑缓存和业务逻辑缓存分离
   alone-redis:
     # Redis数据库索引（默认为0）
-    database: 13
+    database: 5
     # Redis服务器地址
     host: 127.0.0.1
     # Redis服务器连接端口

diff --git a/business/src/main/resources/application.yml b/business/src/main/resources/application.yml
@@ -1,5 +1,7 @@
 server:
   port: 6059
+  servlet:
+    context-path: /user
 
 spring:
   profiles: