diff --git a/.gitignore b/.gitignore
index c2065bc..7f7091e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ out/
 
 ### VS Code ###
 .vscode/
+
+jooq/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index df6b99d..d3ac6fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.jooq:jooq-codegen:3.6.1'
+        classpath 'org.jooq:jooq-codegen:3.16.11'
         classpath 'org.flywaydb:flyway-core'
         classpath "org.flywaydb:flyway-mysql:9.2.0"
     }
@@ -14,12 +14,14 @@ plugins {
     id 'org.springframework.boot' version '2.7.5'
     id 'io.spring.dependency-management' version '1.0.15.RELEASE'
     id "org.flywaydb.flyway" version "8.5.13"
+    id 'nu.studer.jooq' version '7.1.1'
 }
 
 allprojects{
     apply plugin: 'java'
     apply plugin: 'org.springframework.boot'
     apply plugin: 'io.spring.dependency-management'
+    apply plugin: 'nu.studer.jooq'
     group = 'org.fycd'
     version = '0.0.1'
 
@@ -44,6 +46,8 @@ allprojects{
         runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
         annotationProcessor 'org.projectlombok:lombok'
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
+        jooqGenerator 'org.mariadb.jdbc:mariadb-java-client'
+        jooqGenerator 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
     }
 
     tasks.named('test') {
@@ -64,7 +68,7 @@ task migrateDB(type: org.flywaydb.gradle.task.FlywayMigrateTask) {
     password = 'roottoor'
     locations = ['filesystem:migrations']
     target = 'latest'
-    baselineVersion = '0.0.1.0.1'
+    baselineVersion = '0.0.1.1'
     baselineOnMigrate = true
     validateOnMigrate = true
     outOfOrder = true
@@ -79,9 +83,10 @@ task cleanDB(type: org.flywaydb.gradle.task.FlywayCleanTask) {
     password = 'roottoor'
     locations = ['filesystem:migrations']
     target = 'latest'
-    baselineVersion = '0.0.1.0.1'
+    baselineVersion = '0.0.1.1'
     baselineOnMigrate = true
     validateOnMigrate = true
     outOfOrder = true
     placeholderReplacement = false
 }
+
diff --git a/migrations/V0.0.1.0.1__demo.sql b/migrations/V0.0.1.1__demo.sql
similarity index 100%
rename from migrations/V0.0.1.0.1__demo.sql
rename to migrations/V0.0.1.1__demo.sql
diff --git a/security-core/build.gradle b/security-core/build.gradle
index 8b5f43b..d1c9700 100644
--- a/security-core/build.gradle
+++ b/security-core/build.gradle
@@ -12,4 +12,40 @@ dependencies {
 
 test {
     useJUnitPlatform()
+}
+
+
+jooq {
+    version = '3.16.11'  // default (can be omitted)
+    configurations {
+        main {  // name of the jOOQ configuration
+            generationTool {
+                jdbc {
+                    driver = 'org.mariadb.jdbc.Driver'
+                    url = 'jdbc:mariadb://localhost:3306/fycd?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Taipei'
+                    user = 'root'
+                    password = 'roottoor'
+                }
+                generator {
+                    name = 'org.jooq.codegen.DefaultGenerator'
+                    database {
+                        name = 'org.jooq.meta.mariadb.MariaDBDatabase'
+                        inputSchema = 'fycd'
+                        includes = 'flyway_schema_history'
+                    }
+                    generate {
+                        deprecated = false
+                        records = true
+                        immutablePojos = true
+                        fluentSetters = true
+                    }
+                    target {
+                        packageName = 'jooq'
+                        directory = 'src/main/java/org/fycd/bigdata/infra'  // default (can be omitted)
+                    }
+                    strategy.name = 'org.jooq.codegen.DefaultGeneratorStrategy'
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/security-core/src/main/java/org/fycd/bigdata/service/RefreshTokenService.java b/security-core/src/main/java/org/fycd/bigdata/service/RefreshTokenService.java
index f7c2f0b..40f56e1 100644
--- a/security-core/src/main/java/org/fycd/bigdata/service/RefreshTokenService.java
+++ b/security-core/src/main/java/org/fycd/bigdata/service/RefreshTokenService.java
@@ -28,7 +28,6 @@ public class RefreshTokenService {
 
   public RefreshTokenSub createRefreshToken(Long userId) {
     RefreshTokenSub refreshToken = new RefreshTokenSub();
-
     refreshToken.setUser(userDao.findById(userId).get());
     refreshToken.setExpiryDate(LocalDateTime.now().plusSeconds(refreshTokenDuration));
     refreshToken.setToken(UUID.randomUUID().toString());
diff --git a/settings.gradle b/settings.gradle
index 11b26fa..a09fdf1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,2 @@
 rootProject.name = 'big-data'
 include 'security-core'
-