Skip to content

Commit b5f1a61

Browse files
xiaorongnieipcjs
andauthored
fix: 修复初始化账号的问题, 配置字体文件夹, 等 (#15)
* fix(数据库初始化): 修复账号和昵称反了的BUG * perf(自定义字体): 支持配置默认字体文件夹 * wip: MAINTAIN_TOKEN_DIR改成非必选, 里面的数据, 不存在都会自动下载 --------- Co-authored-by: ipcjs.mac4 <[email protected]>
1 parent b620b50 commit b5f1a61

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.env.default

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ JTT808_PORT_FTP_PASSIVE=9041-9049
7070
## maintain
7171
MAINTAIN_HOST='maintain' # maintain | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
7272
MAINTAIN_PORT='8080'
73-
# 必填, TOKEN目录的绝对路径
74-
# - access/ras_key|ras_key.pub: 访问密钥的公私钥对
75-
# - refresh/ras_key|ras_key.pub: 刷新密钥的公私钥对
76-
# - ip2region.xdb: ip到区域的映射数据, 下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb
77-
MAINTAIN_TOKEN_DIR=''
73+
# TOKEN目录的绝对路径
74+
# - access/ras_key|ras_key.pub: 访问密钥的公私钥对, 不存在会自动下载
75+
# - refresh/ras_key|ras_key.pub: 刷新密钥的公私钥对, 不存在会自动下载
76+
# - ip2region.xdb: ip到区域的映射数据, 不存在会自动下载, 手动下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb
77+
MAINTAIN_TOKEN_DIR='/home/token'
7878

7979
## MYSQL, 必填
8080
MYSQL_HOST='mysql8' # mysql8 | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}

maintain/compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ services:
55
restart: always
66
volumes:
77
- /etc/localtime:/etc/localtime
8-
- ${MAINTAIN_TOKEN_DIR:?required}:/home/token
8+
- ${MAINTAIN_TOKEN_DIR:-/home/token}:/home/token
99
- /data/logs/maintain:/logs
10+
- /data/fonts:/data/fonts
1011
ports:
1112
- ${MAINTAIN_PORT:-8080}:8080
1213
environment:

mysql8/initdb/01-create-db-maintain.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3894,8 +3894,8 @@ CREATE TABLE `user_info` (
38943894
-- ----------------------------
38953895
-- Records of user_info
38963896
-- ----------------------------
3897-
INSERT INTO `user_info` VALUES (15865, 'dca0f9e348384d23958e151bb4adb98f', '系统管理员', 'sysadmin', '{bcrypt-md5}$2a$10$dsfVEzh5NlfrgkcLFbrPLOuSsm5zJMJJwYqlQfTSWs3qKzwhQx5Ku', '/minio/maintain/avatar/202504/3e9b5f914ff105ea2d32c4a4c53b10121a16aac4.png', NULL, NULL, '+08:00', NULL, 0, 0, 100, 0, '', '系统账号', '2025-04-29 09:27:50', NULL, NULL, '2025-04-29 03:46:24', 0, NULL, '', 0, '2025-04-29 03:46:24', '2025-04-29 09:28:57');
3898-
INSERT INTO `user_info` VALUES (15866, '25d19d8c917747ea', 'tgadmin', '组织管理员', '{bcrypt-md5}$2a$10$x7PPR5QH/2yooQmv4szk5O4.l1AujbzMbosaO4SaYL9UxXTsOKKey', '/minio/maintain/avatar/202504/db1c192ad620acdff541de0125ae887bf2366a2b.png', NULL, NULL, '+08:00', NULL, 0, 0, 1, 0, '', NULL, '2025-04-30 08:04:22', NULL, NULL, '2025-04-30 07:35:32', 0, 110, '', 0, '2025-04-30 07:35:32', '2025-04-30 08:22:00');
3897+
INSERT INTO `user_info` VALUES (1, 'dca0f9e348384d23958e151bb4adb98f', '系统管理员', 'sysadmin', '{bcrypt-md5}$2a$10$dsfVEzh5NlfrgkcLFbrPLOuSsm5zJMJJwYqlQfTSWs3qKzwhQx5Ku', '', NULL, NULL, '+08:00', NULL, 0, 0, 100, 0, '', '系统账号', '2025-04-29 09:27:50', NULL, NULL, '2025-04-29 03:46:24', 0, NULL, '', 0, '2025-04-29 03:46:24', '2025-04-29 09:28:57');
3898+
INSERT INTO `user_info` VALUES (2, '25d19d8c917747ea', '组织管理员', 'tgadmin', '{bcrypt-md5}$2a$10$x7PPR5QH/2yooQmv4szk5O4.l1AujbzMbosaO4SaYL9UxXTsOKKey', '', NULL, NULL, '+08:00', NULL, 0, 0, 1, 0, '', NULL, '2025-04-30 08:04:22', NULL, NULL, '2025-04-30 07:35:32', 0, 110, '', 0, '2025-04-30 07:35:32', '2025-04-30 08:22:00');
38993899
-- ----------------------------
39003900
-- Table structure for user_issue
39013901
-- ----------------------------

0 commit comments

Comments
 (0)