diff --git a/dsBase/WebRoot/index_ai.html b/dsBase/WebRoot/index_ai.html deleted file mode 100644 index 95c35240..00000000 --- a/dsBase/WebRoot/index_ai.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dsBase/WebRoot/integration.html b/dsBase/WebRoot/integration.html deleted file mode 100644 index 147c2790..00000000 --- a/dsBase/WebRoot/integration.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - 长春市云校运行监测数据分析 - - - - -
-
-
-
-
-
-
全角色数据覆盖
-
精准评估课程效用
-
-
-
全景剖析建设路径
-
精准布局章节要点
-
-
-
全览访问数据
-
洞悉用户行为趋势
-
-
-
深度挖掘访问数据
-
提升应用效能
-
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/dsBase/WebRoot/login.html b/dsBase/WebRoot/login.html index d7a67dfa..71f473b9 100644 --- a/dsBase/WebRoot/login.html +++ b/dsBase/WebRoot/login.html @@ -115,13 +115,12 @@ "captcha": captcha }, async: false, - success: function (res) { + success: function (res) { if (res.success) { window.location.href = '/dsWeb/index.html'; }else{ alert(res.msg); } - } }); } diff --git a/dsBase/WebRoot/login_ai.html b/dsBase/WebRoot/login_ai.html deleted file mode 100644 index b14c4189..00000000 --- a/dsBase/WebRoot/login_ai.html +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - 知识库问答系统 - - - - - - - - - - - - - - - - - - -
-
-
- -
-
-
-

知识库问答系统

- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - - 点击图片刷新校验码 -
-
- - -
-
-
-
- - - - - - \ No newline at end of file diff --git a/dsBase/WebRoot/login_gtzz.html b/dsBase/WebRoot/login_gtzz.html deleted file mode 100644 index d682f8e2..00000000 --- a/dsBase/WebRoot/login_gtzz.html +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - 长春市教育装备与信息化项目智慧管理系统 - - - - - - - - - - - - - - - - - -
-
-
- -
-
-
- -

长春市教育装备与信息化项目智慧管理系统

- -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - - 点击图片刷新校验码 -
-
- - -
-
-
-
-
- ©版权所有  2020-2022  长春市教育技术装备与信息中心  |  吉ICP备20000186号-1 -
- - - - \ No newline at end of file diff --git a/dsBase/WebRoot/login_old.html b/dsBase/WebRoot/login_old.html deleted file mode 100644 index 424f1eae..00000000 --- a/dsBase/WebRoot/login_old.html +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - 系统登录 - - - - - - - -
-
- -
- -
- -
-
-
-
- - - - - - - - diff --git a/dsBase/WebRoot/pindex.html b/dsBase/WebRoot/pindex.html deleted file mode 100644 index 98365e82..00000000 --- a/dsBase/WebRoot/pindex.html +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - 长春市教育装备与信息化项目智慧管理系统 - - - - - - - - - - - - -
- -
- - - - - -
- - -
- -
- - - -
-
-
-
- -
- -
-
- -
- - Released under the MIT license. - - - - Copyright © 2021-2022 pearadmin.com - -
- -
- -
- -
-
-
- -
- -
- - - - - - - - \ No newline at end of file diff --git a/dsBase/WebRoot/plogin.html b/dsBase/WebRoot/plogin.html deleted file mode 100644 index 791c31bd..00000000 --- a/dsBase/WebRoot/plogin.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - 长春市教育数据采集系统 - - - - - - - - - - - -
-
-
-
长春市教育数据采集系统
-
- -
-
-
-
-

- 登 录

-
-
-
-
- - -
-
-
-
- - -
-
- - - -
-
-
-
-
- ©版权所有：长春市教育技术装备与信息中心 | 技术支持：东北师范大学理想软件股份有限公司 -
- - - - - - - - - \ No newline at end of file diff --git a/dsBase/WebRoot/plogin.html.bak b/dsBase/WebRoot/plogin.html.bak deleted file mode 100644 index d91ae810..00000000 --- a/dsBase/WebRoot/plogin.html.bak +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - 登录 - - - - - - - -
-
- -
登 录
- -
-
- -
-
- -
- -
- -
-
- - - - - - - - \ No newline at end of file diff --git a/dsBase/WebRoot/zj_login.html b/dsBase/WebRoot/zj_login.html deleted file mode 100644 index 114d65b2..00000000 --- a/dsBase/WebRoot/zj_login.html +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - 登录 - - - - - - - - - - - -
-
-
-
长春市教育装备和信息化专家抽取工具
-
-
-
- -
- -
- - - -
    -
  • -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    - - -
    - 点击图片刷新校验码 -
    -
    - -
    -
    -
    - - -
    - -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    -
    • - -
-
- - - - - -
-
-
-
- - - -
- © 版权所有  长春市教育局装备信息与技术中心  |  吉ICP备20000186号-1 -
- - - - - - - - - \ No newline at end of file diff --git a/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java index 7fe73527..6ea6c5b9 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java @@ -155,7 +155,7 @@ public class LoginPersonController extends Controller { } //生成JWT的Token,并且写入到Cookie中 String token = JwtUtil.generateToken(Integer.parseInt(loginMap.get("identity_id").toString()), loginMap.get("person_id").toString(), loginMap.get("bureau_id").toString()); - CookieUtil.set(getResponse(), "jwt-token", token, false, false); + CookieUtil.set(getResponse(), "jwt-token", token, false, true); //返回相关信息 resultJson.put("success", true); resultJson.put("identity_id", loginMap.get("identity_id").toString()); diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java index 5a40e02e..00a72400 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java +++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java @@ -15,6 +15,7 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -239,9 +240,22 @@ public class RouterHandler extends Handler { } // 处理Cookie - String cookie = req.getHeader(Constants.HEADER_COOKIE); - if (!StrKit.isBlank(cookie)) { - builder.addHeader(Constants.HEADER_COOKIE, cookie); + javax.servlet.http.Cookie[] cookies = req.getCookies(); + if (cookies != null && cookies.length > 0) { + StringBuilder cookieString = new StringBuilder(); + for (Cookie cookie : cookies) { + if (cookieString.length() > 0) { + cookieString.append("; "); + } + cookieString.append(cookie.getName()).append("=").append(cookie.getValue()); + } + builder.addHeader(Constants.HEADER_COOKIE, cookieString.toString()); + } + + // 如果还有Cookie头，也添加进去 + String cookieHeader = req.getHeader(Constants.HEADER_COOKIE); + if (!StrKit.isBlank(cookieHeader)) { + builder.addHeader(Constants.HEADER_COOKIE, cookieHeader); } // 添加其他重要头信息 @@ -284,6 +298,16 @@ public class RouterHandler extends Handler { try { Response response = OK_HTTP_CLIENT.newCall(request).execute(); if (response.isSuccessful()) { + // 处理Set-Cookie响应头 + Headers headers = response.headers(); + for (String name : headers.names()) { + if ("Set-Cookie".equalsIgnoreCase(name)) { + for (String value : headers.values(name)) { + res.addHeader("Set-Cookie", value); + } + } + } + ResponseBody body = response.body(); if (body != null) { String contentType = response.header(Constants.HEADER_CONTENT_TYPE); diff --git a/dsWeb/conf/nginx.conf b/dsWeb/conf/nginx.conf index b4763a23..e2c00692 100644 --- a/dsWeb/conf/nginx.conf +++ b/dsWeb/conf/nginx.conf @@ -44,6 +44,12 @@ http { location / { proxy_pass http://10.10.21.20:8000; + proxy_cookie_path / /; + proxy_set_header Cookie $http_cookie; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; } location /dsWeb { diff --git a/dsWeb/logs/nginx.pid b/dsWeb/logs/nginx.pid index a05ce72a..a43852ac 100644 --- a/dsWeb/logs/nginx.pid +++ b/dsWeb/logs/nginx.pid @@ -1 +1 @@ -196476 +193300