From 473efdfb83855bd018436471610bcca6110290d2 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 31 Mar 2025 10:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.local.xml | 14 ++++++++++++++ .idea/dataSources.xml | 13 +++++++++++++ pom.xml | 6 +++--- .../bonus/imgTool/config/LoginPageConfig.java | 2 +- .../com/bonus/imgTool/filter/TokenFilter.java | 2 +- src/main/resources/application.properties | 2 +- src/main/resources/static/js/publicJs.js | 18 +++++++++--------- src/main/resources/static/login.html | 2 +- 8 files changed, 43 insertions(+), 16 deletions(-) diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index af734c7..7b67756 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -14,5 +14,19 @@ + + + #@ + ` + true + + + root + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 38267f9..8fae928 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -14,5 +14,18 @@ $ProjectFileDir$ + + mysql.8 + true + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://192.168.0.14:4418/yn_img_tool?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + + + + + + $ProjectFileDir$ + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e56d15a..90609f4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,10 @@ com.bonus.boot - szgqj-service + ynImgTool 1.0.0.1-SNAPSHOT - szgqj-service - szgqj-service + ynImgTool + ynImgTool 1.8 diff --git a/src/main/java/com/bonus/imgTool/config/LoginPageConfig.java b/src/main/java/com/bonus/imgTool/config/LoginPageConfig.java index acd079a..0a1c708 100644 --- a/src/main/java/com/bonus/imgTool/config/LoginPageConfig.java +++ b/src/main/java/com/bonus/imgTool/config/LoginPageConfig.java @@ -12,6 +12,6 @@ public class LoginPageConfig { @RequestMapping("/") public RedirectView loginPage() { - return new RedirectView("/szgqj/login.html"); + return new RedirectView("/ynImgTool/login.html"); } } diff --git a/src/main/java/com/bonus/imgTool/filter/TokenFilter.java b/src/main/java/com/bonus/imgTool/filter/TokenFilter.java index 76913b6..7232d3d 100644 --- a/src/main/java/com/bonus/imgTool/filter/TokenFilter.java +++ b/src/main/java/com/bonus/imgTool/filter/TokenFilter.java @@ -66,7 +66,7 @@ public class TokenFilter extends OncePerRequestFilter { @Autowired private RedisUtil redisUtil; - private static String url="/szgqj/login.html"; + private static String url="/imgTool/login.html"; private static final Long MINUTES_10 = 10 * 60 * 1000L; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e837669..84578e6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ server.port=11997 -server.servlet.context-path=/szgqj +server.servlet.context-path=/imgTool spring.datasource.url=jdbc:mysql://192.168.0.14:4418/yn_img_tool?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false spring.datasource.username=root spring.datasource.password=Bonus@admin123! diff --git a/src/main/resources/static/js/publicJs.js b/src/main/resources/static/js/publicJs.js index 6476388..7b2b536 100644 --- a/src/main/resources/static/js/publicJs.js +++ b/src/main/resources/static/js/publicJs.js @@ -4,11 +4,11 @@ let aqEnnable = true;//是否开启安全验证 var url=window.location.href; console.log(url) -let test_url="http://192.168.0.14:11997/szgqj"; -let dev_url="http://112.27.246.86:21997/szgqj"; -let dev_url2="https://jj.jypxks.com/szgqj"; -let local_url="http://127.0.0.1:11997/szgqj"; -let dataUrl = "http://112.27.246.86:21997/szgqj" +let test_url="http://192.168.0.14:11997/imgTool"; +let dev_url="http://112.27.246.86:21997/imgTool"; +let dev_url2="https://jj.jypxks.com/imgTool"; +let local_url="http://127.0.0.1:11997/imgTool"; +let dataUrl = "http://112.27.246.86:21997/imgTool" if(url.indexOf("112.27.246.86")!=-1){ dataUrl = dev_url; @@ -20,10 +20,10 @@ if(url.indexOf("112.27.246.86")!=-1){ dataUrl = test_url }else{ if(url.indexOf(":8000")!=-1){ - dataUrl = "http://192.168.0.14:8000/szgqj" + dataUrl = "http://192.168.0.14:8000/imgTool" } if(url.indexOf(":11997")!=-1){ - dataUrl = "http://192.168.0.14:21997/szgqj" + dataUrl = "http://192.168.0.14:21997/imgTool" } } @@ -47,10 +47,10 @@ function error(xhr) { icon: 5, move: false, cancel: function (index, layero) { - location.href = '/szgqj/login.html'; + location.href = '/imgTool/login.html'; } }, function () { - location.href = '/szgqj/login.html'; + location.href = '/imgTool/login.html'; }) } else if (code == 403) { console.log("未授权:" + message); diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html index c79cc9e..cd31bd6 100644 --- a/src/main/resources/static/login.html +++ b/src/main/resources/static/login.html @@ -36,7 +36,7 @@