Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita72fdec

Browse files
authored
Merge pull request#51 from Resgrid/develop
Develop
2 parents9b2fc24 +86de62a commita72fdec

File tree

682 files changed

+41344
-12440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

682 files changed

+41344
-12440
lines changed

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version:2
2+
3+
updates:
4+
-package-ecosystem:"github-actions"
5+
directory:"/"
6+
target-branch:"develop"
7+
schedule:
8+
interval:"weekly"

‎.gitignore‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,113 @@ Common/resgrid.local.pfx
194194
Web/Resgrid.Web.ServicesCore/Properties/serviceDependencies.json
195195
Web/Resgrid.Web.ServicesCore/Properties/serviceDependencies.local.json
196196
Web/Resgrid.Web.ServicesCore/Properties/ServiceDependencies/local/appInsights1.arm.json
197+
198+
Docker/docker-data/dms/mail-state/lib-clamav/bytecode.cvd
199+
200+
Docker/docker-data/dms/mail-state/lib-clamav/daily.cvd
201+
202+
Docker/docker-data/dms/mail-state/lib-clamav/freshclam.dat
203+
204+
Docker/docker-data/dms/mail-state/lib-clamav/main.cvd
205+
Docker/docker-data/dms/config/dovecot-quotas.cf
206+
Docker/docker-data/dms/config/mailconfig
207+
Docker/docker-data/dms/config/postfix-aliases.cf
208+
Docker/docker-data/dms/mail-data/maildata
209+
Docker/docker-data/dms/mail-logs/maillogs
210+
Docker/docker-data/dms/mail-state/mailstate
211+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/identity
212+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/identity-ruYtA-SdhH
213+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/server.n001.cloudmark.com.conf
214+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/server.n004.cloudmark.com.conf
215+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/servers.catalogue.lst
216+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/servers.discovery.lst
217+
Docker/docker-data/dms/mail-state/lib-amavis/.razor/servers.nomination.lst
218+
Docker/docker-data/dms/mail-state/lib-spamassassin/sa-update-keys/pubring.kbx
219+
Docker/docker-data/dms/mail-state/lib-spamassassin/sa-update-keys/trustdb.gpg
220+
Docker/docker-data/sql/backup/sqlbackups
221+
Docker/docker-data/sql/data/Entropy.bin
222+
Docker/docker-data/sql/data/master.mdf
223+
Docker/docker-data/sql/data/mastlog.ldf
224+
Docker/docker-data/sql/data/model_msdbdata.mdf
225+
Docker/docker-data/sql/data/model_msdblog.ldf
226+
Docker/docker-data/sql/data/model_replicatedmaster.ldf
227+
Docker/docker-data/sql/data/model_replicatedmaster.mdf
228+
Docker/docker-data/sql/data/model.mdf
229+
Docker/docker-data/sql/data/modellog.ldf
230+
Docker/docker-data/sql/data/msdbdata.mdf
231+
Docker/docker-data/sql/data/msdblog.ldf
232+
Docker/docker-data/sql/data/Resgrid_log.ldf
233+
Docker/docker-data/sql/data/Resgrid.mdf
234+
Docker/docker-data/sql/data/ResgridOIDC_log.ldf
235+
Docker/docker-data/sql/data/ResgridOIDC.mdf
236+
Docker/docker-data/sql/data/ResgridWorkers_log.ldf
237+
Docker/docker-data/sql/data/ResgridWorkers.mdf
238+
Docker/docker-data/sql/data/sqldata
239+
Docker/docker-data/sql/data/tempdb.mdf
240+
Docker/docker-data/sql/data/templog.ldf
241+
Docker/docker-data/sql/log/errorlog
242+
Docker/docker-data/sql/log/errorlog.1
243+
Docker/docker-data/sql/log/errorlog.2
244+
Docker/docker-data/sql/log/errorlog.3
245+
Docker/docker-data/sql/log/errorlog.4
246+
Docker/docker-data/sql/log/errorlog.5
247+
Docker/docker-data/sql/log/errorlog.6
248+
Docker/docker-data/sql/log/errorlog.7
249+
Docker/docker-data/sql/log/errorlog.8
250+
Docker/docker-data/sql/log/errorlog.9
251+
Docker/docker-data/sql/log/errorlog.10
252+
Docker/docker-data/sql/log/errorlog.11
253+
Docker/docker-data/sql/log/errorlog.12
254+
Docker/docker-data/sql/log/errorlog.13
255+
Docker/docker-data/sql/log/errorlog.14
256+
Docker/docker-data/sql/log/errorlog.15
257+
Docker/docker-data/sql/log/errorlog.16
258+
Docker/docker-data/sql/log/errorlog.17
259+
Docker/docker-data/sql/log/errorlog.18
260+
Docker/docker-data/sql/log/errorlog.19
261+
Docker/docker-data/sql/log/HkEngineEventFile_0_132921975549100000.xel
262+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922007317990000.xel
263+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922009309080000.xel
264+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922013218750000.xel
265+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922018741370000.xel
266+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922033212920000.xel
267+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922067366660000.xel
268+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922075764680000.xel
269+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922088137910000.xel
270+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922111474730000.xel
271+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922117751690000.xel
272+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922122624170000.xel
273+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922132763460000.xel
274+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922142267410000.xel
275+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922152684910000.xel
276+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922153785260000.xel
277+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922154586090000.xel
278+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922155443490000.xel
279+
Docker/docker-data/sql/log/HkEngineEventFile_0_132922211494070000.xel
280+
Docker/docker-data/sql/log/log_16.trc
281+
Docker/docker-data/sql/log/log_17.trc
282+
Docker/docker-data/sql/log/log_18.trc
283+
Docker/docker-data/sql/log/log_19.trc
284+
Docker/docker-data/sql/log/log_20.trc
285+
Docker/docker-data/sql/log/sqllogs
286+
Docker/docker-data/sql/log/system_health_0_132922111481530000.xel
287+
Docker/docker-data/sql/log/system_health_0_132922117759410000.xel
288+
Docker/docker-data/sql/log/system_health_0_132922122632370000.xel
289+
Docker/docker-data/sql/log/system_health_0_132922132771730000.xel
290+
Docker/docker-data/sql/log/system_health_0_132922142272820000.xel
291+
Docker/docker-data/sql/log/system_health_0_132922152690110000.xel
292+
Docker/docker-data/sql/log/system_health_0_132922153791210000.xel
293+
Docker/docker-data/sql/log/system_health_0_132922154593260000.xel
294+
Docker/docker-data/sql/log/system_health_0_132922155450540000.xel
295+
Docker/docker-data/sql/log/system_health_0_132922211502270000.xel
296+
Docker/docker-data/dms/config/mailconfig
297+
Docker/docker-data/dms/mail-data/maildata
298+
Docker/docker-data/dms/mail-logs/maillogs
299+
Docker/docker-data/dms/mail-state/mailstate
300+
Docker/docker-data/sql/backup/sqlbackups
301+
Docker/docker-data/sql/data/sqldata
302+
Docker/docker-data/sql/log/sqllogs
303+
Docker/docker-data/dms/config/mailconfig
304+
Docker/docker-data/dms/mail-data/maildata
305+
Docker/docker-data/dms/mail-logs/maillogs
306+
Docker/docker-data/dms/mail-state/mailstate

‎Core/Resgrid.Config/ExternalErrorConfig.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
namespaceResgrid.Config
22
{
3+
/// <summary>
4+
/// Configuration for working with external error tracking systems like Elk and Sentry
5+
/// </summary>
36
publicstaticclassExternalErrorConfig
47
{
8+
/// <summary>
9+
/// The current operating enviorment for the code, i.e. prod, qa, dev
10+
/// </summary>
11+
publicstaticstringEnvironment="dev";
12+
513
#region Elk Settings
614
publicstaticstringElkServiceUrl="http://localhost:9200";
715
#endregion Elk Settings
816

917
#region Sentry Settings
1018
publicstaticstringExternalErrorServiceUrl="";
1119
publicstaticstringExternalErrorServiceUrlForWebsite="";
20+
publicstaticstringExternalErrorServiceUrlForWebjobs="";
1221
#endregion Sentry Settings
1322
}
1423

‎Core/Resgrid.Config/JwtConfig.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
namespaceResgrid.Config
2+
{
3+
/// <summary>
4+
/// Config settings for JWT's used in the website and api
5+
/// </summary>
6+
publicstaticclassJwtConfig
7+
{
8+
publicstaticstringKey="";
9+
10+
publicstaticstringIssuer="resgrid.local";
11+
12+
publicstaticstringAudience="resgrid.local";
13+
14+
publicstaticintDuration=30;
15+
}
16+
}

‎Core/Resgrid.Config/OidcConfig.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
namespaceResgrid.Config
2+
{
3+
/// <summary>
4+
/// Configuration for OpenID Connect (https://documentation.openiddict.com/)
5+
/// </summary>
6+
publicstaticclassOidcConfig
7+
{
8+
publicstaticstringKey="";
9+
10+
publicstaticstringConnectionString="Server=rgdevserver;Database=ResgridOIDC;User Id=resgrid_app;Password=resgrid123;MultipleActiveResultSets=True;";
11+
12+
publicstaticintAccessTokenExpiryMinutes=1440;
13+
14+
publicstaticintRefreshTokenExpiryDays=30;
15+
16+
publicstaticstringEncryptionCert="";
17+
18+
publicstaticstringSigningCert="";
19+
}
20+
}

‎Core/Resgrid.Config/Resgrid.Config.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ProjectSdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<AssemblyName>Resgrid.Config</AssemblyName>
66
<RootNamespace>Resgrid.Config</RootNamespace>
77
</PropertyGroup>

‎Core/Resgrid.Config/ServiceBusConfig.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public static class ServiceBusConfig
1212
publicstaticstringEmailBroadcastQueueName="resgridemails";
1313
publicstaticstringSystemQueueName="resgridsys";
1414
publicstaticstringPaymentQueueName="payment";
15+
publicstaticstringAuditQueueName="audit";
1516

1617
#region Azure Service Bus Values
1718
publicstaticstringSignalRServiceBusConnectionString="";
@@ -49,6 +50,8 @@ public static class ServiceBusConfig
4950

5051
#region RabbitMQ Bus Values
5152
publicstaticstringRabbitHostname="localhost";
53+
publicstaticstringRabbitHostname2="";// For 3 host cluster, node 2
54+
publicstaticstringRabbitHostname3="";// For 3 host cluster, node 3
5255
publicstaticstringRabbitUsername="guest";
5356
publicstaticstringRabbbitPassword="guest";
5457
publicstaticstringRabbbitExchange="";

‎Core/Resgrid.Config/SystemBehaviorConfig.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ public static class SystemBehaviorConfig
107107
/// </summary>
108108
publicstaticLinksProviderTypesLinkProviderType=LinksProviderTypes.Polr;
109109

110+
/// <summary>
111+
/// Sets the type of voip provider to use
112+
/// </summary>
113+
publicstaticVoipProviderTypesVoipProviderType=VoipProviderTypes.Kazoo;
114+
110115
/// <summary>
111116
/// Sets the type of sms provider to use
112117
/// </summary>
@@ -150,6 +155,11 @@ public static class SystemBehaviorConfig
150155
/// </summary>
151156
publicstaticstringSiteKey="";
152157

158+
/// <summary>
159+
/// A notice to display on the login page
160+
/// </summary>
161+
publicstaticstringLoginPageNotice="";
162+
153163
publicstaticstringGetEnvPrefix()
154164
{
155165
switch(Environment)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespaceResgrid.Config
2+
{
3+
publicstaticclassTelemetryConfig
4+
{
5+
publicstaticstringExporter="";
6+
}
7+
}

‎Core/Resgrid.Config/VoipConfig.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
namespaceResgrid.Config
2+
{
3+
/// <summary>
4+
/// Configuration for using a VOIP system for voice communication between applications
5+
/// </summary>
6+
publicstaticclassVoipConfig
7+
{
8+
publicstaticintBaseChannelExtensionNumber=15;
9+
publicstaticintBaseChannelExtensionBump=15;
10+
11+
publicstaticstringVoipDomain="";
12+
publicstaticstringVoipServerAddress="";
13+
publicstaticstringVoipServerWebsocketAddress="";
14+
publicstaticstringVoipServerWebsocketSslAddress="";
15+
16+
publicstaticstringKazooUsername="";
17+
publicstaticstringKazooPassword="";
18+
publicstaticstringKazzoAccount="";
19+
publicstaticstringKazooCrossbarApiUrl=@"";
20+
publicstaticstringKazooCrossbarApiVersion="";
21+
22+
publicstaticstringOpenViduUrl="";
23+
publicstaticstringOpenViduSecret="";
24+
}
25+
26+
/// <summary>
27+
/// Possible backend voip providers
28+
/// </summary>
29+
publicenumVoipProviderTypes
30+
{
31+
Kazoo=0,
32+
OpenVidu=1
33+
}
34+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp