notazof
/
yavsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mise à niveau de la plateforme .Net : 

Mono 4.2.1 Asp.Net 4.0.30319.17020

* Web.config: l'entité nbsp n'est plus supportée

* Yavsc.csproj: mise à niveau de Newtownsoft.Json

* packages.config: mise à jour des paquets nuget

* GoogleHelpers.cs: ça marchait avant, mais c'etait mal écrit et a
  cassé à la mise à niveau de la plateforme.

* SimpleJsonPostMethod.cs: using Newtonsoft.Json
main
Paul Schneider 10 years ago
parent 3b33be013c
commit d40679cdf4
7 changed files with 56 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
web/ChangeLog
Unescape Escape View File

@ -1,3 +1,11 @@
2015-12-30 Paul Schneider <paul@pschneider.fr>
* Web.config: l'entité nbsp n'est plus supportée
* Yavsc.csproj: mise à niveau de Newtownsoft.Json
* packages.config: mise à jour des paquets nuget
2015-12-30 Paul Schneider <paul@pschneider.fr> 2015-12-30 Paul Schneider <paul@pschneider.fr>
* Sent.aspx: Vue de confirmation du messag envoyé * Sent.aspx: Vue de confirmation du messag envoyé

4
web/Web.config
Unescape Escape View File

@ -97,7 +97,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
<membership defaultProvider="NpgsqlMembershipProvider" userIsOnlineTimeWindow="1"> <membership defaultProvider="NpgsqlMembershipProvider" userIsOnlineTimeWindow="1">
<providers> <providers>
<clear /> <clear />
<add name="NpgsqlMembershipProvider" type="Npgsql.Web.NpgsqlMembershipProvider, NpgsqlMRPProviders" connectionStringName="yavsc" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="true" passwordFormat="Clear" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" autogenerateschema="false" /> <add name="NpgsqlMembershipProvider" type="Npgsql.Web.NpgsqlMembershipProvider, NpgsqlMRPProviders" connectionStringName="yavsc" enablePasswordRetrieval="true" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="true" passwordFormat="Clear" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" autogenerateschema="false" />
</providers> </providers>
</membership> </membership>
<roleManager enabled="true" defaultProvider="NpgsqlRoleProvider"> <roleManager enabled="true" defaultProvider="NpgsqlRoleProvider">
@ -162,7 +162,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
<thanks html_class="thanks" title_format="Voir le site ({0})"> <thanks html_class="thanks" title_format="Voir le site ({0})">
<to> <to>
<add name="Mono" url="http://www.mono-project.com/Main_Page" image="/App_Themes/images/Mono-powered.png" /> <add name="Mono" url="http://www.mono-project.com/Main_Page" image="/App_Themes/images/Mono-powered.png" />
<add name="Apache&nbsp;Fondation" url="http://httpd.apache.org/" image="/App_Themes/images/apache_pbw.png" /> <add name="Apache Fondation" url="http://httpd.apache.org/" image="/App_Themes/images/apache_pbw.png" />
<add name="Debian" url="http://www.debian.org" image="/App_Themes/images/debian-logo.png" /> <add name="Debian" url="http://www.debian.org" image="/App_Themes/images/debian-logo.png" />
<add name="MarkdownDeep" url="http://www.toptensoftware.com/markdowndeep/" /> <add name="MarkdownDeep" url="http://www.toptensoftware.com/markdowndeep/" />
<add name="MarkdownHelper" url="http://www.nuget.org/packages/MarkdownHelper" /> <add name="MarkdownHelper" url="http://www.nuget.org/packages/MarkdownHelper" />

6
web/Yavsc.csproj
Unescape Escape View File

@ -97,9 +97,6 @@
<Reference Include="nunit.framework"> <Reference Include="nunit.framework">
<Package>nunit</Package> <Package>nunit</Package>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="xunit.abstractions"> <Reference Include="xunit.abstractions">
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath> <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
</Reference> </Reference>
@ -143,6 +140,9 @@
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Admin\" /> <Folder Include="Admin\" />

50
web/packages.config
Unescape Escape View File

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cldrjs" version="0.4.1" targetFramework="net45" /> <package id="cldrjs" version="0.4.1" targetFramework="net45" />
<package id="jQuery" version="2.1.4" targetFramework="net45" /> <package id="jQuery" version="2.1.4" targetFramework="net45" />
<package id="JQuery.GoogleMaps" version="2.2.4" targetFramework="net45" /> <package id="JQuery.GoogleMaps" version="2.2.4" targetFramework="net45" />
<package id="jquery.mobile" version="1.4.5" targetFramework="net451" /> <package id="jquery.mobile" version="1.4.5" targetFramework="net451" />
<package id="jQuery.UI.Combined" version="1.11.4" targetFramework="net451" /> <package id="jQuery.UI.Combined" version="1.11.4" targetFramework="net451" />
<package id="jQuery.Validation" version="1.14.0" targetFramework="net451" /> <package id="jQuery.Validation" version="1.14.0" targetFramework="net451" />
<package id="jquery-globalize" version="1.0.0" targetFramework="net45" /> <package id="jquery-globalize" version="1.0.0" targetFramework="net45" />
<package id="log4net" version="2.0.5" targetFramework="net451" /> <package id="log4net" version="2.0.5" targetFramework="net451" />
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="3.2.3" targetFramework="net451" /> <package id="Microsoft.jQuery.Unobtrusive.Ajax" version="3.2.3" targetFramework="net451" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net451" /> <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net451" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net451" /> <package id="Microsoft.Owin" version="3.0.1" targetFramework="net451" />
<package id="Mono.Web.Xdt" version="1.0.0" targetFramework="net451" /> <package id="Mono.Web.Xdt" version="1.0.0" targetFramework="net451" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> <package id="Newtonsoft.Json" version="8.0.1" targetFramework="net451" />
<package id="Npgsql" version="3.0.4" targetFramework="net451" /> <package id="Npgsql" version="3.0.4" targetFramework="net451" />
<package id="PayPalButtonManagerSDK" version="2.10.109" targetFramework="net451" /> <package id="PayPalButtonManagerSDK" version="2.10.109" targetFramework="net451" />
<package id="PayPalCoreSDK" version="1.7.0" targetFramework="net451" /> <package id="PayPalCoreSDK" version="1.7.0" targetFramework="net451" />
<package id="Prettify" version="3.3.04.2013" targetFramework="net451" /> <package id="Prettify" version="3.3.04.2013" targetFramework="net451" />
<package id="xunit" version="2.1.0" targetFramework="net451" /> <package id="xunit" version="2.1.0" targetFramework="net451" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" /> <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net451" /> <package id="xunit.assert" version="2.1.0" targetFramework="net451" />
<package id="xunit.core" version="2.1.0" targetFramework="net451" /> <package id="xunit.core" version="2.1.0" targetFramework="net451" />
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" /> <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net451" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" /> <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net451" />
</packages> </packages>

7
yavscModel/ChangeLog
Unescape Escape View File

@ -1,3 +1,10 @@
2015-12-30 Paul Schneider <paul@pschneider.fr>
* GoogleHelpers.cs: ça marchait avant, mais c'etait mal écrit
et a cassé à la mise à niveau de la plateforme.
* SimpleJsonPostMethod.cs: using Newtonsoft.Json
2015-12-30 Paul Schneider <paul@pschneider.fr> 2015-12-30 Paul Schneider <paul@pschneider.fr>
* PerformerContact.cs: modèle de donnnée d'un message * PerformerContact.cs: modèle de donnnée d'un message

4
yavscModel/Google/Api/GoogleHelpers.cs
Unescape Escape View File

@ -145,14 +145,14 @@ namespace Yavsc.Model.Google.Api
public static MessageWithPayloadResponse NotifyEvent (NominativeEventPub evpub) public static MessageWithPayloadResponse NotifyEvent (NominativeEventPub evpub)
{ {
using (var r = using (var r =
new SimpleJsonPostMethod<MessageWithPayload<YaEvent>,MessageWithPayloadResponse> ( new SimpleJsonPostMethod<MessageWithPayload<NominativeEventPub>,MessageWithPayloadResponse> (
"https://gcm-http.googleapis.com/gcm/send")) { "https://gcm-http.googleapis.com/gcm/send")) {
r.SetCredential ("key="+ConfigurationManager.AppSettings ["GOOGLE_API_KEY"]); r.SetCredential ("key="+ConfigurationManager.AppSettings ["GOOGLE_API_KEY"]);
var userprofile = ProfileBase.Create (evpub.PerformerName); var userprofile = ProfileBase.Create (evpub.PerformerName);
var regid = userprofile.GetPropertyValue ("gregid") as string; var regid = userprofile.GetPropertyValue ("gregid") as string;
if (regid == null) if (regid == null)
throw new NotImplementedException ("Notification via e-mail"); throw new NotImplementedException ("Notification via e-mail");
var msg = new MessageWithPayload<YaEvent> () { var msg = new MessageWithPayload<NominativeEventPub> () {
notification = new Notification() { title = evpub.Title, body = evpub.Description, icon = "icon" }, notification = new Notification() { title = evpub.Title, body = evpub.Description, icon = "icon" },
data = evpub, registration_ids = new string[] { regid } }; data = evpub, registration_ids = new string[] { regid } };
return r.Invoke (msg); return r.Invoke (msg);

17
yavscModel/SimpleJsonPostMethod.cs
Unescape Escape View File

@ -23,6 +23,8 @@ using System.Net;
using System.Text; using System.Text;
using System.IO; using System.IO;
using System.Runtime.Serialization.Json; using System.Runtime.Serialization.Json;
using System.Collections.Generic;
using Newtonsoft.Json;
namespace Yavsc.Model namespace Yavsc.Model
{ {
@ -75,18 +77,17 @@ namespace Yavsc.Model
/// <param name="query">Query.</param> /// <param name="query">Query.</param>
public TAnswer Invoke(TQuery query) public TAnswer Invoke(TQuery query)
{ {
DataContractJsonSerializer serquery = new DataContractJsonSerializer (typeof(TQuery));
DataContractJsonSerializer seransw = new DataContractJsonSerializer (typeof(TAnswer));
using (Stream streamQuery = request.GetRequestStream()) {
serquery.WriteObject (streamQuery, query);
}
using (Stream streamQuery = request.GetRequestStream()) {
using (StreamWriter writer = new StreamWriter(streamQuery)) {
writer.Write (JsonConvert.SerializeObject(query));
}}
TAnswer ans = default (TAnswer); TAnswer ans = default (TAnswer);
using (WebResponse response = Request.GetResponse ()) { using (WebResponse response = Request.GetResponse ()) {
using (Stream responseStream = response.GetResponseStream ()) { using (Stream responseStream = response.GetResponseStream ()) {
ans = (TAnswer) seransw.ReadObject(responseStream); using (StreamReader rdr = new StreamReader (responseStream)) {
ans = (TAnswer) JsonConvert.DeserializeObject<TAnswer> (rdr.ReadToEnd ());
}
} }
response.Close(); response.Close();
} }

Write Preview
Loading…