From 6d147bd548c336c1a2b2fc4a63e4e8fc0222aa17 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 26 十二月 2023 17:31:09 +0800
Subject: [PATCH] 添加py初始化参数

---
 MoonExp/Web.config                      |    2 ++
 MoonExp/Controllers/ExportController.cs |    2 ++
 MoonExp/export.html                     |    1 +
 MoonExp/Tools.cs                        |   18 ++++++++++++++++--
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/MoonExp/Controllers/ExportController.cs b/MoonExp/Controllers/ExportController.cs
index 1a369d9..ee7b0ad 100644
--- a/MoonExp/Controllers/ExportController.cs
+++ b/MoonExp/Controllers/ExportController.cs
@@ -18,6 +18,8 @@
             string str = "http://219.153.49.10:7511/sj_raster/v6/wmts/service/system/10000201/1?ak=mf72ff9295c740ec0f37e61433e8a3ad8d&a=1";
             string escapeStr = SecurityElement.Escape(str);
 
+            Tools.ExecCmd("dir", true, true);
+
             return DateTime.Now.ToString("yyyyy-MM-dd HH:mm:ss");
         }
 
diff --git a/MoonExp/Tools.cs b/MoonExp/Tools.cs
index 9417417..638443a 100644
--- a/MoonExp/Tools.cs
+++ b/MoonExp/Tools.cs
@@ -46,6 +46,19 @@
         }
 
         /// <summary>
+        /// 鑾峰彇Py鍒濆鍖栧弬鏁�
+        /// </summary>
+        public static string[] PyInitArgs
+        {
+            get
+            {
+                string args = GetSetting("pyInitArgs");
+
+                return args.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            }
+        }
+
+        /// <summary>
         /// 鏍规嵁鍋滅墝鑾峰彇鐢ㄦ埛ID
         /// </summary>
         public static int SelectUserIdByToken(string token)
@@ -70,8 +83,9 @@
             List<string> list = new List<string>();
             if (isPy)
             {
-                list.Add("cd \"C:\\Program Files\\QGIS 3.16\\apps\\Python37\"");
-                list.Add("\"C:\\Program Files\\QGIS 3.16\\bin\\qgis_process-qgis-ltr.bat\"");
+                //list.Add("cd \"C:\\Program Files\\QGIS 3.16\\apps\\Python37\"");
+                //list.Add("\"C:\\Program Files\\QGIS 3.16\\bin\\qgis_process-qgis-ltr.bat\"");
+                list.AddRange(PyInitArgs);
                 //list.Add("\"C:\\Program Files\\QGIS 3.16\\bin\\python-qgis-ltr.bat\"");
                 //list.Add("exit()");
             }
diff --git a/MoonExp/Web.config b/MoonExp/Web.config
index a590083..0987bf2 100644
--- a/MoonExp/Web.config
+++ b/MoonExp/Web.config
@@ -9,6 +9,8 @@
     <add key="pgConn" value="Server=192.168.20.83;Port=5433;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>
     <!-- WMTS鍦板潃 -->
     <add key="wmtsUrl" value="http://219.153.49.10:7511/sj_raster/v6/wmts/service/system/10000201/1?ak=mf72ff9295c740ec0f37e61433e8a3ad8d"/>
+    <!--Py鍒濆鍖栧弬鏁�-->
+    <add key="pyInitArgs" value="cd &quot;C:/Program Files/QGIS 3.16/apps/Python37&quot;;&quot;C:/Program Files/QGIS 3.16/bin/qgis_process-qgis-ltr.bat&quot;"/>
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5.2" />
diff --git a/MoonExp/export.html b/MoonExp/export.html
index 69b19b4..7910c11 100644
--- a/MoonExp/export.html
+++ b/MoonExp/export.html
@@ -72,6 +72,7 @@
     <option selected="selected">A4</option>
   </select>
   <input type="button" value="鍑哄浘-1" onclick="exportMap1()" />
+  <a href="Export/Test">Test</a>
   <br /><br />
 </body>
 </html>

--
Gitblit v1.9.3