Merge branch 'release/0.0.7'

.github/workflows/publish-image.yml

@@ -75,7 +75,7 @@ jobs:
         name: GetDockerTagNames
         id: getDockerTags
         run: |
-          DOCKER_IMAGE_TAG="zai7lou/bilibili_tool_pro:${{ steps.getRepoTag.outputs.repoTag }},zai7lou/bilibili_tool_pro:latest"
+          DOCKER_IMAGE_TAG="zai7lou/bilibili_tool_pro:${{ steps.getRepoTag.outputs.repoTag }}"
           DOCKER_IMAGE_LATEST_TAG=",zai7lou/bilibili_tool_pro:latest"
           if [ "${{ github.event.inputs.manualTag }}" ] ; then
             DOCKER_IMAGE_LATEST_TAG=""

CHANGELOG.md

@@ -21,3 +21,6 @@
 - 更新docker镜像的构建
 - 【#12】新增配置`Notification:IsSingleAccountSingleNotify`，支持开启每个账号单独推送消息
 - publish-release.yml新增手动输入tag功能
+## 0.0.7
+- 【#44】兼容青龙最新版本（v2.12.0），修复因青龙调整目录结构导致的bug
+- 更新`publish-image.yml`，只有`release`时才打`latest tag`，手动运行时不打`latest tag`

Ray.BiliBiliTool.sln

@@ -58,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\auto-close-pr.yml = .github\workflows\auto-close-pr.yml
 		.github\workflows\auto-deploy-tencent-scf.yml = .github\workflows\auto-deploy-tencent-scf.yml
 		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		.github\workflows\publish-image.yml = .github\workflows\publish-image.yml
 		.github\workflows\publish-release.yml = .github\workflows\publish-release.yml
 		.github\workflows\repo-sync.yml = .github\workflows\repo-sync.yml
 	EndProjectSection

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>0.0.6</Version>
+    <Version>0.0.7</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>

qinglong/DefaultTasks/bili_dev_task_daily.sh

@@ -2,4 +2,7 @@
 # new Env("bili每日任务[dev先行版]")
 # cron 0 9 * * * bili_dev_task_daily.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro_develop/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Daily
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro_develop" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Daily

qinglong/DefaultTasks/bili_dev_task_liveLottery.sh

@@ -2,4 +2,7 @@
 # new Env("bili天选时刻[dev先行版]")
 # cron 0 13 * * * bili_dev_task_liveLottery.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro_develop/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=LiveLottery
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro_develop" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=LiveLottery

qinglong/DefaultTasks/bili_dev_task_test.sh

@@ -2,4 +2,7 @@
 # new Env("bili测试ck[dev先行版]")
 # cron 0 8 * * * bili_dev_task_test.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro_develop/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Test
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro_develop" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Test

qinglong/DefaultTasks/bili_dev_task_unfollowBatched.sh

@@ -2,4 +2,7 @@
 # new Env("bili批量取关主播[dev先行版]")
 # cron 0 12 1 * * bili_dev_task_unfollowBatched.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro_develop/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=UnfollowBatched
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro_develop" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=UnfollowBatched

qinglong/DefaultTasks/bili_task_daily.sh

@@ -2,4 +2,7 @@
 # new Env("bili每日任务")
 # cron 0 9 * * * bili_task_daily.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Daily
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Daily

qinglong/DefaultTasks/bili_task_liveLottery.sh

@@ -2,4 +2,7 @@
 # new Env("bili天选时刻")
 # cron 0 13 * * * bili_task_liveLottery.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=LiveLottery
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=LiveLottery

qinglong/DefaultTasks/bili_task_test.sh

@@ -2,4 +2,7 @@
 # new Env("bili测试ck")
 # cron 0 8 * * * bili_task_test.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Test
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=Test

qinglong/DefaultTasks/bili_task_unfollowBatched.sh

@@ -2,4 +2,7 @@
 # new Env("bili批量取关主播")
 # cron 0 12 1 * * bili_task_unfollowBatched.sh
 
-dotnet run --project /ql/repo/raywangqvq_bilibilitoolpro/src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=UnfollowBatched
+cd "$(find /ql -type d -name "repo" -print)"
+cd "$(find . -type d -name "raywangqvq_bilibilitoolpro" -print)"
+
+dotnet run --project ./src/Ray.BiliBiliTool.Console --ENVIRONMENT=Production --runTasks=UnfollowBatched

qinglong/README.md

@@ -37,7 +37,7 @@ echo -e "\n-------set up dot net env finish-------"
 ```
 
 ### 1.2.重启青龙容器
-重启青龙容器，或在宿主机中执行 `docker exec -it qinglong bash /ql/config/extra.sh`，其中 `qinglong` 是你的容器名。
+重启青龙容器，或在宿主机中执行 `docker exec -it qinglong bash /ql/data/config/extra.sh`，其中 `qinglong` 是你的容器名。
 
 ### 1.3.登录青龙面板并添加相应配置
 访问青龙面板并登录（通常面板地址为 `ip:5700` ），然后进入`配置文件`页面。