LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jdk 17

Browse Source
This commit is contained in:
MaxKey
2023-08-15 11:58:38 +08:00
parent 7ebf4a57f3
commit d2500690e2
255 changed files with 1092 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java
View File

@@ -90,11 +90,11 @@ public class ApplicationAutoConfiguration implements InitializingBean {
@Bean
public PasswordEncoder passwordEncoder(
@Value("${maxkey.crypto.password.encoder:bcrypt}") String idForEncode) {
Map<String ,PasswordEncoder > encoders = new HashMap<String ,PasswordEncoder>();
Map<String ,PasswordEncoder > encoders = new HashMap<String ,PasswordEncoder>();
encoders.put("bcrypt", new BCryptPasswordEncoder());
encoders.put("plain", NoOpPasswordEncoder.getInstance());
encoders.put("pbkdf2", new Pbkdf2PasswordEncoder());
encoders.put("scrypt", new SCryptPasswordEncoder());
encoders.put("pbkdf2", Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_8());
encoders.put("scrypt", SCryptPasswordEncoder.defaultsForSpringSecurity_v5_8());
//md
encoders.put("md4", new Md4PasswordEncoder());
encoders.put("md5", new MessageDigestPasswordEncoder("MD5"));

7
maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java
View File

@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.servlet.Filter;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.constants.ConstsTimeInterval;
@@ -53,7 +52,6 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import org.springframework.web.filter.DelegatingFilterProxy;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
@@ -61,6 +59,8 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import jakarta.servlet.Filter;
@AutoConfiguration
public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer {
@@ -102,6 +102,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
* upload file support .
* @return multipartResolver
*/
/*
@Bean (name = "multipartResolver")
public CommonsMultipartResolver commonsMultipartResolver(
@Value("${spring.servlet.multipart.max-file-size:0}") int maxUploadSize) {
@@ -110,7 +111,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer
new CommonsMultipartResolver();
multipartResolver.setMaxUploadSize(maxUploadSize);
return multipartResolver;
}
}*/
/**
* handlerMapping .

2
maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java
View File

@@ -5,8 +5,8 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springdoc.core.GroupedOpenApi;
import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.Bean;

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java
View File

@@ -21,17 +21,17 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/*
ID varchar(40) not null,
UID varchar(40) null,
@@ -43,14 +43,14 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
*/
@Entity
@Table(name = "MXK_ACCOUNTS")
public class Accounts extends JpaBaseEntity implements Serializable {
public class Accounts extends JpaEntity implements Serializable {
private static final long serialVersionUID = 6829592256223630307L;
public static final String DEFAULT_PASSWORD_SUFFIX = UserInfo.DEFAULT_PASSWORD_SUFFIX;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String userId;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java
View File

@@ -20,17 +20,18 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import java.util.Base64;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_ACCOUNTS_STRATEGY")
public class AccountsStrategy extends JpaBaseEntity implements Serializable {
public class AccountsStrategy extends JpaEntity implements Serializable {
/**
*
@@ -38,7 +39,7 @@ public class AccountsStrategy extends JpaBaseEntity implements Serializable {
private static final long serialVersionUID = -8743329570694948718L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String name;

4
maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java
View File

@@ -17,9 +17,9 @@
package org.dromara.maxkey.entity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
public class ChangePassword extends JpaBaseEntity{
public class ChangePassword extends JpaEntity{
/**
*

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java
View File

@@ -17,23 +17,23 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.maxkey.pretty.impl.JsonPretty;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_CONNECTORS")
public class Connectors extends JpaBaseEntity implements Serializable {
public class Connectors extends JpaEntity implements Serializable {
private static final long serialVersionUID = 4660258495864814777L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
String connName;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java
View File

@@ -17,18 +17,19 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_EMAIL_SENDERS")
public class EmailSenders extends JpaBaseEntity{
public class EmailSenders extends JpaEntity{
/**
*
@@ -37,7 +38,7 @@ public class EmailSenders extends JpaBaseEntity{
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column

14
maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java
View File

@@ -19,17 +19,17 @@ package org.dromara.maxkey.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import java.io.IOException;
import java.io.InputStream;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -37,7 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
* @author Crystal.Sea
*
*/
public class ExcelImport extends JpaBaseEntity {
public class ExcelImport extends JpaEntity {
/**
*
@@ -46,7 +46,7 @@ public class ExcelImport extends JpaBaseEntity {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@JsonIgnore

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java
View File

@@ -17,26 +17,26 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.springframework.web.multipart.MultipartFile;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_FILE_UPLOAD")
public class FileUpload extends JpaBaseEntity {
public class FileUpload extends JpaEntity {
private static final long serialVersionUID = -4338400992411166457L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java
View File

@@ -18,18 +18,18 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
@Entity
@Table(name = "MXK_HISTORY_CONNECTOR")
public class HistoryConnector extends JpaBaseEntity implements Serializable {
public class HistoryConnector extends JpaEntity implements Serializable {
/**
*
@@ -38,7 +38,7 @@ public class HistoryConnector extends JpaBaseEntity implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java
View File

@@ -19,14 +19,14 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
/**
@@ -35,7 +35,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
*/
@Entity
@Table(name = "MXK_HISTORY_LOGIN")
public class HistoryLogin extends JpaBaseEntity implements Serializable{
public class HistoryLogin extends JpaEntity implements Serializable{
/**
*
@@ -43,7 +43,7 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{
private static final long serialVersionUID = -1321470643357719383L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
String id;
@Column
String sessionId;

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java
View File

@@ -17,14 +17,13 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* @author Crystal.Sea
@@ -32,12 +31,12 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
*/
@Entity
@Table(name = "MXK_HISTORY_LOGIN_APPS")
public class HistoryLoginApps extends JpaBaseEntity {
public class HistoryLoginApps extends JpaEntity {
private static final long serialVersionUID = 5085201575292304749L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
String id;
@Column
private String sessionId;

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java
View File

@@ -19,18 +19,18 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
@Entity
@Table(name = "MXK_HISTORY_SYNCHRONIZER")
public class HistorySynchronizer extends JpaBaseEntity implements Serializable{
public class HistorySynchronizer extends JpaEntity implements Serializable{
/**
*
@@ -38,7 +38,7 @@ public class HistorySynchronizer extends JpaBaseEntity implements Serializable
private static final long serialVersionUID = -1184644499009162756L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
String id;
@Column
String syncId;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java
View File

@@ -18,13 +18,14 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* .
@@ -33,11 +34,11 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
*/
@Entity
@Table(name = "MXK_HISTORY_SYSTEM_LOGS")
public class HistorySystemLogs extends JpaBaseEntity implements Serializable {
public class HistorySystemLogs extends JpaEntity implements Serializable {
private static final long serialVersionUID = 6560201093784960493L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
String topic;

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java
View File

@@ -17,23 +17,23 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
@Entity
@Table(name = "MXK_INSTITUTIONS")
public class Institutions extends JpaBaseEntity implements Serializable {
public class Institutions extends JpaEntity implements Serializable {
private static final long serialVersionUID = -2375872012431214098L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String name;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java
View File

@@ -18,17 +18,18 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_LDAP_CONTEXT")
public class LdapContext extends JpaBaseEntity implements Serializable {
public class LdapContext extends JpaEntity implements Serializable {
/**
@@ -37,7 +38,7 @@ public class LdapContext extends JpaBaseEntity implements Serializable {
private static final long serialVersionUID = -4595539647817265938L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
String product;

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java
View File

@@ -19,18 +19,17 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_LOCALIZATION")
public class Localization extends JpaBaseEntity implements Serializable {
public class Localization extends JpaEntity implements Serializable {
/**
*
@@ -38,7 +37,7 @@ public class Localization extends JpaBaseEntity implements Serializable {
private static final long serialVersionUID = -142504964446659847L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java
View File

@@ -18,13 +18,13 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* root organization node,<br> id = instId or id = parentId or parentId = -1 or parentId = 0
@@ -34,7 +34,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
@Entity
@Table(name = "MXK_ORGANIZATIONS")
public class Organizations extends JpaBaseEntity implements Serializable {
public class Organizations extends JpaEntity implements Serializable {
private static final long serialVersionUID = 5085413816404119803L;
@@ -43,7 +43,7 @@ public class Organizations extends JpaBaseEntity implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String orgCode;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java
View File

@@ -18,16 +18,17 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_ORGANIZATIONS_CAST")
public class OrganizationsCast extends JpaBaseEntity implements Serializable {
public class OrganizationsCast extends JpaEntity implements Serializable {
/**
@@ -36,7 +37,7 @@ public class OrganizationsCast extends JpaBaseEntity implements Serializable {
private static final long serialVersionUID = 5166920258761620856L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String code;

21
maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java
View File

@@ -17,14 +17,15 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import org.dromara.maxkey.constants.ConstsServiceMessage;
import org.dromara.maxkey.exception.PasswordPolicyException;
import org.dromara.maxkey.web.WebContext;
@@ -39,12 +40,12 @@ import java.util.List;
@Entity
@Table(name = "MXK_PASSWORD_POLICY")
public class PasswordPolicy extends JpaBaseEntity implements java.io.Serializable {
public class PasswordPolicy extends JpaEntity implements java.io.Serializable {
private static final long serialVersionUID = -4797776994287829182L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
/**
* minimum password lengths

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java
View File

@@ -17,18 +17,17 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_REGISTER")
public class Register extends JpaBaseEntity{
public class Register extends JpaEntity{
/**
*
@@ -36,7 +35,7 @@ public class Register extends JpaBaseEntity{
private static final long serialVersionUID = -4021412077583763378L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String displayName;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java
View File

@@ -18,21 +18,22 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_RESOURCES")
public class Resources extends JpaBaseEntity implements Serializable {
public class Resources extends JpaEntity implements Serializable {
private static final long serialVersionUID = 2567171742999638608L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid")
@GeneratedValue
String id;
@Column
String resourceName;

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java
View File

@@ -19,12 +19,13 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/*
@@ -43,7 +44,7 @@ public class RoleMember extends UserInfo implements Serializable{
private static final long serialVersionUID = -8059639972590554760L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
String id;
@Column
private String roleId;

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java
View File

@@ -19,12 +19,13 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.dromara.maxkey.entity.apps.Apps;
@@ -45,7 +46,7 @@ public class RolePermissions extends Apps implements Serializable{
private static final long serialVersionUID = 8634166407201007340L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
String id;
@Column
private String roleId;

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java
View File

@@ -18,24 +18,24 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.web.WebContext;
@Entity
@Table(name = "MXK_ROLE_PRIVILEGES")
public class RolePrivileges extends JpaBaseEntity implements Serializable {
public class RolePrivileges extends JpaEntity implements Serializable {
private static final long serialVersionUID = -8783585691243853899L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
String appId;

19
maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java
View File

@@ -18,17 +18,18 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.hibernate.validator.constraints.Length;
@Entity
@Table(name = "MXK_ROLES")
public class Roles extends JpaBaseEntity implements Serializable {
public class Roles extends JpaEntity implements Serializable {
private static final long serialVersionUID = 4660258495864814777L;
@@ -43,7 +44,7 @@ public class Roles extends JpaBaseEntity implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Length(max = 60)

10
maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java
View File

@@ -18,14 +18,20 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* Saml20Metadata.
* @author Crystal.Sea
*
*/
public class Saml20Metadata extends JpaBaseEntity implements Serializable {
public class Saml20Metadata extends JpaEntity implements Serializable {
private static final long serialVersionUID = -403743150268165622L;
public static final class ContactPersonType {

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java
View File

@@ -18,17 +18,17 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_SMS_PROVIDER")
public class SmsProvider extends JpaBaseEntity implements Serializable {
public class SmsProvider extends JpaEntity implements Serializable {
/**
@@ -37,7 +37,7 @@ public class SmsProvider extends JpaBaseEntity implements Serializable {
private static final long serialVersionUID = -4595539647817265938L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
String provider;

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java
View File

@@ -17,14 +17,13 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
*
@@ -32,7 +31,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
*/
@Entity
@Table(name = "MXK_SOCIALS_ASSOCIATE")
public class SocialsAssociate extends JpaBaseEntity {
public class SocialsAssociate extends JpaEntity {
/**
*
@@ -40,7 +39,7 @@ public class SocialsAssociate extends JpaBaseEntity {
private static final long serialVersionUID = 2151179554190800162L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String provider;

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java
View File

@@ -19,14 +19,13 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* @author Crystal.Sea
@@ -34,14 +33,14 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
*/
@Entity
@Table(name = "MXK_SOCIALS_PROVIDER")
public class SocialsProvider extends JpaBaseEntity implements Serializable {
public class SocialsProvider extends JpaEntity implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1636727203025187769L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String provider;

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.entity;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.dromara.maxkey.util.DateUtils;
/**
@@ -36,12 +36,12 @@ import org.dromara.maxkey.util.DateUtils;
@Entity
@Table(name = "MXK_SYNCHRO_RELATED")
public class SynchroRelated extends JpaBaseEntity {
public class SynchroRelated extends JpaEntity {
private static final long serialVersionUID = 6993697309055585706L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
protected String objectId;

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java
View File

@@ -17,25 +17,25 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.hibernate.validator.constraints.Length;
@Entity
@Table(name = "MXK_SYNCHRONIZERS")
public class Synchronizers extends JpaBaseEntity implements Serializable {
public class Synchronizers extends JpaEntity implements Serializable {
private static final long serialVersionUID = 4660258495864814777L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Length(max = 60)

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java
View File

@@ -21,13 +21,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.HashMap;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.dromara.maxkey.crypto.Base64Utils;
import org.dromara.maxkey.util.StringUtils;
@@ -39,7 +39,7 @@ import org.dromara.maxkey.util.StringUtils;
@Entity
@Table(name = "MXK_USERINFO")
public class UserInfo extends JpaBaseEntity {
public class UserInfo extends JpaEntity {
private static final long serialVersionUID = 6402443942083382236L;
public static final String CLASS_TYPE = "UserInfo";
@@ -51,7 +51,7 @@ public class UserInfo extends JpaBaseEntity {
//
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
@Column
protected String username;

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java
View File

@@ -17,18 +17,17 @@
package org.dromara.maxkey.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_USERINFO_ADJUNCT")
public class UserInfoAdjoint extends JpaBaseEntity {
public class UserInfoAdjoint extends JpaEntity {
/**
*
@@ -37,7 +36,7 @@ public class UserInfoAdjoint extends JpaBaseEntity {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
String id;
protected String displayName;

17
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java
View File

@@ -19,14 +19,13 @@ package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.dromara.maxkey.constants.ConstsBoolean;
import org.dromara.maxkey.crypto.Base64Utils;
@@ -34,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
@Entity
@Table(name = "MXK_APPS")
public class Apps extends JpaBaseEntity implements Serializable {
public class Apps extends JpaEntity implements Serializable {
/**
*
@@ -57,7 +56,7 @@ public class Apps extends JpaBaseEntity implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
protected String id;
/**
*

18
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java
View File

@@ -18,17 +18,17 @@
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_APPS_ADAPTERS")
public class AppsAdapters extends JpaBaseEntity implements Serializable {
public class AppsAdapters extends JpaEntity implements Serializable {
/**
*
@@ -37,7 +37,7 @@ public class AppsAdapters extends JpaBaseEntity implements Serializable {
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
protected String id;
/**
*

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java
View File

@@ -17,12 +17,13 @@
package org.dromara.maxkey.entity.apps;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_APPS_CAS_DETAILS")
@@ -34,7 +35,7 @@ public class AppsCasDetails extends Apps {
private static final long serialVersionUID = -4272290765948322084L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
private String id;
@Column
private String service;

9
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java
View File

@@ -17,8 +17,13 @@
package org.dromara.maxkey.entity.apps;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_APPS_EXTENDAPI_DETAILS")

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java
View File

@@ -17,12 +17,13 @@
package org.dromara.maxkey.entity.apps;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* @author Crystal.Sea
@@ -37,7 +38,7 @@ public class AppsFormBasedDetails extends Apps {
private static final long serialVersionUID = 563313247706861431L;
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
protected String id;
@Column

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java
View File

@@ -20,12 +20,13 @@
*/
package org.dromara.maxkey.entity.apps;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* @author Crystal.Sea
@@ -42,7 +43,7 @@ public class AppsJwtDetails extends Apps {
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
protected String id;
@Column

9
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java
View File

@@ -17,8 +17,13 @@
package org.dromara.maxkey.entity.apps;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails;
import org.springframework.util.StringUtils;

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java
View File

@@ -19,12 +19,13 @@ package org.dromara.maxkey.entity.apps;
import java.security.cert.X509Certificate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* @author Crystal.Sea
@@ -40,7 +41,7 @@ public class AppsSAML20Details extends Apps {
private static final long serialVersionUID = -291159876339333345L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid")
@GeneratedValue
protected String id;
@Column
private String certIssuer;

15
maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java
View File

@@ -20,12 +20,13 @@
*/
package org.dromara.maxkey.entity.apps;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/**
* @author Crystal.Sea
@@ -42,7 +43,7 @@ public class AppsTokenBasedDetails extends Apps {
@Id
@Column
@GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid")
@GeneratedValue
protected String id;
/**
*

6
maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java
View File

@@ -17,9 +17,9 @@
package org.dromara.maxkey.entity.xml;
import javax.xml.bind.annotation.XmlRootElement;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import jakarta.xml.bind.annotation.XmlRootElement;
/**
* xml can not include array , MultipartFile
@@ -27,7 +27,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
*
*/
@XmlRootElement
public class UserInfoXML extends JpaBaseEntity {
public class UserInfoXML extends JpaEntity {
/**
*

2
maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java
View File

@@ -20,7 +20,6 @@ package org.dromara.maxkey.web;
import java.io.IOException;
import java.util.Map;
import javax.annotation.PostConstruct;
import org.dromara.maxkey.web.tag.FreemarkerTag;
import org.slf4j.Logger;
@@ -33,6 +32,7 @@ import org.springframework.stereotype.Component;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
import jakarta.annotation.PostConstruct;
@Component
public class ConfigurerFreeMarker implements ApplicationContextAware {

5
maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java
View File

@@ -17,14 +17,15 @@
package org.dromara.maxkey.web;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* Exception.
*

6
maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java
View File

@@ -18,12 +18,12 @@
package org.dromara.maxkey.web;
import java.io.IOException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.constants.ContentType;
import org.springframework.stereotype.Component;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
@Component
public class HttpResponseAdapter {

12
maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java
View File

@@ -20,10 +20,10 @@ package org.dromara.maxkey.web;
import org.apache.commons.lang.SystemUtils;
import org.apache.commons.lang3.ArchUtils;
import org.apache.commons.lang3.arch.Processor;
import org.apache.mybatis.jpa.util.JpaWebContext;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.crypto.Md5Sum;
import org.dromara.maxkey.util.PathUtils;
import org.dromara.mybatis.jpa.spring.MybatisJpaContext;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,9 +35,10 @@ import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.web.context.support.WebApplicationContextUtils;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
@@ -69,7 +70,7 @@ public class InitializeContext extends HttpServlet {
WebContext.applicationContext = applicationContext;
JpaWebContext.applicationContext = applicationContext;
MybatisJpaContext.init(applicationContext);
// List Environment Variables
listEnvVars();
@@ -178,7 +179,6 @@ public class InitializeContext extends HttpServlet {
_logger.debug("propertySource {}" , it.next());
}
JpaWebContext.properties = WebContext.properties;
_logger.trace("-----------------------------------------------------------");
}
}

9
maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java
View File

@@ -17,22 +17,21 @@
package org.dromara.maxkey.web;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.mybatis.jpa.util.JpaWebContext;
import org.dromara.maxkey.constants.ContentType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@Controller
public class MetadataEndpoint {
@RequestMapping(value = "/metadata/version",produces = ContentType.TEXT_PLAIN_UTF8, method={RequestMethod.GET})
@ResponseBody
public String metadata(HttpServletRequest request,HttpServletResponse response) {
return JpaWebContext.version();
return "";//WebContext.version();
}
}

9
maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java
View File

@@ -24,10 +24,6 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.LogFactory;
import org.dromara.maxkey.configuration.ApplicationConfig;
@@ -47,6 +43,11 @@ import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import org.springframework.web.servlet.support.RequestContextUtils;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
/**
* Application is common class for Web Application Context.
*

11
maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java
View File

@@ -19,11 +19,6 @@ package org.dromara.maxkey.web;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.configuration.ApplicationConfig;
@@ -33,6 +28,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.filter.GenericFilterBean;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
public class WebInstRequestFilter extends GenericFilterBean {
final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class);

11
maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java
View File

@@ -21,17 +21,18 @@ import java.io.IOException;
import java.util.Enumeration;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.text.StringEscapeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.filter.GenericFilterBean;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
public class WebXssRequestFilter extends GenericFilterBean {
final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class);

2
maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java
View File

@@ -20,7 +20,6 @@ package org.dromara.maxkey.web.tag;
import java.io.IOException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.dromara.maxkey.web.WebContext;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +29,7 @@ import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
import jakarta.servlet.http.HttpServletRequest;
/**
* <@basePath/>

3
maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java
View File

@@ -20,8 +20,6 @@ package org.dromara.maxkey.web.tag;
import java.io.IOException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import freemarker.core.Environment;
@@ -29,6 +27,7 @@ import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
import jakarta.servlet.http.HttpServletRequest;
/**
* 获取应用上下文标签
* <@base/>

3
maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java
View File

@@ -20,8 +20,6 @@ package org.dromara.maxkey.web.tag;
import java.io.IOException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import freemarker.core.Environment;
@@ -29,6 +27,7 @@ import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
import jakarta.servlet.http.HttpServletRequest;
/**
* 获取应用上下文标签
* <@browser name=""></@browser>

3
maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java
View File

@@ -22,9 +22,10 @@ import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.dromara.maxkey.persistence.repository.LocalizationRepository;
import org.dromara.maxkey.web.WebContext;