.env.example

@@ -7,3 +7,12 @@ PLAYEDU_JWT_KEY=playeduxyz
 
 #################  MySQL ###################
 MYSQL_PORT=3306
+
+#################  Redis ###################
+REDIS_PORT=6379
+
+#################  MINIO ###################
+MINIO_ROOT_USERNAME=username
+MINIO_ROOT_PASSWORD=password
+MINIO_PORT=9002
+MINIO_CONSOLE_PORT=50002

CHANGELOG.md

@@ -1,16 +1,11 @@
-## 1.9 
+## 1.8 版本更新
-
-- 优化:移除`Redis`运行依赖改为使用内存缓存
-- 优化:移除本地存储方案`MinIO`的支持改为支持阿里云OSS和腾讯云COS
-
-## 1.8
 
 - 优化:[API]日志输出
 - 优化:[API]LDAP的部门同步逻辑
 - 优化:[API]LDAP的用户同步逻辑
 - 优化:[其它]`docker`镜像更换为阿里云加速
 
-## 1.7
+## 1.7 版本更新
 
 - 新增:[API]MinIO配置信息增加环境变量的读取
 - 新增:[API]学员学习权限优化

Dockerfile

@@ -31,4 +31,4 @@ COPY --from=node-builder /app/h5/dist /app/h5
 
 COPY docker/nginx/conf/nginx.conf /etc/nginx/sites-enabled/default
 
-CMD nginx; echo "Waiting for MySQL to start..."; sleep 15; java -jar /app/api/app.jar --spring.profiles.active=prod --spring.datasource.url="jdbc:mysql://${DB_HOST}:${DB_PORT:-3306}/${DB_NAME}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true" --spring.datasource.username=${DB_USER} --spring.datasource.password=${DB_PASS} --sa-token.is-concurrent=${SA_TOKEN_IS_CONCURRENT:-false} --sa-token.jwt-secret-key=${SA_TOKEN_JWT_SECRET_KEY}
+CMD nginx; echo "Waiting for MySQL/Redis/MinIO to start..."; sleep 15; java -jar /app/api/app.jar --spring.profiles.active=prod --spring.datasource.url="jdbc:mysql://${DB_HOST}:${DB_PORT:-3306}/${DB_NAME}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true" --spring.datasource.username=${DB_USER} --spring.datasource.password=${DB_PASS} --spring.data.redis.host=${REDIS_HOST} --spring.data.redis.port=${REDIS_PORT:-6379} --spring.data.redis.password=${REDIS_PASS} --spring.data.redis.database=${REDIS_DB:-0} --sa-token.is-concurrent=${SA_TOKEN_IS_CONCURRENT:-false} --sa-token.jwt-secret-key=${SA_TOKEN_JWT_SECRET_KEY}

README.md

@@ -45,7 +45,7 @@ cd playedu && docker-compose up -d
 
 ## 📃 使用须知
 
-- **1.版权归属**： 杭州白书科技有限公司对 PlayEdu 开源版拥有完整版权，所有使用权保留。
+- **1.版权归属**： PlayEdu 开源版版权归杭州白书科技有限公司所有。我们鼓励社区成员在遵守开源协议的前提下，对开源版进行合法的使用和贡献。
-- **2.代码修改**： 在遵守相关开源协议的严格前提下，允许对 PlayEdu 开源版代码进行修改。修改时，必须在代码中加入明确备注，详细记录每一处修改的具体内容。
+- **2.代码修改**： 用户有权在遵守开源协议的前提下，对 PlayEdu 开源版的代码进行必要的修改和优化。需在修改处添加清晰备注，记录修改内容信息。
-- **3.版权保护**： 严令禁止删除、修改或篡改源代码中的版权信息及开源说明文件，侵犯版权的行为将面临法律追究。
+- **3.版权保护**： 严禁删除、修改或篡改源代码中的版权信息及开源说明文件。
-- 在任何使用场景下，必须严格保留 PlayEdu 开源版页面及代码中的原有版权信息，包括不限于 “Designed By PlayEdu” 页面版权标识、官网链接以及代码中的开源说明等，一旦出现侵犯版权的行为，将承担相应法律责任。
+- **4.商业化行为**： 在遵循开源协议的前提下，可以进行商用。但请注意，任何商业化行为都应明确标注 PlayEdu 开源版的版权信息。

compose.yml

@@ -6,14 +6,21 @@ x-logging: &default-logging
 
 networks:
   playedu:
-    driver: host
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.10.10.0/24
 
 volumes:
   mysql-data:
+  redis-data:
+  minio-data:
 
 services:
   playedu:
-    image: registry.cn-hangzhou.aliyuncs.com/playedu/light:1.9
+    # build: .
+    image: registry.cn-hangzhou.aliyuncs.com/playedu/light:1.7
     restart: always
     environment:
       - DB_HOST=mysql
@@ -21,6 +28,10 @@ services:
       - DB_NAME=playedu
       - DB_USER=root
       - DB_PASS=playeduxyz
+      - REDIS_HOST=redis
+      - REDIS_PASS=playeduxyz
+      - REDIS_PORT=6379
+      - REDIS_DB=2
       - SA_TOKEN_IS_CONCURRENT=false
       - SA_TOKEN_JWT_SECRET_KEY=${PLAYEDU_JWT_KEY:-playeduxyz}
     ports:
@@ -34,6 +45,19 @@ services:
       - playedu
     depends_on:
       - mysql
+      - redis
+      - minio
+    logging: *default-logging
+
+  redis:
+    build: ./docker/redis
+    restart: always
+    volumes:
+      - redis-data:/data
+    # ports:
+    #   - "${REDIS_PORT:-6379}:6379"
+    networks:
+      - playedu
     logging: *default-logging
 
   mysql:
@@ -50,3 +74,19 @@ services:
     networks:
       - playedu
     logging: *default-logging
+
+  minio:
+    image: registry.cn-hangzhou.aliyuncs.com/hzbs/bitnami-minio:2024.6.6
+    restart: always
+    environment:
+      - MINIO_ROOT_USER=${MINIO_ROOT_USERNAME:-username}
+      - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-password}
+      - MINIO_DEFAULT_BUCKETS=playedu:public
+    volumes:
+      - minio-data:/bitnami/minio/data
+    ports:
+      - "${MINIO_PORT:-9002}:9000"
+      - "${MINIO_CONSOLE_PORT:-50002}:9001"
+    networks:
+      - playedu
+    logging: *default-logging

docker/nginx/conf/nginx.conf

@@ -1,18 +1,5 @@
 client_max_body_size 50m;
 
-server {
-	listen 9700;
-	server_name _;
-	root /app/pc;
-	index index.html;
-
-	location / {
-	    proxy_set_header X-Real-IP $remote_addr;
-	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	    proxy_pass http://127.0.0.1:9898/;
-	}
-}
-
 server {
 	listen 9800;
 	server_name _;
@@ -87,3 +74,17 @@ server {
         try_files $uri /index.html;
     }
 }
+
+
+server {
+	listen 9700;
+	server_name _;
+	root /app/pc;
+	index index.html;
+
+	location / {
+	    proxy_set_header X-Real-IP $remote_addr;
+	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	    proxy_pass http://127.0.0.1:9898/;
+	}
+}

docker/redis/Dockerfile

@@ -0,0 +1,3 @@
+FROM registry.cn-hangzhou.aliyuncs.com/hzbs/redis:7.0.12
+
+COPY redis.conf /usr/local/etc/redis/redis.conf

playedu-admin/src/index.less

@@ -551,10 +551,6 @@ textarea.ant-input {
   }
 }
 
-.ant-btn-variant-link {
-  color: @primaryColor !important;
-}
-
 .b-link {
   padding: 0 !important;
   &:hover {

playedu-admin/src/pages/system/config/index.tsx

@@ -11,7 +11,6 @@ import {
   Checkbox,
   Slider,
   Space,
-  Select,
 } from "antd";
 import { appConfig, system } from "../../../api/index";
 import { UploadImageButton } from "../../../compenents";
@@ -32,7 +31,6 @@ const SystemConfigPage = () => {
   const [thumb, setThumb] = useState("");
   const [avatar, setAvatar] = useState("");
   const [tabKey, setTabKey] = useState(1);
-  const [s3Service, setS3Service] = useState("");
   const [nameChecked, setNameChecked] = useState(false);
   const [emailChecked, setEmailChecked] = useState(false);
   const [idCardchecked, setIdCardChecked] = useState(false);
@@ -138,34 +136,25 @@ const SystemConfigPage = () => {
           form.setFieldsValue({
             "member.default_avatar": configData[i].key_value,
           });
-        } else if (configData[i].key_name === "s3.service") {
+        } else if (configData[i].key_name === "minio.access_key") {
           form.setFieldsValue({
-            "s3.service": configData[i].key_value,
+            "minio.access_key": configData[i].key_value,
           });
-          setS3Service(configData[i].key_value);
+        } else if (configData[i].key_name === "minio.secret_key") {
-        } else if (configData[i].key_name === "s3.access_key") {
           form.setFieldsValue({
-            "s3.access_key": configData[i].key_value,
+            "minio.secret_key": configData[i].key_value,
           });
-        } else if (configData[i].key_name === "s3.secret_key") {
+        } else if (configData[i].key_name === "minio.bucket") {
           form.setFieldsValue({
-            "s3.secret_key": configData[i].key_value,
+            "minio.bucket": configData[i].key_value,
           });
-        } else if (configData[i].key_name === "s3.bucket") {
+        } else if (configData[i].key_name === "minio.endpoint") {
           form.setFieldsValue({
-            "s3.bucket": configData[i].key_value,
+            "minio.endpoint": configData[i].key_value,
           });
-        } else if (configData[i].key_name === "s3.region") {
+        } else if (configData[i].key_name === "minio.domain") {
           form.setFieldsValue({
-            "s3.region": configData[i].key_value,
+            "minio.domain": configData[i].key_value,
-          });
-        } else if (configData[i].key_name === "s3.endpoint") {
-          form.setFieldsValue({
-            "s3.endpoint": configData[i].key_value,
-          });
-        } else if (configData[i].key_name === "s3.domain") {
-          form.setFieldsValue({
-            "s3.domain": configData[i].key_value,
           });
         } else if (configData[i].key_name === "ldap.enabled") {
           let value = 0;
@@ -631,7 +620,7 @@ const SystemConfigPage = () => {
     },
     {
       key: "4",
-      label: `S3存储`,
+      label: `MinIO存储`,
       children: (
         <Form
           form={form}
@@ -643,28 +632,10 @@ const SystemConfigPage = () => {
           onFinishFailed={onFinishFailed}
           autoComplete="off"
         >
-          <Form.Item
-            style={{ marginBottom: 30 }}
-            label="服务商"
-            name="s3.service"
-          >
-            <Select
-              defaultValue={null}
-              style={{ width: 200 }}
-              placeholder="请选择服务商"
-              options={[
-                { value: "oss", label: "阿里云OSS" },
-                { value: "cos", label: "腾讯云COS" },
-              ]}
-              onChange={(e: any) => {
-                setS3Service(e);
-              }}
-            />
-          </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
             label="AccessKey"
-            name="s3.access_key"
+            name="minio.access_key"
           >
             <Input
               style={{ width: 274 }}
@@ -675,7 +646,7 @@ const SystemConfigPage = () => {
           <Form.Item
             style={{ marginBottom: 30 }}
             label="SecretKey"
-            name="s3.secret_key"
+            name="minio.secret_key"
           >
             <Input
               style={{ width: 274 }}
@@ -686,7 +657,7 @@ const SystemConfigPage = () => {
           <Form.Item
             style={{ marginBottom: 30 }}
             label="Bucket"
-            name="s3.bucket"
+            name="minio.bucket"
           >
             <Input
               style={{ width: 274 }}
@@ -694,21 +665,10 @@ const SystemConfigPage = () => {
               placeholder="请填写Bucket"
             />
           </Form.Item>
-          <Form.Item
-            style={{ marginBottom: 30 }}
-            label="Region"
-            name="s3.region"
-          >
-            <Input
-              style={{ width: 274 }}
-              allowClear
-              placeholder="请填写Region"
-            />
-          </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
             label="Endpoint"
-            name="s3.endpoint"
+            name="minio.endpoint"
           >
             <Input
               style={{ width: 274 }}
@@ -719,7 +679,7 @@ const SystemConfigPage = () => {
           <Form.Item
             style={{ marginBottom: 30 }}
             label="Domain"
-            name="s3.domain"
+            name="minio.domain"
           >
             <Input
               style={{ width: 274 }}

playedu-api/playedu-api/pom.xml

@@ -6,32 +6,35 @@
     <parent>
         <groupId>xyz.playedu</groupId>
         <artifactId>playedu</artifactId>
-        <version>1.0</version>
+        <version>1.2</version>
     </parent>
 
     <artifactId>playedu-api</artifactId>
-    <version>1.9</version>
+
+    <properties>
+        <java.version>17</java.version>
+    </properties>
 
     <dependencies>
         <dependency>
             <groupId>xyz.playedu</groupId>
             <artifactId>playedu-common</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>xyz.playedu</groupId>
             <artifactId>playedu-system</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>xyz.playedu</groupId>
             <artifactId>playedu-course</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>xyz.playedu</groupId>
             <artifactId>playedu-resource</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 
@@ -41,7 +44,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <goals>

playedu-api/playedu-api/src/main/java/xyz/playedu/api/PlayeduApiApplication.java

@@ -22,6 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+
 import xyz.playedu.common.config.UniqueNameGeneratorConfig;
 
 @SpringBootApplication

playedu-api/playedu-api/src/main/java/xyz/playedu/api/bus/LoginBus.java

@@ -15,12 +15,13 @@
  */
 package xyz.playedu.api.bus;
 
-import java.util.HashMap;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+
 import xyz.playedu.api.event.UserLoginEvent;
 import xyz.playedu.common.bus.LDAPBus;
 import xyz.playedu.common.domain.User;
@@ -30,6 +31,8 @@ import xyz.playedu.common.util.IpUtil;
 import xyz.playedu.common.util.RequestUtil;
 import xyz.playedu.common.util.ldap.LdapTransformUser;
 
+import java.util.HashMap;
+
 @Component
 @Slf4j
 public class LoginBus {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/bus/UserBus.java

@@ -15,10 +15,12 @@
  */
 package xyz.playedu.api.bus;
 
-import java.util.Map;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.constant.ConfigConstant;
 
+import java.util.Map;
+
 @Component
 public class UserBus {
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/cache/LoginLimitCache.java

@@ -17,10 +17,11 @@ package xyz.playedu.api.cache;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.common.config.PlayEduConfig;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.service.RateLimiterService;
-import xyz.playedu.common.util.MemoryCacheUtil;
+import xyz.playedu.common.util.RedisUtil;
 
 @Component
 public class LoginLimitCache {
@@ -33,14 +34,14 @@ public class LoginLimitCache {
         String limitKey = cacheKey(email);
         Long reqCount = rateLimiterService.current(limitKey, 600L);
         if (reqCount >= 10 && !playEduConfig.getTesting()) {
-            Long exp = MemoryCacheUtil.ttlWithoutPrefix(limitKey);
+            Long exp = RedisUtil.ttlWithoutPrefix(limitKey);
             String msg = String.format("您的账号已被锁定，请%s后重试", exp > 60 ? exp / 60 + "分钟" : exp + "秒");
             throw new ServiceException(msg);
         }
     }
 
     public void destroy(String email) {
-        MemoryCacheUtil.del(cacheKey(email));
+        RedisUtil.del(cacheKey(email));
     }
 
     private String cacheKey(String email) {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/cache/LoginLockCache.java

@@ -15,23 +15,25 @@
  */
 package xyz.playedu.api.cache;
 
-import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import xyz.playedu.common.util.MemoryDistributedLock;
+
+import xyz.playedu.common.util.RedisDistributedLock;
+
+import java.util.concurrent.TimeUnit;
 
 @Component
 public class LoginLockCache {
 
-    @Autowired private MemoryDistributedLock distributedLock;
+    @Autowired private RedisDistributedLock redisDistributedLock;
 
     public boolean apply(String username) {
         String key = cacheKey(username);
-        return distributedLock.tryLock(key, 10L, TimeUnit.SECONDS);
+        return redisDistributedLock.tryLock(key, 10L, TimeUnit.SECONDS);
     }
 
     public void release(String username) {
-        distributedLock.releaseLock(cacheKey(username));
+        redisDistributedLock.releaseLock(cacheKey(username));
     }
 
     private String cacheKey(String username) {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/ExceptionController.java

@@ -16,8 +16,10 @@
 package xyz.playedu.api.controller;
 
 import com.amazonaws.services.s3.model.AmazonS3Exception;
-import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.data.redis.RedisConnectionFailureException;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -26,12 +28,14 @@ import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-import org.springframework.web.servlet.resource.NoResourceFoundException;
+
 import xyz.playedu.common.exception.LimitException;
 import xyz.playedu.common.exception.NotFoundException;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.types.JsonResponse;
 
+import java.util.List;
+
 @RestControllerAdvice
 @Slf4j
 public class ExceptionController {
@@ -47,6 +51,11 @@ public class ExceptionController {
         return JsonResponse.error(e.getMessage(), 1);
     }
 
+    @ExceptionHandler(RedisConnectionFailureException.class)
+    public JsonResponse serviceExceptionHandler(RedisConnectionFailureException e) {
+        return JsonResponse.error("redis服务连接失败", 500);
+    }
+
     @ExceptionHandler(HttpMessageNotReadableException.class)
     public JsonResponse serviceExceptionHandler(HttpMessageNotReadableException e) {
         log.error("error", e);
@@ -94,9 +103,4 @@ public class ExceptionController {
         log.error("s3错误={}", e.getMessage());
         return JsonResponse.error("存储配置有问题或存储无法无法正常访问", 500);
     }
-
-    @ExceptionHandler(NoResourceFoundException.class)
-    public JsonResponse serviceExceptionHandler(NoResourceFoundException e) {
-        return JsonResponse.error("资源不存在", 404);
-    }
 }

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminLogController.java

@@ -15,11 +15,12 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.HashMap;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.bus.BackendBus;
@@ -33,6 +34,8 @@ import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.AdminLogPaginateFiler;
 import xyz.playedu.common.types.paginate.PaginationResult;
 
+import java.util.HashMap;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/admin/log")

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminRoleController.java

@@ -15,15 +15,12 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.request.backend.AdminRoleRequest;
 import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
@@ -37,6 +34,12 @@ import xyz.playedu.common.service.AdminPermissionService;
 import xyz.playedu.common.service.AdminRoleService;
 import xyz.playedu.common.types.JsonResponse;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/backend/v1/admin-role")
 @Slf4j
@@ -85,7 +88,7 @@ public class AdminRoleController {
         List<Integer> permissionIds = roleService.getPermissionIdsByRoleId(role.getId());
         List<Integer> permAction = new ArrayList<>();
         List<Integer> permData = new ArrayList<>();
-        if (permissionIds != null && !permissionIds.isEmpty()) {
+        if (permissionIds != null && permissionIds.size() > 0) {
             List<AdminPermission> permissions = permissionService.chunks(permissionIds);
             Map<String, List<AdminPermission>> permissionsGroup =
                     permissions.stream().collect(Collectors.groupingBy(AdminPermission::getType));

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java

@@ -15,15 +15,13 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.request.backend.AdminUserRequest;
 import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
@@ -39,6 +37,11 @@ import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.types.paginate.AdminUserPaginateFilter;
 import xyz.playedu.common.types.paginate.PaginationResult;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/admin-user")
@@ -64,7 +67,7 @@ public class AdminUserController {
         PaginationResult<AdminUser> result = adminUserService.paginate(page, size, filter);
 
         Map<Integer, List<Integer>> userRoleIds = new HashMap<>();
-        if (result.getData() != null && !result.getData().isEmpty()) {
+        if (result.getData() != null && result.getData().size() > 0) {
             userRoleIds =
                     adminUserService.getAdminUserRoleIds(
                             result.getData().stream().map(AdminUser::getId).toList());
@@ -98,7 +101,7 @@ public class AdminUserController {
     @Log(title = "管理员-新建", businessType = BusinessTypeConstant.INSERT)
     public JsonResponse store(@RequestBody @Validated AdminUserRequest req)
             throws ServiceException {
-        if (req.getPassword().isEmpty()) {
+        if (req.getPassword().length() == 0) {
             return JsonResponse.error("请输入密码");
         }
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/AppConfigController.java

@@ -15,11 +15,9 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.request.backend.AppConfigRequest;
 import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
@@ -32,6 +30,10 @@ import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.StringUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 @RestController
 @RequestMapping("/backend/v1/app-config")
 public class AppConfigController {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CacheController.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2023 杭州白书科技有限公司
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package xyz.playedu.api.controller.backend;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.web.bind.annotation.*;
-import xyz.playedu.common.annotation.BackendPermission;
-import xyz.playedu.common.annotation.Log;
-import xyz.playedu.common.constant.BPermissionConstant;
-import xyz.playedu.common.constant.BusinessTypeConstant;
-import xyz.playedu.common.types.JsonResponse;
-import xyz.playedu.common.util.MemoryCacheUtil;
-
-@RestController
-@Slf4j
-@RequestMapping("/backend/v1/cache")
-public class CacheController {
-
-    @BackendPermission(slug = BPermissionConstant.CACHE_MANAGE)
-    @GetMapping("/list")
-    @Log(title = "缓存列表", businessType = BusinessTypeConstant.GET)
-    public JsonResponse list(MemoryCacheUtil memoryCacheUtil) {
-        Map<String, Object> data = new HashMap<>();
-        data.put("keys", memoryCacheUtil.getAllKeys());
-        data.put("cache", memoryCacheUtil.getAllCache());
-        return JsonResponse.data(data);
-    }
-
-    @BackendPermission(slug = BPermissionConstant.CACHE_MANAGE)
-    @DeleteMapping("/clear")
-    @Log(title = "缓存删除key", businessType = BusinessTypeConstant.DELETE)
-    public JsonResponse clear(@RequestParam HashMap<String, Object> params) {
-        String cache_key = MapUtils.getString(params, "cache_key");
-        MemoryCacheUtil.del(cache_key);
-        return JsonResponse.success();
-    }
-
-    @BackendPermission(slug = BPermissionConstant.CACHE_MANAGE)
-    @DeleteMapping("/clear/all")
-    @Log(title = "缓存清空", businessType = BusinessTypeConstant.DELETE)
-    public JsonResponse clearAll(MemoryCacheUtil memoryCacheUtil) {
-        List<String> keys = memoryCacheUtil.getAllKeys();
-        for (String key : keys) {
-            MemoryCacheUtil.del(key);
-        }
-        return JsonResponse.success();
-    }
-}

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentController.java

@@ -15,12 +15,13 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.*;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.request.backend.CourseAttachmentMultiRequest;
 import xyz.playedu.api.request.backend.CourseAttachmentRequest;
 import xyz.playedu.api.request.backend.CourseAttachmentSortRequest;
@@ -34,6 +35,8 @@ import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.course.domain.CourseAttachment;
 import xyz.playedu.course.service.CourseAttachmentService;
 
+import java.util.*;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/course/{courseId}/attachment")
@@ -62,8 +65,9 @@ public class CourseAttachmentController {
             }
         }
 
-        attachmentService.create(courseId, req.getSort(), req.getTitle(), type, req.getRid());
+        CourseAttachment courseAttachment =
-
+                attachmentService.create(
+                        courseId, req.getSort(), req.getTitle(), type, req.getRid());
         return JsonResponse.success();
     }
 
@@ -74,7 +78,7 @@ public class CourseAttachmentController {
     public JsonResponse storeMulti(
             @PathVariable(name = "courseId") Integer courseId,
             @RequestBody @Validated CourseAttachmentMultiRequest req) {
-        if (req.getAttachments().isEmpty()) {
+        if (req.getAttachments().size() == 0) {
             return JsonResponse.error("参数为空");
         }
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseAttachmentDownloadLogController.java

@@ -15,11 +15,12 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.*;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BusinessTypeConstant;
 import xyz.playedu.common.types.JsonResponse;
@@ -28,6 +29,8 @@ import xyz.playedu.common.types.paginate.PaginationResult;
 import xyz.playedu.course.domain.CourseAttachmentDownloadLog;
 import xyz.playedu.course.service.CourseAttachmentDownloadLogService;
 
+import java.util.*;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/course/attachment/download/log")

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseChapterController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.CourseChapterDestroyEvent;
 import xyz.playedu.api.request.backend.CourseChapterRequest;
 import xyz.playedu.api.request.backend.CourseChapterSortRequest;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseController.java

@@ -15,18 +15,16 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.text.ParseException;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.CourseDestroyEvent;
 import xyz.playedu.api.request.backend.CourseRequest;
 import xyz.playedu.common.annotation.BackendPermission;
@@ -55,6 +53,11 @@ import xyz.playedu.course.service.CourseService;
 import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceService;
 
+import java.text.ParseException;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/course")

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java

@@ -15,13 +15,14 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.*;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.CourseHourCreatedEvent;
 import xyz.playedu.api.event.CourseHourDestroyEvent;
 import xyz.playedu.api.request.backend.CourseHourMultiRequest;
@@ -41,6 +42,8 @@ import xyz.playedu.course.domain.CourseHour;
 import xyz.playedu.course.service.CourseChapterService;
 import xyz.playedu.course.service.CourseHourService;
 
+import java.util.*;
+
 /**
  * @Author 杭州白书科技有限公司
  *
@@ -132,7 +135,7 @@ public class CourseHourController {
     public JsonResponse storeMulti(
             @PathVariable(name = "courseId") Integer courseId,
             @RequestBody @Validated CourseHourMultiRequest req) {
-        if (req.getHours().isEmpty()) {
+        if (req.getHours().size() == 0) {
             return JsonResponse.error("参数为空");
         }
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/CourseUserController.java

@@ -15,17 +15,15 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
 import xyz.playedu.api.request.backend.CourseUserDestroyRequest;
 import xyz.playedu.common.annotation.BackendPermission;
@@ -44,6 +42,11 @@ import xyz.playedu.course.service.CourseService;
 import xyz.playedu.course.service.UserCourseHourRecordService;
 import xyz.playedu.course.service.UserCourseRecordService;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Author 杭州白书科技有限公司
  *
@@ -99,7 +102,7 @@ public class CourseUserController {
                     });
         } else { // 默认读取课程关联的全部部门
             List<Integer> depIds = courseService.getDepIdsByCourseId(courseId);
-            if (depIds != null && !depIds.isEmpty()) {
+            if (depIds != null && depIds.size() > 0) {
                 filter.setDepIds(depIds);
             }
         }
@@ -156,7 +159,7 @@ public class CourseUserController {
     public JsonResponse destroy(
             @PathVariable(name = "courseId") Integer courseId,
             @RequestBody @Validated CourseUserDestroyRequest req) {
-        if (req.getIds().isEmpty()) {
+        if (req.getIds().size() == 0) {
             return JsonResponse.error("请选择需要删除的数据");
         }
         List<UserCourseRecord> records =

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DashboardController.java

@@ -15,15 +15,11 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.constant.BusinessTypeConstant;
@@ -36,6 +32,12 @@ import xyz.playedu.course.service.CourseService;
 import xyz.playedu.course.service.UserLearnDurationStatsService;
 import xyz.playedu.resource.service.ResourceService;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java

@@ -15,15 +15,15 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.*;
-import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.DepartmentDestroyEvent;
 import xyz.playedu.api.request.backend.DepartmentParentRequest;
 import xyz.playedu.api.request.backend.DepartmentRequest;
@@ -50,6 +50,9 @@ import xyz.playedu.course.service.CourseDepartmentService;
 import xyz.playedu.course.service.CourseService;
 import xyz.playedu.course.service.UserCourseRecordService;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/department")

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/LoginController.java

@@ -15,11 +15,11 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.HashMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.AdminUserLoginEvent;
 import xyz.playedu.api.request.backend.LoginRequest;
 import xyz.playedu.api.request.backend.PasswordChangeRequest;
@@ -37,9 +37,11 @@ import xyz.playedu.common.service.RateLimiterService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.HelperUtil;
 import xyz.playedu.common.util.IpUtil;
-import xyz.playedu.common.util.MemoryCacheUtil;
+import xyz.playedu.common.util.RedisUtil;
 import xyz.playedu.common.util.RequestUtil;
 
+import java.util.HashMap;
+
 @RestController
 @RequestMapping("/backend/v1/auth")
 public class LoginController {
@@ -66,8 +68,8 @@ public class LoginController {
 
         String limitKey = "admin-login-limit:" + loginRequest.getEmail();
         Long reqCount = rateLimiterService.current(limitKey, 3600L);
-        if (reqCount > 10 && !playEduConfig.getTesting()) {
+        if (reqCount > 5 && !playEduConfig.getTesting()) {
-            Long exp = MemoryCacheUtil.ttlWithoutPrefix(limitKey);
+            Long exp = RedisUtil.ttlWithoutPrefix(limitKey);
             return JsonResponse.error(
                     String.format("您的账号已被锁定，请%s后重试", exp > 60 ? exp / 60 + "分钟" : exp + "秒"));
         }
@@ -78,7 +80,7 @@ public class LoginController {
             return JsonResponse.error("邮箱或密码错误");
         }
 
-        MemoryCacheUtil.del(limitKey);
+        RedisUtil.del(limitKey);
 
         if (adminUser.getIsBanLogin().equals(1)) {
             return JsonResponse.error("当前管理员已禁止登录");

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java

@@ -15,12 +15,11 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.*;
-import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.ResourceCategoryDestroyEvent;
 import xyz.playedu.api.request.backend.ResourceCategoryParentRequest;
 import xyz.playedu.api.request.backend.ResourceCategoryRequest;
@@ -41,6 +40,9 @@ import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceCategoryService;
 import xyz.playedu.resource.service.ResourceService;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @Author 杭州白书科技有限公司
  *
@@ -126,7 +128,7 @@ public class ResourceCategoryController {
         data.put("videos", new ArrayList<>());
         data.put("images", new ArrayList<>());
 
-        if (courseIds != null && !courseIds.isEmpty()) {
+        if (courseIds != null && courseIds.size() > 0) {
             data.put(
                     "courses",
                     courseService.chunks(
@@ -139,7 +141,7 @@ public class ResourceCategoryController {
                             }));
         }
 
-        if (rids != null && !rids.isEmpty()) {
+        if (rids != null && rids.size() > 0) {
             Map<String, List<Resource>> resources =
                     resourceService
                             .chunks(

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java

@@ -15,14 +15,14 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.*;
-import java.util.stream.Collectors;
 import lombok.SneakyThrows;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.request.backend.ResourceDestroyMultiRequest;
 import xyz.playedu.api.request.backend.ResourceUpdateRequest;
 import xyz.playedu.common.annotation.Log;
@@ -47,6 +47,9 @@ import xyz.playedu.resource.domain.ResourceVideo;
 import xyz.playedu.resource.service.ResourceService;
 import xyz.playedu.resource.service.ResourceVideoService;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/backend/v1/resource")
 public class ResourceController {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/SystemController.java

@@ -15,15 +15,13 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.api.bus.UserBus;
 import xyz.playedu.common.annotation.Log;
 import xyz.playedu.common.constant.BusinessTypeConstant;
@@ -34,6 +32,11 @@ import xyz.playedu.common.service.DepartmentService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.RequestUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/backend/v1/system")
 @Slf4j

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UploadController.java

@@ -15,13 +15,14 @@
  */
 package xyz.playedu.api.controller.backend;
 
-import java.util.HashMap;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import xyz.playedu.api.request.backend.UploadFileMergeRequest;
 import xyz.playedu.common.annotation.BackendPermission;
 import xyz.playedu.common.annotation.Log;
@@ -32,13 +33,14 @@ import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.exception.ServiceException;
 import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.types.JsonResponse;
-import xyz.playedu.common.types.config.S3Config;
 import xyz.playedu.common.util.HelperUtil;
 import xyz.playedu.common.util.S3Util;
 import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceService;
 import xyz.playedu.resource.service.UploadService;
 
+import java.util.HashMap;
+
 @RestController
 @Slf4j
 @RequestMapping("/backend/v1/upload")
@@ -57,12 +59,7 @@ public class UploadController {
             @RequestParam HashMap<String, Object> params, MultipartFile file)
             throws ServiceException {
         String categoryIds = MapUtils.getString(params, "category_ids");
-        Resource res =
+        Resource res = uploadService.storeMinio(BCtx.getId(), file, categoryIds);
-                uploadService.storeMinio(
-                        appConfigService.getS3Config().getService(),
-                        BCtx.getId(),
-                        file,
-                        categoryIds);
         return JsonResponse.data(res);
     }
 
@@ -124,8 +121,7 @@ public class UploadController {
         String originalFilename = req.getOriginalFilename().replaceAll("(?i)." + extension, "");
 
         // 合并资源文件
-        S3Config s3Config = appConfigService.getS3Config();
+        S3Util s3Util = new S3Util(appConfigService.getS3Config());
-        S3Util s3Util = new S3Util(s3Config);
         String url = s3Util.merge(req.getFilename(), req.getUploadId());
 
         // 资源素材保存
@@ -137,7 +133,7 @@ public class UploadController {
                         originalFilename,
                         extension,
                         req.getSize(),
-                        s3Config.getService(),
+                        BackendConstant.STORAGE_DRIVER_MINIO,
                         "",
                         req.getFilename(),
                         url);
@@ -146,8 +142,7 @@ public class UploadController {
         if (BackendConstant.RESOURCE_TYPE_VIDEO.equals(type)) {
             // 视频封面素材保存
             Resource posterResource =
-                    uploadService.storeBase64Image(
+                    uploadService.storeBase64Image(BCtx.getId(), req.getPoster(), null);
-                            s3Config.getService(), BCtx.getId(), req.getPoster(), null);
             // 视频的封面素材改为[隐藏 && 属于视频的子素材]
             resourceService.changeParentId(posterResource.getId(), videoResource.getId());
             // 视频信息

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/backend/UserController.java

@@ -16,17 +16,18 @@
 package xyz.playedu.api.controller.backend;
 
 import cn.hutool.core.date.DateTime;
-import java.util.*;
+
-import java.util.stream.Collectors;
 import lombok.Data;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.bus.UserBus;
 import xyz.playedu.api.event.UserCourseHourRecordDestroyEvent;
 import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
@@ -54,6 +55,9 @@ import xyz.playedu.common.util.StringUtil;
 import xyz.playedu.course.domain.*;
 import xyz.playedu.course.service.*;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CategoryController.java

@@ -15,17 +15,19 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.common.domain.Category;
 import xyz.playedu.common.service.CategoryService;
 import xyz.playedu.common.types.JsonResponse;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/api/v1/category")
 public class CategoryController {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/CourseController.java

@@ -15,15 +15,11 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 import lombok.SneakyThrows;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.IpUtil;
@@ -32,6 +28,13 @@ import xyz.playedu.course.service.*;
 import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceService;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/DepartmentController.java

@@ -15,13 +15,15 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.common.domain.Department;
 import xyz.playedu.common.service.DepartmentService;
 import xyz.playedu.common.types.JsonResponse;
 
+import java.util.stream.Collectors;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/HourController.java

@@ -15,19 +15,20 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import xyz.playedu.api.event.UserCourseHourFinishedEvent;
 import xyz.playedu.api.event.UserLearnCourseUpdateEvent;
 import xyz.playedu.api.request.frontend.CourseHourRecordRequest;
 import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.types.JsonResponse;
-import xyz.playedu.common.util.MemoryDistributedLock;
+import xyz.playedu.common.util.RedisDistributedLock;
+import xyz.playedu.course.caches.CourseCache;
 import xyz.playedu.course.caches.UserCanSeeCourseCache;
 import xyz.playedu.course.caches.UserLastLearnTimeCache;
 import xyz.playedu.course.domain.Course;
@@ -39,6 +40,9 @@ import xyz.playedu.course.service.UserCourseHourRecordService;
 import xyz.playedu.resource.domain.Resource;
 import xyz.playedu.resource.service.ResourceService;
 
+import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
+
 /**
  * @Author 杭州白书科技有限公司
  *
@@ -58,8 +62,9 @@ public class HourController {
 
     // ------- CACHE ----------
     @Autowired private UserCanSeeCourseCache userCanSeeCourseCache;
+    @Autowired private CourseCache courseCache;
 
-    @Autowired private MemoryDistributedLock distributedLock;
+    @Autowired private RedisDistributedLock redisDistributedLock;
 
     @Autowired private UserLastLearnTimeCache userLastLearnTimeCache;
 
@@ -120,7 +125,7 @@ public class HourController {
 
         // 获取锁
         String lockKey = String.format("record:%d", FCtx.getId());
-        boolean tryLock = distributedLock.tryLock(lockKey, 5, TimeUnit.SECONDS);
+        boolean tryLock = redisDistributedLock.tryLock(lockKey, 5, TimeUnit.SECONDS);
         if (!tryLock) {
             return JsonResponse.success();
         }
@@ -136,7 +141,7 @@ public class HourController {
             }
         } finally {
             // 此处未考虑上面代码执行失败释放锁
-            distributedLock.releaseLock(lockKey);
+            redisDistributedLock.releaseLock(lockKey);
         }
 
         return JsonResponse.success();
@@ -151,7 +156,7 @@ public class HourController {
 
         // 获取锁
         String lockKey = String.format("ping:%d", FCtx.getId());
-        boolean tryLock = distributedLock.tryLock(lockKey, 5, TimeUnit.SECONDS);
+        boolean tryLock = redisDistributedLock.tryLock(lockKey, 5, TimeUnit.SECONDS);
         if (!tryLock) {
             return JsonResponse.success();
         }
@@ -173,7 +178,7 @@ public class HourController {
                             this, FCtx.getId(), courseId, id, lastTime, curTime));
         } finally {
             // 此处未考虑上面代码执行失败释放锁
-            distributedLock.releaseLock(lockKey);
+            redisDistributedLock.releaseLock(lockKey);
         }
 
         return JsonResponse.success();

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java

@@ -15,9 +15,9 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.HashMap;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.api.bus.LoginBus;
 import xyz.playedu.api.cache.LoginLimitCache;
 import xyz.playedu.api.cache.LoginLockCache;
@@ -42,6 +43,8 @@ import xyz.playedu.common.util.*;
 import xyz.playedu.common.util.ldap.LdapTransformUser;
 import xyz.playedu.common.util.ldap.LdapUtil;
 
+import java.util.HashMap;
+
 @RestController
 @RequestMapping("/api/v1/auth/login")
 @Slf4j

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/SystemController.java

@@ -15,16 +15,18 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.HashMap;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import xyz.playedu.common.constant.ConfigConstant;
 import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.types.JsonResponse;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/api/v1/system")
 public class SystemController {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/controller/frontend/UserController.java

@@ -15,15 +15,15 @@
  */
 package xyz.playedu.api.controller.frontend;
 
-import java.util.*;
-import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import xyz.playedu.api.request.frontend.ChangePasswordRequest;
 import xyz.playedu.common.constant.FrontendConstant;
 import xyz.playedu.common.context.FCtx;
@@ -32,7 +32,6 @@ import xyz.playedu.common.domain.Department;
 import xyz.playedu.common.domain.User;
 import xyz.playedu.common.domain.UserUploadImageLog;
 import xyz.playedu.common.exception.ServiceException;
-import xyz.playedu.common.service.AppConfigService;
 import xyz.playedu.common.service.CategoryService;
 import xyz.playedu.common.service.DepartmentService;
 import xyz.playedu.common.service.UserService;
@@ -44,6 +43,9 @@ import xyz.playedu.course.domain.*;
 import xyz.playedu.course.service.*;
 import xyz.playedu.resource.service.UploadService;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/api/v1/user")
 @Slf4j
@@ -67,8 +69,6 @@ public class UserController {
 
     @Autowired private CategoryService categoryService;
 
-    @Autowired private AppConfigService appConfigService;
-
     @GetMapping("/detail")
     public JsonResponse detail() {
         User user = FCtx.getUser();
@@ -91,7 +91,6 @@ public class UserController {
     public JsonResponse changeAvatar(MultipartFile file) {
         UserUploadImageLog log =
                 uploadService.userAvatar(
-                        appConfigService.getS3Config().getService(),
                         FCtx.getId(),
                         file,
                         FrontendConstant.USER_UPLOAD_IMAGE_TYPE_AVATAR,

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/AdminUserLoginEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 @Getter
 @Setter
 public class AdminUserLoginEvent extends ApplicationEvent {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/CourseCategoryDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/CourseChapterDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/CourseDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/CourseHourCreatedEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/CourseHourDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/DepartmentDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/ResourceCategoryDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserCourseHourFinishedEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserCourseHourRecordDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserCourseRecordDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserDestroyEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserLearnCourseUpdateEvent.java

@@ -17,6 +17,7 @@ package xyz.playedu.api.event;
 
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
 /**

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserLoginEvent.java

@@ -16,11 +16,14 @@
 package xyz.playedu.api.event;
 
 import cn.hutool.http.useragent.UserAgent;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/event/UserLogoutEvent.java

@@ -15,11 +15,13 @@
  */
 package xyz.playedu.api.event;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+
 import org.springframework.context.ApplicationEvent;
 
+import java.util.Date;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/AdminInterceptor.java

@@ -17,13 +17,14 @@ package xyz.playedu.api.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
+
 import xyz.playedu.common.bus.BackendBus;
 import xyz.playedu.common.context.BCtx;
 import xyz.playedu.common.domain.AdminUser;
@@ -33,6 +34,9 @@ import xyz.playedu.common.service.BackendAuthService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.HelperUtil;
 
+import java.io.IOException;
+import java.util.Map;
+
 @Component
 @Slf4j
 @Order(20)

playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/ApiInterceptor.java

@@ -17,11 +17,14 @@ package xyz.playedu.api.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
+
 import xyz.playedu.common.config.PlayEduConfig;
 import xyz.playedu.common.constant.BackendConstant;
 import xyz.playedu.common.service.RateLimiterService;
@@ -42,13 +45,20 @@ public class ApiInterceptor implements HandlerInterceptor {
     public boolean preHandle(
             HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Headers", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
+        response.setHeader("Access-Control-Max-Age", "86400");
+
         if ("OPTIONS".equals(request.getMethod())) {
+            response.setStatus(204);
+            // 返回false意味着整个请求执行到这里结束，不会继续乡下执行了
             return false;
         }
 
         // 当前api的请求路径
         String path = request.getRequestURI();
-        // 白名单过滤
+        // 白名单过滤 || OPTIONS请求
         if (BackendConstant.API_LIMIT_WHITELIST.contains(path)) {
             return HandlerInterceptor.super.preHandle(request, response, handler);
         }

playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/FrontInterceptor.java

@@ -17,12 +17,14 @@ package xyz.playedu.api.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
+
 import xyz.playedu.common.constant.FrontendConstant;
 import xyz.playedu.common.context.FCtx;
 import xyz.playedu.common.domain.User;
@@ -31,6 +33,8 @@ import xyz.playedu.common.service.UserService;
 import xyz.playedu.common.types.JsonResponse;
 import xyz.playedu.common.util.HelperUtil;
 
+import java.io.IOException;
+
 @Component
 @Slf4j
 @Order(20)

playedu-api/playedu-api/src/main/java/xyz/playedu/api/interceptor/WebMvcConfig.java

@@ -16,9 +16,9 @@
 package xyz.playedu.api.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -38,13 +38,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addInterceptor(adminInterceptor).addPathPatterns("/backend/**");
         registry.addInterceptor(frontInterceptor).addPathPatterns("/api/v1/**");
     }
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowedMethods("*")
-                .allowedHeaders("*")
-                .maxAge(1_296_000);
-    }
 }

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/AdminUserLoginListener.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.listener;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.AdminUserLoginEvent;
 import xyz.playedu.common.domain.AdminUser;
 import xyz.playedu.common.service.AdminUserService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/CourseCategoryDestroyListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.CourseCategoryDestroyEvent;
 import xyz.playedu.course.service.CourseService;
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/CourseChapterDestroyListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.CourseChapterDestroyEvent;
 import xyz.playedu.course.service.CourseHourService;
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/CourseDestroyListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.CourseDestroyEvent;
 import xyz.playedu.course.service.CourseAttachmentService;
 import xyz.playedu.course.service.CourseCategoryService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourCreatedListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.CourseHourCreatedEvent;
 import xyz.playedu.course.service.CourseHourService;
 import xyz.playedu.course.service.CourseService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/CourseHourDestroyListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.CourseHourDestroyEvent;
 import xyz.playedu.course.service.CourseHourService;
 import xyz.playedu.course.service.CourseService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/DepartmentDestroyListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.DepartmentDestroyEvent;
 import xyz.playedu.common.service.DepartmentService;
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourFinishedListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserCourseHourFinishedEvent;
 import xyz.playedu.course.service.CourseHourService;
 import xyz.playedu.course.service.UserCourseHourRecordService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseHourRecordDestroyListener.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.listener;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserCourseHourRecordDestroyEvent;
 import xyz.playedu.course.service.UserCourseRecordService;
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserCourseRecordDestroyListener.java

@@ -18,6 +18,7 @@ package xyz.playedu.api.listener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserCourseRecordDestroyEvent;
 import xyz.playedu.course.service.UserCourseHourRecordService;
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserDestroyListener.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.listener;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserDestroyEvent;
 import xyz.playedu.common.service.UserLoginRecordService;
 import xyz.playedu.common.service.UserService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserLearnCourseUpdateListener.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.listener;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserLearnCourseUpdateEvent;
 import xyz.playedu.course.service.UserLearnDurationRecordService;
 import xyz.playedu.course.service.UserLearnDurationStatsService;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserLoginListener.java

@@ -15,17 +15,20 @@
  */
 package xyz.playedu.api.listener;
 
-import java.util.HashMap;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserLoginEvent;
 import xyz.playedu.common.service.FrontendAuthService;
 import xyz.playedu.common.service.UserLoginRecordService;
 import xyz.playedu.common.util.IpUtil;
 
+import java.util.HashMap;
+
 @Component
 @Slf4j
 public class UserLoginListener {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/listener/UserLogoutListener.java

@@ -16,10 +16,12 @@
 package xyz.playedu.api.listener;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.event.UserLogoutEvent;
 import xyz.playedu.common.service.UserLoginRecordService;
 

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/AdminRoleRequest.java

@@ -16,12 +16,16 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/AdminUserRequest.java

@@ -16,13 +16,17 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/AppConfigRequest.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotNull;
-import java.util.HashMap;
+
 import lombok.Data;
 
+import java.util.HashMap;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentMultiRequest.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class CourseAttachmentMultiRequest {
     @Data

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentRequest.java

@@ -17,6 +17,7 @@ package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import lombok.Data;
 
 @Data

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseAttachmentSortRequest.java

@@ -15,9 +15,10 @@
  */
 package xyz.playedu.api.request.backend;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class CourseAttachmentSortRequest {
     private List<Integer> ids;

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseCategoryRequest.java

@@ -16,12 +16,16 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseChapterRequest.java

@@ -17,7 +17,9 @@ package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import lombok.Data;
+
 import org.hibernate.validator.constraints.Length;
 
 /**

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseChapterSortRequest.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java

@@ -16,10 +16,13 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourRequest.java

@@ -16,8 +16,10 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import lombok.Data;
 
 /**

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseHourSortRequest.java

@@ -15,9 +15,10 @@
  */
 package xyz.playedu.api.request.backend;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseRequest.java

@@ -16,11 +16,14 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
-import lombok.Data;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/CourseUserDestroyRequest.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentParentRequest.java

@@ -16,10 +16,13 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentRequest.java

@@ -16,12 +16,16 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @Author 杭州白书科技有限公司

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/DepartmentSortRequest.java

@@ -15,9 +15,10 @@
  */
 package xyz.playedu.api.request.backend;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/LoginRequest.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotNull;
+
+import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.Data;
 
 @Data
 public class LoginRequest implements Serializable {

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/PasswordChangeRequest.java

@@ -16,7 +16,9 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
+
 import lombok.Data;
 
 /**

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryChangeRequest.java

@@ -16,10 +16,13 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ResourceCategoryChangeRequest {
     @NotNull(message = "参数为空")

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryParentRequest.java

@@ -16,10 +16,13 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategoryRequest.java

@@ -16,9 +16,12 @@
 package xyz.playedu.api.request.backend;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import lombok.Data;
+
 import org.hibernate.validator.constraints.Length;
 
 /**

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceCategorySortRequest.java

@@ -16,9 +16,11 @@
 package xyz.playedu.api.request.backend;
 
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
+
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author 杭州白书科技有限公司
  *

playedu-api/playedu-api/src/main/java/xyz/playedu/api/request/backend/ResourceDestroyMultiRequest.java

@@ -15,9 +15,10 @@
  */
 package xyz.playedu.api.request.backend;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ResourceDestroyMultiRequest {
     private List<Integer> ids;