Ver Fonte

1. 下發測試工具修改設定檔連到Azure & 版本號V1.2.0
2. Fix Release Build Failure Issue

Jessica Tseng há 1 ano atrás
pai
commit
0836212273

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

@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
 //
 //
 // 您可以指定所有的值,或將組建編號或修訂編號設為預設值
 // 您可以指定所有的值,或將組建編號或修訂編號設為預設值
 // 指定為預設值: 
 // 指定為預設值: 
-// [assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+// [assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
 
 
-[assembly: AssemblyInformationalVersion("36903b0")]
+[assembly: AssemblyInformationalVersion("dd15382")]

+ 6 - 0
SuperWebSocket/SuperWebSocket.NET45.csproj

@@ -140,6 +140,12 @@
   <ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="packages.config" />
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SocketBase\SuperSocket.SocketBase.Net40.csproj">
+      <Project>{40B77789-EA11-4C05-8F52-86711D7BCAAF}</Project>
+      <Name>SuperSocket.SocketBase.Net40</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
        Other similar extension points exist, see Microsoft.Common.targets.

BIN
SuperWebSocket/bin/Debug/SuperWebSocket.dll


BIN
SuperWebSocket/bin/Debug/SuperWebSocket.pdb


+ 6 - 11
TestTool.RemoteTriggerAPP/App.config

@@ -10,15 +10,10 @@
       <section name="TestTool.RemoteTriggerAPP.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
       <section name="TestTool.RemoteTriggerAPP.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
     </sectionGroup>
   </configSections>
   </configSections>
-   <connectionStrings>
-     <!--<add name="ConnectionLogDBContext" connectionString="data source=172.1.0.142\SQLEXPRESS;initial catalog=OCPP_ConnectionLogDBContext;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-     <add name="MainDBContext" connectionString="data source=172.1.0.142\SQLEXPRESS;initial catalog=OCPP_MainDBContext;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-     <add name="MeterValueDBContext" connectionString="data source=172.1.0.142\SQLEXPRESS;initial catalog=OCPP_MeterValueDBContext;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />-->
-
-     <add name="ConnectionLogDBContext" connectionString="data source=172.1.2.187\SQLSERVER2016;initial catalog=StandardOCPP_ConnectionLog;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-     <add name="MainDBContext" connectionString="data source=172.1.2.187\SQLSERVER2016;initial catalog=StandardOCPP_Main;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-     <add name="MeterValueDBContext" connectionString="data source=172.1.2.187\SQLSERVER2016;initial catalog=StandardOCPP_MeterValue;;persist security info=True;user id=sa;password=Ph0930118811;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-   </connectionStrings>  
+  <connectionStrings>
+    <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" 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" providerName="System.Data.SqlClient" />
+  </connectionStrings>
   <startup>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
   </startup>
   </startup>
@@ -35,13 +30,13 @@
   <applicationSettings>
   <applicationSettings>
     <TestTool.RemoteTriggerAPP.Properties.Settings>
     <TestTool.RemoteTriggerAPP.Properties.Settings>
       <setting name="UpdateFWPreUrl" serializeAs="String">
       <setting name="UpdateFWPreUrl" serializeAs="String">
-        <value>https://ocpp.phihong.com.tw:5011/</value>
+        <value>https://evcb.zerovatech.com:5021/</value>
       </setting>
       </setting>
       <setting name="FTPUpdateFWPreUrl" serializeAs="String">
       <setting name="FTPUpdateFWPreUrl" serializeAs="String">
         <value>ftps://testocpp:testocpp@ocpp.phihong.com.tw:5002/</value>
         <value>ftps://testocpp:testocpp@ocpp.phihong.com.tw:5002/</value>
       </setting>
       </setting>
       <setting name="GetDiagnosticsPreUrl" serializeAs="String">
       <setting name="GetDiagnosticsPreUrl" serializeAs="String">
-        <value>https://ocpp.phihong.com.tw:5011/api/v1/file/</value>
+        <value>https://evcb.zerovatech.com:5021/api/v1/file/</value>
       </setting>
       </setting>
       <setting name="FTPGetDiagnosticsPreUrl" serializeAs="String">
       <setting name="FTPGetDiagnosticsPreUrl" serializeAs="String">
         <value>ftps://evseocpp:evseocpp@ocpp.phihong.com.tw:5002/</value>
         <value>ftps://evseocpp:evseocpp@ocpp.phihong.com.tw:5002/</value>

+ 1 - 1
TestTool.RemoteTriggerAPP/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TestTool.RemoteTriggerAPP"      
         xmlns:local="clr-namespace:TestTool.RemoteTriggerAPP"      
         mc:Ignorable="d"
         mc:Ignorable="d"
-        Title="下發測試用工具(公司內網) V1.1.39 (20230223)" Height="481" Width="652">
+        Title="下發測試用工具(公司內網) V1.2.0 (20230419)" Height="481" Width="652">
     <Viewbox>
     <Viewbox>
         <Grid Margin="0,2,2,0">
         <Grid Margin="0,2,2,0">
             <Grid.ColumnDefinitions>
             <Grid.ColumnDefinitions>