From 34448d603361554589283ee65446b70d6469610f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Miller=20=28=E9=94=BA=E4=BF=8A=29?= Date: Sun, 26 Jun 2022 19:23:33 +0800 Subject: [PATCH] fix: correct all kinds of issues 1. SQL script 2. OpenAPI info 3. Mybatis mapper's script --- .../configuration/OpenApiConfiguration.kt | 2 +- .../service/impl/UserDomainServiceImpl.kt | 26 ++-- .../user/payload/GetUserPageListPayload.kt | 17 ++- .../maf/common/bean/PaginationBase.kt | 24 +--- ...{2_Dump20220604.sql => 2_Dump20220626.sql} | 122 +++++++++--------- ...{2_Dump20220604.sql => 2_Dump20220626.sql} | 122 +++++++++--------- ...etQuartzJobConfigurationPageListPayload.kt | 6 +- .../RedisDistributedLockDemoController.kt | 12 +- .../quartz/QuartzJobConfigurationMapper.xml | 12 +- 9 files changed, 157 insertions(+), 186 deletions(-) rename docker/script/mysql-server-replica-1/{2_Dump20220604.sql => 2_Dump20220626.sql} (99%) rename docker/script/mysql-server-source/{2_Dump20220604.sql => 2_Dump20220626.sql} (99%) diff --git a/api-gateway/api-gateway-web/src/main/kotlin/com/jmsoftware/maf/apigateway/configuration/OpenApiConfiguration.kt b/api-gateway/api-gateway-web/src/main/kotlin/com/jmsoftware/maf/apigateway/configuration/OpenApiConfiguration.kt index 7f18319a..6c899e0b 100644 --- a/api-gateway/api-gateway-web/src/main/kotlin/com/jmsoftware/maf/apigateway/configuration/OpenApiConfiguration.kt +++ b/api-gateway/api-gateway-web/src/main/kotlin/com/jmsoftware/maf/apigateway/configuration/OpenApiConfiguration.kt @@ -45,7 +45,7 @@ class OpenApiConfiguration( .info( Info() .title("API for $projectArtifactId@$version") - .description("$mafProjectProperties.description, artifact ID: $projectArtifactId, environment: ${mafProjectProperties.environment}") + .description("${mafProjectProperties.description}, artifact ID: $projectArtifactId, environment: ${mafProjectProperties.environment}") .contact( Contact() .name(mafProjectProperties.developerName) diff --git a/auth-center/auth-center-domain/src/main/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImpl.kt b/auth-center/auth-center-domain/src/main/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImpl.kt index 34eb5d66..ffaba67a 100644 --- a/auth-center/auth-center-domain/src/main/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImpl.kt +++ b/auth-center/auth-center-domain/src/main/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImpl.kt @@ -1,13 +1,9 @@ package com.jmsoftware.maf.authcenter.user.service.impl -import cn.hutool.core.collection.ListUtil import cn.hutool.core.util.ObjectUtil import cn.hutool.core.util.RandomUtil -import cn.hutool.core.util.StrUtil import cn.hutool.json.JSONUtil -import com.baomidou.mybatisplus.core.metadata.OrderItem -import com.baomidou.mybatisplus.core.toolkit.Wrappers -import com.baomidou.mybatisplus.core.toolkit.support.SFunction +import com.baomidou.mybatisplus.core.metadata.OrderItem.desc import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import com.jmsoftware.maf.authcenter.security.service.JwtService @@ -119,18 +115,16 @@ class UserDomainServiceImpl( } override fun getUserPageList(payload: GetUserPageListPayload): PageResponseBodyBean { - logger.info("$payload") - val page = Page( - payload.currentPage.toLong(), payload.pageSize.toLong() - ) - val queryWrapper = Wrappers.lambdaQuery( - User::class.java - ) - if (StrUtil.isNotBlank(payload.username)) { - queryWrapper.like(SFunction { obj: User -> obj.username }, payload.username) + val page = Page(payload.currentPage.toLong(), payload.pageSize.toLong()) + .apply { this.orders = listOf(desc(payload.orderBy)) } + this.ktQuery().apply { + payload.username?.let { + if (it.isNotBlank()) { + this.like(User::username, payload.username) + } + } } - page.orders = ListUtil.of(OrderItem.desc(payload.orderBy)) - this.page(page, queryWrapper) + .page(page) return PageResponseBodyBean.ofSuccess(page.records, page.total) } } diff --git a/auth-center/auth-center-infra/src/main/kotlin/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.kt b/auth-center/auth-center-infra/src/main/kotlin/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.kt index f02c30a7..014a9987 100644 --- a/auth-center/auth-center-infra/src/main/kotlin/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.kt +++ b/auth-center/auth-center-infra/src/main/kotlin/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.kt @@ -2,6 +2,8 @@ package com.jmsoftware.maf.authcenter.user.payload import com.jmsoftware.maf.common.bean.PaginationBase import java.time.LocalDateTime +import javax.validation.constraints.NotEmpty +import javax.validation.constraints.NotNull /** * # GetUserPageListPayload @@ -10,10 +12,11 @@ import java.time.LocalDateTime * * @author Johnny Miller (锺俊), e-mail: johnnysviva@outlook.com, date: 4/12/22 12:46 PM */ -class GetUserPageListPayload : PaginationBase() { - var username: String? = null - - var startTime: LocalDateTime? = null - - var endTime: LocalDateTime? = null -} +data class GetUserPageListPayload( + @field:NotEmpty + val username: String, + @field:NotNull + val startTime: LocalDateTime, + @field:NotNull + val endTime: LocalDateTime +) : PaginationBase() diff --git a/common/src/main/kotlin/com/jmsoftware/maf/common/bean/PaginationBase.kt b/common/src/main/kotlin/com/jmsoftware/maf/common/bean/PaginationBase.kt index 808d3ecb..d9127bc6 100644 --- a/common/src/main/kotlin/com/jmsoftware/maf/common/bean/PaginationBase.kt +++ b/common/src/main/kotlin/com/jmsoftware/maf/common/bean/PaginationBase.kt @@ -1,7 +1,6 @@ package com.jmsoftware.maf.common.bean import cn.hutool.core.util.NumberUtil -import com.fasterxml.jackson.annotation.JsonIgnore import org.hibernate.validator.constraints.Range import javax.validation.constraints.Min import javax.validation.constraints.NotNull @@ -14,52 +13,41 @@ import javax.validation.constraints.Pattern * * @author Johnny Miller (锺俊), e-mail: johnnysviva@outlook.com, date: 4/16/22 11:13 AM */ +@Suppress("MemberVisibilityCanBePrivate") open class PaginationBase { /** * The current page. Default: 1 */ - @JsonIgnore @NotNull(message = "The current page is required!") @Min(value = 1L, message = "The current page is not less then 1!") - var currentPage: Int = 1 + var currentPage: Int = 0 /** * The page size. Default: 10 */ - @JsonIgnore @NotNull(message = "The page size is required!") @Range(min = 10L, max = 100L, message = "The rage of page size: 10 <= page size <= 100!") - var pageSize: Int = 10 + val pageSize: Int = 10 /** * The order-by. (for table's field) */ - @JsonIgnore - var orderBy: String? = null + val orderBy: String? = null /** * The order rule. Default: DESC */ - @JsonIgnore @Pattern(regexp = "^(ASC|DESC)$") - var orderRule: String = "DESC" + val orderRule: String = "DESC" /** * The order-by statement needs to be joined. */ - @JsonIgnore - var orderByStatement: String? = null - - /** - * The order-by statement needs to be joined. - */ - @JsonIgnore fun orderByStatement(): String { - orderByStatement?.isBlank() if (orderBy?.isNotBlank() == true) { return "ORDER BY `$orderBy` $orderRule" } - return orderByStatement!! + return "" } /** diff --git a/docker/script/mysql-server-replica-1/2_Dump20220604.sql b/docker/script/mysql-server-replica-1/2_Dump20220626.sql similarity index 99% rename from docker/script/mysql-server-replica-1/2_Dump20220604.sql rename to docker/script/mysql-server-replica-1/2_Dump20220626.sql index d1420582..18a0206e 100644 --- a/docker/script/mysql-server-replica-1/2_Dump20220604.sql +++ b/docker/script/mysql-server-replica-1/2_Dump20220626.sql @@ -17,10 +17,6 @@ SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN; SET @@SESSION.SQL_LOG_BIN= 0; -DROP DATABASE IF EXISTS muscle_and_fitness_0; -CREATE DATABASE muscle_and_fitness_0 CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci; -USE muscle_and_fitness_0; - -- -- Table structure for table `body_part_0` -- @@ -34,7 +30,7 @@ CREATE TABLE `body_part_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by.', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -65,7 +61,7 @@ CREATE TABLE `body_part_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by.', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -96,7 +92,7 @@ CREATE TABLE `equipment_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -126,7 +122,7 @@ CREATE TABLE `equipment_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -159,12 +155,12 @@ CREATE TABLE `exercise_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=1692 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise.\n\nhttps://exrx.net/Lists/Directory'; +) ENGINE=InnoDB AUTO_INCREMENT=1692 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise. https://exrx.net/Lists/Directory'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -193,12 +189,12 @@ CREATE TABLE `exercise_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=1688 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise.\n\nhttps://exrx.net/Lists/Directory'; +) ENGINE=InnoDB AUTO_INCREMENT=1688 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise. https://exrx.net/Lists/Directory'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -225,12 +221,12 @@ CREATE TABLE `exercise_classification_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_classification_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification.\n\nhttps://exrx.net/WeightTraining/Glossary'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification. https://exrx.net/WeightTraining/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -257,12 +253,12 @@ CREATE TABLE `exercise_classification_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_classification_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification.\n\nhttps://exrx.net/WeightTraining/Glossary'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification. https://exrx.net/WeightTraining/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -289,12 +285,12 @@ CREATE TABLE `exercise_comment_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_comment_exercise_id_uindex` (`exercise_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment.\n\nRelationship:\nOne exercise to one comment.\n\nIf the exercise doen''t have comment,\nthen this table will still store the comment record for it,\nlike { id: 1, exercise_id: 1, comment: ''NONE'' }.'; +) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment. Relationship: One exercise to one comment. If the exercise doen''t have comment, then this table will still store the comment record for it, like { id: 1, exercise_id: 1, comment: ''NONE'' }.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -321,12 +317,12 @@ CREATE TABLE `exercise_comment_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_comment_exercise_id_uindex` (`exercise_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment.\n\nRelationship:\nOne exercise to one comment.\n\nIf the exercise doen''t have comment,\nthen this table will still store the comment record for it,\nlike { id: 1, exercise_id: 1, comment: ''NONE'' }.'; +) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment. Relationship: One exercise to one comment. If the exercise doen''t have comment, then this table will still store the comment record for it, like { id: 1, exercise_id: 1, comment: ''NONE'' }.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -458,12 +454,12 @@ CREATE TABLE `kinesiology_glossary_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `kinesiology_glossary_name_uindex` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary.\n\nhttps://exrx.net/Kinesiology/Glossary'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary. https://exrx.net/Kinesiology/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -490,12 +486,12 @@ CREATE TABLE `kinesiology_glossary_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `kinesiology_glossary_name_uindex` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary.\n\nhttps://exrx.net/Kinesiology/Glossary'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary. https://exrx.net/Kinesiology/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -523,12 +519,12 @@ CREATE TABLE `muscle_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle.\n\nhttps://exrx.net/Lists/Muscle'; +) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle. https://exrx.net/Lists/Muscle'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -557,12 +553,12 @@ CREATE TABLE `muscle_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle.\n\nhttps://exrx.net/Lists/Muscle'; +) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle. https://exrx.net/Lists/Muscle'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -590,12 +586,12 @@ CREATE TABLE `muscle_image_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_image_image_path_uindex` (`image_path`) -) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image.\n\nThe relationship:\nOne muscle to one or more muscle image.'; +) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image. The relationship: One muscle to one or more muscle image.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -623,12 +619,12 @@ CREATE TABLE `muscle_image_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_image_image_path_uindex` (`image_path`) -) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image.\n\nThe relationship:\nOne muscle to one or more muscle image.'; +) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image. The relationship: One muscle to one or more muscle image.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -660,7 +656,7 @@ CREATE TABLE `permission_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -696,7 +692,7 @@ CREATE TABLE `permission_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -722,23 +718,23 @@ DROP TABLE IF EXISTS `quartz_job_configuration_0`; /*!50503 SET character_set_client = utf8mb4 */; CREATE TABLE `quartz_job_configuration_0` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'The primary key ID', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Name of job', - `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Group of job', - `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Service name, equal to artifact-id', - `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Invoke target', - `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Cron Expressions', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Name of job', + `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Group of job', + `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Service name, equal to artifact-id', + `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Invoke target', + `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Cron Expressions', `misfire_policy` tinyint NOT NULL COMMENT 'Trigger''s misfire policy', `concurrent` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Concurrent. true(1): is concurrent, false(0): not concurrent', - `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Description', + `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Description', `status` tinyint NOT NULL COMMENT 'Status', - `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', + `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Craeted time', - `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', - `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', + `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Quartz Job Configuration'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Quartz Job Configuration'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -760,23 +756,23 @@ DROP TABLE IF EXISTS `quartz_job_configuration_1`; /*!50503 SET character_set_client = utf8mb4 */; CREATE TABLE `quartz_job_configuration_1` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'The primary key ID', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Name of job', - `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Group of job', - `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Service name, equal to artifact-id', - `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Invoke target', - `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Cron Expressions', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Name of job', + `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Group of job', + `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Service name, equal to artifact-id', + `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Invoke target', + `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Cron Expressions', `misfire_policy` tinyint NOT NULL COMMENT 'Trigger''s misfire policy', `concurrent` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Concurrent. true(1): is concurrent, false(0): not concurrent', - `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Description', + `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Description', `status` tinyint NOT NULL COMMENT 'Status', - `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', + `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Craeted time', - `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', - `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', + `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Quartz Job Configuration'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Quartz Job Configuration'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -853,7 +849,7 @@ CREATE TABLE `role_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -885,7 +881,7 @@ CREATE TABLE `role_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -970,7 +966,7 @@ CREATE TABLE `user_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -1012,7 +1008,7 @@ CREATE TABLE `user_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -1045,7 +1041,7 @@ CREATE TABLE `user_role_0` ( `user_id` bigint unsigned NOT NULL COMMENT 'The primary key of user', `role_id` bigint unsigned NOT NULL COMMENT 'The primary key of role', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='User-role Relation. Roles that users have.'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='User-role Relation. Roles that users have.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1070,7 +1066,7 @@ CREATE TABLE `user_role_1` ( `user_id` bigint unsigned NOT NULL COMMENT 'The primary key of user', `role_id` bigint unsigned NOT NULL COMMENT 'The primary key of role', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='User-role Relation. Roles that users have.'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='User-role Relation. Roles that users have.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1093,4 +1089,4 @@ SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-06-04 7:54:05 +-- Dump completed on 2022-06-26 18:16:01 diff --git a/docker/script/mysql-server-source/2_Dump20220604.sql b/docker/script/mysql-server-source/2_Dump20220626.sql similarity index 99% rename from docker/script/mysql-server-source/2_Dump20220604.sql rename to docker/script/mysql-server-source/2_Dump20220626.sql index d1420582..18a0206e 100644 --- a/docker/script/mysql-server-source/2_Dump20220604.sql +++ b/docker/script/mysql-server-source/2_Dump20220626.sql @@ -17,10 +17,6 @@ SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN; SET @@SESSION.SQL_LOG_BIN= 0; -DROP DATABASE IF EXISTS muscle_and_fitness_0; -CREATE DATABASE muscle_and_fitness_0 CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci; -USE muscle_and_fitness_0; - -- -- Table structure for table `body_part_0` -- @@ -34,7 +30,7 @@ CREATE TABLE `body_part_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by.', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -65,7 +61,7 @@ CREATE TABLE `body_part_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by.', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -96,7 +92,7 @@ CREATE TABLE `equipment_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -126,7 +122,7 @@ CREATE TABLE `equipment_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -159,12 +155,12 @@ CREATE TABLE `exercise_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=1692 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise.\n\nhttps://exrx.net/Lists/Directory'; +) ENGINE=InnoDB AUTO_INCREMENT=1692 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise. https://exrx.net/Lists/Directory'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -193,12 +189,12 @@ CREATE TABLE `exercise_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=1688 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise.\n\nhttps://exrx.net/Lists/Directory'; +) ENGINE=InnoDB AUTO_INCREMENT=1688 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise. https://exrx.net/Lists/Directory'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -225,12 +221,12 @@ CREATE TABLE `exercise_classification_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_classification_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification.\n\nhttps://exrx.net/WeightTraining/Glossary'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification. https://exrx.net/WeightTraining/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -257,12 +253,12 @@ CREATE TABLE `exercise_classification_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_classification_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification.\n\nhttps://exrx.net/WeightTraining/Glossary'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Classification. https://exrx.net/WeightTraining/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -289,12 +285,12 @@ CREATE TABLE `exercise_comment_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_comment_exercise_id_uindex` (`exercise_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment.\n\nRelationship:\nOne exercise to one comment.\n\nIf the exercise doen''t have comment,\nthen this table will still store the comment record for it,\nlike { id: 1, exercise_id: 1, comment: ''NONE'' }.'; +) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment. Relationship: One exercise to one comment. If the exercise doen''t have comment, then this table will still store the comment record for it, like { id: 1, exercise_id: 1, comment: ''NONE'' }.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -321,12 +317,12 @@ CREATE TABLE `exercise_comment_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `exercise_comment_exercise_id_uindex` (`exercise_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment.\n\nRelationship:\nOne exercise to one comment.\n\nIf the exercise doen''t have comment,\nthen this table will still store the comment record for it,\nlike { id: 1, exercise_id: 1, comment: ''NONE'' }.'; +) ENGINE=InnoDB AUTO_INCREMENT=1347 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Exercise Comment. Relationship: One exercise to one comment. If the exercise doen''t have comment, then this table will still store the comment record for it, like { id: 1, exercise_id: 1, comment: ''NONE'' }.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -458,12 +454,12 @@ CREATE TABLE `kinesiology_glossary_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `kinesiology_glossary_name_uindex` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary.\n\nhttps://exrx.net/Kinesiology/Glossary'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary. https://exrx.net/Kinesiology/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -490,12 +486,12 @@ CREATE TABLE `kinesiology_glossary_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `kinesiology_glossary_name_uindex` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary.\n\nhttps://exrx.net/Kinesiology/Glossary'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Kinesiology Glossary. https://exrx.net/Kinesiology/Glossary'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -523,12 +519,12 @@ CREATE TABLE `muscle_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle.\n\nhttps://exrx.net/Lists/Muscle'; +) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle. https://exrx.net/Lists/Muscle'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -557,12 +553,12 @@ CREATE TABLE `muscle_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_name_uindex` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle.\n\nhttps://exrx.net/Lists/Muscle'; +) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle. https://exrx.net/Lists/Muscle'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -590,12 +586,12 @@ CREATE TABLE `muscle_image_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_image_image_path_uindex` (`image_path`) -) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image.\n\nThe relationship:\nOne muscle to one or more muscle image.'; +) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image. The relationship: One muscle to one or more muscle image.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -623,12 +619,12 @@ CREATE TABLE `muscle_image_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), UNIQUE KEY `muscle_image_image_path_uindex` (`image_path`) -) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image.\n\nThe relationship:\nOne muscle to one or more muscle image.'; +) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Muscle Image. The relationship: One muscle to one or more muscle image.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -660,7 +656,7 @@ CREATE TABLE `permission_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -696,7 +692,7 @@ CREATE TABLE `permission_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -722,23 +718,23 @@ DROP TABLE IF EXISTS `quartz_job_configuration_0`; /*!50503 SET character_set_client = utf8mb4 */; CREATE TABLE `quartz_job_configuration_0` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'The primary key ID', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Name of job', - `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Group of job', - `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Service name, equal to artifact-id', - `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Invoke target', - `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Cron Expressions', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Name of job', + `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Group of job', + `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Service name, equal to artifact-id', + `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Invoke target', + `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Cron Expressions', `misfire_policy` tinyint NOT NULL COMMENT 'Trigger''s misfire policy', `concurrent` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Concurrent. true(1): is concurrent, false(0): not concurrent', - `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Description', + `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Description', `status` tinyint NOT NULL COMMENT 'Status', - `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', + `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Craeted time', - `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', - `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', + `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Quartz Job Configuration'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Quartz Job Configuration'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -760,23 +756,23 @@ DROP TABLE IF EXISTS `quartz_job_configuration_1`; /*!50503 SET character_set_client = utf8mb4 */; CREATE TABLE `quartz_job_configuration_1` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'The primary key ID', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Name of job', - `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Group of job', - `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Service name, equal to artifact-id', - `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Invoke target', - `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Cron Expressions', + `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Name of job', + `group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Group of job', + `service_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Service name, equal to artifact-id', + `invoke_target` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Invoke target', + `cron_expression` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Cron Expressions', `misfire_policy` tinyint NOT NULL COMMENT 'Trigger''s misfire policy', `concurrent` tinyint unsigned NOT NULL DEFAULT '0' COMMENT 'Concurrent. true(1): is concurrent, false(0): not concurrent', - `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'Description', + `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Description', `status` tinyint NOT NULL COMMENT 'Status', - `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', + `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Craeted time', - `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', - `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', + `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Quartz Job Configuration'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Quartz Job Configuration'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -853,7 +849,7 @@ CREATE TABLE `role_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -885,7 +881,7 @@ CREATE TABLE `role_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted', PRIMARY KEY (`id`), @@ -970,7 +966,7 @@ CREATE TABLE `user_0` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -1012,7 +1008,7 @@ CREATE TABLE `user_1` ( `created_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'system' COMMENT 'Created by', `created_time` datetime NOT NULL COMMENT 'Created time', `modified_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 'system' COMMENT 'Modified by', - `modified_time` datetime DEFAULT NULL COMMENT 'Modified time', + `modified_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modified time', `version` int unsigned NOT NULL DEFAULT '0' COMMENT 'Optimistic locking', `deleted` enum('N','Y') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT 'Deleted. ''N'' - not deleted; ''Y'' - deleted', PRIMARY KEY (`id`), @@ -1045,7 +1041,7 @@ CREATE TABLE `user_role_0` ( `user_id` bigint unsigned NOT NULL COMMENT 'The primary key of user', `role_id` bigint unsigned NOT NULL COMMENT 'The primary key of role', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='User-role Relation. Roles that users have.'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='User-role Relation. Roles that users have.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1070,7 +1066,7 @@ CREATE TABLE `user_role_1` ( `user_id` bigint unsigned NOT NULL COMMENT 'The primary key of user', `role_id` bigint unsigned NOT NULL COMMENT 'The primary key of role', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='User-role Relation. Roles that users have.'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='User-role Relation. Roles that users have.'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1093,4 +1089,4 @@ SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2022-06-04 7:54:05 +-- Dump completed on 2022-06-26 18:16:01 diff --git a/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/quartz/entity/GetQuartzJobConfigurationPageListPayload.kt b/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/quartz/entity/GetQuartzJobConfigurationPageListPayload.kt index 49eedf37..6adadd01 100644 --- a/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/quartz/entity/GetQuartzJobConfigurationPageListPayload.kt +++ b/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/quartz/entity/GetQuartzJobConfigurationPageListPayload.kt @@ -9,6 +9,6 @@ import com.jmsoftware.maf.common.bean.PaginationBase * * @author Johnny Miller (锺俊), e-mail: johnnysviva@outlook.com, date: 4/14/22 10:38 PM */ -class GetQuartzJobConfigurationPageListPayload : PaginationBase() { - var serviceName: String? = null -} +data class GetQuartzJobConfigurationPageListPayload( + val serviceName: String? +) : PaginationBase() diff --git a/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/redis/RedisDistributedLockDemoController.kt b/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/redis/RedisDistributedLockDemoController.kt index 765a741d..900b69d3 100644 --- a/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/redis/RedisDistributedLockDemoController.kt +++ b/spring-cloud-starter/src/main/kotlin/com/jmsoftware/maf/springcloudstarter/redis/RedisDistributedLockDemoController.kt @@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController -import java.util.concurrent.TimeUnit -import java.util.concurrent.locks.Lock /** * # RedisDistributedLockDemoController @@ -31,14 +29,14 @@ class RedisDistributedLockDemoController( fun accessRaceResource( @PathVariable resourceKey: String, @PathVariable autoUnlock: Boolean - ): ResponseBodyBean { - return ResponseBodyBean.ofSuccess(lockRaceResource(resourceKey, autoUnlock).toString()) + ): ResponseBodyBean> { + return ResponseBodyBean.ofSuccess(lockRaceResource(resourceKey, autoUnlock)) } - private fun lockRaceResource(key: String, autoUnlock: Boolean): Lock { + private fun lockRaceResource(key: String, autoUnlock: Boolean): Map { val lock = redisLockRegistry.obtain(key) log.info("Obtained the lock from the registry: $lock, Key: $key") - val acquiredLock = lock.tryLock(3, TimeUnit.SECONDS) + val acquiredLock = lock.tryLock() if (acquiredLock && autoUnlock) { log.warn("Acquired the lock. Mocking to do busy computes. Will release the lock automatically") Thread.sleep(RandomUtil.randomInt(10000).toLong()) @@ -46,6 +44,6 @@ class RedisDistributedLockDemoController( log.warn("Released the lock. $lock") } log.info("Lock: $lock, Key: $key, acquiredLock: $acquiredLock") - return lock + return mapOf("acquiredLock" to acquiredLock, "lock" to lock, "lockString" to lock.toString()) } } diff --git a/spring-cloud-starter/src/main/resources/mapper/quartz/QuartzJobConfigurationMapper.xml b/spring-cloud-starter/src/main/resources/mapper/quartz/QuartzJobConfigurationMapper.xml index 2936cefa..6cd49f49 100644 --- a/spring-cloud-starter/src/main/resources/mapper/quartz/QuartzJobConfigurationMapper.xml +++ b/spring-cloud-starter/src/main/resources/mapper/quartz/QuartzJobConfigurationMapper.xml @@ -40,13 +40,11 @@ qjc.concurrent AS concurrent, qjc.description AS description, qjc.status AS status, - createdBy.username AS createdBy, + qjc.created_by AS createdBy, qjc.created_time AS createdTime, - modifiedBy.username AS modifiedBy, + qjc.modified_by AS modifiedBy, qjc.modified_time AS modified_time FROM quartz_job_configuration qjc - LEFT JOIN user createdBy ON createdBy.id = qjc.created_by - LEFT JOIN user modifiedBy ON modifiedBy.id = qjc.modified_by qjc.deleted = 'N' @@ -67,13 +65,11 @@ qjc.concurrent AS concurrent, qjc.description AS description, qjc.status AS status, - createdBy.username AS createdBy, + qjc.created_by AS createdBy, qjc.created_time AS createdTime, - modifiedBy.username AS modifiedBy, + qjc.modified_by AS modifiedBy, qjc.modified_time AS modified_time FROM quartz_job_configuration qjc - LEFT JOIN user createdBy ON createdBy.id = qjc.created_by - LEFT JOIN user modifiedBy ON modifiedBy.id = qjc.modified_by WHERE qjc.deleted = 'N' AND qjc.service_name = #{serviceName}