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

src/Resource/Measure/ItemCateoty.xml

@@ -291,6 +291,8 @@
     <Item Id="AFI-Q2" BaseType="Distance" />
     <Item Id="AFI-Q3" BaseType="Distance" />
     <Item Id="AFI-Q4" BaseType="Distance" />
+    <Item Id="%LV" Categories="CARD" />
+    <Item Id="PA/Ao" Categories="CARD" />
   </MeasureMode>
   <MeasureMode Id="Flow">
     <Item Id="LV Study" Categories="CARD" />

src/WingServer.cs

@@ -477,10 +477,22 @@ namespace WingCloudServer
             _apiAccessPlugin.Load(_rpcClientPool);
 
             var notValidateLicense = ConfigurationManager.GetParammeter<BoolParameter>("General", "NotValidateLicense").Value;
+            var isResearchEditionService = ConfigurationManager.GetParammeter<BoolParameter>("General", "IsResearchEditionService").Value;
             //InitLicense
             if (!notValidateLicense)
             {
-                ServerLicense.Instance.VerifyLicense(_licensePlugin.DisabledServerRequest);
+                if (isResearchEditionService)
+                {
+                    Task.Run(() =>
+                    {
+                        ServerLicense.Instance.VerifyLicense(_licensePlugin.DisabledServerRequest);
+                    });
+                }
+                else
+                {
+                    ServerLicense.Instance.VerifyLicense(_licensePlugin.DisabledServerRequest);
+                }
+
             }
         }