TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-02 07:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 缓存使用redis无法set问题修复&admin账号默认有所有菜单

Browse Source
This commit is contained in:
meilin.huang
2023-10-12 21:50:55 +08:00
parent d300f604f1
commit e0f1f40ba0
14 changed files with 35 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_release.sh
View File

@@ -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"

2
server/internal/common/consts/consts.go
View File

@@ -3,6 +3,8 @@ package consts
import "time"
const (
AdminId = 1
MachineConnExpireTime = 60 * time.Minute
DbConnExpireTime = 45 * time.Minute
RedisConnExpireTime = 30 * time.Minute

10
server/internal/db/api/db.go
View File

@@ -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 {

5
server/internal/sys/api/account.go
View File

@@ -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)
}

4
server/internal/sys/api/resource.go
View File

@@ -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)
}

2
server/internal/sys/api/role.go
View File

@@ -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 {

10
server/internal/sys/application/resource.go
View File

@@ -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)
}

67
server/migrations/migrate-database-instance.sql
View File

@@ -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`;

10
server/pkg/cache/str_cache.go vendored
View File

@@ -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

7
server/pkg/rediscli/rediscli.go
View File

@@ -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) {

BIN
server/mayfly-go.sqlite → server/resources/data/mayfly-go.sqlite
View File

Binary file not shown.

0
server/shutdown.sh → server/resources/script/shutdown.sh
View File

157
server/mayfly-go.sql → server/resources/script/sql/mayfly-go.sql
View File

@@ -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;
-- ----------------------------

0
server/startup.sh → server/resources/script/startup.sh
View File