From 80580b65be75b0ad876f8d0ca56fc7a64ba11b36 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 23 十二月 2022 16:19:59 +0800
Subject: [PATCH] 1
---
ExportMap/cs/ExportUtil.cs | 3 ++-
JavaCode/BsTemplate/Entity.java | 1 +
JavaCode/BsTemplate/GeoEntity.java | 1 +
JavaCode/App.config | 4 ++--
ExportMap/up.html | 2 +-
JavaCode/FrmMyBatisPlus.cs | 7 ++++++-
ExportMap/lf.html | 2 +-
7 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ExportMap/cs/ExportUtil.cs b/ExportMap/cs/ExportUtil.cs
index 02f82a8..6f096d8 100644
--- a/ExportMap/cs/ExportUtil.cs
+++ b/ExportMap/cs/ExportUtil.cs
@@ -238,7 +238,8 @@
.Replace("{province}", args.province)
.Replace("{scale}", args.scale)
.Replace("{resolution}", args.resolution)
- .Replace("{date}", args.date)
+ //.Replace("{date}", args.date)
+ .Replace("{date}", DateTime.Now.ToString("yyyy.MM.dd"))
.Replace("{layers}", args.layers)
.Replace("{imgPath}", imgPath);
diff --git a/ExportMap/lf.html b/ExportMap/lf.html
index 2c305b7..b0d47fc 100644
--- a/ExportMap/lf.html
+++ b/ExportMap/lf.html
@@ -283,7 +283,7 @@
</script>
<script>
var url = "http://127.0.0.1:12316/server/";
- var token = "?token=b2c4ec35-bd9a-4fdd-8ef2-ceea09436ea6";
+ var token = "?token=2d44e1be-b332-4aa8-893f-61e6edac61b7";
// 椤圭洰,绔欏満,绠￠亾涓績绾�,鎴樼暐閫氶亾,鐭㈤噺鍥�,褰卞儚娉ㄨ,褰卞儚鍥�
function exportMap1() {
diff --git a/ExportMap/up.html b/ExportMap/up.html
index de3f1ab..249f44b 100644
--- a/ExportMap/up.html
+++ b/ExportMap/up.html
@@ -10,7 +10,7 @@
var app = {};
var path = "20221128010101";
var url = "http://127.0.0.1:12316/server/";
- var token = "d283c67f-7c8d-4b2d-a28a-485f5e346dab";
+ var token = "2d44e1be-b332-4aa8-893f-61e6edac61b7";
$(function () {
$("#pathSpan").html(path);
diff --git a/JavaCode/App.config b/JavaCode/App.config
index e6c7397..b619118 100644
--- a/JavaCode/App.config
+++ b/JavaCode/App.config
@@ -2,9 +2,9 @@
<configuration>
<appSettings>
<!-- 69701 -->
- <add key="pgConn" value="Server=127.0.0.1;Port=5432;Database=langfang;User Id=postgres;Password=postgres;"/>
+ <!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
<!-- 20582 -->
- <!--<add key="pgConn" value="Server=192.168.20.39;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
+ <add key="pgConn" value="Server=192.168.20.39;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
diff --git a/JavaCode/BsTemplate/Entity.java b/JavaCode/BsTemplate/Entity.java
index c6bdd66..0cea7bd 100644
--- a/JavaCode/BsTemplate/Entity.java
+++ b/JavaCode/BsTemplate/Entity.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.time.LocalDate;
/**
* {bak}
diff --git a/JavaCode/BsTemplate/GeoEntity.java b/JavaCode/BsTemplate/GeoEntity.java
index b72f579..6e669f3 100644
--- a/JavaCode/BsTemplate/GeoEntity.java
+++ b/JavaCode/BsTemplate/GeoEntity.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.time.LocalDate;
/**
* {bak}
diff --git a/JavaCode/FrmMyBatisPlus.cs b/JavaCode/FrmMyBatisPlus.cs
index 3b7b576..c945dca 100644
--- a/JavaCode/FrmMyBatisPlus.cs
+++ b/JavaCode/FrmMyBatisPlus.cs
@@ -333,8 +333,13 @@
{
switch (ti.type)
{
+ case "timestamptz":
case "timestamp":
return "Timestamp";
+ case "date":
+ return "LocalDate";
+ case "time":
+ return "LocalTime";
case "float4": // float
return "Float";
case "float8": // double
@@ -348,7 +353,7 @@
case "int2":
case "int4": // int
return "Integer";
- default:
+ default: // text, varchar
return "String";
}
}
--
Gitblit v1.9.3