From e0f1f40ba0015a624d7dbdee62eddf05c9780f82 Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Thu, 12 Oct 2023 21:50:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=93=E5=AD=98=E4=BD=BF=E7=94=A8redi?= =?UTF-8?q?s=E6=97=A0=E6=B3=95set=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D&admi?= =?UTF-8?q?n=E8=B4=A6=E5=8F=B7=E9=BB=98=E8=AE=A4=E6=9C=89=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_release.sh | 6 +- server/internal/common/consts/consts.go | 2 + server/internal/db/api/db.go | 10 +- server/internal/sys/api/account.go | 5 +- server/internal/sys/api/resource.go | 4 +- server/internal/sys/api/role.go | 2 +- server/internal/sys/application/resource.go | 10 ++ .../migrations/migrate-database-instance.sql | 67 -------- server/pkg/cache/str_cache.go | 10 +- server/pkg/rediscli/rediscli.go | 7 +- server/{ => resources/data}/mayfly-go.sqlite | Bin 180224 -> 180224 bytes server/{ => resources/script}/shutdown.sh | 0 .../{ => resources/script/sql}/mayfly-go.sql | 157 ------------------ server/{ => resources/script}/startup.sh | 0 14 files changed, 35 insertions(+), 245 deletions(-) delete mode 100644 server/migrations/migrate-database-instance.sql rename server/{ => resources/data}/mayfly-go.sqlite (94%) rename server/{ => resources/script}/shutdown.sh (100%) rename server/{ => resources/script/sql}/mayfly-go.sql (90%) rename server/{ => resources/script}/startup.sh (100%) diff --git a/build_release.sh b/build_release.sh index 98b06d09..7cec8b35 100755 --- a/build_release.sh +++ b/build_release.sh @@ -76,10 +76,10 @@ function build() { if [ "${copyDocScript}" == "1" ] ; then echo_green "拷贝脚本等资源文件[config.yml.example、mayfly-go.sql、readme.txt、startup.sh、shutdown.sh]" cp ${server_folder}/config.yml.example ${toFolder} - cp ${server_folder}/mayfly-go.sql ${toFolder} cp ${server_folder}/readme.txt ${toFolder} - cp ${server_folder}/startup.sh ${toFolder} - cp ${server_folder}/shutdown.sh ${toFolder} + cp ${server_folder}/resources/script/startup.sh ${toFolder} + cp ${server_folder}/resources/script/shutdown.sh ${toFolder} + cp ${server_folder}/resources/script/sql/mayfly-go.sql ${toFolder} fi echo_yellow ">>>>>>>>>>>>>>>>>>>${os}-${arch}打包构建完成<<<<<<<<<<<<<<<<<<<<\n" diff --git a/server/internal/common/consts/consts.go b/server/internal/common/consts/consts.go index c2ec1110..e70c88ba 100644 --- a/server/internal/common/consts/consts.go +++ b/server/internal/common/consts/consts.go @@ -3,6 +3,8 @@ package consts import "time" const ( + AdminId = 1 + MachineConnExpireTime = 60 * time.Minute DbConnExpireTime = 45 * time.Minute RedisConnExpireTime = 30 * time.Minute diff --git a/server/internal/db/api/db.go b/server/internal/db/api/db.go index fb13518f..30a9edab 100644 --- a/server/internal/db/api/db.go +++ b/server/internal/db/api/db.go @@ -2,11 +2,13 @@ package api import ( "fmt" - "github.com/lib/pq" "io" + "mayfly-go/pkg/utils/collx" "mayfly-go/pkg/utils/uniqueid" "mayfly-go/pkg/ws" + "github.com/lib/pq" + "mayfly-go/internal/db/api/form" "mayfly-go/internal/db/api/vo" "mayfly-go/internal/db/application" @@ -182,9 +184,7 @@ func (d *Db) ExecSqlFile(rc *req.Ctx) { defer func() { var errInfo string switch t := recover().(type) { - case biz.BizError: - errInfo = t.Error() - case *biz.BizError: + case error: errInfo = t.Error() case string: errInfo = t @@ -325,7 +325,7 @@ func (d *Db) DumpSql(rc *req.Ctx) { d.dumpDb(writer, dbId, dbName, tables, needStruct, needData, len(dbNames) > 1) } - rc.ReqParam = fmt.Sprintf("DB[id=%d, tag=%s, name=%s, databases=%s, tables=%s, dumpType=%s]", db.Id, db.TagPath, db.Name, dbNamesStr, tablesStr, dumpType) + rc.ReqParam = collx.Kvs("db", db, "databases", dbNamesStr, "tables", tablesStr, "dumpType", dumpType) } func escapeSql(dbType string, sql string) string { diff --git a/server/internal/sys/api/account.go b/server/internal/sys/api/account.go index 4e0f36c8..016885ac 100644 --- a/server/internal/sys/api/account.go +++ b/server/internal/sys/api/account.go @@ -1,7 +1,6 @@ package api import ( - "fmt" "mayfly-go/internal/common/utils" msgapp "mayfly-go/internal/msg/application" "mayfly-go/internal/sys/api/form" @@ -153,7 +152,7 @@ func (a *Account) ChangeStatus(rc *req.Ctx) { account := &entity.Account{} account.Id = uint64(ginx.PathParamInt(g, "id")) account.Status = int8(ginx.PathParamInt(g, "status")) - rc.ReqParam = fmt.Sprintf("accountId: %d, status: %d", account.Id, account.Status) + rc.ReqParam = collx.Kvs("accountId", account.Id, "status", account.Status) a.AccountApp.Update(account) } @@ -208,6 +207,6 @@ func (a *Account) ResetOtpSecret(rc *req.Ctx) { account := &entity.Account{OtpSecret: "-"} accountId := uint64(ginx.PathParamInt(rc.GinCtx, "id")) account.Id = accountId - rc.ReqParam = fmt.Sprintf("accountId = %d", accountId) + rc.ReqParam = collx.Kvs("accountId", accountId) a.AccountApp.Update(account) } diff --git a/server/internal/sys/api/resource.go b/server/internal/sys/api/resource.go index 04e469f1..58f1da72 100644 --- a/server/internal/sys/api/resource.go +++ b/server/internal/sys/api/resource.go @@ -2,13 +2,13 @@ package api import ( "encoding/json" - "fmt" "mayfly-go/internal/sys/api/form" "mayfly-go/internal/sys/api/vo" "mayfly-go/internal/sys/application" "mayfly-go/internal/sys/domain/entity" "mayfly-go/pkg/ginx" "mayfly-go/pkg/req" + "mayfly-go/pkg/utils/collx" ) type Resource struct { @@ -47,7 +47,7 @@ func (r *Resource) DelResource(rc *req.Ctx) { func (r *Resource) ChangeStatus(rc *req.Ctx) { rid := uint64(ginx.PathParamInt(rc.GinCtx, "id")) status := int8(ginx.PathParamInt(rc.GinCtx, "status")) - rc.ReqParam = fmt.Sprintf("id = %d, status = %d", rid, status) + rc.ReqParam = collx.Kvs("id", rid, "status", status) r.ResourceApp.ChangeStatus(rid, status) } diff --git a/server/internal/sys/api/role.go b/server/internal/sys/api/role.go index 3c1018c1..14437697 100644 --- a/server/internal/sys/api/role.go +++ b/server/internal/sys/api/role.go @@ -38,7 +38,7 @@ func (r *Role) SaveRole(rc *req.Ctx) { // 删除角色及其资源关联关系 func (r *Role) DelRole(rc *req.Ctx) { idsStr := ginx.PathParam(rc.GinCtx, "id") - rc.ReqParam = idsStr + rc.ReqParam = collx.Kvs("ids", idsStr) ids := strings.Split(idsStr, ",") for _, v := range ids { diff --git a/server/internal/sys/application/resource.go b/server/internal/sys/application/resource.go index 38983ae6..1b67faab 100644 --- a/server/internal/sys/application/resource.go +++ b/server/internal/sys/application/resource.go @@ -1,6 +1,7 @@ package application import ( + "mayfly-go/internal/common/consts" "mayfly-go/internal/sys/domain/entity" "mayfly-go/internal/sys/domain/repository" "mayfly-go/pkg/biz" @@ -158,5 +159,14 @@ func (r *resourceAppImpl) Delete(id uint64) { } func (r *resourceAppImpl) GetAccountResources(accountId uint64, toEntity any) { + // 超级管理员返回所有 + if accountId == consts.AdminId { + cond := &entity.Resource{ + Status: entity.ResourceStatusEnable, + } + r.resourceRepo.GetResourceList(cond, toEntity, "pid asc", "weight asc") + return + } + r.resourceRepo.GetAccountResources(accountId, toEntity) } diff --git a/server/migrations/migrate-database-instance.sql b/server/migrations/migrate-database-instance.sql deleted file mode 100644 index 93e0066a..00000000 --- a/server/migrations/migrate-database-instance.sql +++ /dev/null @@ -1,67 +0,0 @@ -CREATE TABLE `t_db_instance` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据库实例名称', - `host` varchar(100) COLLATE utf8mb4_bin NOT NULL, - `port` int(8) NOT NULL, - `username` varchar(255) COLLATE utf8mb4_bin NOT NULL, - `password` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, - `type` varchar(20) COLLATE utf8mb4_bin NOT NULL COMMENT '数据库实例类型(mysql...)', - `params` varchar(125) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '其他连接参数', - `network` varchar(20) COLLATE utf8mb4_bin DEFAULT NULL, - `ssh_tunnel_machine_id` bigint(20) DEFAULT NULL COMMENT 'ssh隧道的机器id', - `remark` varchar(125) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注，描述等', - `create_time` datetime DEFAULT NULL, - `creator_id` bigint(20) DEFAULT NULL, - `creator` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - `modifier_id` bigint(20) DEFAULT NULL, - `modifier` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL, - `is_deleted` tinyint(8) NOT NULL DEFAULT '0', - `delete_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='数据库实例信息表'; - -ALTER TABLE t_db - ADD COLUMN instance_id bigint(20) UNSIGNED NULL AFTER tag_path; - -BEGIN; - -INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (135, 36, 'dbms23ax/X0f4BxT0/', 1, 1, '数据库实例', 'instances', 1693040706, '{\"component\":\"ops/db/InstanceList\",\"icon\":\"Coin\",\"isKeepAlive\":true,\"routeName\":\"InstanceList\"}', 1, 'admin', 1, 'admin', '2023-08-26 09:05:07', '2023-08-29 22:35:11', 0, NULL); - -INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (136, 135, 'dbms23ax/X0f4BxT0/D23fUiBr/', 2, 1, '实例保存', 'db:instance:save', 1693041001, 'null', 1, 'admin', 1, 'admin', '2023-08-26 09:10:02', '2023-08-26 09:10:02', 0, NULL); - -INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (137, 135, 'dbms23ax/X0f4BxT0/mJlBeTCs/', 2, 1, '基本权限', 'db:instance', 1693041055, 'null', 1, 'admin', 1, 'admin', '2023-08-26 09:10:55', '2023-08-26 09:10:55', 0, NULL); - -INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (138, 135, 'dbms23ax/X0f4BxT0/Sgg8uPwz/', 2, 1, '实例删除', 'db:instance:del', 1693041084, 'null', 1, 'admin', 1, 'admin', '2023-08-26 09:11:24', '2023-08-26 09:11:24', 0, NULL); - -INSERT INTO `t_sys_role_resource` (role_id,resource_id,creator_id,creator,create_time,is_deleted,delete_time) VALUES - (1,135,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,136,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,137,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,138,1,'admin','2023-08-30 20:17:00', 0, NULL); - -INSERT INTO t_db_instance (`host`, `port`, `username`, `password`, `type`, `params`, `network`, `ssh_tunnel_machine_id`, `remark`, `create_time`, `creator_id`, `creator`, `update_time`, `modifier_id`, `modifier`, `is_deleted`, `delete_time`) -SELECT DISTINCT `host`, `port`, `username`, `password`, `type`, `params`, `network`, `ssh_tunnel_machine_id`, '', '2023-08-30 15:04:07', 1, 'admin', '2023-08-30 15:04:07', 1, 'admin', 0, NULL -FROM t_db -WHERE is_deleted = 0; - -UPDATE t_db_instance SET name = CONCAT('instance_', id) -WHERE name is NULL; - -UPDATE t_db a, t_db_instance b SET a.instance_id = b.id -WHERE a.`host`=b.`host` and a.`port`=b.`port` and a.`username`=b.`username` and a.`password`=b.`password` and a.`type`=b.`type` and a.`params`=b.`params` and a.`network`=b.`network` and a.`ssh_tunnel_machine_id`=b.`ssh_tunnel_machine_id`; - -COMMIT; - -ALTER TABLE t_db - MODIFY COLUMN instance_id bigint(20) UNSIGNED NOT NULL AFTER tag_path; - -ALTER TABLE t_db -DROP COLUMN `host`, -DROP COLUMN `port`, -DROP COLUMN `username`, -DROP COLUMN `password`, -DROP COLUMN `type`, -DROP COLUMN `params`, -DROP COLUMN `network`, -DROP COLUMN `ssh_tunnel_machine_id`; \ No newline at end of file diff --git a/server/pkg/cache/str_cache.go b/server/pkg/cache/str_cache.go index 0a687132..6e42333e 100644 --- a/server/pkg/cache/str_cache.go +++ b/server/pkg/cache/str_cache.go @@ -1,6 +1,7 @@ package cache import ( + "mayfly-go/pkg/biz" "mayfly-go/pkg/logx" "mayfly-go/pkg/rediscli" "strconv" @@ -20,11 +21,10 @@ func GetStr(key string) string { return val.(string) } - res, err := rediscli.Get(key) - if err != nil { - return "" + if res, err := rediscli.Get(key); err == nil { + return res } - return res + return "" } func GetInt(key string) int { @@ -47,7 +47,7 @@ func SetStr(key, value string, duration time.Duration) { tm.Add(key, value, duration) return } - rediscli.Set(key, value, duration) + biz.ErrIsNilAppendErr(rediscli.Set(key, value, duration), "redis set err: %s") } // 删除指定key diff --git a/server/pkg/rediscli/rediscli.go b/server/pkg/rediscli/rediscli.go index 9bf3b3bc..a45c15b8 100644 --- a/server/pkg/rediscli/rediscli.go +++ b/server/pkg/rediscli/rediscli.go @@ -23,8 +23,11 @@ func Get(key string) (string, error) { } // set key value -func Set(key string, val string, expiration time.Duration) { - cli.Set(context.TODO(), key, val, expiration) +func Set(key string, val string, expiration time.Duration) error { + if expiration < 0 { + expiration = 0 + } + return cli.Set(context.TODO(), key, val, expiration).Err() } func Del(key string) { diff --git a/server/mayfly-go.sqlite b/server/resources/data/mayfly-go.sqlite similarity index 94% rename from server/mayfly-go.sqlite rename to server/resources/data/mayfly-go.sqlite index 0d09b2e38db969e2251fe9fe94c20763dbc5da80..bd55c73481934a0cb5e432e14adca631d388a7be 100644 GIT binary patch delta 1434 zcmb`HeP~r>9LJyMIj_%o-Mzcbp-5NTWZ~4+oXauIh=N&{O;#ExPDGGUlLk?u>0PD_ zUvP4SUrKZL)*OZ+)5|=2w(Y6L$X3ckO>DSU8uPWFk*WvteX_%|<0YhN)290Ofq(^}{?= z7Do3G&iJ%im5{xVIM2$xj190YqD9joPJb+h2)ef6Nm4Pl) zSdvynB{#stu>T^c0Jj5-+=V9rMusA+EyBnVXd3oAkgf0zD)0MR9${-^tP%!?nIq~4 zDM0fGVyN09Y!xI%St)dlFv%k_a1;qoRl#`33K84tvE>-VvD8r?BSSC`6_zANBCN&7 zJZo!YHOHCD;nOg)(w!J(62;$x{Q;N9a4%3@gJP&oL)m!X?S)2E7Dm^_`%@0-aU2D` z2IvgA6r2e-`b*5EB92~yM*&AagY*Tz9^DahGh=QgY!0I}akMm!YA}dV@0Y$0cSAMq z6m!1yiBp#MMZ43O_XZ}f$0h2Wbl#hn%yByN70&a$6;9oWIfd*AgX&G3Q0{-wiu3F7 zlvv+Tv-qR_zJ6NVg$dq8aaI5G$gtY1#a5~Lv-ypgH@BN_nhQ*B+%v`uFy1v@Gb;5b z`YpYnAN=dlqJ6BjX${&_yvV=heY}IO;q^Qj960KBb*1{8YA8P_Un$+n2TH3_J73}Q zefffXOny&pmY5k+|how!@E7H^ABk{U;M(h;Vi;ZHLP!ui;y~0jB0VkR34zMQ8 qd64_^Umw-*9@RA8APXgzxYhk^zvQG#D!lA&#oOJ}?ptH*B>NN3byf}l delta 5800 zcmeI#U1%Id902gW%kJLo?d?u3N%PgDx!X(9G|4slaeE)rCaI0qRvW3JwHmdJ6pRm1 zkwTzS_s|tVv8eaZK8Oic`(Po7ULkLVf*&A#u;`1$J`_b!0*ViceGq4F<9~LO&btp6 z61e>Dw==W<*_ruor6N}<^4r~NWP#(jQSw*+d1t5)jVyd};=?g9f^Kr?W-WE(8^mY2 zB(8RAGJOOQ#jDdCa*(QCP^W9D=5e(;{r*+{c@c5dmc@DAiI5MkE}n4&Vk79b*X}5~ zjporolvV#xzf)`KTk4!TrS>X+Dc6-t%4^DTrL43ie@lLq{3uyT&Lj)Tl)Nr~DSsfJ zk&nritR{X*e3n>DoK8HF&=a!slXO*jPg;;3l5$c!{zLpq{Cxby_~H0qoQvIvU5=fN z&Bd&#*beb;@mq04d_z1bPKcetAHp@^qEHcL1Y1D-ul(oy68{o^l-K!0(~nJ8n$Fig zUAh*HibLlz%hB%S(-IenNF7$369@drERD4IkrOnM@*~G-q`4lczP{Z5sOCN?agyKK zzS)!W&pv1BrjgT&Ia5y?I?k7{Ro2`m08O&d44{c~=~L0RR2iG(+Q%V09t=MQ;l1_n zu&1-`F*?k0s4K%v8wH%tW5cXoS{_t1_b9Zmr~2SZt6=Nc)N9w5lM(p=_zIJ++EOKK z>zX?a(XtnH{ODnb7DFBCrLhj4&#u4I3L|=ta#vL~c;3&tCQC zl`bdi9;A0H1THJ&yaABQbZnQh?!8pWY;}Mtm96ff%Hi4UZpzYZHAPj1t@cyZ7gSF8 zF7KiY1zA|_qiQEhY3?M<#@H5QVAH_1skzPssNHNe4k*V)djXBI(H=k}b>#TV&7W)- z6$UlTZmJAu7aNrT4c!qr^(+)Y4ThDK*2|du=1HmwfCkve2Bd|NQD01XtXrC!2eiXs zD+^RF8<~K%v5^6&bu%JM5?lVLbWr`96#vSXLvvdI zg{OxgZ{N(wj$dJglND0U&{R0>A%p;JNy2~qWn7gYzrdgmmg*(Jt3pW8JK~;t zW%c4}Mn*aa+ diff --git a/server/shutdown.sh b/server/resources/script/shutdown.sh similarity index 100% rename from server/shutdown.sh rename to server/resources/script/shutdown.sh diff --git a/server/mayfly-go.sql b/server/resources/script/sql/mayfly-go.sql similarity index 90% rename from server/mayfly-go.sql rename to server/resources/script/sql/mayfly-go.sql index 18bf42f5..e21df4e6 100644 --- a/server/mayfly-go.sql +++ b/server/resources/script/sql/mayfly-go.sql @@ -434,7 +434,6 @@ CREATE TABLE `t_sys_account_role` ( -- Records of t_sys_account_role -- ---------------------------- BEGIN; -INSERT INTO `t_sys_account_role` VALUES (25, 1, 1, 'admin', 1, '2021-05-28 16:21:45', 0, NULL); COMMIT; -- ---------------------------- @@ -666,8 +665,6 @@ CREATE TABLE `t_sys_role` ( -- Records of t_sys_role -- ---------------------------- BEGIN; -INSERT INTO `t_sys_role` VALUES (1, '超级管理员', 'SUPBER_ADMIN', 1, '权限超级大，拥有所有权限', 2, '2021-05-27 14:09:50', 1, 'admin', '2021-05-28 10:26:28', 1, 'admin', 0, NULL); -INSERT INTO `t_sys_role` VALUES (6, '普通管理员', 'ADMIN', 1, '只拥有部分管理权限', 2, '2021-05-28 15:55:36', 1, 'admin', '2021-05-28 15:55:36', 1, 'admin', 0, NULL); INSERT INTO `t_sys_role` VALUES (7, '公共角色', 'COMMON', 1, '所有账号基础角色', 1, '2021-07-06 15:05:47', 1, 'admin', '2021-07-06 15:05:47', 1, 'admin', 0, NULL); INSERT INTO `t_sys_role` VALUES (8, '开发', 'DEV', 1, '研发人员', 0, '2021-07-09 10:46:10', 1, 'admin', '2021-07-09 10:46:10', 1, 'admin', 0, NULL); COMMIT; @@ -693,71 +690,7 @@ CREATE TABLE `t_sys_role_resource` ( -- ---------------------------- BEGIN; INSERT INTO `t_sys_role_resource` (role_id,resource_id,creator_id,creator,create_time,is_deleted,delete_time) VALUES - (1,1,1,'admin','2021-05-27 15:07:39', 0, NULL), - (1,2,1,'admin','2021-05-28 09:04:50', 0, NULL), - (1,4,1,'admin','2021-05-28 09:04:50', 0, NULL), - (1,5,1,'admin','2021-05-28 09:04:50', 0, NULL), - (1,11,1,'admin','2021-05-28 09:04:50', 0, NULL), - (1,14,1,'admin','2021-05-28 17:42:21', 0, NULL), - (1,3,1,'admin','2021-05-28 17:42:43', 0, NULL), - (1,12,1,'admin','2021-05-28 17:42:43', 0, NULL), - (6,2,1,'admin','2021-05-28 19:19:38', 0, NULL), - (6,3,1,'admin','2021-05-28 19:19:38', 0, NULL), - (6,1,1,'admin','2021-05-29 01:31:22', 0, NULL), - (5,1,1,'admin','2021-05-31 14:05:23', 0, NULL), - (5,4,1,'admin','2021-05-31 14:05:23', 0, NULL), - (5,14,1,'admin','2021-05-31 14:05:23', 0, NULL), - (5,5,1,'admin','2021-05-31 14:05:23', 0, NULL), - (5,11,1,'admin','2021-05-31 14:05:23', 0, NULL), - (5,3,1,'admin','2021-05-31 16:33:14', 0, NULL), - (5,12,1,'admin','2021-05-31 16:33:14', 0, NULL), - (5,2,1,'admin','2021-05-31 16:33:14', 0, NULL), - (1,15,1,'admin','2021-05-31 17:48:33', 0, NULL), - (1,16,1,'admin','2021-05-31 17:48:33', 0, NULL), - (1,17,1,'admin','2021-05-31 17:48:33', 0, NULL), - (1,18,1,'admin','2021-05-31 17:48:33', 0, NULL), - (1,20,1,'admin','2021-05-31 17:52:08', 0, NULL), - (1,22,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,23,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,24,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,25,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,26,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,27,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,28,1,'admin','2021-05-31 18:05:04', 0, NULL), - (1,31,1,'admin','2021-05-31 21:25:56', 0, NULL), - (1,32,1,'admin','2021-05-31 21:25:56', 0, NULL), - (1,33,1,'admin','2021-05-31 21:25:56', 0, NULL), - (1,36,1,'admin','2021-06-01 14:01:57', 0, NULL), - (1,19,1,'admin','2021-06-01 17:34:03', 0, NULL), - (1,21,1,'admin','2021-06-01 17:34:03', 0, NULL), - (1,29,1,'admin','2021-06-01 17:34:03', 0, NULL), - (1,30,1,'admin','2021-06-01 17:34:03', 0, NULL), - (1,34,1,'admin','2021-06-01 17:34:03', 0, NULL), - (1,37,1,'admin','2021-06-03 09:09:42', 0, NULL), - (1,38,1,'admin','2021-06-03 09:09:42', 0, NULL), - (1,40,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,41,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,42,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,43,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,44,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,45,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,46,1,'admin','2021-06-08 11:21:52', 0, NULL), - (1,47,1,'admin','2021-06-08 11:21:52', 0, NULL), - (6,39,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,15,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,31,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,33,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,32,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,4,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,14,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,11,1,'admin','2021-06-08 15:10:58', 0, NULL), - (6,5,1,'admin','2021-06-08 15:10:58', 0, NULL), (7,1,1,'admin','2021-07-06 15:07:09', 0, NULL), - (1,49,1,'admin','2021-07-07 15:14:17', 0, NULL), - (1,54,1,'admin','2021-07-08 17:32:19', 0, NULL), - (1,55,1,'admin','2021-07-08 17:32:19', 0, NULL), - (1,57,1,'admin','2021-07-09 10:48:50', 0, NULL), - (1,58,1,'admin','2021-07-09 10:48:50', 0, NULL), (8,57,1,'admin','2021-07-09 10:49:46', 0, NULL), (8,12,1,'admin','2021-07-09 10:49:46', 0, NULL), (8,15,1,'admin','2021-07-09 10:49:46', 0, NULL), @@ -765,107 +698,17 @@ INSERT INTO `t_sys_role_resource` (role_id,resource_id,creator_id,creator,create (8,2,1,'admin','2021-07-09 10:49:46', 0, NULL), (8,3,1,'admin','2021-07-09 10:49:46', 0, NULL), (8,36,1,'admin','2021-07-09 10:49:46', 0, NULL), - (1,59,1,'admin','2021-07-09 10:50:20', 0, NULL), (8,59,1,'admin','2021-07-09 10:50:32', 0, NULL), - (6,57,1,'admin','2021-07-12 16:44:12', 0, NULL), - (1,60,1,'admin','2021-07-19 20:19:29', 0, NULL), - (1,61,1,'admin','2021-07-19 20:19:29', 0, NULL), - (1,62,1,'admin','2021-07-19 20:19:29', 0, NULL), - (1,63,1,'admin','2021-07-20 10:48:39', 0, NULL), - (1,64,1,'admin','2021-07-20 10:48:39', 0, NULL), (7,39,1,'admin','2021-09-09 10:10:30', 0, NULL), - (6,16,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,17,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,18,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,37,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,40,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,41,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,42,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,43,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,44,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,45,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,46,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,47,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,36,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,38,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,59,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,49,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,58,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,54,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,55,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,60,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,61,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,62,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,63,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,64,1,'admin','2021-09-09 15:52:38', 0, NULL), - (6,19,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,21,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,29,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,30,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,34,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,20,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,22,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,23,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,24,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,25,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,26,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,27,1,'admin','2021-09-09 15:53:56', 0, NULL), - (6,28,1,'admin','2021-09-09 15:53:56', 0, NULL), (8,42,1,'admin','2021-11-05 15:59:16', 0, NULL), (8,43,1,'admin','2021-11-05 15:59:16', 0, NULL), (8,47,1,'admin','2021-11-05 15:59:16', 0, NULL), (8,60,1,'admin','2021-11-05 15:59:16', 0, NULL), (8,61,1,'admin','2021-11-05 15:59:16', 0, NULL), (8,62,1,'admin','2021-11-05 15:59:16', 0, NULL), - (1,72,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,71,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,79,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,80,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,81,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,82,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,83,1,'admin','2022-07-14 11:03:09', 0, NULL), - (1,84,1,'admin','2022-07-14 11:10:11', 0, NULL), - (1,85,1,'admin','2022-07-14 11:10:11', 0, NULL), - (1,87,1,'admin','2022-07-14 11:10:11', 0, NULL), - (1,88,1,'admin','2022-10-08 10:54:06', 0, NULL), (8,80,1,'admin','2022-10-08 10:54:34', 0, NULL), (8,81,1,'admin','2022-10-08 10:54:34', 0, NULL), (8,79,1,'admin','2022-10-08 10:54:34', 0, NULL), - (1,93,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,94,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,96,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,98,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,95,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,97,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,99,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,100,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,101,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,102,1,'admin','2022-10-26 20:03:14', 0, NULL), - (1,106,1,'admin','2023-02-23 14:30:54', 0, NULL), - (1,103,1,'admin','2023-02-23 14:30:54', 0, NULL), - (1,105,1,'admin','2023-02-23 14:31:00', 0, NULL), - (1,104,1,'admin','2023-02-24 13:40:26', 0, NULL), - (1,108,1,'admin','2023-03-14 17:28:06', 0, NULL), - (6,79,1,'admin','2023-03-14 17:28:50', 0, NULL), - (6,80,1,'admin','2023-03-14 17:28:50', 0, NULL), - (6,81,1,'admin','2023-03-14 17:28:50', 0, NULL), - (6,82,1,'admin','2023-03-14 17:28:50', 0, NULL), - (6,83,1,'admin','2023-03-14 17:28:50', 0, NULL), - (6,84,1,'admin','2023-03-14 17:29:00', 0, NULL), - (6,85,1,'admin','2023-03-14 17:29:00', 0, NULL), - (6,87,1,'admin','2023-03-14 17:29:00', 0, NULL), - (6,88,1,'admin','2023-03-14 17:29:00', 0, NULL), - (1,109,1,'admin','2023-03-16 16:11:25', 0, NULL), - (1,128,1,'admin','2023-03-16 16:11:25', 0, NULL), - (1,130,1,'admin','2023-03-16 16:11:25', 0, NULL), - (1,131,1,'admin','2023-03-16 16:11:25', 0, NULL), - (1,132,1,'admin','2023-03-16 16:11:25', 0, NULL), - (1,133,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,134,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,135,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,136,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,137,1,'admin','2023-08-30 20:17:00', 0, NULL), - (1,138,1,'admin','2023-08-30 20:17:00', 0, NULL); COMMIT; -- ---------------------------- diff --git a/server/startup.sh b/server/resources/script/startup.sh similarity index 100% rename from server/startup.sh rename to server/resources/script/startup.sh