diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 274156c4..8c14ec40 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,6 +22,8 @@ jobs: uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 + - name: install dotnet maui + run: dotnet workload install maui - name: get current date id: date run: echo "::set-output name=today::$(date +'%Y-%m-%d')" @@ -35,9 +37,9 @@ jobs: release_name: v1.7.2.${{ steps.date.outputs.today }} draft: false prerelease: false - body: "1. 内网穿透的计划任务\r\n2. 一些修复和优化" + body: "1. 内网穿透的计划任务\r\n2. 一些修复和优化\r\n3. 优化自动分配IP\r\n4. 优化网卡,排除不明数据包\r\n5. 优化管理UI,适配移动端" - name: publish projects - run: ./publish.bat + run: ./publish.bat "C:\\Android\\android-sdk" - name: upload-win-x86-oss id: upload-win-x86-oss uses: tvrcgo/oss-action@v0.1.1 diff --git a/gen/index.js b/gen/index.js index 5125cfb1..b50b124e 100644 --- a/gen/index.js +++ b/gen/index.js @@ -128,6 +128,35 @@ function writeUpload(data, tagName) { } }); + /* + data.jobs.build.steps.push({ + name: `upload-apk-oss`, + id: `upload-apk-oss`, + uses: 'tvrcgo/oss-action@v0.1.1', + with: { + 'region': 'oss-cn-shenzhen', + 'key-id': '${{ secrets.ALIYUN_OSS_ID }}', + 'key-secret': '${{ secrets.ALIYUN_OSS_SECRET }}', + 'bucket': 'ide-qbcode', + 'asset-path': `./public/publish-zip/linker.apk`, + 'target-path': `/downloads/linker/${tagName}/linker.apk` + } + }); + data.jobs.build.steps.push({ + name: `upload-apk`, + id: `upload-apk`, + uses: 'actions/upload-release-asset@master', + env: { + 'GITHUB_TOKEN': '${{ secrets.ACTIONS_TOKEN }}' + }, + with: { + 'upload_url': '${{ steps.create_release.outputs.upload_url }}', + 'asset_path': `./public/publish-zip/linker.apk`, + 'asset_name': `linker.apk`, + 'asset_content_type': 'application/apk' + } + }); + */ } function writeUploadIpk(data, tagName) { const platforms = ['x64', 'arm', 'arm64']; diff --git a/publish.bat b/publish.bat index 1408bca4..cc8a4ab2 100644 --- a/publish.bat +++ b/publish.bat @@ -1,5 +1,8 @@ @echo off +SET sdkpath=%1 +if "%sdkpath%"=="" (SET sdkpath="D:\\Android\\android-sdk") + rd /s /q public\\extends rd /s /q public\\publish rd /s /q public\\publish-zip @@ -14,6 +17,10 @@ cd ../../ echo F|xcopy "version.txt" "public\\version.txt" /f /h /y +echo F|xcopy "public\\extends\\any\\web\\*" "src\\linker.app\\public\\web\\*" /s /f /h /y +dotnet publish ./src/linker.app -c:Release -f:net8.0-android /p:AndroidSigningKeyPass=123321 /p:AndroidSdkDirectory=%sdkpath% +echo F|xcopy "src\\linker.app\\bin\\Release\\net8.0-android\\publish\\com.snltty.linker.app-Signed.apk" "public\\publish-zip\\linker.apk" /s /f /h /y + for %%r in (win-x86,win-x64,win-arm64) do ( echo F|xcopy "src\\linker.tray.win\\dist\\*" "public\\extends\\%%r\\linker-%%r\\*" /s /f /h /y echo F|xcopy "src\\linker.route.win\\dist\\*" "public\\extends\\%%r\\linker-%%r\\*" /s /f /h /y diff --git a/src/linker.app/public/web/css/445.b42d2ee8.css b/src/linker.app/public/web/css/89.7620f7e2.css similarity index 88% rename from src/linker.app/public/web/css/445.b42d2ee8.css rename to src/linker.app/public/web/css/89.7620f7e2.css index c61822ff..79bbd277 100644 --- a/src/linker.app/public/web/css/445.b42d2ee8.css +++ b/src/linker.app/public/web/css/89.7620f7e2.css @@ -1 +1 @@ -.el-radio-group[data-v-7061404c]{margin-right:.6rem}.wrap[data-v-7061404c]{padding-bottom:1rem}.el-form-item[data-v-2bef0d8e]{margin-bottom:1rem}.el-input-number--small[data-v-2bef0d8e]{width:10rem!important}.el-form-item[data-v-3d96703d]{margin-bottom:1rem}.el-input-number--small[data-v-3d96703d]{width:10rem!important}.head .search>div[data-v-5d11d068]{margin-right:1rem}.page[data-v-5d11d068]{padding:2rem 0;display:inline-block}.el-form-item[data-v-5d11d068]{margin-bottom:1rem}.el-input-number--small[data-v-5d11d068]{width:10rem!important}.head .search>div[data-v-22d5523e]{margin-right:1rem}.page[data-v-22d5523e]{padding:2rem 0;display:inline-block}.el-form-item[data-v-22d5523e]{margin-bottom:1rem}.el-input-number--small[data-v-22d5523e]{width:10rem!important}.el-form-item[data-v-c2557c92]{margin-bottom:1rem}.el-input-number--small[data-v-c2557c92]{width:10rem!important}.blue[data-v-5b81e49d]{color:#409eff}a.a-edit[data-v-5b81e49d]{margin-left:1rem}a.a-edit .el-icon[data-v-5b81e49d]{vertical-align:middle}.servers-wrap[data-v-597f32d0]{padding:1rem;font-size:1.3rem;color:#555}.servers-wrap a[data-v-597f32d0]{color:#333} \ No newline at end of file +.el-radio-group[data-v-7061404c]{margin-right:.6rem}.wrap[data-v-7061404c]{padding-bottom:1rem}.el-form-item[data-v-2bef0d8e]{margin-bottom:1rem}.el-input-number--small[data-v-2bef0d8e]{width:10rem!important}.el-form-item[data-v-3d96703d]{margin-bottom:1rem}.el-input-number--small[data-v-3d96703d]{width:10rem!important}.head .search>div[data-v-5d11d068]{margin-right:1rem}.page[data-v-5d11d068]{padding:2rem 0;display:inline-block}.el-form-item[data-v-5d11d068]{margin-bottom:1rem}.el-input-number--small[data-v-5d11d068]{width:10rem!important}.head .search>div[data-v-22d5523e]{margin-right:1rem}.page[data-v-22d5523e]{padding:2rem 0;display:inline-block}.el-form-item[data-v-22d5523e]{margin-bottom:1rem}.el-input-number--small[data-v-22d5523e]{width:10rem!important}.el-form-item[data-v-c2557c92]{margin-bottom:1rem}.el-input-number--small[data-v-c2557c92]{width:10rem!important}.blue[data-v-21fcf68e]{color:#409eff}a.a-edit[data-v-21fcf68e]{margin-left:1rem}a.a-edit .el-icon[data-v-21fcf68e]{vertical-align:middle}.servers-wrap[data-v-597f32d0]{padding:1rem;font-size:1.3rem;color:#555}.servers-wrap a[data-v-597f32d0]{color:#333} \ No newline at end of file diff --git a/src/linker.app/public/web/index.html b/src/linker.app/public/web/index.html index e7e3f69d..f6a24f31 100644 --- a/src/linker.app/public/web/index.html +++ b/src/linker.app/public/web/index.html @@ -1 +1 @@ -