From 84e61bc1cbf02bf973046c15b54f0594d97a1922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Mon, 17 Oct 2022 15:37:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=9A=E4=B8=AA=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-xwy.yml | 2 +- src/main/resources/templates/changepwd.html | 2 +- src/main/resources/templates/register.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index ac12eda..cd13fd0 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -10,7 +10,7 @@ spring: name: dhManager datasource: #url: jdbc:postgresql://180.184.65.203:5432/dhmanage - url: jdbc:postgresql://192.168.1.8:5432/huludaosso + url: jdbc:postgresql://192.168.1.60:5432/huludaosso username: postgres password: 123456 #password: Zdk@824. diff --git a/src/main/resources/templates/changepwd.html b/src/main/resources/templates/changepwd.html index 2735447..7b2b6df 100644 --- a/src/main/resources/templates/changepwd.html +++ b/src/main/resources/templates/changepwd.html @@ -17,7 +17,7 @@
- +
diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index f3a6dd6..7957342 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -18,7 +18,7 @@
-- Gitee From 4618c8131b0ca5030eb2584d1027151bb010e904 Mon Sep 17 00:00:00 2001 From: xuwen Date: Sat, 12 Nov 2022 19:51:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecate=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cetc32/dh/controller/views/IndexController.java | 4 ++++ src/main/resources/application-xwybjb.yml | 5 +++-- src/main/resources/templates/index.html | 13 +++++++++---- src/main/resources/templates/wizard.html | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cetc32/dh/controller/views/IndexController.java b/src/main/java/com/cetc32/dh/controller/views/IndexController.java index b266af5..25e2455 100644 --- a/src/main/java/com/cetc32/dh/controller/views/IndexController.java +++ b/src/main/java/com/cetc32/dh/controller/views/IndexController.java @@ -48,6 +48,8 @@ public class IndexController { String eip = "http://www.baidu.com/"; @Value("${title}") String title; + @Value("${sso.tokeAge}") + Integer tokenAge; private Logger logger = LoggerFactory.getLogger(this.getClass()); @RequestMapping({"/index","/"}) @@ -76,6 +78,7 @@ public class IndexController { map.put("originUrl", req.getRequestURL()); map.put("eip",eip); map.put("cate",cate); + map.put("tokenAge",tokenAge); return "index"; } /** @@ -167,6 +170,7 @@ public class IndexController { adminUserService.updateUserInfo(baseAdminUser); logger.debug("{} code: {}",code.size() ,code); } + CookieUtil.setCookie(req,response,"token",token,tokenAge,false); logger.debug("status 1002 wizard token: {}",token); return "redirect:"+eip+"?token="+token; } diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml index 9879ac4..eefc641 100644 --- a/src/main/resources/application-xwybjb.yml +++ b/src/main/resources/application-xwybjb.yml @@ -8,7 +8,7 @@ spring: name: dhManager datasource: #url: jdbc:postgresql://180.184.65.203:5432/dhmanage - url: jdbc:postgresql://192.168.1.60:5432/dhmanage + url: jdbc:postgresql://localhost:5432/dhmanage #url: jdbc:postgresql://127.0.0.1:5432/dhmanage username: postgres #password: 123456 @@ -79,6 +79,7 @@ sso: syscode: S000 basePermission: S000接口用户 #单位是毫秒 - tokeAge : 3600000 + tokeAge : -1 departmentRoot: 1 thirdRole: 1 +title: 公共信息门户系统 \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 0dcfa99..cae904e 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -103,7 +103,6 @@
-
立即注册 @@ -116,6 +115,8 @@ + +