Browse Source

remove log and cofig reference

arthur.wu 3 years ago
parent
commit
4afea9b857
3 changed files with 81 additions and 10 deletions
  1. 80 0
      clone&pull tool.bat
  2. 0 9
      src/Publish.ps1
  3. 1 1
      src/WingCloudServer.csproj

+ 80 - 0
clone&pull tool.bat

@@ -0,0 +1,80 @@
+@echo off & color 0A
+@title git tool
+
+rem 当前文件夹名称
+pushd %1 & for %%i in (.) do set curr=%%~ni
+if "%curr%"=="WingCloudServer" (
+	cd ..
+	goto Main
+) else (
+	echo the current folder is %curr%, operation was cancelled!
+	pause>nul
+	exit
+)
+
+:Main
+set /a pullnum=0
+for /d %%i in (*) do (
+	cd %%i			
+	if exist *.git (
+		set /a pullnum+=1
+	)
+	cd ..
+)
+
+if %pullnum% equ 0 (
+	echo [正在下载项目文件,请勿关闭当前操作页]
+	goto Clone
+) else (
+	echo [正在检查获取远程代码,请勿关闭当前操作页]	
+	for /d %%i in (*) do (
+		cd %%i			
+		if exist *.git (
+			echo ---------------------- %%i ----------------------
+			chdir && git pull
+		)
+		cd ..
+	)
+	if %pullnum% lss 14 (
+		goto MsgClone
+	)
+) 
+
+echo;
+echo Finished!
+pause>nul
+exit
+
+:MsgClone
+echo;
+echo 远程代码已成功合并到本地,是否检查下载其它模块?(y/n)
+set /p dl=
+if "%dl%"=="y" (
+	goto Clone
+) else (
+	echo;
+	echo Finished!
+)
+
+pause>nul
+exit
+
+:Clone
+if not exist WingServerCommon (git clone http://git.ius.plus:88/Project-Wing/WingServerCommon.git && echo;)
+if not exist WingMongoDBModule (git clone http://git.ius.plus:88/Project-Wing/WingMongoDBModule.git && echo;)
+if not exist WingStorageModule (git clone http://git.ius.plus:88/Project-Wing/WingStorageModule.git && echo;)
+if not exist WingSMSModule (git clone http://git.ius.plus:88/Project-Wing/WingSMSModule.git && echo;)
+if not exist WingUserModule (git clone http://git.ius.plus:88/Project-Wing/WingUserModule.git && echo;)
+if not exist WingSessionModule (git clone http://git.ius.plus:88/Project-Wing/WingSessionModule.git && echo;)
+if not exist WingRemedicalModule (git clone http://git.ius.plus:88/Project-Wing/WingRemedicalModule.git && echo;)
+if not exist WingManagementModule (git clone http://git.ius.plus:88/Project-Wing/WingManagementModule.git && echo;)
+if not exist WingEmailModule (git clone http://git.ius.plus:88/Project-Wing/WingEmailModule.git && echo;)
+if not exist WingServerTools (git clone http://git.ius.plus:88/Project-Wing/WingServerTools.git && echo;)
+if not exist WingInternalInterface (git clone http://git.ius.plus:88/Project-Wing/WingInternalInterface.git && echo;)
+if not exist WingRpcSDK (git clone http://git.ius.plus:88/Project-Wing/WingRpcSDK.git && echo;)
+if not exist WingInterfaceLibrary (git clone http://git.ius.plus:88/Project-Wing/WingInterfaceLibrary.git && echo;)
+if not exist WingCloudServer (git clone http://git.ius.plus:88/Project-Wing/WingCloudServer.git && echo;)
+
+echo Finished!
+pause>nul
+exit

+ 0 - 9
src/Publish.ps1

@@ -8,15 +8,6 @@ IF (-not(Test-Path ../../Wing/server/NetService/)) { New-Item -Path ../../Wing/s
 IF (-not(Test-Path ../../Wing/server/InternalService/)) { New-Item -Path ../../Wing/server/ -Name InternalService -Type Directory -force }
 
 ### inprocess modules
-nuget restore "../../WingLogModule/src/WingLogModule.csproj" -source "http://nuget.ius.plus:88/v3/index.json;https://nuget.cdn.azure.cn/v3/index.json"
-dotnet publish "../../WingLogModule/src/WingLogModule.csproj" -c Release
-Copy-Item -recurse -Force ../../WingLogModule/src/bin/Release/net6.0/publish/WingLogModule.dll -Destination ../../Wing/server/InternalService/WingLogModule.dll
-Copy-Item -recurse -Force ../../WingLogModule/src/bin/Release/net6.0/publish/*.dll -Destination ../../Wing/server/Dependencies/ -Exclude WingLogModule.dll
-
-nuget restore "../../WingConfigModule/src/WingConfigModule.csproj" -source "http://nuget.ius.plus:88/v3/index.json;https://nuget.cdn.azure.cn/v3/index.json"
-dotnet publish "../../WingConfigModule/src/WingConfigModule.csproj" -c Release
-Copy-Item -recurse -Force ../../WingConfigModule/src/bin/Release/net6.0/publish/WingConfigModule.dll -Destination ../../Wing/server/InternalService/WingConfigModule.dll
-Copy-Item -recurse -Force ../../WingConfigModule/src/bin/Release/net6.0/publish/*.dll -Destination ../../Wing/server/Dependencies/ -Exclude WingConfigModule.dll
 
 nuget restore "../../WingMongoDBModule/src/WingMongoDBModule.csproj" -source "http://nuget.ius.plus:88/v3/index.json;https://nuget.cdn.azure.cn/v3/index.json"
 dotnet publish "../../WingMongoDBModule/src/WingMongoDBModule.csproj" -c Release

+ 1 - 1
src/WingCloudServer.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0" />
     <PackageReference Include="WingRpcSDK" Version="1.0.0.11" />
-    <PackageReference Include="WingServerCommon" Version="1.0.0.2" />
+    <PackageReference Include="WingServerCommon" Version="1.0.0.3" />
   </ItemGroup>
   
   <ItemGroup>