diff --git a/dsSso/WebRoot/WEB-INF/web.xml b/dsSso/WebRoot/WEB-INF/web.xml index 37239a21..3ee6c859 100644 --- a/dsSso/WebRoot/WEB-INF/web.xml +++ b/dsSso/WebRoot/WEB-INF/web.xml @@ -17,6 +17,6 @@ webAppRootKey - dsssoserver + dsSso \ No newline at end of file diff --git a/dsSso/WebRoot/html/bindUser.html b/dsSso/WebRoot/html/bindUser.html index a891bed6..9a597f3e 100644 --- a/dsSso/WebRoot/html/bindUser.html +++ b/dsSso/WebRoot/html/bindUser.html @@ -3,7 +3,7 @@ 绑定账户 - + @@ -43,9 +43,9 @@ - - - + + + - - - \ No newline at end of file diff --git a/dsSso/WebRoot/html/jumpQq.html b/dsSso/WebRoot/html/jumpQq.html index bf6e98f6..3f94d284 100644 --- a/dsSso/WebRoot/html/jumpQq.html +++ b/dsSso/WebRoot/html/jumpQq.html @@ -2,9 +2,9 @@ - - - + + + @@ -19,7 +19,7 @@ $.ajax({ type : "POST", dataType : "json", - url : "/dsssoserver/third/qqLogin", + url : "/dsSso/third/qqLogin", data : { "code" : code }, @@ -51,7 +51,7 @@ $.ajax({ type : "GET", dataType : "json", - url : "/dsssoserver/third/getQqWxRedirectUrl", + url : "/dsSso/third/getQqWxRedirectUrl", async : false, success : function(result) { if (result.success) { diff --git a/dsSso/WebRoot/html/jumpWx.html b/dsSso/WebRoot/html/jumpWx.html index 618b63fb..e0da13fb 100644 --- a/dsSso/WebRoot/html/jumpWx.html +++ b/dsSso/WebRoot/html/jumpWx.html @@ -2,9 +2,9 @@ - - - + + + @@ -19,7 +19,7 @@ $.ajax({ type : "POST", dataType : "json", - url : "/dsssoserver/third/wxLogin", + url : "/dsSso/third/wxLogin", data : { "code" : code }, @@ -49,7 +49,7 @@ $.ajax({ type : "GET", dataType : "json", - url : "/dsssoserver/third/getQqWxRedirectUrl", + url : "/dsSso/third/getQqWxRedirectUrl", async : false, success : function(result) { if (result.success) { diff --git a/dsSso/WebRoot/html/login.html b/dsSso/WebRoot/html/login.html index 75902c25..40057a87 100644 --- a/dsSso/WebRoot/html/login.html +++ b/dsSso/WebRoot/html/login.html @@ -5,20 +5,20 @@ 统一认证中心 - - - + + +
- +
  • @@ -50,7 +50,7 @@ - 点击图片刷新校验码 换一张 @@ -68,11 +68,11 @@
    • -
    @@ -206,7 +206,7 @@ $.ajax({ type: "POST", dataType: "json", - url: "/dsssoserver/doLogin", + url: "/dsSso/doLogin", data: { "username": username, "password": aesEncrypt(password), @@ -243,7 +243,7 @@ $.ajax({ type: "POST", dataType: "json", - url: "/dsssoserver/phoneSmsCodeFastLogin", + url: "/dsSso/phoneSmsCodeFastLogin", data: { "smsFlag": smsFlag, "smsCode": smsCode @@ -327,7 +327,7 @@ //刷新验证码 function refreshCaptcha() { - $("#userCaptchaImage").attr("src", "/dsssoserver/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); + $("#userCaptchaImage").attr("src", "/dsSso/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); } //获取默认回调地址 @@ -336,7 +336,7 @@ $.ajax({ type: "GET", dataType: "json", - url: "/dsssoserver/getDefaultRedirectUrl", + url: "/dsSso/getDefaultRedirectUrl", async: false, success: function (result) { if (result.success) { @@ -366,7 +366,7 @@ $.ajax({ type: "POST", dataType: "json", - url: "/dsssoserver/sendSmsCode", + url: "/dsSso/sendSmsCode", data: { "phonenum": phonenum }, @@ -387,7 +387,7 @@ $('.loginV2').hide(); $('.shortLogin').show(); $('.form-error').hide(); - $("#smsCaptchaImage").attr("src", "/dsssoserver/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); + $("#smsCaptchaImage").attr("src", "/dsSso/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); }); $('.backLogin').click( @@ -396,7 +396,7 @@ $('.loginV2').show(); $('.shortLogin').hide(); $('.form-error').hide(); - $("#userCaptchaImage").attr("src", "/dsssoserver/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); + $("#userCaptchaImage").attr("src", "/dsSso/getCaptcha?id=" + new Date() + Math.floor(Math.random() * 24)); }); //判断是否为手机号 @@ -410,7 +410,7 @@ $.ajax({ type: "POST", dataType: "json", - url: "/dsssoserver/common/getGlobalValueByKey", + url: "/dsSso/common/getGlobalValueByKey", data: { "key": "sso_system_name,sso_copyright" }, diff --git a/dsSso/WebRoot/html/login_bak.html b/dsSso/WebRoot/html/login_bak.html deleted file mode 100644 index fc45aa8d..00000000 --- a/dsSso/WebRoot/html/login_bak.html +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - -统一认证中心 - - - - - - - - -
    -
    -
    - - 用户登录 - -
    - 用户名 -
    - -
    - 密码 -
    - -
    - 验证码 -
    - -
    - -
    - 忘记密码？ -
    - -
    -
    -
    - -
    -
    - -
    - 第三方登录 -
    - -
    - - - - - -
    - -
    - -
    -
    -
    - - - - - - - \ No newline at end of file diff --git a/dsSso/WebRoot/html/logout.html b/dsSso/WebRoot/html/logout.html index 8339ffc6..f1ac5e49 100644 --- a/dsSso/WebRoot/html/logout.html +++ b/dsSso/WebRoot/html/logout.html @@ -6,7 +6,7 @@ - + + 无权限接入统一认证中心 diff --git a/dsSso/WebRoot/html/pwdfind/findPwdEmail.html b/dsSso/WebRoot/html/pwdfind/findPwdEmail.html index c7efe83e..70015238 100644 --- a/dsSso/WebRoot/html/pwdfind/findPwdEmail.html +++ b/dsSso/WebRoot/html/pwdfind/findPwdEmail.html @@ -37,7 +37,7 @@
    - +   |  找回密码
    @@ -74,7 +74,7 @@ $.ajax({ type : "POST", dataType : "json", - url : "/dsssoserver/common/getGlobalValueByKey", + url : "/dsSso/common/getGlobalValueByKey", data : { "key" : "sso_copyright" }, @@ -119,7 +119,7 @@ clearInterval(timer); email=$("#email").val(); $.ajax({ - url : '/dsssoserver/sendFindPwdEmailCode', + url : '/dsSso/sendFindPwdEmailCode', async : true, type : "POST", dataType: "json", @@ -175,7 +175,7 @@ type: "POST", async: false, dataType: "json", - url: "/dsssoserver/checkVerificationCode", + url: "/dsSso/checkVerificationCode", data: { "flag":emailFlag, "code": f.code, diff --git a/dsSso/WebRoot/html/pwdfind/findPwdTel.html b/dsSso/WebRoot/html/pwdfind/findPwdTel.html index 0443c80f..12c20ab6 100644 --- a/dsSso/WebRoot/html/pwdfind/findPwdTel.html +++ b/dsSso/WebRoot/html/pwdfind/findPwdTel.html @@ -37,7 +37,7 @@
    - +   |  找回密码
    @@ -74,7 +74,7 @@ $.ajax({ type : "POST", dataType : "json", - url : "/dsssoserver/common/getGlobalValueByKey", + url : "/dsSso/common/getGlobalValueByKey", data : { "key" : "sso_copyright" }, @@ -120,7 +120,7 @@ clearInterval(timer); telnum=$("#tel").val(); $.ajax({ - url : '/dsssoserver/sendFindPwdPhoneSmsCode', + url : '/dsSso/sendFindPwdPhoneSmsCode', type : "POST", dataType: "json", data:{ @@ -176,7 +176,7 @@ type: "POST", async: false, dataType: "json", - url: "/dsssoserver/checkVerificationCode", + url: "/dsSso/checkVerificationCode", data: { "flag":sendFlag, "code": f.code, diff --git a/dsSso/WebRoot/html/pwdfind/pwdfind.html b/dsSso/WebRoot/html/pwdfind/pwdfind.html index f0d0f4e3..bff49ce5 100644 --- a/dsSso/WebRoot/html/pwdfind/pwdfind.html +++ b/dsSso/WebRoot/html/pwdfind/pwdfind.html @@ -61,7 +61,7 @@
    - +   |  找回密码
    @@ -110,7 +110,7 @@ $.ajax({ type : "POST", dataType : "json", - url : "/dsssoserver/common/getGlobalValueByKey", + url : "/dsSso/common/getGlobalValueByKey", data : { "key" : "sso_copyright" }, diff --git a/dsSso/WebRoot/html/pwdfind/setPwd.html b/dsSso/WebRoot/html/pwdfind/setPwd.html index 9c56228d..09f53351 100644 --- a/dsSso/WebRoot/html/pwdfind/setPwd.html +++ b/dsSso/WebRoot/html/pwdfind/setPwd.html @@ -38,7 +38,7 @@
    - +   |  找回密码
    @@ -106,7 +106,7 @@ $.ajax({ type : "POST", dataType : "json", - url : "/dsssoserver/common/getGlobalValueByKey", + url : "/dsSso/common/getGlobalValueByKey", data : { "key" : "sso_copyright" }, @@ -129,7 +129,7 @@ type: "POST", async: false, dataType: "json", - url: "/dsssoserver/findPwdByFlag", + url: "/dsSso/findPwdByFlag", data: { "flag":flag, "pwd":f.new, diff --git a/dsSso/src/main/java/com/dsideal/Sso/Controller/CommomController.java b/dsSso/src/main/java/com/dsideal/Sso/Controller/CommomController.java index 6053613d..a2c9aec9 100644 --- a/dsSso/src/main/java/com/dsideal/Sso/Controller/CommomController.java +++ b/dsSso/src/main/java/com/dsideal/Sso/Controller/CommomController.java @@ -6,13 +6,13 @@ import com.jfinal.ext.interceptor.GET; import com.alibaba.fastjson.JSONObject; import com.dsideal.Sso.Model.LoginModel; import com.jfinal.core.Controller; +import com.jfinal.ext.interceptor.POST; public class CommomController extends Controller { /** * 根据全局变量的key获取value */ - @Before({GET.class}) @EmptyInterface({"key"}) public void getGlobalValueByKey(String key) { JSONObject resultJson = new JSONObject(); diff --git a/dsSso/src/main/resources/logback.xml b/dsSso/src/main/resources/logback.xml index 45924271..94ea68cf 100644 --- a/dsSso/src/main/resources/logback.xml +++ b/dsSso/src/main/resources/logback.xml @@ -11,10 +11,10 @@ - ${LOG_HOME}/dsssoserver.log + ${LOG_HOME}/dsSso.log - ${LOG_HOME}/dsssoserver.log.%d{yyyy-MM-dd}.log + ${LOG_HOME}/dsSso.log.%d{yyyy-MM-dd}.log 30 diff --git a/dsSso/target/classes/logback.xml b/dsSso/target/classes/logback.xml index 45924271..94ea68cf 100644 --- a/dsSso/target/classes/logback.xml +++ b/dsSso/target/classes/logback.xml @@ -11,10 +11,10 @@ - ${LOG_HOME}/dsssoserver.log + ${LOG_HOME}/dsSso.log - ${LOG_HOME}/dsssoserver.log.%d{yyyy-MM-dd}.log + ${LOG_HOME}/dsSso.log.%d{yyyy-MM-dd}.log 30