Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -80,7 +80,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         User user = BeanUtil.toBean(dto, User.class);
 
         //密码加密加盐存储到数据库
-        user.setPassword(SaSecureUtil.md5BySalt(dto.getPassword(), GlobalConstant.SECRET_KEY));
+        user.setPassword(BCrypt.hashpw(dto.getPassword(), BCrypt.gensalt()));
         save(user);
 
         List<UserDeptRelation> userDeptRelationList = new ArrayList<>();

src/main/resources/sqlScript/20231120_sql.sql

@@ -1,5 +1,5 @@
 
---------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
+-- ------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
 -- ----------------------------
 -- 奖学金类别
 -- ----------------------------
@@ -42,7 +42,40 @@ CREATE TABLE base_student_scholarship_level
     `score` double NOT NULL DEFAULT 0 COMMENT '金额',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '奖学金级别';
---------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
+
+-- ----------------------------
+-- 奖学金申请
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_scholarship_applicant;
+CREATE TABLE base_student_scholarship_applicant
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `base_student_scholarship_category_id` bigint NULL DEFAULT NULL COMMENT '奖学金类别ID(base_student_scholarship_category)',
+    `applicant_user_id` BIGINT NULL DEFAULT NULL COMMENT '申请人',
+    `semester_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '学期名称',
+    `grade_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '入学名称',
+    `class_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '班级名称',
+    `name` VARCHAR(200) NULL DEFAULT NULL COMMENT '姓名',
+    `student_id` VARCHAR(200) NULL DEFAULT NULL COMMENT '学号',
+    `gender_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '性别',
+    `enroll_type_cn` VARCHAR(200) NULL DEFAULT NULL COMMENT '招生类型名称',
+    `major_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '在读专业',
+    `award_date` date NULL DEFAULT NULL COMMENT '获奖日期',
+    `bank_type` VARCHAR(20) NULL DEFAULT NULL COMMENT '收款银行(xjr_dictionary_item[bank_type])',
+    `bank_no` VARCHAR(200) NULL DEFAULT NULL COMMENT '银行卡号',
+    `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
+    `status` INT NOT NULL default 0 COMMENT '状态（1:结束 0:未结束）',
+    `release_status` INT NOT NULL default 0 COMMENT '发放状态（1:已发放 0:未发放）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '奖学金申请';
+-- ------------------------------------------------------------------奖学金管理--------------------------------------------------------------------