feat: add tencent cos

Dockerfile

@@ -3,10 +3,12 @@ FROM eclipse-temurin:21-jre
 WORKDIR application
 ARG JAR_FILE=starter/build/libs/portal-server*.jar
 COPY ${JAR_FILE} application.jar
+COPY starter/src/main/resources/application.yml application.yml
+COPY starter/src/main/resources/docker/.env .env
 
 ENV JVM_OPTS="-Xmx512m -Xms2048m" \
     TZ=Asia/Shanghai
 
 EXPOSE 8080
 
-ENTRYPOINT [ "sh", "-c", "java $JVM_OPTS -jar application.jar" ]
+ENTRYPOINT [ "java", "$JVM_OPTS", "-jar", "application.jar", "--spring.config.import=optional:file:.env[.properties]" ]

build.gradle

@@ -4,6 +4,7 @@ buildscript {
         set('springCloudVersion', '2023.0.1')
         set('springCloudAlibabaVersion', '2023.0.1.2')
         set('redissonVersion', '3.31.0')
+        set('cosVersion', '5.6.225')
         set('knife4jVersion', '4.4.0')
         set('springDocVersion', '2.5.0')
         set('jjwtVersion', '0.12.5')

common/core/build.gradle

@@ -9,9 +9,11 @@ java {
 }
 
 dependencies {
+    api project(':common:domain')
     api 'com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery'
     api "com.github.penggle:kaptcha:${kaptchaVersion}"
     api "com.github.xiaoymin:knife4j-openapi3-jakarta-spring-boot-starter:${knife4jVersion}"
+    api "com.qcloud:cos_api:${cosVersion}"
     api "io.jsonwebtoken:jjwt-api:${jjwtVersion}"
     api "io.jsonwebtoken:jjwt-impl:${jjwtVersion}"
     api "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}"
@@ -33,9 +35,3 @@ dependencies {
     runtimeOnly 'org.postgresql:postgresql'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
-
-hibernate {
-    enhancement {
-        enableAssociationManagement = true
-    }
-}

common/core/src/main/java/org/funcode/portal/server/common/core/base/repository/IBaseRepository.java

@@ -5,7 +5,7 @@
 
 package org.funcode.portal.server.common.core.base.repository;
 
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.NoRepositoryBean;

common/core/src/main/java/org/funcode/portal/server/common/core/base/service/impl/BaseServiceImpl.java

@@ -6,10 +6,10 @@
 package org.funcode.portal.server.common.core.base.service.impl;
 
 
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
+import lombok.extern.slf4j.Slf4j;
 import org.funcode.portal.server.common.core.base.repository.IBaseRepository;
 import org.funcode.portal.server.common.core.base.service.IBaseService;
-import lombok.extern.slf4j.Slf4j;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;

common/core/src/main/java/org/funcode/portal/server/common/core/config/ApplicationConfig.java

@@ -5,7 +5,6 @@
 
 package org.funcode.portal.server.common.core.config;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -16,7 +15,6 @@
  */
 @Data
 @ConfigurationProperties(prefix = "application")
-@AllArgsConstructor
 public class ApplicationConfig {
 
     private final Security security;

common/core/src/main/java/org/funcode/portal/server/common/core/config/CosConfig.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2024 李冲. All rights reserved.
+ *
+ */
+
+package org.funcode.portal.server.common.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author 李冲
+ * @see <a href="https://lichong.work">李冲博客</a>
+ * @since 0.0.1
+ */
+@Data
+@ConfigurationProperties(prefix = "application.cos")
+@Configuration
+public class CosConfig {
+
+    /**
+     * 腾讯云控制台项目配置secretId
+     */
+    private String secretId;
+
+    /**
+     * 腾讯云控制台项目配置secretKey
+     */
+    private String secretKey;
+    /**
+     * 存储桶地域
+     */
+    private String region;
+    /**
+     * 存储桶名称
+     */
+    private String bucketName = "ielts-online-1312690188";
+    /**
+     * 业务项目名称
+     */
+    private String projectName = "ielts-online";
+    /**
+     * 公共目录
+     */
+    private String common = "common";
+    /**
+     * 图片大小
+     */
+    private String imageSize = "2";
+    /**
+     * CDN加速域名
+     */
+    private String prefixDomain = "";
+    /**
+     * 过期时间
+     */
+    private Long expiration = 60L;
+}

common/core/src/main/java/org/funcode/portal/server/common/core/security/handler/CustomAuthenticationSuccessHandler.java

@@ -16,8 +16,8 @@
 import org.funcode.portal.server.common.core.config.ApplicationConfig;
 import org.funcode.portal.server.common.core.constant.RedisKeyConstant;
 import org.funcode.portal.server.common.core.constant.SecurityConstant;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
 import org.funcode.portal.server.common.core.security.service.IJwtService;
+import org.funcode.portal.server.common.domain.security.User;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

common/core/src/main/java/org/funcode/portal/server/common/core/security/repository/IBasicAuthorityRepository.java

@@ -6,7 +6,7 @@
 package org.funcode.portal.server.common.core.security.repository;
 
 import org.funcode.portal.server.common.core.base.repository.IBaseRepository;
-import org.funcode.portal.server.common.core.security.domain.dto.BasicAuthority;
+import org.funcode.portal.server.common.domain.security.BasicAuthority;
 import org.springframework.stereotype.Repository;
 
 /**

common/core/src/main/java/org/funcode/portal/server/common/core/security/repository/IRoleRepository.java

@@ -6,7 +6,7 @@
 package org.funcode.portal.server.common.core.security.repository;
 
 import org.funcode.portal.server.common.core.base.repository.IBaseRepository;
-import org.funcode.portal.server.common.core.security.domain.dto.Role;
+import org.funcode.portal.server.common.domain.security.Role;
 import org.springframework.stereotype.Repository;
 
 /**

common/core/src/main/java/org/funcode/portal/server/common/core/security/repository/IUserRepository.java

@@ -6,7 +6,7 @@
 package org.funcode.portal.server.common.core.security.repository;
 
 import org.funcode.portal.server.common.core.base.repository.IBaseRepository;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
+import org.funcode.portal.server.common.domain.security.User;
 import org.springframework.stereotype.Repository;
 
 /**

common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/AuthenticationServiceImpl.java

@@ -11,11 +11,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.funcode.portal.server.common.core.base.http.response.ResponseResult;
 import org.funcode.portal.server.common.core.base.http.response.ResponseStatusEnum;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
 import org.funcode.portal.server.common.core.security.domain.vo.request.SignUpRequest;
 import org.funcode.portal.server.common.core.security.repository.IUserRepository;
 import org.funcode.portal.server.common.core.security.service.IAuthenticationService;
 import org.funcode.portal.server.common.core.security.service.IJwtService;
+import org.funcode.portal.server.common.domain.security.User;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;

common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/JwtServiceImpl.java

@@ -18,8 +18,8 @@
 import org.funcode.portal.server.common.core.config.ApplicationConfig;
 import org.funcode.portal.server.common.core.constant.RedisKeyConstant;
 import org.funcode.portal.server.common.core.constant.SecurityConstant;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
 import org.funcode.portal.server.common.core.security.service.IJwtService;
+import org.funcode.portal.server.common.domain.security.User;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.lang.NonNull;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

common/core/src/main/java/org/funcode/portal/server/common/core/security/service/impl/UserDetailsServiceImpl.java

@@ -7,8 +7,8 @@
 
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
 import org.funcode.portal.server.common.core.security.repository.IUserRepository;
+import org.funcode.portal.server.common.domain.security.User;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

common/core/src/main/java/org/funcode/portal/server/common/core/util/CookieUtils.java

@@ -1,18 +1,28 @@
+/*
+ * Copyright 2024 李冲. All rights reserved.
+ *
+ */
+
 package org.funcode.portal.server.common.core.util;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author 李冲
+ * @see <a href="https://lichong.work">李冲博客</a>
+ * @since 0.0.1
+ */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class CookieUtils {
 
     /**
      * 获取指定Cookie的值
      *
-     * @param request  HttpServletRequest
-     * @param cookieName  cookie name
+     * @param request    HttpServletRequest
+     * @param cookieName cookie name
      * @return cookie value
      */
     public static String getCookieValue(HttpServletRequest request, String cookieName) {

common/domain/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'org.hibernate.orm' version "${hibernatePluginVersion}"
+    id 'org.graalvm.buildtools.native' version "${graalvmNativePluginVersion}"
+}
+
+dependencies {
+    api "com.github.xiaoymin:knife4j-openapi3-jakarta-spring-boot-starter:${knife4jVersion}"
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}"
+    api 'org.springframework.boot:spring-boot-starter-data-jpa'
+    api 'org.springframework.boot:spring-boot-starter-security'
+    api 'org.springframework.boot:spring-boot-starter-validation'
+    api 'org.springframework.boot:spring-boot-starter-web'
+    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
+}

common/core/src/main/java/org/funcode/portal/server/common/core/base/entity/BaseEntity.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/base/BaseEntity.java

@@ -3,7 +3,7 @@
  *
  */
 
-package org.funcode.portal.server.common.core.base.entity;
+package org.funcode.portal.server.common.domain.base;
 
 import jakarta.persistence.*;
 import lombok.*;

common/core/src/main/java/org/funcode/portal/server/common/core/module/ielts/domain/Carousel.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Carousel.java

@@ -3,12 +3,12 @@
  *
  */
 
-package org.funcode.portal.server.common.core.module.ielts.domain;
+package org.funcode.portal.server.common.domain.ielts;
 
 
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 

common/core/src/main/java/org/funcode/portal/server/common/core/module/ielts/domain/Course.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Course.java

@@ -3,14 +3,14 @@
  *
  */
 
-package org.funcode.portal.server.common.core.module.ielts.domain;
+package org.funcode.portal.server.common.domain.ielts;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
+import org.funcode.portal.server.common.domain.security.User;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 

common/core/src/main/java/org/funcode/portal/server/common/core/module/ielts/domain/CourseColumn.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/CourseColumn.java

@@ -3,14 +3,14 @@
  *
  */
 
-package org.funcode.portal.server.common.core.module.ielts.domain;
+package org.funcode.portal.server.common.domain.ielts;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
+import org.funcode.portal.server.common.domain.security.User;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 

common/core/src/main/java/org/funcode/portal/server/common/core/module/ielts/domain/Order.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Order.java

@@ -3,13 +3,13 @@
  *
  */
 
-package org.funcode.portal.server.common.core.module.ielts.domain;
+package org.funcode.portal.server.common.domain.ielts;
 
 
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
+import org.funcode.portal.server.common.domain.security.User;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 

common/core/src/main/java/org/funcode/portal/server/common/core/module/ielts/domain/RedeemCode.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/RedeemCode.java

@@ -3,13 +3,13 @@
  *
  */
 
-package org.funcode.portal.server.common.core.module.ielts.domain;
+package org.funcode.portal.server.common.domain.ielts;
 
 
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
-import org.funcode.portal.server.common.core.security.domain.dto.User;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
+import org.funcode.portal.server.common.domain.security.User;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 

common/core/src/main/java/org/funcode/portal/server/common/core/module/ielts/domain/Storage.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Storage.java

@@ -3,13 +3,13 @@
  *
  */
 
-package org.funcode.portal.server.common.core.module.ielts.domain;
+package org.funcode.portal.server.common.domain.ielts;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 

common/core/src/main/java/org/funcode/portal/server/common/core/security/domain/dto/BasicAuthority.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/security/BasicAuthority.java

@@ -3,12 +3,12 @@
  *
  */
 
-package org.funcode.portal.server.common.core.security.domain.dto;
+package org.funcode.portal.server.common.domain.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.security.core.GrantedAuthority;

common/core/src/main/java/org/funcode/portal/server/common/core/security/domain/dto/Role.java → common/domain/src/main/java/org/funcode/portal/server/common/domain/security/Role.java

@@ -3,12 +3,12 @@
  *
  */
 
-package org.funcode.portal.server.common.core.security.domain.dto;
+package org.funcode.portal.server.common.domain.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
-import org.funcode.portal.server.common.core.base.entity.BaseEntity;
+import org.funcode.portal.server.common.domain.base.BaseEntity;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.security.core.GrantedAuthority;