Skip to content

Commit

Permalink
Fixed some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@aelassas
aelassas committed Nov 12, 2022
1 parent 2abc85e commit 0697c83
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 27 deletions.
4 changes: 2 additions & 2 deletions samples/netcore/linux/Wexflow/Wexflow.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- SQLite -->
<Setting name="connectionString" value="Data Source=/opt/wexflow/Wexflow/Database/Wexflow.sqlite;Version=3;" />
<!-- MongoDB -->
<!--<Setting name="connectionString" value="Database=wexflow;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!--<Setting name="connectionString" value="Database=wexflow_netcore;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!-- SQLServer -->
<!--<Setting name="connectionString" value="Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow;" />-->
<!--<Setting name="connectionString" value="Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;" />-->
</Wexflow>
4 changes: 2 additions & 2 deletions samples/netcore/macos/Wexflow/Wexflow.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- SQLite -->
<Setting name="connectionString" value="Data Source=/Applications/wexflow/Wexflow/Database/Wexflow.sqlite;Version=3;" />
<!-- MongoDB -->
<!--<Setting name="connectionString" value="Database=wexflow;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!--<Setting name="connectionString" value="Database=wexflow_netcore;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!-- SQLServer -->
<!--<Setting name="connectionString" value="Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow;" />-->
<!--<Setting name="connectionString" value="Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;" />-->
</Wexflow>
4 changes: 1 addition & 3 deletions setup/net/Wexflow.Scripts.SQLServer/Wexflow.Scripts.SQLServer.exe.config
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="connectionString" value="Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow;"/>
<!--<add key="connectionString" value="Server=127.0.0.1;Trusted_Connection=True;Database=wexflow;"/>-->
<!--<add key="connectionString" value="Server=.\SQLEXPRESS01;Trusted_Connection=True;Database=wexflow;"/>-->
<add key="connectionString" value="Server=localhost;Trusted_Connection=True;Database=wexflow;"/>
<add key="workflowsFolder" value="..\Wexflow.Scripts.MongoDB\Workflows"/>
<add key="recordsFolder" value="C:\Wexflow\Records"/>
<add key="documentFile" value="C:\WexflowTesting\Records\document.xls"/>
Expand Down
4 changes: 1 addition & 3 deletions setup/netcore/linux/SQLServer/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"connectionString": "Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow_netcore;",
//"connectionString": "Server=127.0.0.1;Trusted_Connection=True;Database=wexflow_netcore;",
//"connectionString": "Server=.\\SQLEXPRESS01;Trusted_Connection=True;Database=wexflow_netcore;",
"connectionString": "Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;",
"workflowsFolder": "../Wexflow.Scripts.MongoDB/Workflows",
"recordsFolder": "/opt/wexflow/Wexflow/Records",
"documentFile": "/opt/wexflow/WexflowTesting/Records/document.xls",
Expand Down
4 changes: 1 addition & 3 deletions setup/netcore/macos/SQLServer/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"connectionString": "Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow_netcore;",
//"connectionString": "Server=127.0.0.1;Trusted_Connection=True;Database=wexflow_netcore;",
//"connectionString": "Server=.\\SQLEXPRESS01;Trusted_Connection=True;Database=wexflow_netcore;",
"connectionString": "Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;",
"workflowsFolder": "../Wexflow.Scripts.MongoDB/Workflows",
"recordsFolder": "/Applications/wexflow/Wexflow/Records",
"documentFile": "/Applications/wexflow/WexflowTesting/Records/document.xls",
Expand Down
4 changes: 1 addition & 3 deletions setup/netcore/windows/SQLServer/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"connectionString": "Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow_netcore;",
//"connectionString": "Server=127.0.0.1;Trusted_Connection=True;Database=wexflow_netcore;",
//"connectionString": "Server=.\\SQLEXPRESS01;Trusted_Connection=True;Database=wexflow_netcore;",
"connectionString": "Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;",
"workflowsFolder": "..\\Wexflow.Scripts.MongoDB\\Workflows",
"recordsFolder": "C:\\Wexflow-netcore\\Records",
"documentFile": "C:\\WexflowTesting\\Records\\document.xls",
Expand Down
3 changes: 2 additions & 1 deletion setup/netcore/windows/run.bat
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
cd Wexflow.Server
dotnet Wexflow.Server.dll
dotnet Wexflow.Server.dll
pause
2 changes: 1 addition & 1 deletion src/net/Wexflow.Core/Wexflow.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
<!-- MongoDB -->
<!--<Setting name="connectionString" value="Database=wexflow;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!-- SQLServer -->
<!--<Setting name="connectionString" value="Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow;" />-->
<!--<Setting name="connectionString" value="Server=localhost;Trusted_Connection=True;Database=wexflow;" />-->
</Wexflow>
2 changes: 0 additions & 2 deletions src/net/Wexflow.Scripts.SQLServer/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<configuration>
<appSettings>
<add key="connectionString" value="Server=localhost;Trusted_Connection=True;Database=wexflow;"/>
<!--<add key="connectionString" value="Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow;"/>-->
<!--<add key="connectionString" value="Server=.\SQLEXPRESS01;Trusted_Connection=True;Database=wexflow;"/>-->
<add key="workflowsFolder" value="..\..\..\..\..\samples\net\Wexflow\Workflows"/>
<add key="recordsFolder" value="C:\Wexflow\Records"/>
<add key="documentFile" value="C:\WexflowTesting\Records\document.xls"/>
Expand Down
2 changes: 1 addition & 1 deletion src/netcore/Wexflow.Core.Db.SQLServer/Db.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Wexflow.Core.Db.SQLServer
public sealed class Db : Core.Db.Db
{
private static readonly object padlock = new object();
private static readonly string dateTimeFormat = "yyyy-MM-dd HH:mm:ss.fff";
private static readonly string dateTimeFormat = "yyyyMMdd HH:mm:ss.fff";

private static string connectionString;

Expand Down
4 changes: 2 additions & 2 deletions src/netcore/Wexflow.Core/Wexflow.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- SQLite -->
<Setting name="connectionString" value="Data Source=C:\Wexflow-netcore\Database\Wexflow.sqlite;Version=3;" />
<!-- MongoDB -->
<!--<Setting name="connectionString" value="Database=wexflow;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!--<Setting name="connectionString" value="Database=wexflow_netcore;MongoUrl=mongodb://localhost:27017;EnabledSslProtocols=false;SslProtocols=None" />-->
<!-- SQLServer -->
<!--<Setting name="connectionString" value="Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow;" />-->
<!--<Setting name="connectionString" value="Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;" />-->
</Wexflow>
5 changes: 1 addition & 4 deletions src/netcore/Wexflow.Scripts.SQLServer/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"connectionString": "Server=127.0.0.1;User Id=wexflow;Password=pwd;Database=wexflow_netcore;",
//"connectionString": "Server=127.0.0.1;Trusted_Connection=True;Database=wexflow_netcore;",
//"connectionString": "Server=.\\SQLEXPRESS01;Trusted_Connection=True;Database=wexflow_netcore;",
"workflowsFolder": "..\\..\\..\\..\\..\\..\\samples\\netcore\\windows\\Wexflow\\Workflows",
"connectionString": "Server=localhost;Trusted_Connection=True;Database=wexflow_netcore;",
"recordsFolder": "C:\\Wexflow-netcore\\Records",
"documentFile": "C:\\WexflowTesting\\Records\\document.xls",
"invoiceFile": "C:\\WexflowTesting\\Records\\invoice.xls",
Expand Down

0 comments on commit 0697c83

Please sign in to comment.