231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
5 changed files with 7 additions and 47 deletions
Showing only changes of commit 2675c02d13 - Show all commits

View File

@ -125,12 +125,6 @@
"UserConfigView": { "UserConfigView": {
"dataSource": "vn" "dataSource": "vn"
}, },
"UserLog": {
"dataSource": "vn"
},
"RoleLog": {
"dataSource": "vn"
},
"Warehouse": { "Warehouse": {
"dataSource": "vn" "dataSource": "vn"
}, },

View File

@ -1,43 +1,3 @@
DROP TABLE IF EXISTS `vn`.`userLog`;
CREATE TABLE `account`.`userLog` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`originFk` int(10) unsigned DEFAULT NULL,
`userFk` int(10) unsigned DEFAULT NULL,
`action` set('insert','update','delete') COLLATE utf8mb4_unicode_ci NOT NULL,
`creationDate` timestamp NULL DEFAULT current_timestamp(),
`description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`changedModel` varchar(45) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`oldInstance` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`newInstance` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`changedModelId` int(11) DEFAULT NULL,
`changedModelValue` varchar(45) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `originFk` (`originFk`),
KEY `userFk` (`userFk`),
CONSTRAINT `userLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `userLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `account`.`roleLog` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`originFk` int(10) unsigned DEFAULT NULL,
`userFk` int(10) unsigned DEFAULT NULL,
`action` set('insert','update','delete') COLLATE utf8mb3_unicode_ci NOT NULL,
`creationDate` timestamp NULL DEFAULT current_timestamp(),
`description` text CHARACTER SET utf8mb3 DEFAULT NULL,
`changedModel` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`oldInstance` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`newInstance` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`changedModelId` int(11) DEFAULT NULL,
`changedModelValue` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `originFk` (`originFk`),
KEY `userFk` (`userFk`),
CONSTRAINT `roleLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT `roleLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `role` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES VALUES
('UserLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee'), ('UserLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),

View File

@ -23,6 +23,9 @@
"RoleConfig": { "RoleConfig": {
"dataSource": "vn" "dataSource": "vn"
}, },
"RoleLog": {
"dataSource": "vn"
},
"RoleInherit": { "RoleInherit": {
"dataSource": "vn" "dataSource": "vn"
}, },
@ -41,10 +44,13 @@
"UserAccount": { "UserAccount": {
"dataSource": "vn" "dataSource": "vn"
}, },
"UserLog": {
"dataSource": "vn"
},
"UserPassword": { "UserPassword": {
"dataSource": "vn" "dataSource": "vn"
}, },
"UserSync": { "UserSync": {
"dataSource": "vn" "dataSource": "vn"
} }
} }