发布

.github/workflows/dotnet.yml

@@ -12,9 +12,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: setup MSBuild
-      uses: microsoft/setup-msbuild@v1
-
     - name: setup node.js
       uses: actions/setup-node@v2
       with:

README.md

@@ -163,11 +163,12 @@ start=AUTO
 
 ## 发布项目
 1. nodejs 16.17.0
-2. netframework 4.5 加入环境变量，以能够使用msbuild，应该是 **C:\Windows\Microsoft.NET\Framework\v4.0.30319** 目录
+2. netframework 4.5 加入环境变量，以使用msbuild，应该是 **C:\Windows\Microsoft.NET\Framework\v4.0.30319** 目录
 3. NET7.0 SDK
 4. 进入根目执行
 ```
-./publish
+./publish-extends  rem 生成web和netframework
+./publish rem 发布主程序
 ```
 5. 在 /public/publish 目录下查看已发布程序
 

cmonitor.web/vue.config.js

@@ -1,6 +1,6 @@
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
     productionSourceMap: process.env.NODE_ENV === 'production' ? false : true,
-    outputDir: '../public/extends/web',
+    outputDir: '../cmonitor/publish/web',
     transpileDependencies: true
 })

cmonitor/cmonitor.csproj

@@ -55,7 +55,7 @@
 	  <None Remove="Properties\**" />
 	</ItemGroup>
 
-
+	
 	<ItemGroup>
 		<PackageReference Include="MemoryPack" Version="1.10.0" />
 		<PackageReference Include="NAudio" Version="2.2.1" />
@@ -67,4 +67,9 @@
 		
 	</ItemGroup>
 
+	
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+	  <Exec Command="call copy.bat &quot;$(OutDir)&quot;" />
+	</Target>
+
 </Project>

cmonitor/cmonitor.csproj.user

@@ -7,4 +7,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
+  <ItemGroup />
 </Project>

cmonitor/copy.bat

@@ -0,0 +1 @@
+echo F|xcopy "publish\\*" "%1"  /s /f /h /y

cmonitor/publish/web/css/app.9c6b579f.css

@@ -0,0 +1 @@
+*{margin:0;padding:0;list-style:none}a{text-decoration:none;color:#6f9ccd}.flex{display:flex;display:-ms-flex;display:-o-flex;flex-wrap:wrap}.flex-nowrap{flex-wrap:nowrap}.flex-wrap{flex-wrap:wrap}.flex-column{flex-direction:column}.flex-row{flex-direction:row}.flex-1{flex:1 1 0%}.absolute{position:absolute;left:0;top:0;right:0;bottom:0}.relative{position:relative}.h-100{height:100%}.w-100{width:100%}.t-c{text-align:center}.t-r{text-align:right}.t-l{text-align:left!important}.m-r-1{margin-right:1rem}table{border-spacing:0;border-collapse:collapse}html{font-size:10px;background-color:#f4f4f4}body{overflow:hidden}span.split{width:.6rem}span.split-pad{padding:0 .3rem}span.split-pad10{padding:0 1rem}.middle{vertical-align:middle}.red{color:red}.scrollbar,.scrollbar-1,.scrollbar-10,.scrollbar-4{overflow:auto}.scrollbar-1::-webkit-scrollbar{width:0;height:1px}.scrollbar-1::-webkit-scrollbar-thumb{background:rgba(0,0,0,.1);border-radius:10px}.scrollbar::-webkit-scrollbar{width:1px;height:1px}.scrollbar::-webkit-scrollbar-thumb{background:rgba(0,0,0,.1);border-radius:10px}.scrollbar-4::-webkit-scrollbar{width:4px;height:4px}.scrollbar-4::-webkit-scrollbar-thumb{background:rgba(0,0,0,.1);border-radius:10px}.scrollbar-10::-webkit-scrollbar{width:10px;height:1px}.scrollbar-10::-webkit-scrollbar-thumb{background:rgba(0,0,0,.1);border-radius:10px}:root{--el-color-primary:var(--el-color-success)!important;--el-color-primary-light-3:var(--el-color-success-light-3)!important;--el-color-primary-light-5:var(--el-color-success-light-5)!important;--el-color-primary-light-7:var(--el-color-success-light-7)!important;--el-color-primary-light-8:var(--el-color-success-light-8)!important;--el-color-primary-light-9:var(--el-color-success-light-9)!important;--el-color-primary-dark-2:var(--el-color-success-dark-2)!important}.el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar{background:#f5f5f5}.el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-thumb{background:#ddd}.el-collapse-item__header{background-color:#fafafa!important;border-left:1px solid #ebeef5;border-right:1px solid #ebeef5;padding:0 2rem}.el-collapse-item__content{padding:1rem;border:1px solid #ebeef5;border-bottom:0}.el-input.w-search,.el-input.w-search .el-input__inner,.el-select.w-search{width:10rem}.el-form-item.w-search .el-form-item__label{font-size:1.2rem}.table-search .el-form--inline .el-form-item{margin-bottom:0}.el-dropdown,.el-dropdown-menu__item{font-size:1.3rem}.el-dropdown-menu__item a{color:#333}.el-input__inner:focus{border-color:var(--main-color)}.el-date-editor.el-input.w-auto,.el-date-editor.el-input__inner.w-auto{width:auto}.el-table .active-row{background:rgba(0,0,0,.15)}.el-table .table-green-row{background:rgba(0,255,0,.15)}.el-table .table-red-row{background:rgba(255,0,0,.15)}.el-table .table-green-row td,.el-table .table-red-row td{background:transparent!important}.el-date-editor.el-input,.el-date-editor.el-input__inner{width:auto}.el-table .active-row td{background:transparent!important}.el-table--border th{background-color:#fafafa}.el-table td,.el-table th.is-leaf,.el-table--border,.el-table--group,.el-table-filter{border-color:var(--main-border-color)}.el-pagination.is-background .el-pager li:not(.disabled).active{background-color:var(--main-color)}.el-pagination.is-background .el-pager li:not(.disabled):hover{color:var(--main-color)}.el-pagination .btn-next .el-icon,.el-pagination .btn-prev .el-icon{width:inherit}.el-dialog{max-width:96%}.el-dialog__body .el-form-item:last-child{margin-bottom:0}.el-input-group__append,.el-input-group__prepend{padding:0 4px!important;background-color:transparent!important}.el-checkbox__label .el-icon{vertical-align:middle;margin-top:-2px}.el-color-picker{vertical-align:middle}.el-color-picker__trigger{border:0!important}.el-color-picker__color{border:0!important;border-radius:2px}.el-color-picker__color-inner{border-radius:2px}.el-message{min-width:10rem!important}.card-header{font-size:1.4rem}.forward-wrap .el-table--small.el-table .el-table__expanded-cell[class*=cell]{padding:20px 50px 20px 50px}h3.title{font-size:1.6rem;padding-bottom:.6rem;color:#555}.el-message-box{max-width:90%}.el-select-dropdown__item{padding-right:2rem!important}.el-form-item--default{--font-size:13px!important}.el-input__inner{font-size:13px}.el-dialog--center .el-dialog__body{padding-top:1rem!important;padding-bottom:1rem!important}

cmonitor/publish/web/img/keyboard.0621787b.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1695713240314" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14947" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400"><path d="M937.51 195.12h-852a80.09 80.09 0 0 0-80 80v473a80.09 80.09 0 0 0 80 80h852a80.09 80.09 0 0 0 80-80v-473a80.09 80.09 0 0 0-80-80z m20 553a20 20 0 0 1-20 20h-852a20 20 0 0 1-20-20v-473a20 20 0 0 1 20-20h852a20 20 0 0 1 20 20z" fill="#3e5a6e" p-id="14948"></path><path d="M197.51 374.12l100 0 0 80-100 0 0-80Z" fill="#3e5a6e" p-id="14949"></path><path d="M197.51 570.12l100 0 0 80-100 0 0-80Z" fill="#3e5a6e" p-id="14950"></path><path d="M373.51 374.12l100 0 0 80-100 0 0-80Z" fill="#3e5a6e" p-id="14951"></path><path d="M373.51 570.12l276 0 0 80-276 0 0-80Z" fill="#3e5a6e" p-id="14952"></path><path d="M550.51 374.12l100 0 0 80-100 0 0-80Z" fill="#3e5a6e" p-id="14953"></path><path d="M726.51 374.12l100 0 0 80-100 0 0-80Z" fill="#3e5a6e" p-id="14954"></path><path d="M726.51 570.12l100 0 0 80-100 0 0-80Z" fill="#3e5a6e" p-id="14955"></path></svg>

cmonitor/publish/web/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=0"><link rel="icon" href="/favicon.ico"><title>cmonitor.web</title><script defer="defer" src="/js/chunk-vendors.93db0d1d.js"></script><script defer="defer" src="/js/app.3d096398.js"></script><link href="/css/chunk-vendors.faad7142.css" rel="stylesheet"><link href="/css/app.9c6b579f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but cmonitor.web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

publish-docker.sh

@@ -6,10 +6,6 @@ fs=('cmonitor')
 ps=('alpine')
 rs=('x64' 'arm64')
 
-cd cmonitor.web
-npm install;
-npm run build;
-cd ../ 
 
 for f in ${fs[@]} 
 do
@@ -21,7 +17,7 @@ do
 			cp -rf public/publish/docker/linux-${p}-${r}/${f}/${f} public/publish/docker/linux-${p}-${r}/${f}/${f}.run
 			rm -rf public/publish/docker/linux-${p}-${r}/${f}/${f}
 			cp -rf cmonitor/Dockerfile-${p} public/publish/docker/linux-${p}-${r}/${f}/Dockerfile-${p}
-			cp -r public/extends/web  public/publish/docker/linux-${p}-${r}/${f}/web
+			cp -rf cmonitor/publish/web public/publish/docker/linux-${p}-${r}/${f}
 		done
 
 		cd public/publish/docker/linux-${p}-x64/${f}

publish-extends.bat

@@ -0,0 +1,14 @@
+@echo off
+
+cd cmonitor.web
+call npm install
+call npm run build 
+cd ../ 
+		
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./cmonitor.install.win/cmonitor.install.win.csproj
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./cmonitor.sas.service/cmonitor.sas.service.csproj
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./cmonitor.win/cmonitor.win.csproj
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./llock.win/llock.win.csproj
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./message.win/message.win.csproj
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./notify.win/notify.win.csproj
+msbuild  /t:build /p:Configuration=Release /p:OutDir="../cmonitor/publish/" ./wallpaper.win/wallpaper.win.csproj

publish.bat

@@ -3,12 +3,7 @@
 rd /s /q public\\publish
 rd /s /q public\\publish-zip
 mkdir public\\publish-zip
-
-cd cmonitor.web
-call npm install
-call npm run build 
-cd ../ 
-		
+	
 
 dotnet publish ./cmonitor -c release -f net7.0 -o ./public/publish/win-x64  -r win-x64 -p:PublishTrimmed=true  -p:TrimMode=partial  --self-contained true -p:TieredPGO=true  -p:DebugType=none -p:DebugSymbols=false -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true
 
@@ -18,21 +13,12 @@ dotnet publish ./cmonitor -c release -f net7.0 -r win-x64 -o ./public/publish/wi
 dotnet publish ./cmonitor -c releaselinux -f net7.0 -r linux-x64 -o ./public/publish/linux-x64-any/  -p:PublishSingleFile=true --self-contained false
 
 
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./cmonitor.install.win/cmonitor.install.win.csproj
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./cmonitor.sas.service/cmonitor.sas.service.csproj
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./cmonitor.win/cmonitor.win.csproj
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./llock.win/llock.win.csproj
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./message.win/message.win.csproj
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./notify.win/notify.win.csproj
-msbuild  /t:build /p:Configuration=Release /p:OutDir="../public/extends/" ./wallpaper.win/wallpaper.win.csproj
-
-
 for %%r in (win-x64,win-x64-any) do (
-	echo F|xcopy "public\\extends\\*" "public\\publish\\%%r\\*"  /s /f /h /y
+	echo F|xcopy "cmonitor\\publish\\*" "public\\publish\\%%r\\*"  /s /f /h /y
 )
 
 for %%r in (linux-x64,linux-x64-any) do (
-	echo F|xcopy "public\\extends\\web\\*" "public\\publish\\%%r\\web\\"  /s /f /h /y
+	echo F|xcopy "cmonitor\\publish\\web" "public\\publish\\%%r\\web"  /s /f /h /y
 	for %%f in (nfapi.dll,nfdriver.sys,ntrights.exe) do (
 		del  "public\\publish\\%%r\\%%f"
 	)