Merge branch 'master' of http://git.ius.plus:88/Project-Wing/WingCloudServer

# Conflicts:
#	src/appsettings.json

clone&pull tool.bat

@@ -71,7 +71,7 @@ if not exist WingManagementModule (git clone http://git.ius.plus:88/Project-Wing
 if not exist WingEmailModule (git clone http://git.ius.plus:88/Project-Wing/WingEmailModule.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;)
-if not exist DeviceService (git clone http://git.ius.plus:88/Project-Wing/DeviceService.git && echo;)
+if not exist WingDeviceService (git clone http://git.ius.plus:88/Project-Wing/WingDeviceService.git && echo;)
 
 echo Finished!
 pause>nul

src/Publish.ps1

@@ -1,6 +1,6 @@
 dotnet nuget locals all --clear
 
-Function BuildService($serviceName, $copyDll, $servicePath='', $copyDest='')
+Function BuildService($serviceName, $copyDll, $copyXml=0, $servicePath='', $copyDest='')
 {
     if($servicePath -eq '')
     {
@@ -17,6 +17,11 @@ Function BuildService($serviceName, $copyDll, $servicePath='', $copyDest='')
         Copy-Item -recurse -Force $servicePath/bin/Debug/net6.0/publish/$serviceName.dll -Destination $copyDest/Services/$serviceName.dll
         Copy-Item -recurse -Force $servicePath/bin/Debug/net6.0/publish/*.dll -Destination $copyDest/Dependencies/ -Exclude $serviceName.dll         
     }
+    if($copyXml -eq 1)
+    {
+        Copy-Item -recurse -Force $servicePath/bin/Debug/net6.0/publish/$serviceName.xml -Destination $copyDest/Services/$serviceName.xml
+        Copy-Item -recurse -Force $servicePath/bin/Debug/net6.0/publish/*.xml -Destination $copyDest/Dependencies/ -Exclude $serviceName.xml         
+    }
 }
 
 ### server
@@ -25,6 +30,8 @@ IF (-not(Test-Path ../../WingCloudServer/src/bin/Debug/net6.0/Services/)) { New-
 
 BuildService "WingCloudServer" 0
 
+BuildService "WingInterfaceLibrary" 0 1
+
 BuildService "WingMongoDBModule" 1
 
 BuildService "WingSMSModule" 1
@@ -45,11 +52,13 @@ BuildService "WingManagementModule" 1
 
 BuildService "WingStorageModule" 1
 
-BuildService "DeviceService" 1 "../../DeviceService"
+BuildService "DeviceService" 1 0 "../../DeviceService"
 
 BuildService "WingRemedicalModule" 1
 
-BuildService "WingServerCommon" 0 "../../WingServerCommon"
+BuildService "WingNotificationModule" 1
+
+BuildService "WingServerCommon" 0 0 "../../WingServerCommon"
 Copy-Item -recurse -Force ../../WingServerCommon/bin/Debug/net6.0/publish/WingServerCommon.dll -Destination ../../WingCloudServer/src/bin/Debug/net6.0/WingServerCommon.dll
 Copy-Item -recurse -Force ../../WingServerCommon/bin/Debug/net6.0/publish/WingServerCommon.dll -Destination ../../WingCloudServer/src/bin/Debug/net6.0/Dependencies/WingServerCommon.dll
 

src/appsettings.json

@@ -11,14 +11,18 @@
   },
   "Services":{
     "InProcess":"WingEmailModule,WingMongoDBModule,WingSessionModule,WingSMSModule,WingNotificationModule",
-    "JsonRpcHttp":"WingManagementModule,WingStorageModule,WingUserModule,DeviceService,WingRemedicalModule",    
-    "Remote": "WingUserModule|http://192.168.6.91,DeviceService|http://192.168.6.91"
+    "JsonRpcHttp":"WingManagementModule,WingStorageModule,WingUserModule,WingDeviceService,WingRemedicalModule,WingNotificationModule",
+    "Remote": "WingUserModule|http://192.168.6.91,WingDeviceService|http://192.168.6.91"
   },
   "ServerHosts":{
     "SMSCheckUrl":"http://127.0.0.1:9998/SmsTool/SendSms/CheckVerifyCode",
     "SMSSendUrl":"http://127.0.0.1:9998/SmsTool/SendSms/SendVerifyCode"
   },
-  "Storage":{      
+  "Remedical":
+  {
+    "IsUploadThumbnail":true
+  },
+  "Storage":{
       "RpcServerPort":80,
       "WebServerPort":9002,
       "StorageServer":"Vinno",
@@ -27,8 +31,8 @@
       "SliceSizeForUpload": 2097152,
       "AppId":"AKIDMSIsADUUpvJGwJOKvsb5IDrGtGNBRzzi",
       "Sercret":"4sQhdJBl5HI7f3oLbZIlwqXOyILyLWP0",
-      "Bucket":"Storage",
-      "CFSServerUrl":"http://192.168.6.91:9001",    
-      "CDNServerUrl":"http://192.168.6.91:9001"
-  }  
+      "Bucket":"BJ_VinnoBucket",
+      "CFSServerUrl":"http://192.168.6.92:9001",
+      "CDNServerUrl":"http://192.168.6.92:9001"
+  }
 }