Skip to content

fix(db-init): 修复初始化账号的问题 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jss-tg merged 8 commits into from
Jul 29, 2025
Merged

fix(db-init): 修复初始化账号的问题 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d23ce79
fix(nginx代理minio): 默认9000被占用，改成约定的8000
xiaorongnie Jul 14, 2025
9ac0356
fix(rtp): minio链接url改成动态
xiaorongnie Jul 14, 2025
f10216e
fix(数据库初始化): 修复账号和昵称反了的BUG
xiaorongnie Jul 17, 2025
7f6bb02
Merge remote-tracking branch 'origin/master' into fix/db-init/nxr
xiaorongnie Jul 17, 2025
d162997
perf(自定义字体): 支持配置默认字体文件夹
xiaorongnie Jul 18, 2025
5089322
feat(bus后端): 增加token目录映射, 方便免密登录
xiaorongnie Jul 29, 2025
002efc1
Revert "feat(bus后端): 增加token目录映射, 方便免密登录"
ipcjs Jul 29, 2025
6e54f3d
wip: MAINTAIN_TOKEN_DIR改成非必选, 里面的数据, 不存在都会自动下载
ipcjs Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .env.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ JTT808_PORT_FTP_PASSIVE=9041-9049
## maintain
MAINTAIN_HOST='maintain' # maintain | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
MAINTAIN_PORT='8080'
# 必填, TOKEN目录的绝对路径
# - access/ras_key|ras_key.pub: 访问密钥的公私钥对
# - refresh/ras_key|ras_key.pub: 刷新密钥的公私钥对
# - ip2region.xdb: ip到区域的映射数据, 下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb
MAINTAIN_TOKEN_DIR=''
# TOKEN目录的绝对路径
# - access/ras_key|ras_key.pub: 访问密钥的公私钥对, 不存在会自动下载
# - refresh/ras_key|ras_key.pub: 刷新密钥的公私钥对, 不存在会自动下载
# - ip2region.xdb: ip到区域的映射数据, 不存在会自动下载, 手动下载连接: https://raw.githubusercontent.com/lionsoul2014/ip2region/master/data/ip2region.xdb
MAINTAIN_TOKEN_DIR='/home/token'

## MYSQL, 必填
MYSQL_HOST='mysql8' # mysql8 | ${SERVER_IP_INTERNAL} | ${SERVER_IP_PUBLIC}
Expand Down
3 changes: 2 additions & 1 deletion maintain/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ services:
restart: always
volumes:
- /etc/localtime:/etc/localtime
- ${MAINTAIN_TOKEN_DIR:?required}:/home/token
- ${MAINTAIN_TOKEN_DIR:-/home/token}:/home/token
- /data/logs/maintain:/logs
- /data/fonts:/data/fonts
ports:
- ${MAINTAIN_PORT:-8080}:8080
environment:
Expand Down
4 changes: 2 additions & 2 deletions mysql8/initdb/01-create-db-maintain.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3894,8 +3894,8 @@ CREATE TABLE `user_info` (
-- ----------------------------
-- Records of user_info
-- ----------------------------
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');
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');
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');
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');
-- ----------------------------
-- Table structure for user_issue
-- ----------------------------
Expand Down