From a461fc3103ec7325db46dd8da15fed8db728390d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 01 三月 2024 10:41:51 +0800
Subject: [PATCH] 修改Turf的类库
---
Turf/Properties/PublishProfiles/FolderProfile.pubxml | 17 +++++
Turf/Controllers/CallController.cs | 6 ++
Turf/Web.config | 8 +-
Turf/cs/Tools.cs | 28 +++-----
Turf/Properties/PublishProfiles/FolderProfile.pubxml.user | 82 +++++++++++++++++++++++++++
Turf/index.html | 5 +
Turf/App_Start/WebApiConfig.cs | 2
7 files changed, 124 insertions(+), 24 deletions(-)
diff --git a/Turf/App_Start/WebApiConfig.cs b/Turf/App_Start/WebApiConfig.cs
index a39be8d..5120947 100644
--- a/Turf/App_Start/WebApiConfig.cs
+++ b/Turf/App_Start/WebApiConfig.cs
@@ -17,7 +17,7 @@
config.Routes.MapHttpRoute(
name: "DefaultApi",
- routeTemplate: "{controller}/{id}",
+ routeTemplate: "{controller}/{action}/{id}",
defaults: new { id = RouteParameter.Optional }
);
diff --git a/Turf/Controllers/CallController.cs b/Turf/Controllers/CallController.cs
index a18e23f..65c5118 100644
--- a/Turf/Controllers/CallController.cs
+++ b/Turf/Controllers/CallController.cs
@@ -15,6 +15,12 @@
return DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
+ /*[HttpGet]
+ public string GetCs(string code)
+ {
+ return Tools.selectCoordinates(code);
+ }*/
+
[HttpGet]
public double CalcArea(string code)
{
diff --git a/Turf/Properties/PublishProfiles/FolderProfile.pubxml b/Turf/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..8e9250a
--- /dev/null
+++ b/Turf/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,17 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <DeleteExistingFiles>false</DeleteExistingFiles>
+ <ExcludeApp_Data>false</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>E:\Release\Turf</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Turf/Properties/PublishProfiles/FolderProfile.pubxml.user b/Turf/Properties/PublishProfiles/FolderProfile.pubxml.user
new file mode 100644
index 0000000..940654c
--- /dev/null
+++ b/Turf/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -0,0 +1,82 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <_PublishTargetUrl>E:\Release\Turf</_PublishTargetUrl>
+ <History>True|2024-02-29T09:40:10.9541479Z;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="bin/ClearScript.Core.dll">
+ <publishTime>10/16/2023 20:34:14</publishTime>
+ </File>
+ <File Include="bin/ClearScript.V8.dll">
+ <publishTime>10/16/2023 20:34:46</publishTime>
+ </File>
+ <File Include="bin/ClearScript.V8.ICUData.dll">
+ <publishTime>10/16/2023 20:33:56</publishTime>
+ </File>
+ <File Include="bin/ClearScript.Windows.Core.dll">
+ <publishTime>10/16/2023 20:34:46</publishTime>
+ </File>
+ <File Include="bin/ClearScriptV8.win-x64.dll">
+ <publishTime>10/16/2023 20:34:58</publishTime>
+ </File>
+ <File Include="bin/Mono.Security.dll">
+ <publishTime>08/01/2022 15:31:14</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/18/2021 04:03:36</publishTime>
+ </File>
+ <File Include="bin/Npgsql.dll">
+ <publishTime>08/01/2022 15:31:14</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>09/07/2023 10:19:08</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.InteropServices.RuntimeInformation.dll">
+ <publishTime>11/05/2016 12:57:00</publishTime>
+ </File>
+ <File Include="bin/System.ValueTuple.dll">
+ <publishTime>05/15/2018 21:29:52</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/08/2022 14:22:52</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>11/08/2022 14:22:53</publishTime>
+ </File>
+ <File Include="bin/Turf.dll">
+ <publishTime>02/29/2024 17:40:10</publishTime>
+ </File>
+ <File Include="bin/Turf.pdb">
+ <publishTime>02/29/2024 17:40:10</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>10/02/2013 04:55:08</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>10/02/2013 04:55:08</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
+ <publishTime>10/02/2013 04:55:10</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>02/29/2024 15:15:27</publishTime>
+ </File>
+ <File Include="index.html">
+ <publishTime>02/29/2024 16:03:10</publishTime>
+ </File>
+ <File Include="js/turf.min.6.5.js">
+ <publishTime>02/29/2024 15:20:41</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>02/29/2024 16:07:05</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>02/29/2024 16:43:54</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Turf/Web.config b/Turf/Web.config
index 482d4e7..4de8560 100644
--- a/Turf/Web.config
+++ b/Turf/Web.config
@@ -1,10 +1,10 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
- <!-- PG杩炴帴 -->
- <add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
- <!--<add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
- <!--<add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
+ <!-- PG杩炴帴 -->
+ <add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
+ <!--<add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
+ <!--<add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
diff --git a/Turf/cs/Tools.cs b/Turf/cs/Tools.cs
index 5617c3b..a1dfdb1 100644
--- a/Turf/cs/Tools.cs
+++ b/Turf/cs/Tools.cs
@@ -63,28 +63,22 @@
public static double CalcArea(string code)
{
- try
+ using (V8ScriptEngine engine = new V8ScriptEngine())
{
- using (V8ScriptEngine engine = new V8ScriptEngine())
- {
- engine.DocumentSettings.AccessFlags = DocumentAccessFlags.EnableFileLoading;
- engine.DefaultAccess = ScriptAccess.Full;
+ engine.DocumentSettings.AccessFlags = DocumentAccessFlags.EnableFileLoading;
+ engine.DefaultAccess = ScriptAccess.Full;
- string jsFile = Path.Combine(BaseDir, "js\\turf.min.6.5.js");
- V8Script script = engine.CompileDocument(jsFile);
- engine.Execute(script);
+ string jsFile = Path.Combine(BaseDir, "js\\turf.min.6.5.js");
+ V8Script script = engine.CompileDocument(jsFile);
+ engine.Execute(script);
- string cs = selectCoordinates(code);
- object obj = engine.Invoke("pointsToPolygon", cs);
+ string cs = selectCoordinates(code);
+ if (string.IsNullOrEmpty(cs)) return 0;
- return null == obj ? 0 : Convert.ToDouble(obj);
- }
+ object obj = engine.Invoke("pointsToPolygon", cs);
+
+ return null == obj ? 0 : Convert.ToDouble(obj);
}
- catch (Exception ex)
- {
- //
- }
- return 0;
}
}
}
diff --git a/Turf/index.html b/Turf/index.html
index 8e6ed6d..f5f07a3 100644
--- a/Turf/index.html
+++ b/Turf/index.html
@@ -5,7 +5,8 @@
<title></title>
</head>
<body>
- <a href="Call/Test">Test</a> <br/>
- <a href="Call/CalcArea?code=07">CalcArea</a>
+ <a href="Call/Test">Test</a> <br />
+ <a href="Call/GetCs?code=07">GetCs</a> <br />
+ <a href="Call/CalcArea?code=07">CalcArea</a> <br />
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3