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

调整

Browse Source
This commit is contained in:
MaxKey
2023-08-19 19:01:24 +08:00
parent 6d11ee4e9c
commit b57707aaa4
111 changed files with 1920 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,15 +32,6 @@ import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/*
ID varchar(40) not null,
UID varchar(40) null,
APPID varchar(40) null,
USERNAME varchar(60) null,
PASSWORD varchar(60) null,
STATUS char(1) null
constraint PK_ROLES primary key clustered (ID)
*/
@Entity
@Table(name = "MXK_ACCOUNTS")
public class Accounts extends JpaEntity implements Serializable {

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

@@ -19,6 +19,8 @@ package org.dromara.maxkey.entity;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -29,7 +31,7 @@ import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_EMAIL_SENDERS")
public class EmailSenders extends JpaEntity{
public class EmailSenders extends JpaEntity implements Serializable {
/**
*

16
maxkey-core/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java
View File

@@ -26,7 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ExtraAttrs {
final static Logger _logger = LoggerFactory.getLogger(ExtraAttrs.class);
static final Logger _logger = LoggerFactory.getLogger(ExtraAttrs.class);
ArrayList <ExtraAttr> extraAttrs ;
@@ -43,7 +43,7 @@ public class ExtraAttrs {
*/
public ExtraAttrs(String arrayJsonString) {
String extraAttrsJsonString= "{\"extraAttrs\":"+arrayJsonString+"}";
_logger.debug("Extra Attrs Json String " +extraAttrsJsonString);
_logger.debug("Extra Attrs Json String {}" ,extraAttrsJsonString);
ExtraAttrs extraAttrs=JsonUtils.gsonStringToObject(extraAttrsJsonString, ExtraAttrs.class);
this.extraAttrs=extraAttrs.getExtraAttrs();
}
@@ -52,21 +52,21 @@ public class ExtraAttrs {
public void put(String attr,String value) {
if(extraAttrs==null){
extraAttrs=new ArrayList<ExtraAttr>();
extraAttrs=new ArrayList<>();
}
this.extraAttrs.add(new ExtraAttr(attr,value));
}
public void put(String attr,String type,String value) {
if(extraAttrs==null){
extraAttrs=new ArrayList<ExtraAttr>();
extraAttrs=new ArrayList<>();
}
this.extraAttrs.add(new ExtraAttr(attr,type,value));
}
public String get(String attr) {
String value=null;
if(extraAttrs!=null&& extraAttrs.size()!=0){
if(extraAttrs!=null&& !extraAttrs.isEmpty()){
for(ExtraAttr extraAttr :extraAttrs){
if(extraAttr.getAttr().equals(attr)){
value=extraAttr.getValue();
@@ -78,7 +78,7 @@ public class ExtraAttrs {
public String toJsonString(){
String jsonString =JsonUtils.gsonToString(extraAttrs);
_logger.debug("jsonString " +jsonString);
_logger.debug("jsonString {}" ,jsonString);
return jsonString;
}
@@ -87,7 +87,7 @@ public class ExtraAttrs {
for(ExtraAttr extraAttr :extraAttrs){
extraAttrsHashMap.put(extraAttr.getAttr(), extraAttr.getValue());
}
_logger.debug("extraAttrs HashMap " +extraAttrsHashMap);
_logger.debug("extraAttrs HashMap {}" , extraAttrsHashMap);
return extraAttrsHashMap;
}
@@ -96,7 +96,7 @@ public class ExtraAttrs {
for(ExtraAttr extraAttr :extraAttrs){
properties.put(extraAttr.getAttr(), extraAttr.getValue());
}
_logger.debug("extraAttrs HashMap " +properties);
_logger.debug("extraAttrs HashMap {}" , properties);
return properties;
}

211
maxkey-core/src/main/java/org/dromara/maxkey/entity/GroupMember.java Normal file
View File

@@ -0,0 +1,211 @@
/*
* 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.dromara.maxkey.entity;
import java.io.Serializable;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_ROLE_MEMBER")
public class GroupMember extends UserInfo implements Serializable{
/**
*
*/
private static final long serialVersionUID = -8059639972590554760L;
@Id
@Column
@GeneratedValue
String id;
@Column
private String groupId;
private String groupName;
private String category;
@Column
private String memberId;
private String memberName;
@Column
private String type;//User or Group
@Column
private String instId;
private String instName;
public GroupMember(){
super();
}
/**
* @param groupId
* @param memberId
* @param type
*/
public GroupMember(String groupId, String memberId, String type , String instId) {
super();
this.groupId = groupId;
this.memberId = memberId;
this.type = type;
this.instId = instId;
}
public GroupMember(String groupId, String groupName, String memberId,
String memberName, String type , String instId) {
super();
this.groupId = groupId;
this.groupName = groupName;
this.memberId = memberId;
this.memberName = memberName;
this.type = type;
this.instId = instId;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getGroupId() {
return groupId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
/**
* @return the memberId
*/
public String getMemberId() {
return memberId;
}
/**
* @param memberId the memberId to set
*/
public void setMemberId(String memberId) {
this.memberId = memberId;
}
/**
* @return the type
*/
public String getType() {
return type;
}
/**
* @param type the type to set
*/
public void setType(String type) {
this.type = type;
}
public String getMemberName() {
return memberName;
}
public void setMemberName(String memberName) {
this.memberName = memberName;
}
public String getCategory() {
return category;
}
public void setCategory(String category) {
this.category = category;
}
public String getInstId() {
return instId;
}
public void setInstId(String instId) {
this.instId = instId;
}
public String getInstName() {
return instName;
}
public void setInstName(String instName) {
this.instName = instName;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("GroupMember [id=");
builder.append(id);
builder.append(", groupId=");
builder.append(groupId);
builder.append(", groupName=");
builder.append(groupName);
builder.append(", category=");
builder.append(category);
builder.append(", memberId=");
builder.append(memberId);
builder.append(", memberName=");
builder.append(memberName);
builder.append(", type=");
builder.append(type);
builder.append(", instId=");
builder.append(instId);
builder.append(", instName=");
builder.append(instName);
builder.append("]");
return builder.toString();
}
}

46
maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java → maxkey-core/src/main/java/org/dromara/maxkey/entity/GroupPermissions.java
View File

@@ -29,16 +29,9 @@ import jakarta.persistence.Table;
import org.dromara.maxkey.entity.apps.Apps;
/*
ID varchar(40) not null,
ROLEID varchar(40) null,
MENUID varchar(40) null
constraint PK_ROLES primary key clustered (ID)
*/
@Entity
@Table(name = "MXK_ROLE_PERMISSIONS")
public class RolePermissions extends Apps implements Serializable{
public class GroupPermissions extends Apps implements Serializable{
/**
*
@@ -49,9 +42,9 @@ public class RolePermissions extends Apps implements Serializable{
@GeneratedValue
String id;
@Column
private String roleId;
private String groupId;
private String roleName;
private String groupName;
@Column
private String appId;
@@ -63,7 +56,7 @@ public class RolePermissions extends Apps implements Serializable{
private String instName;
public RolePermissions(){
public GroupPermissions(){
super();
}
@@ -72,31 +65,32 @@ public class RolePermissions extends Apps implements Serializable{
* @param groupId
* @param appId
*/
public RolePermissions(String roleId, String appId, String instId) {
public GroupPermissions(String groupId, String appId, String instId) {
super();
this.roleId = roleId;
this.groupId = groupId;
this.appId = appId;
this.instId = instId;
}
public String getRoleId() {
return roleId;
public String getGroupId() {
return groupId;
}
public void setRoleId(String roleId) {
this.roleId = roleId;
public void setGroupId(String groupId) {
this.groupId = groupId;
}
public String getRoleName() {
return roleName;
public String getGroupName() {
return groupName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
public void setGroupName(String groupName) {
this.groupName = groupName;
}
@@ -158,12 +152,12 @@ public class RolePermissions extends Apps implements Serializable{
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("RolePermissions [id=");
builder.append("GroupPermissions [id=");
builder.append(id);
builder.append(", roleId=");
builder.append(roleId);
builder.append(", roleName=");
builder.append(roleName);
builder.append(", groupId=");
builder.append(groupId);
builder.append(", groupName=");
builder.append(groupName);
builder.append(", appId=");
builder.append(appId);
builder.append(", appName=");

38
maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java → maxkey-core/src/main/java/org/dromara/maxkey/entity/GroupPrivileges.java
View File

@@ -29,8 +29,8 @@ import org.dromara.maxkey.constants.ConstsStatus;
import org.dromara.maxkey.web.WebContext;
@Entity
@Table(name = "MXK_ROLE_PRIVILEGES")
public class RolePrivileges extends JpaEntity implements Serializable {
@Table(name = "MXK_GROUP_PRIVILEGES")
public class GroupPrivileges extends JpaEntity implements Serializable {
private static final long serialVersionUID = -8783585691243853899L;
@Id
@@ -40,7 +40,7 @@ public class RolePrivileges extends JpaEntity implements Serializable {
@Column
String appId;
@Column
String roleId;
String groupId;
@Column
String resourceId;
@@ -50,25 +50,25 @@ public class RolePrivileges extends JpaEntity implements Serializable {
private String instName;
public RolePrivileges() {
public GroupPrivileges() {
}
public RolePrivileges(String appId, String roleId, String instId) {
public GroupPrivileges(String appId, String groupId, String instId) {
this.appId = appId;
this.roleId = roleId;
this.groupId = groupId;
this.instId = instId;
}
/**
* .
* @param appId String
* @param roleId String
* @param groupId String
* @param resourceId String
*/
public RolePrivileges(String appId, String roleId, String resourceId , String instId) {
public GroupPrivileges(String appId, String groupId, String resourceId , String instId) {
this.id = WebContext.genId();
this.appId = appId;
this.roleId = roleId;
this.groupId = groupId;
this.resourceId = resourceId;
this.instId = instId;
}
@@ -89,15 +89,15 @@ public class RolePrivileges extends JpaEntity implements Serializable {
this.appId = appId;
}
public String getRoleId() {
return roleId;
}
public String getGroupId() {
return groupId;
}
public void setRoleId(String roleId) {
this.roleId = roleId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
public String getResourceId() {
public String getResourceId() {
return resourceId;
}
@@ -114,7 +114,7 @@ public class RolePrivileges extends JpaEntity implements Serializable {
}
public String getUniqueId() {
return appId + "_" + roleId + "_" + resourceId;
return appId + "_" + groupId + "_" + resourceId;
}
public String getInstId() {
@@ -140,8 +140,8 @@ public class RolePrivileges extends JpaEntity implements Serializable {
builder.append(id);
builder.append(", appId=");
builder.append(appId);
builder.append(", roleId=");
builder.append(roleId);
builder.append(", groupId=");
builder.append(groupId);
builder.append(", resourceId=");
builder.append(resourceId);
builder.append(", status=");

302
maxkey-core/src/main/java/org/dromara/maxkey/entity/Groups.java Normal file
View File

@@ -0,0 +1,302 @@
/*
* Copyright [2022] [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.dromara.maxkey.entity;
import java.io.Serializable;
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_GROUPS")
public class Groups extends JpaEntity implements Serializable {
private static final long serialVersionUID = 4660258495864814777L;
public class Category{
public static final String DYNAMIC = "dynamic";
public static final String STATIC = "static";
public static final String APP = "app";
}
@Id
@Column
@GeneratedValue
String id;
@Length(max = 60)
@Column
String groupCode;
@Length(max = 60)
@Column
String groupName;
@Column
String category;
@Column
String filters ;
@Column
String orgIdsList;
@Column
String resumeTime;
@Column
String suspendTime;
@Column
int isdefault;
@Column
String description;
@Column
String createdBy;
@Column
String createdDate;
@Column
String modifiedBy;
@Column
String modifiedDate;
@Column
int status;
@Column
private String instId;
private String instName;
public Groups() {
}
public Groups(String id) {
this.id = id;
}
/**
* Groups.
* @param id String
* @param name String
* @param isdefault int
*/
public Groups(String id,String groupCode, String groupName, int isdefault) {
super();
this.id = id;
this.groupCode = groupCode;
this.groupName = groupName;
this.isdefault = isdefault;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getGroupCode() {
return groupCode;
}
public void setGroupCode(String groupCode) {
this.groupCode = groupCode;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public int getIsdefault() {
return isdefault;
}
public void setIsdefault(int isdefault) {
this.isdefault = isdefault;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getCreatedBy() {
return createdBy;
}
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
public String getCreatedDate() {
return createdDate;
}
public void setCreatedDate(String createdDate) {
this.createdDate = createdDate;
}
public String getModifiedBy() {
return modifiedBy;
}
public void setModifiedBy(String modifiedBy) {
this.modifiedBy = modifiedBy;
}
public String getModifiedDate() {
return modifiedDate;
}
public void setModifiedDate(String modifiedDate) {
this.modifiedDate = modifiedDate;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
/**
* ROLE_ALL_USER must be
* 1, dynamic
* 2, all orgIdsList
* 3, not filters
*/
public void setDefaultAllUser() {
this.category = "dynamic";
this.orgIdsList ="";
this.filters ="";
}
public String getCategory() {
return category;
}
public void setCategory(String category) {
this.category = category;
}
public String getFilters() {
return filters;
}
public void setFilters(String filters) {
this.filters = filters;
}
public String getOrgIdsList() {
return orgIdsList;
}
public void setOrgIdsList(String orgIdsList) {
this.orgIdsList = orgIdsList;
}
public String getResumeTime() {
return resumeTime;
}
public void setResumeTime(String resumeTime) {
this.resumeTime = resumeTime;
}
public String getSuspendTime() {
return suspendTime;
}
public void setSuspendTime(String suspendTime) {
this.suspendTime = suspendTime;
}
public String getInstId() {
return instId;
}
public void setInstId(String instId) {
this.instId = instId;
}
public String getInstName() {
return instName;
}
public void setInstName(String instName) {
this.instName = instName;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("Groups [id=");
builder.append(id);
builder.append(", groupCode=");
builder.append(groupCode);
builder.append(", groupName=");
builder.append(groupName);
builder.append(", category=");
builder.append(category);
builder.append(", filters=");
builder.append(filters);
builder.append(", orgIdsList=");
builder.append(orgIdsList);
builder.append(", resumeTime=");
builder.append(resumeTime);
builder.append(", suspendTime=");
builder.append(suspendTime);
builder.append(", isdefault=");
builder.append(isdefault);
builder.append(", description=");
builder.append(description);
builder.append(", createdBy=");
builder.append(createdBy);
builder.append(", createdDate=");
builder.append(createdDate);
builder.append(", modifiedBy=");
builder.append(modifiedBy);
builder.append(", modifiedDate=");
builder.append(modifiedDate);
builder.append(", status=");
builder.append(status);
builder.append(", instId=");
builder.append(instId);
builder.append(", instName=");
builder.append(instName);
builder.append("]");
return builder.toString();
}
}

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -31,7 +33,7 @@ import jakarta.persistence.Table;
*/
@Entity
@Table(name = "MXK_HISTORY_LOGIN_APPS")
public class HistoryLoginApps extends JpaEntity {
public class HistoryLoginApps extends JpaEntity implements Serializable {
private static final long serialVersionUID = 5085201575292304749L;
@Id

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -27,7 +29,7 @@ import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_REGISTER")
public class Register extends JpaEntity{
public class Register extends JpaEntity implements Serializable {
/**
*

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

@@ -27,13 +27,6 @@ import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
/*
ID varchar(40) not null,
APPROLEID varchar(40) null,
USERID varchar(40) null
constraint PK_ROLES primary key clustered (ID)
*/
@Entity
@Table(name = "MXK_ROLE_MEMBER")
public class RoleMember extends UserInfo implements Serializable{

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -31,7 +33,7 @@ import jakarta.persistence.Table;
*/
@Entity
@Table(name = "MXK_SOCIALS_ASSOCIATE")
public class SocialsAssociate extends JpaEntity {
public class SocialsAssociate extends JpaEntity implements Serializable {
/**
*

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

@@ -17,6 +17,7 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import java.util.Date;
import org.dromara.mybatis.jpa.entity.JpaEntity;
@@ -36,7 +37,7 @@ import org.dromara.maxkey.util.DateUtils;
@Entity
@Table(name = "MXK_SYNCHRO_RELATED")
public class SynchroRelated extends JpaEntity {
public class SynchroRelated extends JpaEntity implements Serializable {
private static final long serialVersionUID = 6993697309055585706L;
@Id

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

@@ -18,6 +18,8 @@
package org.dromara.maxkey.entity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
@@ -39,7 +41,7 @@ import org.dromara.maxkey.util.StringUtils;
@Entity
@Table(name = "MXK_USERINFO")
public class UserInfo extends JpaEntity {
public class UserInfo extends JpaEntity implements Serializable {
private static final long serialVersionUID = 6402443942083382236L;
public static final String CLASS_TYPE = "UserInfo";

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -27,7 +29,7 @@ import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_USERINFO_ADJUNCT")
public class UserInfoAdjoint extends JpaEntity {
public class UserInfoAdjoint extends JpaEntity implements Serializable {
/**
*

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -27,7 +29,7 @@ import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_APPS_CAS_DETAILS")
public class AppsCasDetails extends Apps {
public class AppsCasDetails extends Apps implements Serializable {
/**
*

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -27,7 +29,7 @@ import jakarta.persistence.Table;
@Entity
@Table(name = "MXK_APPS_EXTENDAPI_DETAILS")
public class AppsExtendApiDetails extends Apps {
public class AppsExtendApiDetails extends Apps implements Serializable {
/**
*

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

@@ -17,6 +17,8 @@
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -31,7 +33,7 @@ import jakarta.persistence.Table;
*/
@Entity
@Table(name = "MXK_APPS_FORM_BASED_DETAILS")
public class AppsFormBasedDetails extends Apps {
public class AppsFormBasedDetails extends Apps implements Serializable {
/**
*
*/

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

@@ -20,6 +20,8 @@
*/
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -34,7 +36,7 @@ import jakarta.persistence.Table;
*/
@Entity
@Table(name = "MXK_APPS_JWT_DETAILS")
public class AppsJwtDetails extends Apps {
public class AppsJwtDetails extends Apps implements Serializable {
/**
*

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

@@ -25,12 +25,14 @@ import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import java.io.Serializable;
import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails;
import org.springframework.util.StringUtils;
@Entity
@Table(name = "MXK_APPS_OAUTH_CLIENT_DETAILS")
public class AppsOAuth20Details extends Apps {
public class AppsOAuth20Details extends Apps implements Serializable {
/**
*

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

@@ -17,6 +17,7 @@
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import java.security.cert.X509Certificate;
import org.dromara.mybatis.jpa.entity.JpaEntity;
@@ -33,7 +34,7 @@ import jakarta.persistence.Table;
*/
@Entity
@Table(name = "MXK_APPS_SAML_V20_DETAILS")
public class AppsSAML20Details extends Apps {
public class AppsSAML20Details extends Apps implements Serializable {
/**
*

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

@@ -20,6 +20,8 @@
*/
package org.dromara.maxkey.entity.apps;
import java.io.Serializable;
import org.dromara.mybatis.jpa.entity.JpaEntity;
import jakarta.persistence.Column;
@@ -34,7 +36,7 @@ import jakarta.persistence.Table;
*/
@Entity
@Table(name = "MXK_APPS_TOKEN_BASED_DETAILS")
public class AppsTokenBasedDetails extends Apps {
public class AppsTokenBasedDetails extends Apps implements Serializable {
/**
*

6
maxkey-core/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java
View File

@@ -52,7 +52,7 @@ public class LoginRepository {
private static final String ROLES_SELECT_STATEMENT = "select distinct r.id,r.rolecode,r.rolename from mxk_userinfo u,mxk_roles r,mxk_role_member rm where u.id = ? and u.id=rm.memberid and rm.roleid=r.id ";
private static final String ROLES_SELECT_STATEMENT = "select distinct g.id,g.groupcode,g.groupname from mxk_userinfo u,mxk_groups g,mxk_group_member gm where u.id = ? and u.id=gm.memberid and gm.groupid=g.id ";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT = "select * from mxk_userinfo where username = ? ";
@@ -60,7 +60,7 @@ public class LoginRepository {
private static final String DEFAULT_USERINFO_SELECT_STATEMENT_USERNAME_MOBILE_EMAIL = "select * from mxk_userinfo where (username = ? or mobile = ? or email = ?) ";
private static final String DEFAULT_MYAPPS_SELECT_STATEMENT = "select distinct app.id,app.appname from mxk_apps app,mxk_role_permissions pm,mxk_roles r where app.id=pm.appid and app.status = 1 and pm.roleid=r.id and r.id in(%s)";
private static final String DEFAULT_MYAPPS_SELECT_STATEMENT = "select distinct app.id,app.appname from mxk_apps app,mxk_group_permissions gp,mxk_groups g where app.id=gp.appid and app.status = 1 and gp.groupid=g.id and g.id in(%s)";
protected JdbcTemplate jdbcTemplate;
@@ -215,7 +215,7 @@ public class LoginRepository {
public List<Roles> queryRoles(UserInfo userInfo) {
List<Roles> listRoles = jdbcTemplate.query(ROLES_SELECT_STATEMENT, new RowMapper<Roles>() {
public Roles mapRow(ResultSet rs, int rowNum) throws SQLException {
Roles role = new Roles(rs.getString("id"), rs.getString("rolecode"),rs.getString("rolename"), 0);
Roles role = new Roles(rs.getString("id"), rs.getString("groupcode"),rs.getString("groupname"), 0);
return role;
}