From 7bd209e45960f07c1dafbe1f858e1672f542c641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 17 Dec 2024 11:35:17 +0800 Subject: [PATCH] 'commit' --- Doc/v1.0/.cache.json | 2 +- Doc/v1.0/QingLongSso-v1.0-api-docs.json | 16 +++++------ Doc/v1.0/apidoc.log | 26 +++++++++--------- ...eal_sso_Controller_WebLoginController.html | 20 +++++++------- Doc/v1.0/index.html | 4 +-- WebRoot/html/login.html | 8 +++--- src/main/java/com/dsideal/Start.java | 2 +- target/classes/com/dsideal/Start.class | Bin 5214 -> 5217 bytes 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Doc/v1.0/.cache.json b/Doc/v1.0/.cache.json index 81e2cf8..f6e7b90 100644 --- a/Doc/v1.0/.cache.json +++ b/Doc/v1.0/.cache.json @@ -1 +1 @@ -[{"baseUrl":"","className":"WebLoginController","description":"WebLoginController","docFileName":"com_dsideal_sso_Controller_WebLoginController.html","generateDocs":true,"packageName":"com.dsideal.sso.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#index","deprecated":false,"description":"跳转到登录页","header":[],"method":["GET","POST"],"methodName":"index","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//index"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#login","deprecated":false,"description":"登录跳转","header":[],"method":["GET","POST"],"methodName":"login","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//login"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#doLogin","deprecated":false,"description":"WEB登录","header":[],"method":["GET","POST"],"methodName":"doLogin","paramNodes":[{"description":"用户名","jsonBody":false,"name":"username","required":false,"type":"string"},{"description":"密码","jsonBody":false,"name":"password","required":false,"type":"string"},{"description":"验证码","jsonBody":false,"name":"captcha","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//doLogin"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#logout","deprecated":false,"description":"WEB登出","header":[],"method":["GET","POST"],"methodName":"logout","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//logout"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#getDefaultRedirectUrl","deprecated":false,"description":"获取默认RedirectUrl地址","header":[],"method":["GET","POST"],"methodName":"getDefaultRedirectUrl","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//getDefaultRedirectUrl"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#getCaptcha","deprecated":false,"description":"获取验证码","header":[],"method":["GET","POST"],"methodName":"getCaptcha","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//getCaptcha"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#loginCheck","deprecated":false,"description":"功能：登录检查","header":[],"method":["GET","POST"],"methodName":"loginCheck","paramNodes":[{"description":"会话id","jsonBody":false,"name":"sessionId","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"//loginCheck"}],"srcFileName":"D:\\dsWork\\QingLongSso\\src\\main\\java\\com\\dsideal\\sso\\Controller\\WebLoginController.java"}] \ No newline at end of file +[{"baseUrl":"","className":"WebLoginController","description":"WebLoginController","docFileName":"com_dsideal_sso_Controller_WebLoginController.html","generateDocs":true,"packageName":"com.dsideal.sso.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#index","deprecated":false,"description":"跳转到登录页","header":[],"method":["GET","POST"],"methodName":"index","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/index"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#login","deprecated":false,"description":"登录跳转","header":[],"method":["GET","POST"],"methodName":"login","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/login"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#doLogin","deprecated":false,"description":"WEB登录","header":[],"method":["GET","POST"],"methodName":"doLogin","paramNodes":[{"description":"用户名","jsonBody":false,"name":"username","required":false,"type":"string"},{"description":"密码","jsonBody":false,"name":"password","required":false,"type":"string"},{"description":"验证码","jsonBody":false,"name":"captcha","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/doLogin"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#logout","deprecated":false,"description":"WEB登出","header":[],"method":["GET","POST"],"methodName":"logout","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/logout"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#getDefaultRedirectUrl","deprecated":false,"description":"获取默认RedirectUrl地址","header":[],"method":["GET","POST"],"methodName":"getDefaultRedirectUrl","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/getDefaultRedirectUrl"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#getCaptcha","deprecated":false,"description":"获取验证码","header":[],"method":["GET","POST"],"methodName":"getCaptcha","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/getCaptcha"},{"changeFlag":0,"codeFileUrl":"com_dsideal_sso_Controller_WebLoginController.html#loginCheck","deprecated":false,"description":"登录检查","header":[],"method":["GET","POST"],"methodName":"loginCheck","paramNodes":[{"description":"会话id","jsonBody":false,"name":"sessionId","required":false,"type":"string"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/web/loginCheck"}],"srcFileName":"D:\\dsWork\\QingLongSso\\src\\main\\java\\com\\dsideal\\sso\\Controller\\WebLoginController.java"}] \ No newline at end of file diff --git a/Doc/v1.0/QingLongSso-v1.0-api-docs.json b/Doc/v1.0/QingLongSso-v1.0-api-docs.json index 8859b60..c6c1f22 100644 --- a/Doc/v1.0/QingLongSso-v1.0-api-docs.json +++ b/Doc/v1.0/QingLongSso-v1.0-api-docs.json @@ -5,7 +5,7 @@ "method": "GET", "url": { "query": [], - "raw": "{{domain}}//index" + "raw": "{{domain}}/web/index" } }, "name": "跳转到登录页" @@ -14,7 +14,7 @@ "request": { "url": { "query": [], - "raw": "{{domain}}//login" + "raw": "{{domain}}/web/login" } }, "name": "登录跳转" @@ -40,7 +40,7 @@ "key": "captcha" } ], - "raw": "{{domain}}//doLogin" + "raw": "{{domain}}/web/doLogin" } }, "name": "WEB登录" @@ -49,7 +49,7 @@ "request": { "url": { "query": [], - "raw": "{{domain}}//logout" + "raw": "{{domain}}/web/logout" } }, "name": "WEB登出" @@ -58,7 +58,7 @@ "request": { "url": { "query": [], - "raw": "{{domain}}//getDefaultRedirectUrl" + "raw": "{{domain}}/web/getDefaultRedirectUrl" } }, "name": "获取默认RedirectUrl地址" @@ -67,7 +67,7 @@ "request": { "url": { "query": [], - "raw": "{{domain}}//getCaptcha" + "raw": "{{domain}}/web/getCaptcha" } }, "name": "获取验证码" @@ -83,10 +83,10 @@ "key": "sessionId" } ], - "raw": "{{domain}}//loginCheck" + "raw": "{{domain}}/web/loginCheck" } }, - "name": "功能：登录检查" + "name": "登录检查" } ], "name": "WebLoginController" diff --git a/Doc/v1.0/apidoc.log b/Doc/v1.0/apidoc.log index 4a99140..a374a56 100644 --- a/Doc/v1.0/apidoc.log +++ b/Doc/v1.0/apidoc.log @@ -1,26 +1,26 @@ -12月 17, 2024 11:27:41 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: find java src paths: [D:\dsWork\QingLongSso\src\main\java\] -12月 17, 2024 11:27:41 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: project type not set, try to figure out... -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: start find controllers in path : D:\dsWork\QingLongSso\src\main\java\ -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: Jfinal config file path : D:\dsWork\QingLongSso\src\main\java\com\dsideal\Start.java -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: start to parse controller file : WebLoginController.java -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: success to parse controller file : WebLoginController.java -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: start to parse controller file : CommomController.java -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: generate api docs start... -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: start to generate docs for controller file : D:\dsWork\QingLongSso\src\main\java\com\dsideal\sso\Controller\WebLoginController.java -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: success to generate docs for controller file : D:\dsWork\QingLongSso\src\main\java\com\dsideal\sso\Controller\WebLoginController.java -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: generate index start !!! -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: generate index done !!! -12月 17, 2024 11:27:42 上午 io.github.yedaxia.apidocs.LogUtils info +12月 17, 2024 11:34:17 上午 io.github.yedaxia.apidocs.LogUtils info 信息: info: generate api docs done !!! diff --git a/Doc/v1.0/com_dsideal_sso_Controller_WebLoginController.html b/Doc/v1.0/com_dsideal_sso_Controller_WebLoginController.html index a816834..f225d31 100644 --- a/Doc/v1.0/com_dsideal_sso_Controller_WebLoginController.html +++ b/Doc/v1.0/com_dsideal_sso_Controller_WebLoginController.html @@ -61,7 +61,7 @@ 获取验证码 - 功能：登录检查 + 登录检查 @@ -81,7 +81,7 @@

跳转到登录页

请求URL

- //index + /web/index GET POST

@@ -93,7 +93,7 @@

登录跳转

请求URL

- //login + /web/login GET POST

@@ -105,7 +105,7 @@

WEB登录

请求URL

- //doLogin + /web/doLogin GET POST

@@ -144,7 +144,7 @@

WEB登出

请求URL

- //logout + /web/logout GET POST

@@ -156,7 +156,7 @@

获取默认RedirectUrl地址

请求URL

- //getDefaultRedirectUrl + /web/getDefaultRedirectUrl GET POST

@@ -168,7 +168,7 @@

获取验证码

请求URL

- //getCaptcha + /web/getCaptcha GET POST

@@ -177,10 +177,10 @@
-

功能：登录检查

+

登录检查

请求URL

- //loginCheck + /web/loginCheck GET POST

@@ -222,7 +222,7 @@ {name: 'WebLoginController.WEB登出', url: 'com_dsideal_sso_Controller_WebLoginController.html#logout'}, {name: 'WebLoginController.获取默认RedirectUrl地址', url: 'com_dsideal_sso_Controller_WebLoginController.html#getDefaultRedirectUrl'}, {name: 'WebLoginController.获取验证码', url: 'com_dsideal_sso_Controller_WebLoginController.html#getCaptcha'}, - {name: 'WebLoginController.功能：登录检查', url: 'com_dsideal_sso_Controller_WebLoginController.html#loginCheck'}, + {name: 'WebLoginController.登录检查', url: 'com_dsideal_sso_Controller_WebLoginController.html#loginCheck'}, ]; diff --git a/Doc/v1.0/index.html b/Doc/v1.0/index.html index f110d05..88dc21c 100644 --- a/Doc/v1.0/index.html +++ b/Doc/v1.0/index.html @@ -61,7 +61,7 @@ 获取验证码 - 功能：登录检查 + 登录检查
@@ -101,7 +101,7 @@ {name: 'WebLoginController.WEB登出', url: 'com_dsideal_sso_Controller_WebLoginController.html#logout'}, {name: 'WebLoginController.获取默认RedirectUrl地址', url: 'com_dsideal_sso_Controller_WebLoginController.html#getDefaultRedirectUrl'}, {name: 'WebLoginController.获取验证码', url: 'com_dsideal_sso_Controller_WebLoginController.html#getCaptcha'}, - {name: 'WebLoginController.功能：登录检查', url: 'com_dsideal_sso_Controller_WebLoginController.html#loginCheck'}, + {name: 'WebLoginController.登录检查', url: 'com_dsideal_sso_Controller_WebLoginController.html#loginCheck'}, ]; diff --git a/WebRoot/html/login.html b/WebRoot/html/login.html index b2d3c0b..fee22a4 100644 --- a/WebRoot/html/login.html +++ b/WebRoot/html/login.html @@ -121,7 +121,7 @@ $.ajax({ type: "POST", dataType: "json", - url: "/dsssoserver/doLogin", + url: "/dsssoserver/web/doLogin", data: { "username": username, "password": aesEncrypt(password), @@ -191,7 +191,7 @@ //刷新验证码 function refreshCaptcha() { - $("#userCaptchaImage").attr("src", "/dsssoserver/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); + $("#userCaptchaImage").attr("src", "/dsssoserver/web/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); } //获取默认回调地址 @@ -200,7 +200,7 @@ $.ajax({ type: "GET", dataType: "json", - url: "/dsssoserver/getDefaultRedirectUrl", + url: "/dsssoserver/web/getDefaultRedirectUrl", async: false, success: function (result) { if (result.success) { @@ -218,7 +218,7 @@ $('.loginV2').show(); $('.shortLogin').hide(); $('.form-error').hide(); - $("#userCaptchaImage").attr("src", "/dsssoserver/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); + $("#userCaptchaImage").attr("src", "/dsssoserver/web/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); }); diff --git a/src/main/java/com/dsideal/Start.java b/src/main/java/com/dsideal/Start.java index 8f8dd2a..0f55b3f 100644 --- a/src/main/java/com/dsideal/Start.java +++ b/src/main/java/com/dsideal/Start.java @@ -43,7 +43,7 @@ public class Start extends JFinalConfig { * 配置路由 */ public void configRoute(Routes me) { - me.add("/", WebLoginController.class); + me.add("/web", WebLoginController.class); me.add("/common", CommomController.class); } diff --git a/target/classes/com/dsideal/Start.class b/target/classes/com/dsideal/Start.class index 239bbd2215bb7d50f7528890e687cc904cb7fce6..eae395b1b3cb7937317d8a77f303376209d4f7d7 100644 GIT binary patch delta 18 Zcmcbo@lay}Ckrc!etBxrW^R^X0RTKb1!w>O delta 15 WcmaE;aZh6dCkqp!{$@UwU;zLsOavzY