lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Browse Source 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
This commit is contained in:
YunaiV 2024-04-24 09:40:29 +08:00
commit 72b5dd82b6
21 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/dm/ruoyi-vue-pro-dm8.sql
View File

@ -249,7 +249,6 @@ CREATE TABLE "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"
"COLUMN_COMMENT" VARCHAR(500) NOT NULL,
"NULLABLE" BIT NOT NULL,
"PRIMARY_KEY" BIT NOT NULL,
"AUTO_INCREMENT" CHAR(1) NOT NULL,
"ORDINAL_POSITION" INT NOT NULL,
"JAVA_TYPE" VARCHAR(32) NOT NULL,
"JAVA_FIELD" VARCHAR(64) NOT NULL,
@ -2512,8 +2511,6 @@ COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键';
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增';
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序';
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型';

1
sql/mysql/ruoyi-vue-pro.sql
View File

@ -409,7 +409,6 @@ CREATE TABLE `infra_codegen_column` (
`column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述',
`nullable` bit(1) NOT NULL COMMENT '是否允许为空',
`primary_key` bit(1) NOT NULL COMMENT '是否主键',
`auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增',
`ordinal_position` int NOT NULL COMMENT '排序',
`java_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性类型',
`java_field` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性名',

2
sql/oracle/ruoyi-vue-pro.sql
View File

@ -622,7 +622,6 @@ CREATE TABLE "INFRA_CODEGEN_COLUMN" (
"COLUMN_COMMENT" NVARCHAR2(500),
"NULLABLE" NUMBER(4,0),
"PRIMARY_KEY" NUMBER(4,0),
"AUTO_INCREMENT" NUMBER(4,0),
"ORDINAL_POSITION" NUMBER(11,0) NOT NULL,
"JAVA_TYPE" NVARCHAR2(32),
"JAVA_FIELD" NVARCHAR2(64),
@ -664,7 +663,6 @@ COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."DATA_TYPE" IS '字段类型';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."COLUMN_COMMENT" IS '字段描述';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否允许为空';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_FIELD" IS 'Java 属性名';

3
sql/postgresql/ruoyi-vue-pro.sql
View File

@ -1225,7 +1225,6 @@ CREATE TABLE "infra_codegen_column"
"column_comment" varchar(500) COLLATE "pg_catalog"."default" NOT NULL,
"nullable" bool NOT NULL,
"primary_key" bool NOT NULL,
"auto_increment" bool NOT NULL,
"ordinal_position" int4 NOT NULL,
"java_type" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
"java_field" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
@ -1259,8 +1258,6 @@ ON COLUMN "infra_codegen_column"."nullable" IS '是否允许为空';
COMMENT
ON COLUMN "infra_codegen_column"."primary_key" IS '是否主键';
COMMENT
ON COLUMN "infra_codegen_column"."auto_increment" IS '是否自增';
COMMENT
ON COLUMN "infra_codegen_column"."ordinal_position" IS '排序';
COMMENT
ON COLUMN "infra_codegen_column"."java_type" IS 'Java 属性类型';

8
sql/sqlserver/ruoyi-vue-pro.sql
View File

@ -1957,7 +1957,6 @@ CREATE TABLE [dbo].[infra_codegen_column] (
[column_comment] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[nullable] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[primary_key] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[auto_increment] nchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[ordinal_position] int NOT NULL,
[java_type] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
[java_field] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
@ -2029,13 +2028,6 @@ EXEC sp_addextendedproperty
'COLUMN', N'primary_key'
GO
EXEC sp_addextendedproperty
'MS_Description', N'是否自增',
'SCHEMA', N'dbo',
'TABLE', N'infra_codegen_column',
'COLUMN', N'auto_increment'
GO
EXEC sp_addextendedproperty
'MS_Description', N'排序',
'SCHEMA', N'dbo',

3
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java
View File

@ -30,9 +30,6 @@ public class CodegenColumnRespVO {
@Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
private Boolean primaryKey;
@Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
private Boolean autoIncrement;
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private Integer ordinalPosition;

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java
View File

@ -36,10 +36,6 @@ public class CodegenColumnSaveReqVO {
@NotNull(message = "是否主键不能为空")
private Boolean primaryKey;
@Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否自增不能为空")
private Boolean autoIncrement;
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "排序不能为空")
private Integer ordinalPosition;

1
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
View File

@ -41,7 +41,6 @@ public interface CodegenConvert {
@Mapping(source = "comment", target = "columnComment"),
@Mapping(source = "metaInfo.nullable", target = "nullable"),
@Mapping(source = "keyFlag", target = "primaryKey"),
@Mapping(source = "keyIdentityFlag", target = "autoIncrement"),
@Mapping(source = "columnType.type", target = "javaType"),
@Mapping(source = "propertyName", target = "javaField"),
})

6
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
View File

@ -67,12 +67,6 @@ public class CodegenColumnDO extends BaseDO {
* 关联 {@link TableField#isKeyFlag()}
*/
private Boolean primaryKey;
/**
* 是否自增
*
* 关联 {@link TableField#isKeyIdentityFlag()}
*/
private Boolean autoIncrement;
/**
* 排序
*/

2
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java
View File

@ -54,7 +54,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest {
when(metaInfo.getJdbcType()).thenReturn(JdbcType.BIGINT);
when(tableField.getComment()).thenReturn("编号");
when(tableField.isKeyFlag()).thenReturn(true);
when(tableField.isKeyIdentityFlag()).thenReturn(true);
IColumnType columnType = mock(IColumnType.class);
when(tableField.getColumnType()).thenReturn(columnType);
when(columnType.getType()).thenReturn("Long");
@ -72,7 +71,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest {
assertEquals("编号", column.getColumnComment());
assertFalse(column.getNullable());
assertTrue(column.getPrimaryKey());
assertTrue(column.getAutoIncrement());
assertEquals(1, column.getOrdinalPosition());
assertEquals("Long", column.getJavaType());
assertEquals("id", column.getJavaField());

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json
View File

@ -18,7 +18,6 @@
"dataType" : "BIGINT",
"columnComment" : "编号",
"primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long",
"javaField" : "id",
"example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json
View File

@ -14,7 +14,6 @@
"dataType" : "BIGINT",
"columnComment" : "编号",
"primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long",
"javaField" : "id",
"example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json
View File

@ -17,7 +17,6 @@
"dataType" : "BIGINT",
"columnComment" : "编号",
"primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long",
"javaField" : "id",
"example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json
View File

@ -14,7 +14,6 @@
"dataType" : "BIGINT",
"columnComment" : "编号",
"primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long",
"javaField" : "id",
"example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
View File

@ -196,7 +196,6 @@ CREATE TABLE IF NOT EXISTS "infra_codegen_column" (
"column_comment" varchar(500) NOT NULL,
"nullable" tinyint not null,
"primary_key" tinyint not null,
"auto_increment" varchar(5) not null,
"ordinal_position" int not null,
"java_type" varchar(32) NOT NULL,
"java_field" varchar(64) NOT NULL,

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java
View File

@ -30,6 +30,9 @@ public class MailAccountRespVO {
@Schema(description = "是否开启 ssl", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
private Boolean sslEnable;
@Schema(description = "是否开启 starttls", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
private Boolean starttlsEnable;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java
View File

@ -38,4 +38,8 @@ public class MailAccountSaveReqVO {
@NotNull(message = "是否开启 ssl 必填")
private Boolean sslEnable;
@Schema(description = "是否开启 starttls", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否开启 starttls 必填")
private Boolean starttlsEnable;
}

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
View File

@ -49,5 +49,9 @@ public class MailAccountDO extends BaseDO {
* 是否开启 SSL
*/
private Boolean sslEnable;
/**
* 是否开启 STARTTLS
*/
private Boolean starttlsEnable;
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
View File

@ -21,7 +21,7 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
.likeIfPresent(RoleDO::getCode, reqVO.getCode())
.eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
.betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(RoleDO::getId));
.orderByAsc(RoleDO::getId));
}
default RoleDO selectByName(String name) {

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.system.service.mail;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.mail.*;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
@ -12,11 +11,12 @@ import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer;
import cn.iocoder.yudao.module.system.service.member.MemberService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.google.common.annotations.VisibleForTesting;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.dromara.hutool.extra.mail.*;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@ -119,8 +119,9 @@ public class MailSendServiceImpl implements MailSendService {
private MailAccount buildMailAccount(MailAccountDO account, String nickname) {
String from = StrUtil.isNotEmpty(nickname) ? nickname + " <" + account.getMail() + ">" : account.getMail();
return new MailAccount().setFrom(from).setAuth(true)
.setUser(account.getUsername()).setPass(account.getPassword())
.setHost(account.getHost()).setPort(account.getPort()).setSslEnable(account.getSslEnable());
.setUser(account.getUsername()).setPass(account.getPassword().toCharArray())
.setHost(account.getHost()).setPort(account.getPort())
.setSslEnable(account.getSslEnable()).setStarttlsEnable(account.getStarttlsEnable());
}
@VisibleForTesting

1
yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql
View File

@ -520,6 +520,7 @@ CREATE TABLE IF NOT EXISTS "system_mail_account" (
"host" varchar NOT NULL,
"port" int NOT NULL,
"ssl_enable" bit NOT NULL,
"starttls_enable" bit NOT NULL,
"creator" varchar DEFAULT '',
"create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updater" varchar DEFAULT '',