remove unused import
This commit is contained in:
-2
@@ -20,8 +20,6 @@ package org.dromara.maxkey.authn;
|
|||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description:
|
* @description:
|
||||||
|
|||||||
-1
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.dromara.maxkey.authn.SignPrincipal;
|
import org.dromara.maxkey.authn.SignPrincipal;
|
||||||
import org.dromara.maxkey.crypto.jwt.HMAC512Service;
|
import org.dromara.maxkey.crypto.jwt.HMAC512Service;
|
||||||
import org.dromara.maxkey.entity.idm.UserInfo;
|
import org.dromara.maxkey.entity.idm.UserInfo;
|
||||||
import org.dromara.maxkey.util.StrUtils;
|
|
||||||
import org.dromara.maxkey.web.WebContext;
|
import org.dromara.maxkey.web.WebContext;
|
||||||
import org.joda.time.DateTime;
|
import org.joda.time.DateTime;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|||||||
-4
@@ -17,20 +17,16 @@
|
|||||||
|
|
||||||
package org.dromara.maxkey.authn.provider.scancode;
|
package org.dromara.maxkey.authn.provider.scancode;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import org.dromara.maxkey.authn.session.Session;
|
import org.dromara.maxkey.authn.session.Session;
|
||||||
import org.dromara.maxkey.authn.session.SessionManager;
|
|
||||||
import org.dromara.maxkey.exception.BusinessException;
|
import org.dromara.maxkey.exception.BusinessException;
|
||||||
import org.dromara.maxkey.persistence.cache.MomentaryService;
|
import org.dromara.maxkey.persistence.cache.MomentaryService;
|
||||||
import org.dromara.maxkey.util.IdGenerator;
|
import org.dromara.maxkey.util.IdGenerator;
|
||||||
import org.dromara.maxkey.util.JsonUtils;
|
|
||||||
import org.dromara.maxkey.util.TimeJsonUtils;
|
import org.dromara.maxkey.util.TimeJsonUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
-1
@@ -31,7 +31,6 @@ import org.dromara.maxkey.persistence.repository.LoginHistoryRepository;
|
|||||||
import org.dromara.maxkey.persistence.repository.LoginRepository;
|
import org.dromara.maxkey.persistence.repository.LoginRepository;
|
||||||
import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
|
import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
|
||||||
import org.dromara.maxkey.persistence.service.UserInfoService;
|
import org.dromara.maxkey.persistence.service.UserInfoService;
|
||||||
import org.dromara.maxkey.util.DateUtils;
|
|
||||||
import org.dromara.maxkey.web.WebConstants;
|
import org.dromara.maxkey.web.WebConstants;
|
||||||
import org.dromara.maxkey.web.WebContext;
|
import org.dromara.maxkey.web.WebContext;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|||||||
-1
@@ -24,7 +24,6 @@ import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
|
|||||||
import org.dromara.maxkey.authn.web.AuthorizationUtils;
|
import org.dromara.maxkey.authn.web.AuthorizationUtils;
|
||||||
import org.dromara.maxkey.configuration.ApplicationConfig;
|
import org.dromara.maxkey.configuration.ApplicationConfig;
|
||||||
import org.dromara.maxkey.constants.ConstsLoginType;
|
import org.dromara.maxkey.constants.ConstsLoginType;
|
||||||
import org.dromara.maxkey.util.StrUtils;
|
|
||||||
import org.opensaml.saml1.core.impl.AssertionImpl;
|
import org.opensaml.saml1.core.impl.AssertionImpl;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|||||||
-13
@@ -16,24 +16,11 @@
|
|||||||
|
|
||||||
|
|
||||||
package me.zhyd.oauth.request;
|
package me.zhyd.oauth.request;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
|
||||||
import me.zhyd.oauth.cache.AuthStateCache;
|
import me.zhyd.oauth.cache.AuthStateCache;
|
||||||
import me.zhyd.oauth.config.AuthConfig;
|
import me.zhyd.oauth.config.AuthConfig;
|
||||||
import me.zhyd.oauth.enums.AuthUserGender;
|
|
||||||
import me.zhyd.oauth.enums.scope.AuthHuaweiScope;
|
|
||||||
import me.zhyd.oauth.exception.AuthException;
|
|
||||||
import me.zhyd.oauth.model.AuthCallback;
|
import me.zhyd.oauth.model.AuthCallback;
|
||||||
import me.zhyd.oauth.model.AuthResponse;
|
|
||||||
import me.zhyd.oauth.model.AuthToken;
|
import me.zhyd.oauth.model.AuthToken;
|
||||||
import me.zhyd.oauth.model.AuthUser;
|
import me.zhyd.oauth.model.AuthUser;
|
||||||
import me.zhyd.oauth.utils.AuthScopeUtils;
|
|
||||||
import me.zhyd.oauth.utils.HttpUtils;
|
|
||||||
import me.zhyd.oauth.utils.UrlBuilder;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static me.zhyd.oauth.enums.AuthResponseStatus.SUCCESS;
|
|
||||||
|
|
||||||
public class AuthMaxkeyRequest extends AuthDefaultRequest {
|
public class AuthMaxkeyRequest extends AuthDefaultRequest {
|
||||||
|
|
||||||
|
|||||||
-1
@@ -34,7 +34,6 @@ import org.dromara.maxkey.uuid.UUID;
|
|||||||
import org.dromara.maxkey.web.WebContext;
|
import org.dromara.maxkey.web.WebContext;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|||||||
-4
@@ -19,10 +19,6 @@ package org.dromara.maxkey.authn.support.socialsignon.token;
|
|||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.dromara.maxkey.constants.ConstsTimeInterval;
|
import org.dromara.maxkey.constants.ConstsTimeInterval;
|
||||||
import org.dromara.maxkey.persistence.redis.RedisConnection;
|
|
||||||
import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
|
|
||||||
import org.joda.time.DateTime;
|
|
||||||
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
public class RedisTokenStore {
|
public class RedisTokenStore {
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.dromara.maxkey.util.Instance;
|
import org.dromara.maxkey.util.Instance;
|
||||||
import org.dromara.maxkey.util.StringGenerator;
|
import org.dromara.maxkey.util.StringGenerator;
|
||||||
import org.dromara.maxkey.util.StrUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reciprocal cipher or Symmetric-key algorithm
|
* Reciprocal cipher or Symmetric-key algorithm
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
/*
|
||||||
|
* Copyright [2020] [MaxKey of copyright http://www.maxkey.top]
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
package org.maxkey.otp.algorithm;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
|
import org.dromara.maxkey.util.QRCode;
|
||||||
|
|
||||||
|
import com.google.zxing.BarcodeFormat;
|
||||||
|
import com.google.zxing.MultiFormatWriter;
|
||||||
|
import com.google.zxing.common.BitMatrix;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* VCARD
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* BEGIN:VCARD
|
||||||
|
VERSION:3.0
|
||||||
|
N:Gump;Forrest;;Mr.
|
||||||
|
FN:Forrest Gump
|
||||||
|
ORG:Bubba Gump Shrimp Co.
|
||||||
|
TITLE:Shrimp Man
|
||||||
|
PHOTO;VALUE=URL;TYPE=GIF:http://www.example.com/dir_photos/my_photo.gif
|
||||||
|
TEL;TYPE=WORK,VOICE:(111) 555-12121
|
||||||
|
TEL;TYPE=HOME,VOICE:(404) 555-1212
|
||||||
|
ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
|
||||||
|
LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America
|
||||||
|
ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America
|
||||||
|
LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America
|
||||||
|
EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com
|
||||||
|
REV:2008-04-24T19:52:43Z
|
||||||
|
END:VCARD
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
BEGIN:VCARD
|
||||||
|
VERSION:4.0
|
||||||
|
N:Gump;Forrest;;;
|
||||||
|
FN:Forrest Gump
|
||||||
|
ORG:Bubba Gump Shrimp Co.
|
||||||
|
TITLE:Shrimp Man
|
||||||
|
PHOTO;MEDIATYPE=image/gif:http://www.example.com/dir_photos/my_photo.gif
|
||||||
|
TEL;TYPE=work,voice;VALUE=uri:tel:+1-111-555-1212
|
||||||
|
TEL;TYPE=home,voice;VALUE=uri:tel:+1-404-555-1212
|
||||||
|
ADR;TYPE=work;LABEL="100 Waters Edge\nBaytown, LA 30314\nUnited States of America"
|
||||||
|
:;;100 Waters Edge;Baytown;LA;30314;United States of America
|
||||||
|
ADR;TYPE=home;LABEL="42 Plantation St.\nBaytown, LA 30314\nUnited States of America"
|
||||||
|
:;;42 Plantation St.;Baytown;LA;30314;United States of America
|
||||||
|
EMAIL:forrestgump@example.com
|
||||||
|
REV:20080424T195243Z
|
||||||
|
END:VCARD
|
||||||
|
*/
|
||||||
|
public class QRcodeTest {
|
||||||
|
|
||||||
|
// 编码
|
||||||
|
public static void main(String[] args) {
|
||||||
|
try {
|
||||||
|
|
||||||
|
String str = """
|
||||||
|
BEGIN:VCARD
|
||||||
|
VERSION:3.0
|
||||||
|
N:石鸣
|
||||||
|
EMAIL:shimh@qq.com
|
||||||
|
TEL:15618726256
|
||||||
|
TEL;CELL:12345678912
|
||||||
|
ADR:上海
|
||||||
|
ORG:
|
||||||
|
Connsec
|
||||||
|
TITLE:技术总监
|
||||||
|
URL:http://blog.csdn.net/lidew521
|
||||||
|
NOTE:呼呼测试下吧。。。
|
||||||
|
END:VCARD
|
||||||
|
""";
|
||||||
|
|
||||||
|
String str1 = """
|
||||||
|
BEGIN:VCARD
|
||||||
|
VERSION:3.0
|
||||||
|
N:Gump;Forrest;;Mr.
|
||||||
|
ORG:Bubba Gump Shrimp Co.
|
||||||
|
TITLE:Shrimp Man
|
||||||
|
TEL;TYPE=WORK,VOICE:(111) 555-12121
|
||||||
|
ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
|
||||||
|
EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com
|
||||||
|
URL:http://www.johndoe.com
|
||||||
|
GENDER:F
|
||||||
|
REV:2008-04-24T19:52:43Z
|
||||||
|
END:VCARD
|
||||||
|
""";
|
||||||
|
|
||||||
|
System.out.println(str);
|
||||||
|
//String str = "CN:男;COP:公司;ZW:职务";// 二维码内容
|
||||||
|
String path = "D:\\hwy.png";
|
||||||
|
BitMatrix byteMatrix;
|
||||||
|
byteMatrix = new MultiFormatWriter().encode(new String(str1.getBytes("UTF-8"),"iso-8859-1"), BarcodeFormat.QR_CODE, 300, 300);
|
||||||
|
File file = new File(path);
|
||||||
|
|
||||||
|
QRCode.writeToPath(byteMatrix, "png", file);
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright [2020] [MaxKey of copyright http://www.maxkey.top]
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
package org.maxkey.otp.algorithm;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
import org.dromara.maxkey.util.QRCode;
|
|
||||||
|
|
||||||
import com.google.zxing.BarcodeFormat;
|
|
||||||
import com.google.zxing.MultiFormatWriter;
|
|
||||||
import com.google.zxing.common.BitMatrix;
|
|
||||||
|
|
||||||
public class RQcodeTest {
|
|
||||||
|
|
||||||
/*
|
|
||||||
* BEGIN:VCARD
|
|
||||||
VERSION:3.0
|
|
||||||
N:Gump;Forrest;;Mr.
|
|
||||||
FN:Forrest Gump
|
|
||||||
ORG:Bubba Gump Shrimp Co.
|
|
||||||
TITLE:Shrimp Man
|
|
||||||
PHOTO;VALUE=URL;TYPE=GIF:http://www.example.com/dir_photos/my_photo.gif
|
|
||||||
TEL;TYPE=WORK,VOICE:(111) 555-12121
|
|
||||||
TEL;TYPE=HOME,VOICE:(404) 555-1212
|
|
||||||
ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America
|
|
||||||
LABEL;TYPE=WORK:100 Waters Edge\nBaytown, LA 30314\nUnited States of America
|
|
||||||
ADR;TYPE=HOME:;;42 Plantation St.;Baytown;LA;30314;United States of America
|
|
||||||
LABEL;TYPE=HOME:42 Plantation St.\nBaytown, LA 30314\nUnited States of America
|
|
||||||
EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com
|
|
||||||
REV:2008-04-24T19:52:43Z
|
|
||||||
END:VCARD
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BEGIN:VCARD
|
|
||||||
VERSION:4.0
|
|
||||||
N:Gump;Forrest;;;
|
|
||||||
FN:Forrest Gump
|
|
||||||
ORG:Bubba Gump Shrimp Co.
|
|
||||||
TITLE:Shrimp Man
|
|
||||||
PHOTO;MEDIATYPE=image/gif:http://www.example.com/dir_photos/my_photo.gif
|
|
||||||
TEL;TYPE=work,voice;VALUE=uri:tel:+1-111-555-1212
|
|
||||||
TEL;TYPE=home,voice;VALUE=uri:tel:+1-404-555-1212
|
|
||||||
ADR;TYPE=work;LABEL="100 Waters Edge\nBaytown, LA 30314\nUnited States of America"
|
|
||||||
:;;100 Waters Edge;Baytown;LA;30314;United States of America
|
|
||||||
ADR;TYPE=home;LABEL="42 Plantation St.\nBaytown, LA 30314\nUnited States of America"
|
|
||||||
:;;42 Plantation St.;Baytown;LA;30314;United States of America
|
|
||||||
EMAIL:forrestgump@example.com
|
|
||||||
REV:20080424T195243Z
|
|
||||||
END:VCARD
|
|
||||||
*/
|
|
||||||
// 编码
|
|
||||||
public static void main(String[] args) {
|
|
||||||
try {
|
|
||||||
|
|
||||||
String str = "BEGIN:VCARD\n" +
|
|
||||||
"VERSION:3.0\n" +
|
|
||||||
"N:石明海\n" +
|
|
||||||
"EMAIL:shimh@qq.com\n" +
|
|
||||||
"TEL:15618726256\n" +
|
|
||||||
"TEL;CELL:12345678912" +
|
|
||||||
"ADR:上海\n" +
|
|
||||||
"ORG:" +
|
|
||||||
"Connsec\n" +
|
|
||||||
"TITLE:技术总监\n" +
|
|
||||||
//"URL:http://blog.csdn.net/lidew521\n" +
|
|
||||||
//"NOTE:呼呼测试下吧。。。\n" +
|
|
||||||
"END:VCARD";
|
|
||||||
|
|
||||||
String str1 = "BEGIN:VCARD\n" +
|
|
||||||
"VERSION:3.0\n" +
|
|
||||||
"N:Gump;Forrest;;Mr.\n" +
|
|
||||||
"ORG:Bubba Gump Shrimp Co.\n" +
|
|
||||||
"TITLE:Shrimp Man\n" +
|
|
||||||
"TEL;TYPE=WORK,VOICE:(111) 555-12121\n" +
|
|
||||||
"ADR;TYPE=WORK:;;100 Waters Edge;Baytown;LA;30314;United States of America\n" +
|
|
||||||
"EMAIL;TYPE=PREF,INTERNET:forrestgump@example.com\n" +
|
|
||||||
"URL:http://www.johndoe.com\n" +
|
|
||||||
"GENDER:F\n"+
|
|
||||||
"REV:2008-04-24T19:52:43Z\n" +
|
|
||||||
"END:VCARD\n" ;
|
|
||||||
|
|
||||||
System.out.println(str);
|
|
||||||
//String str = "CN:男;COP:公司;ZW:职务";// 二维码内容
|
|
||||||
String path = "D:\\hwy.png";
|
|
||||||
BitMatrix byteMatrix;
|
|
||||||
byteMatrix = new MultiFormatWriter().encode(new String(str1.getBytes("UTF-8"),"iso-8859-1"),
|
|
||||||
BarcodeFormat.QR_CODE, 300, 300);
|
|
||||||
File file = new File(path);
|
|
||||||
|
|
||||||
QRCode.writeToPath(byteMatrix, "png", file);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -19,7 +19,6 @@ package org.dromara.maxkey.entity.apps;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.dromara.mybatis.jpa.entity.JpaEntity;
|
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
|
|||||||
@@ -19,12 +19,7 @@ package org.dromara.maxkey.entity.apps;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.dromara.mybatis.jpa.entity.JpaEntity;
|
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import jakarta.persistence.GeneratedValue;
|
|
||||||
import jakarta.persistence.Id;
|
|
||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ package org.dromara.maxkey.entity.apps;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.dromara.mybatis.jpa.entity.JpaEntity;
|
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import jakarta.persistence.GeneratedValue;
|
import jakarta.persistence.GeneratedValue;
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ package org.dromara.maxkey.entity.apps;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.dromara.mybatis.jpa.entity.JpaEntity;
|
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import jakarta.persistence.GeneratedValue;
|
import jakarta.persistence.GeneratedValue;
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ package org.dromara.maxkey.entity.apps;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
|
|
||||||
import org.dromara.mybatis.jpa.entity.JpaEntity;
|
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import jakarta.persistence.GeneratedValue;
|
import jakarta.persistence.GeneratedValue;
|
||||||
|
|||||||
@@ -21,9 +21,6 @@
|
|||||||
package org.dromara.maxkey.entity.apps;
|
package org.dromara.maxkey.entity.apps;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
import org.dromara.mybatis.jpa.entity.JpaEntity;
|
|
||||||
|
|
||||||
import jakarta.persistence.Column;
|
import jakarta.persistence.Column;
|
||||||
import jakarta.persistence.Entity;
|
import jakarta.persistence.Entity;
|
||||||
import jakarta.persistence.GeneratedValue;
|
import jakarta.persistence.GeneratedValue;
|
||||||
|
|||||||
@@ -17,8 +17,6 @@
|
|||||||
|
|
||||||
package org.dromara.maxkey.exception;
|
package org.dromara.maxkey.exception;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description:
|
* @description:
|
||||||
* @author: orangeBabu
|
* @author: orangeBabu
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ import org.pac4j.cas.client.rest.CasRestFormClient;
|
|||||||
import org.pac4j.cas.config.CasConfiguration;
|
import org.pac4j.cas.config.CasConfiguration;
|
||||||
import org.pac4j.cas.credentials.authenticator.CasRestAuthenticator;
|
import org.pac4j.cas.credentials.authenticator.CasRestAuthenticator;
|
||||||
import org.pac4j.cas.profile.CasProfile;
|
import org.pac4j.cas.profile.CasProfile;
|
||||||
import org.pac4j.core.context.J2EContext;
|
|
||||||
import org.pac4j.core.context.WebContext;
|
import org.pac4j.core.context.WebContext;
|
||||||
import org.pac4j.core.credentials.TokenCredentials;
|
import org.pac4j.core.credentials.TokenCredentials;
|
||||||
import org.pac4j.core.credentials.UsernamePasswordCredentials;
|
import org.pac4j.core.credentials.UsernamePasswordCredentials;
|
||||||
|
|||||||
-1
@@ -12,7 +12,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.dromara.maxkey.authz.oauth2.provider;
|
package org.dromara.maxkey.authz.oauth2.provider;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.dromara.maxkey.authn.SignPrincipal;
|
import org.dromara.maxkey.authn.SignPrincipal;
|
||||||
|
|||||||
-2
@@ -40,10 +40,8 @@ import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication;
|
|||||||
import org.dromara.maxkey.authz.oauth2.provider.token.AccessTokenConverter;
|
import org.dromara.maxkey.authz.oauth2.provider.token.AccessTokenConverter;
|
||||||
import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter;
|
import org.dromara.maxkey.authz.oauth2.provider.token.DefaultAccessTokenConverter;
|
||||||
import org.dromara.maxkey.authz.oauth2.provider.token.ResourceServerTokenServices;
|
import org.dromara.maxkey.authz.oauth2.provider.token.ResourceServerTokenServices;
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
|||||||
-1
@@ -40,7 +40,6 @@ import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptio
|
|||||||
import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService;
|
import org.dromara.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService;
|
||||||
import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails;
|
import org.dromara.maxkey.entity.apps.oauth2.provider.ClientDetails;
|
||||||
import org.joda.time.DateTime;
|
import org.joda.time.DateTime;
|
||||||
import org.joda.time.format.DateTimeFormat;
|
|
||||||
|
|
||||||
import com.nimbusds.jose.util.Base64URL;
|
import com.nimbusds.jose.util.Base64URL;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|||||||
-2
@@ -29,7 +29,6 @@ import java.util.Map;
|
|||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
import org.dromara.maxkey.authn.LoginCredential;
|
import org.dromara.maxkey.authn.LoginCredential;
|
||||||
import org.dromara.maxkey.authn.jwt.AuthJwt;
|
|
||||||
import org.dromara.maxkey.authn.jwt.AuthTokenService;
|
import org.dromara.maxkey.authn.jwt.AuthTokenService;
|
||||||
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
|
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
|
||||||
import org.dromara.maxkey.authz.saml.common.EndpointGenerator;
|
import org.dromara.maxkey.authz.saml.common.EndpointGenerator;
|
||||||
@@ -53,7 +52,6 @@ import org.opensaml.common.binding.security.MessageReplayRule;
|
|||||||
import org.opensaml.saml2.core.Assertion;
|
import org.opensaml.saml2.core.Assertion;
|
||||||
import org.opensaml.saml2.core.Response;
|
import org.opensaml.saml2.core.Response;
|
||||||
import org.opensaml.saml2.core.StatusCode;
|
import org.opensaml.saml2.core.StatusCode;
|
||||||
import org.opensaml.ws.message.decoder.MessageDecodingException;
|
|
||||||
import org.opensaml.xml.security.CriteriaSet;
|
import org.opensaml.xml.security.CriteriaSet;
|
||||||
import org.opensaml.xml.security.SecurityException;
|
import org.opensaml.xml.security.SecurityException;
|
||||||
import org.opensaml.xml.security.credential.Credential;
|
import org.opensaml.xml.security.credential.Credential;
|
||||||
|
|||||||
-2
@@ -15,8 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.dromara.maxkey.ip2location.online;
|
package org.dromara.maxkey.ip2location.online;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import org.dromara.maxkey.ip2location.AbstractIpLocation;
|
import org.dromara.maxkey.ip2location.AbstractIpLocation;
|
||||||
import org.dromara.maxkey.ip2location.IpLocation;
|
import org.dromara.maxkey.ip2location.IpLocation;
|
||||||
import org.dromara.maxkey.ip2location.Region;
|
import org.dromara.maxkey.ip2location.Region;
|
||||||
|
|||||||
-1
@@ -17,7 +17,6 @@
|
|||||||
package org.dromara.maxkey.ip2location;
|
package org.dromara.maxkey.ip2location;
|
||||||
|
|
||||||
|
|
||||||
import org.dromara.maxkey.ip2location.IpLocation;
|
|
||||||
import org.dromara.maxkey.ip2location.online.Ip138;
|
import org.dromara.maxkey.ip2location.online.Ip138;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
|||||||
-1
@@ -15,7 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.dromara.maxkey.ip2location;
|
package org.dromara.maxkey.ip2location;
|
||||||
|
|
||||||
import org.dromara.maxkey.ip2location.IpLocationParser;
|
|
||||||
import org.dromara.maxkey.ip2location.online.Ip138;
|
import org.dromara.maxkey.ip2location.online.Ip138;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
|||||||
-2
@@ -27,8 +27,6 @@ import org.dromara.maxkey.entity.idm.Groups;
|
|||||||
import org.dromara.maxkey.entity.idm.UserInfo;
|
import org.dromara.maxkey.entity.idm.UserInfo;
|
||||||
import org.dromara.maxkey.persistence.service.GroupMemberService;
|
import org.dromara.maxkey.persistence.service.GroupMemberService;
|
||||||
import org.dromara.maxkey.persistence.service.GroupsService;
|
import org.dromara.maxkey.persistence.service.GroupsService;
|
||||||
import org.dromara.maxkey.util.DateUtils;
|
|
||||||
import org.dromara.maxkey.util.StrUtils;
|
|
||||||
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup;
|
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimGroup;
|
||||||
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef;
|
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef;
|
||||||
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta;
|
import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta;
|
||||||
|
|||||||
-5
@@ -17,14 +17,11 @@
|
|||||||
|
|
||||||
package org.dromara.maxkey.autoconfigure;
|
package org.dromara.maxkey.autoconfigure;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
|
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
|
||||||
import org.dromara.maxkey.authn.support.basic.BasicEntryPoint;
|
import org.dromara.maxkey.authn.support.basic.BasicEntryPoint;
|
||||||
import org.dromara.maxkey.authn.support.httpheader.HttpHeaderEntryPoint;
|
import org.dromara.maxkey.authn.support.httpheader.HttpHeaderEntryPoint;
|
||||||
import org.dromara.maxkey.authn.support.kerberos.HttpKerberosEntryPoint;
|
import org.dromara.maxkey.authn.support.kerberos.HttpKerberosEntryPoint;
|
||||||
import org.dromara.maxkey.authn.support.kerberos.KerberosService;
|
import org.dromara.maxkey.authn.support.kerberos.KerberosService;
|
||||||
import org.dromara.maxkey.authn.web.CurrentUserMethodArgumentResolver;
|
|
||||||
import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor;
|
import org.dromara.maxkey.authn.web.interceptor.PermissionInterceptor;
|
||||||
import org.dromara.maxkey.configuration.ApplicationConfig;
|
import org.dromara.maxkey.configuration.ApplicationConfig;
|
||||||
import org.dromara.maxkey.web.interceptor.HistorySignOnAppInterceptor;
|
import org.dromara.maxkey.web.interceptor.HistorySignOnAppInterceptor;
|
||||||
@@ -34,8 +31,6 @@ import org.slf4j.LoggerFactory;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
|
|
||||||
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
||||||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||||
|
|||||||
-1
@@ -32,7 +32,6 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|||||||
import org.springframework.web.bind.annotation.PutMapping;
|
import org.springframework.web.bind.annotation.PutMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
|
|||||||
-1
@@ -35,7 +35,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
|
|||||||
-1
@@ -27,7 +27,6 @@ import org.dromara.maxkey.web.WebContext;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
|||||||
-1
@@ -29,7 +29,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
|||||||
-1
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.WebDataBinder;
|
import org.springframework.web.bind.WebDataBinder;
|
||||||
import org.springframework.web.bind.annotation.InitBinder;
|
import org.springframework.web.bind.annotation.InitBinder;
|
||||||
|
|||||||
-1
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.WebDataBinder;
|
import org.springframework.web.bind.WebDataBinder;
|
||||||
import org.springframework.web.bind.annotation.InitBinder;
|
import org.springframework.web.bind.annotation.InitBinder;
|
||||||
|
|||||||
-2
@@ -25,8 +25,6 @@ import org.dromara.maxkey.persistence.repository.LoginHistoryRepository;
|
|||||||
import org.dromara.maxkey.persistence.repository.LoginRepository;
|
import org.dromara.maxkey.persistence.repository.LoginRepository;
|
||||||
import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
|
import org.dromara.maxkey.persistence.repository.PasswordPolicyValidator;
|
||||||
import org.dromara.maxkey.persistence.service.UserInfoService;
|
import org.dromara.maxkey.persistence.service.UserInfoService;
|
||||||
import org.dromara.maxkey.synchronizer.ISynchronizerService;
|
|
||||||
import org.dromara.maxkey.synchronizer.ldap.LdapSynchronizerService;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
|
|||||||
-3
@@ -28,8 +28,6 @@ import org.dromara.maxkey.entity.Connectors;
|
|||||||
import org.dromara.maxkey.entity.Message;
|
import org.dromara.maxkey.entity.Message;
|
||||||
import org.dromara.maxkey.entity.Synchronizers;
|
import org.dromara.maxkey.entity.Synchronizers;
|
||||||
import org.dromara.maxkey.entity.idm.UserInfo;
|
import org.dromara.maxkey.entity.idm.UserInfo;
|
||||||
import org.dromara.maxkey.persistence.service.SynchronizersService;
|
|
||||||
import org.dromara.maxkey.synchronizer.ISynchronizerService;
|
|
||||||
import org.dromara.maxkey.util.StrUtils;
|
import org.dromara.maxkey.util.StrUtils;
|
||||||
import org.dromara.maxkey.web.WebContext;
|
import org.dromara.maxkey.web.WebContext;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@@ -37,7 +35,6 @@ import org.slf4j.LoggerFactory;
|
|||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|||||||
-1
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.WebDataBinder;
|
import org.springframework.web.bind.WebDataBinder;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
-1
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.web.bind.WebDataBinder;
|
import org.springframework.web.bind.WebDataBinder;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user