fix：优化命令行，但没有了高亮

.vscode/settings.json

@@ -79,13 +79,10 @@
         "zsh": {
             "path": "/usr/bin/zsh",
             "icon": "terminal",
-            "args": ["-l", "-i"]
+            "args": ["-l",  "-c", "cd ${workspaceFolder} && source .zshrc && exec zsh"],
         }
     },
     "terminal.integrated.inheritEnv": true,
-    "terminal.integrated.env.linux": {
-        "PATH": "/root/.version-fox/temp/1732636800-67011/python/bin:/root/.version-fox/temp/1732636800-67011/nodejs/bin:/root/.version-fox/temp/1732636800-43351/nodejs/bin:/root/.version-fox/temp/1732636800-43351/python/bin:/root/.version-fox/temp/1732636800-43351/java/bin:/root/.version-fox/temp/1732636800-43351/maven/bin:/home/fy/bin:/home/fy/.local/bin:/usr/local/bin:/home/fy/.local/share/pnpm:/home/fy/.version-fox/temp/1732636800-169074/python/bin:/home/fy/.version-fox/temp/1732636800-169074/nodejs/bin:/home/fy/.version-fox/temp/1732636800-169074/maven/bin:/home/fy/.version-fox/temp/1732636800-169074/java/bin:/home/fy/.version-fox/temp/1732636800-169074/golang/bin:/home/fy/.version-fox/temp/1732636800-169074/golang/packages/bin:/home/fy/bin:/home/fy/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:/opt/rocm-5.4.1/bin:/opt/rocm-5.4.1/opencl/bin:/home/fy/.local/share/JetBrains/Toolbox/scripts:/home/fy/.config/composer/vendor/bin:/home/fy/.config/composer/vendor/bin:${workspaceFolder}/vendor/bin:${workspaceFolder}/script/ansible/bin:${workspaceFolder}/script/bin"
-    },
     "terminal.integrated.defaultProfile.osx": "zsh",
     "terminal.integrated.profiles.osx": {
         "zsh": {
@@ -131,5 +128,7 @@
     },
     "vite.autoStart": false,
     "codetogether.virtualCursorJoin": "sharedVirtualCursor",
-    "codetogether.virtualCursorRemember": true
+    "codetogether.virtualCursorRemember": true,
+    "ansible.python.interpreterPath": "/bin/python3",
+    "terminal.integrated.copyOnSelection": true,
 }

.zshrc

@@ -0,0 +1,21 @@
+export ZSH="$HOME/.oh-my-zsh"
+export LANG=en_US.UTF-8
+# 禁用 csh 兼容模式
+unsetopt CSH_JUNKIE_QUOTES
+unsetopt CSH_JUNKIE_LOOPS
+unsetopt CSH_NULLCMD
+
+# 禁用系统级 zshrc
+setopt no_global_rcs
+
+# Oh My Zsh 设置
+ZSH_THEME="robbyrussell"  # 使用稳定主题
+DISABLE_AUTO_UPDATE="true"
+DISABLE_MAGIC_FUNCTIONS="true"
+DISABLE_AUTO_TITLE="true"
+ENABLE_CORRECTION="false"
+
+# 加载 Oh My Zsh
+source $ZSH/oh-my-zsh.sh
+
+export PATH="$PATH:./script/bin:./script/ansible/bin"

_ide_helper_models.php

@@ -1739,7 +1739,7 @@ namespace App\Models{
  * @property int $owner_id 业务类型编号
  * @property string $owner_type 业务类型(profit:分账 recharge:充值 withdraw:提现 refund:退款 payment:支付 gift:赠送 breach:违约 compensation:补偿)
  * @property string|null $role 角色
- * @property string $trans_type 交易类型(income:收入 expense:支出)
+ * @property int $trans_type 交易类型(income:收入 expense:支出)
  * @property string $storage_type 存储类型(balance:余额 recharge:充值)
  * @property string $amount 交易金额
  * @property string $before_balance 交易前余额

ansible.cfg

@@ -1,6 +1,6 @@
 [defaults]
 # 主机清单文件路径
-inventory = ./inventory/hosts
+inventory = ./script/ansible/inventory/hosts
 
 # 并发连接数
 forks = 5
@@ -15,7 +15,7 @@ host_key_checking = False
 remote_user = root
 
 # 日志路径
-log_path = ./ansible.log
+log_path = ./script/ansible/ansible.log
 
 # 显示任务执行时间
 callback_whitelist = profile_tasks
@@ -24,7 +24,7 @@ callback_whitelist = profile_tasks
 diff = True
 
 # roles 路径
-roles_path = ./roles
+roles_path = ./script/ansible/roles
 
 [privilege_escalation]
 # 是否需要切换成其他用户

ansible.log

@@ -1,111 +0,0 @@
-2024-11-18 13:23:27,646 p=84765 u=fy n=ansible | ERROR! Empty playbook, nothing to do: /home/fy/work/owl-admin/script/ansible/deploy_playbook.yml
-2024-11-18 13:59:52,455 p=102440 u=fy n=ansible | playbook: script/ansible/deploy_playbook.yml
-2024-11-18 13:59:53,026 p=102447 u=fy n=ansible | {
-    "ansible.builtin.runas": "Run As user",
-    "ansible.builtin.su": "Substitute User",
-    "ansible.builtin.sudo": "Substitute User DO",
-    "ansible.netcommon.enable": "Switch to elevated permissions on a network device",
-    "community.general.doas": "Do As user",
-    "community.general.dzdo": "Centrify's Direct Authorize",
-    "community.general.ksu": "Kerberos substitute user",
-    "community.general.machinectl": "Systemd's machinectl privilege escalation",
-    "community.general.pbrun": "PowerBroker run",
-    "community.general.pfexec": "profile based execution",
-    "community.general.pmrun": "Privilege Manager run",
-    "community.general.run0": "Systemd's run0",
-    "community.general.sesu": "CA Privileged Access Manager",
-    "community.general.sudosu": "Run tasks using sudo su -",
-    "containers.podman.podman_unshare": "Run tasks using podman unshare"
-}
-2024-11-18 14:39:27,864 p=119976 u=fy n=ansible | [WARNING]: Could not match supplied host pattern, ignoring: frpclient
-
-2024-11-18 14:39:27,864 p=119976 u=fy n=ansible | playbook: script/ansible/frpc_playbook.yml
-2024-11-18 14:39:28,422 p=119979 u=fy n=ansible | {
-    "ansible.builtin.runas": "Run As user",
-    "ansible.builtin.su": "Substitute User",
-    "ansible.builtin.sudo": "Substitute User DO",
-    "ansible.netcommon.enable": "Switch to elevated permissions on a network device",
-    "community.general.doas": "Do As user",
-    "community.general.dzdo": "Centrify's Direct Authorize",
-    "community.general.ksu": "Kerberos substitute user",
-    "community.general.machinectl": "Systemd's machinectl privilege escalation",
-    "community.general.pbrun": "PowerBroker run",
-    "community.general.pfexec": "profile based execution",
-    "community.general.pmrun": "Privilege Manager run",
-    "community.general.run0": "Systemd's run0",
-    "community.general.sesu": "CA Privileged Access Manager",
-    "community.general.sudosu": "Run tasks using sudo su -",
-    "containers.podman.podman_unshare": "Run tasks using podman unshare"
-}
-2024-11-18 14:49:55,538 p=123727 u=fy n=ansible | playbook: script/ansible/deploy_playbook.yml
-2024-11-18 14:49:56,139 p=123734 u=fy n=ansible | {
-    "ansible.builtin.runas": "Run As user",
-    "ansible.builtin.su": "Substitute User",
-    "ansible.builtin.sudo": "Substitute User DO",
-    "ansible.netcommon.enable": "Switch to elevated permissions on a network device",
-    "community.general.doas": "Do As user",
-    "community.general.dzdo": "Centrify's Direct Authorize",
-    "community.general.ksu": "Kerberos substitute user",
-    "community.general.machinectl": "Systemd's machinectl privilege escalation",
-    "community.general.pbrun": "PowerBroker run",
-    "community.general.pfexec": "profile based execution",
-    "community.general.pmrun": "Privilege Manager run",
-    "community.general.run0": "Systemd's run0",
-    "community.general.sesu": "CA Privileged Access Manager",
-    "community.general.sudosu": "Run tasks using sudo su -",
-    "containers.podman.podman_unshare": "Run tasks using podman unshare"
-}
-2024-11-18 14:56:38,510 p=127588 u=fy n=ansible | playbook: script/ansible/deploy_playbook.yml
-2024-11-18 14:56:39,101 p=127621 u=fy n=ansible | {
-    "ansible.builtin.runas": "Run As user",
-    "ansible.builtin.su": "Substitute User",
-    "ansible.builtin.sudo": "Substitute User DO",
-    "ansible.netcommon.enable": "Switch to elevated permissions on a network device",
-    "community.general.doas": "Do As user",
-    "community.general.dzdo": "Centrify's Direct Authorize",
-    "community.general.ksu": "Kerberos substitute user",
-    "community.general.machinectl": "Systemd's machinectl privilege escalation",
-    "community.general.pbrun": "PowerBroker run",
-    "community.general.pfexec": "profile based execution",
-    "community.general.pmrun": "Privilege Manager run",
-    "community.general.run0": "Systemd's run0",
-    "community.general.sesu": "CA Privileged Access Manager",
-    "community.general.sudosu": "Run tasks using sudo su -",
-    "containers.podman.podman_unshare": "Run tasks using podman unshare"
-}
-2024-11-18 14:58:44,774 p=129006 u=fy n=ansible | playbook: script/ansible/deploy_playbook.yml
-2024-11-18 14:58:45,375 p=129013 u=fy n=ansible | {
-    "ansible.builtin.runas": "Run As user",
-    "ansible.builtin.su": "Substitute User",
-    "ansible.builtin.sudo": "Substitute User DO",
-    "ansible.netcommon.enable": "Switch to elevated permissions on a network device",
-    "community.general.doas": "Do As user",
-    "community.general.dzdo": "Centrify's Direct Authorize",
-    "community.general.ksu": "Kerberos substitute user",
-    "community.general.machinectl": "Systemd's machinectl privilege escalation",
-    "community.general.pbrun": "PowerBroker run",
-    "community.general.pfexec": "profile based execution",
-    "community.general.pmrun": "Privilege Manager run",
-    "community.general.run0": "Systemd's run0",
-    "community.general.sesu": "CA Privileged Access Manager",
-    "community.general.sudosu": "Run tasks using sudo su -",
-    "containers.podman.podman_unshare": "Run tasks using podman unshare"
-}
-2024-11-18 14:58:59,293 p=129116 u=fy n=ansible | playbook: script/ansible/deploy_playbook.yml
-2024-11-18 14:58:59,880 p=129122 u=fy n=ansible | {
-    "ansible.builtin.runas": "Run As user",
-    "ansible.builtin.su": "Substitute User",
-    "ansible.builtin.sudo": "Substitute User DO",
-    "ansible.netcommon.enable": "Switch to elevated permissions on a network device",
-    "community.general.doas": "Do As user",
-    "community.general.dzdo": "Centrify's Direct Authorize",
-    "community.general.ksu": "Kerberos substitute user",
-    "community.general.machinectl": "Systemd's machinectl privilege escalation",
-    "community.general.pbrun": "PowerBroker run",
-    "community.general.pfexec": "profile based execution",
-    "community.general.pmrun": "Privilege Manager run",
-    "community.general.run0": "Systemd's run0",
-    "community.general.sesu": "CA Privileged Access Manager",
-    "community.general.sudosu": "Run tasks using sudo su -",
-    "containers.podman.podman_unshare": "Run tasks using podman unshare"
-}

doc/bin/doc

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cd doc/
-
-# 获取本机IP地址
-# 启动live-server，使用更高的端口号9000
-http-server

fix-permissions.sh

@@ -17,10 +17,6 @@ chown -R root:root storage
 chown -R root:root bootstrap/cache
 
 # Set proper permissions
-chmod -R 775 storage
-chmod -R 775 bootstrap/cache
-chmod -R 775 public/docs
-
 chmod -R 777 ./
 
 echo "All commands completed and permissions fixed!"

inventory/hosts

@@ -1,10 +0,0 @@
-[web]
-# 这里添加您的 Web 服务器
-# example.com ansible_host=192.168.1.10
-
-[db]
-# 这里添加您的数据库服务器
-# db.example.com ansible_host=192.168.1.11
-
-[all:vars]
-ansible_python_interpreter=/usr/bin/python3

script/bin/myapidoc

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# 检查是否已安装 inotify-tools
+if ! command -v inotifywait &> /dev/null; then
+    echo "正在安装 inotify-tools..."
+    sudo apt-get update
+    sudo apt-get install -y inotify-tools
+fi
+
+# 监听控制器文件变更并自动重新生成文档
+while true; do
+    # 检测控制器目录变更,仅监听文件修改事件
+    inotifywait -r -e close_write,create,delete ./app/Http/Controllers
+    sleep 5
+
+    # 清除缓存并重新生成文档
+    echo "检测到控制器变更,重新生成文档..."
+    php artisan optimize:clear   # 清除所有缓存
+    php artisan scribe:generate  # 生成文档
+    echo "文档已更新"
+done

script/bin/mydoc

@@ -1,21 +1,12 @@
 #!/bin/bash
 
-# 检查是否已安装 inotify-tools
-if ! command -v inotifywait &> /dev/null; then
-    echo "正在安装 inotify-tools..."
-    sudo apt-get update
-    sudo apt-get install -y inotify-tools
-fi
+cd doc/
 
-# 监听控制器文件变更并自动重新生成文档
-while true; do
-    # 检测控制器目录变更,仅监听文件修改事件
-    inotifywait -r -e close_write,create,delete ./app/Http/Controllers
-    sleep 5
+# 检查 http-server 是否已安装
+if ! command -v http-server &> /dev/null; then
+    echo "正在安装 http-server..."
+    npm install -g http-server
+fi
 
-    # 清除缓存并重新生成文档
-    echo "检测到控制器变更,重新生成文档..."
-    php artisan optimize:clear   # 清除所有缓存
-    php artisan scribe:generate  # 生成文档
-    echo "文档已更新"
-done
+# 启动 http-server
+http-server