refactor: 移除冗余文件并优化代码结构
- 删除多个不再使用的脚本和配置文件,包括 `auto_push.bat`, `check_and_fix_users.py`, `init.sql` 等。 - 新增 `git_push.bat` 和 `git_push.sh` 脚本以简化 Git 推送流程。 - 更新 `README.md` 以反映最新的功能和结构变化。 - 优化前端代码,添加新的页面和组件,提升用户体验。 此提交旨在清理项目结构并增强代码可维护性。
This commit is contained in:
@@ -9,7 +9,7 @@ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from src.core.database import db_manager
|
||||
from src.core.models import User
|
||||
from werkzeug.security import generate_password_hash, check_password_hash
|
||||
# from werkzeug.security import generate_password_hash, check_password_hash
|
||||
from sqlalchemy import text, inspect
|
||||
|
||||
print("=" * 60)
|
||||
@@ -37,12 +37,12 @@ try:
|
||||
print(f" 激活状态: {admin_user.is_active}")
|
||||
|
||||
# 验证密码
|
||||
password_ok = check_password_hash(admin_user.password_hash, 'admin123')
|
||||
password_ok = admin_user.check_password('admin123')
|
||||
print(f" 密码验证: {'正确' if password_ok else '错误'}")
|
||||
|
||||
if not password_ok:
|
||||
print("\n密码不匹配,正在更新密码...")
|
||||
admin_user.password_hash = generate_password_hash('admin123')
|
||||
admin_user.set_password('admin123')
|
||||
admin_user.is_active = True
|
||||
if hasattr(admin_user, 'region'):
|
||||
admin_user.region = None
|
||||
@@ -56,7 +56,7 @@ try:
|
||||
print("用户已激活")
|
||||
|
||||
# 最终验证
|
||||
test_password = check_password_hash(admin_user.password_hash, 'admin123')
|
||||
test_password = admin_user.check_password('admin123')
|
||||
if test_password and admin_user.is_active:
|
||||
print("\n管理员用户已就绪!")
|
||||
print(" 用户名: admin")
|
||||
@@ -69,8 +69,10 @@ try:
|
||||
else:
|
||||
print("\n未找到admin用户,正在创建...")
|
||||
|
||||
# 准备密码哈希
|
||||
password_hash = generate_password_hash('admin123')
|
||||
# 创建用户对象来生成密码哈希
|
||||
temp_user = User()
|
||||
temp_user.set_password('admin123')
|
||||
password_hash = temp_user.password_hash
|
||||
|
||||
# 检查表结构,使用SQL直接插入避免字段不匹配
|
||||
try:
|
||||
@@ -78,6 +80,7 @@ try:
|
||||
new_admin = User(
|
||||
username='admin',
|
||||
email='admin@tsp.com',
|
||||
name='系统管理员',
|
||||
password_hash=password_hash,
|
||||
role='admin',
|
||||
is_active=True
|
||||
@@ -93,10 +96,11 @@ try:
|
||||
session.rollback()
|
||||
|
||||
# 使用SQL直接插入
|
||||
insert_fields = ['username', 'email', 'password_hash', 'role']
|
||||
insert_fields = ['username', 'email', 'name', 'password_hash', 'role']
|
||||
insert_values = {
|
||||
'username': 'admin',
|
||||
'email': 'admin@tsp.com',
|
||||
'name': '系统管理员',
|
||||
'password_hash': password_hash,
|
||||
'role': 'admin'
|
||||
}
|
||||
@@ -124,7 +128,7 @@ try:
|
||||
# 验证创建结果
|
||||
verify_user = session.query(User).filter(User.username == 'admin').first()
|
||||
if verify_user:
|
||||
test_password = check_password_hash(verify_user.password_hash, 'admin123')
|
||||
test_password = verify_user.check_password('admin123')
|
||||
print(f"\n验证结果:")
|
||||
print(f" 用户ID: {verify_user.id}")
|
||||
print(f" 密码正确: {test_password}")
|
||||
@@ -138,9 +142,9 @@ try:
|
||||
print("\n警告: 用户创建成功但状态异常")
|
||||
|
||||
# 创建其他示例用户
|
||||
for username, email, password, role, region in [
|
||||
('overseas_ops', 'overseas@tsp.com', 'ops123', 'overseas_ops', 'overseas'),
|
||||
('domestic_ops', 'domestic@tsp.com', 'ops123', 'domestic_ops', 'domestic')
|
||||
for username, name, email, password, role, region in [
|
||||
('overseas_ops', '海外运维', 'overseas@tsp.com', 'ops123', 'overseas_ops', 'overseas'),
|
||||
('domestic_ops', '国内运维', 'domestic@tsp.com', 'ops123', 'domestic_ops', 'domestic')
|
||||
]:
|
||||
ops_user = session.query(User).filter(User.username == username).first()
|
||||
if not ops_user:
|
||||
@@ -148,11 +152,12 @@ try:
|
||||
try:
|
||||
new_user = User(
|
||||
username=username,
|
||||
name=name,
|
||||
email=email,
|
||||
password_hash=generate_password_hash(password),
|
||||
role=role,
|
||||
is_active=True
|
||||
)
|
||||
new_user.set_password(password)
|
||||
if 'region' in existing_columns:
|
||||
new_user.region = region
|
||||
session.add(new_user)
|
||||
|
||||
Reference in New Issue
Block a user