From 30c40198f5ed74dde1b06a60f4bfd1f32ad882cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E9=A3=8E?= <2452618307@qq.com>
Date: Fri, 1 Mar 2024 16:32:43 +0800
Subject: [PATCH] 1

---
 src/main/resources/application.properties | 33 +++++++----------------
 src/main/resources/static/js/public.js    |  3 ++-
 src/main/resources/static/js/publicJs.js  | 12 ++++-----
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d0def0a..435adf8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,23 +1,15 @@
-#?????????
-#????????
 server.port=1930
-#????????
-#server.port=1920
-#?????????
-#server.port=8080
-#??????????
 server.servlet.context-path=/nxnyback
-#mysql??????????
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/nxdtenergy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 #spring.datasource.username=root
 #spring.datasource.password=nxdt@Bonus1234!
-#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/nxdtenergy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=xbzadmin@szedu14!
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/nxdtenergy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.0.14:1115/nxdtenergy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=bonus@admin123!%
+spring.datasource.password=xbzadmin@szedu14!
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/nxdtenergy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+#spring.datasource.username=root
+#spring.datasource.password=Bonus@admin123
 spring.datasource.initialSize=5
 spring.datasource.minIdle=5xbzadmin@szedu14!
 spring.datasource.maxActive=60
@@ -52,32 +44,27 @@ spring.redis.port=2005
 spring.redis.password=Xbzbns@Redis123!
 #spring.redis.host=127.0.0.1
 #spring.redis.port=6379
-#spring.redis.password=NXdt@279redis!
-#??????????????????????????? ?????
+#spring.redis.password=
 loginCode.expiration = 3
-#????????redis??key???????
 loginCode.prefix = login_code
-# ????
 logging.config=classpath:logback-boot.xml
 log.level.root=info
 log.level.my=debug
 log.file=logs/sys-back.log
 log.maxsize=30MB
-#?????????????
 server.max-http-header-size=102400
 spring.servlet.multipart.max-file-size=-1
 spring.servlet.multipart.max-request-size=-1
 spring.http.multipart.maxFileSize=10Mb
 spring.http.multipart.maxRequestSize=10Mb
 token.expire.seconds=7200
-#????????
 spring.servlet.multipart.enabled=true
-files.path=d:\\files
-#files.path=/data/nxdt
+#files.path=d:\\files
+files.path=/data/nxdt
 files.url=http://192.168.0.14:1930/nxnyback/statics
 #files.url=http://218.21.27.6:1930/nxnyback/statics
-files.upload=d:\\files
-#files.upload=/data/nxdt/upload
+#files.upload=d:\\files
+files.upload=/data/nxdt/upload
 spring.freemarker.template-loader-path=classpath:/templates/
 spring.freemarker.suffix=.ftl
 spring.freemarker.charset=utf-8
diff --git a/src/main/resources/static/js/public.js b/src/main/resources/static/js/public.js
index 252ae8b..cfd4293 100644
--- a/src/main/resources/static/js/public.js
+++ b/src/main/resources/static/js/public.js
@@ -1,5 +1,6 @@
 // var dataUrl ="http://218.21.27.6:1930/nxnyback/";
-var dataUrl ="http://127.0.0.1:1930/nxnyback/";
+// var dataUrl ="http://127.0.0.1:1930/nxnyback/";
+var dataUrl = "http://192.168.0.14:1930/nxnyback";
 var token=localStorage.getItem('token');
 $(function() {
 	var headHTML = document.getElementsByTagName('head')[0].innerHTML;
diff --git a/src/main/resources/static/js/publicJs.js b/src/main/resources/static/js/publicJs.js
index 32a3ae3..fba1c29 100644
--- a/src/main/resources/static/js/publicJs.js
+++ b/src/main/resources/static/js/publicJs.js
@@ -1,15 +1,15 @@
 var ctxPath = getContextPath();
-//var dataPath = "http://192.168.0.14:1930/nxenergyweb";
+var dataPath = "http://192.168.0.14:1930/nxnyback";
 // var dataUrl ="http://218.21.27.6:1930/nxnyback/";
-var dataUrl ="http://127.0.0.1:1930/nxnyback/";
+// var dataUrl ="http://127.0.0.1:1930/nxnyback/";
 
 //查看图片的路径
-var lookFile = "http://218.21.27.6:1999/nxnyback/statics";  //文件路径
-//var lookFile = "http://192.168.0.14:1930/nxenergyweb/statics";  //文件路径
+// var lookFile = "http://218.21.27.6:1999/nxnyback/statics";  //文件路径
+var lookFile = "http://192.168.0.14:1930/nxnyback/statics";  //文件路径
 
 //kk file 测试环境地址
-//var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url=";
-var filePreviewPathAll = "http://218.21.27.6:8012/onlinePreview?url=";
+var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url=";
+// var filePreviewPathAll = "http://218.21.27.6:8012/onlinePreview?url=";
 
 
 function getContextPath() {