Эх сурвалжийг харах

Fix iso15118 Authorize 解析處理

Jessica Tseng 1 жил өмнө
parent
commit
dd15382bbe

+ 5 - 5
EVCB_OCPP.WSServer/App.config

@@ -7,15 +7,15 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
    <connectionStrings>
-     <add name="ConnectionLogDBContext" connectionString="data source=172.1.2.187;initial catalog=StandardOCPP_ConnectionLog;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
-     <add name="MainDBContext" connectionString="data source=172.1.2.187;initial catalog=StandardOCPP_Main;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
-     <add name="MeterValueDBContext" connectionString="data source=172.1.2.187;initial catalog=StandardOCPP_MeterValue;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
-     <add name="WebDBContext" connectionString="data source=172.1.2.187;initial catalog=StandardOCPP_Web;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
+     <add name="ConnectionLogDBContext" connectionString="Server=tcp:zerova-evbackend.database.windows.net,1433;initial catalog=StandardOCPP_ConnectionLog;persist security info=True;user id=ev_user;password=Thw2DEa2hZPdg;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
+     <add name="MainDBContext" connectionString="Server=tcp:zerova-evbackend.database.windows.net,1433;initial catalog=StandardOCPP_Main;;persist security info=True;user id=ev_user;password=Thw2DEa2hZPdg;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=1000" providerName="System.Data.SqlClient" />
+     <add name="MeterValueDBContext" connectionString="Server=tcp:zerova-evbackend.database.windows.net,1433;initial catalog=StandardOCPP_MeterValue;;persist security info=True;user id=ev_user;password=Thw2DEa2hZPdg;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
+     <add name="WebDBContext" connectionString="Server=tcp:zerova-evbackend.database.windows.net,1433;initial catalog=StandardOCPP_Web;;persist security info=True;user id=ev_user;password=Thw2DEa2hZPdg;MultipleActiveResultSets=True;App=EntityFramework; Max Pool Size=500" providerName="System.Data.SqlClient" />
    </connectionStrings>
   <appSettings>   
     <add key="LocalAuthAPI" value="" />    
     <!--若不想開放WSPort,請留空-->
-    <add key="WSPort" value="" />
+    <add key="WSPort" value="2012" />
     <add key="WSSPort" value="2013,2014" />
     <add key="OCPP20_WSUrl" value="ws://ocpp.phihong.com.tw:5004" />
     <add key="OCPP20_WSSUrl" value="ws://ocpp.phihong.com.tw:5004" />

+ 1 - 1
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -175,7 +175,7 @@ namespace EVCB_OCPP.WSServer.Message
                                 JObject jo = JObject.Parse(_request.data);
                                 if (jo.ContainsKey("idToken"))
                                 {
-                                    iso15118_token = jo["idToken"].Value<string>();
+                                    iso15118_token = jo["idToken"]["idToken"].Value<string>();
 
                                 }
 

+ 1 - 1
EVCB_OCPP.WSServer/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("1.2.1.0")]
 [assembly: AssemblyFileVersion("1.2.1.0")]
 
-[assembly: AssemblyInformationalVersion("2418318")]
+[assembly: AssemblyInformationalVersion("36903b0")]

BIN
SuperWebSocket/bin/Debug/SuperWebSocket.dll


BIN
SuperWebSocket/bin/Debug/SuperWebSocket.pdb