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

App credential to string type

Browse Source
This commit is contained in:
MaxKey
2022-11-04 21:13:31 +08:00
parent 9bf04827e0
commit 6bd2231a1c
7 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,10 +42,10 @@ public class Apps extends JpaBaseEntity implements Serializable {
private static final long serialVersionUID = -6264641546959620712L;
public static final class CREDENTIALS {
public static final int USER_DEFINED = 3;
public static final int SHARED = 2;
public static final int SYSTEM = 1;
public static final int NONE = 0;
public static final String USER_DEFINED = "user_defined";
public static final String SHARED = "shared";
public static final String SYSTEM = "system";
public static final String NONE = "none";
}
public static final class VISIBLE {
@@ -100,7 +100,7 @@ public class Apps extends JpaBaseEntity implements Serializable {
* CREDENTIAL VALUES USER-DEFINED SYSTEM SHARED NONE
*/
@Column
private int credential;
private String credential;
@Column
private String sharedUsername;
@Column
@@ -116,6 +116,7 @@ public class Apps extends JpaBaseEntity implements Serializable {
@Column
private String logoutUrl;
@Column
@JsonFormat(shape = JsonFormat.Shape.STRING)
private int logoutType;
/*
* extendAttr
@@ -173,7 +174,6 @@ public class Apps extends JpaBaseEntity implements Serializable {
public Apps() {
super();
isSignature = ConstsBoolean.FALSE;
credential = CREDENTIALS.NONE;
}
@@ -354,14 +354,14 @@ public class Apps extends JpaBaseEntity implements Serializable {
/**
* @return the credential
*/
public int getCredential() {
public String getCredential() {
return credential;
}
/**
* @param credential the credential to set
*/
public void setCredential(int credential) {
public void setCredential(String credential) {
this.credential = credential;
}

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

@@ -94,6 +94,7 @@ public class AppsOAuth20Details extends Apps {
this.setAppName(application.getAppName());
this.setLoginUrl(application.getLoginUrl());
this.setLogoutUrl(application.getLogoutUrl());
this.setLogoutType(application.getLogoutType());
this.setCategory(application.getCategory());
this.setProtocol(application.getProtocol());
this.setIcon(application.getIcon());
@@ -103,6 +104,8 @@ public class AppsOAuth20Details extends Apps {
this.setVendor(application.getVendor());
this.setVendorUrl(application.getVendorUrl());
this.setVisible(application.getVisible());
this.setIsAdapter(application.getIsAdapter());
this.setAdapter(application.getAdapter());
this.setAdapterId(application.getAdapterId());
this.setAdapterName(application.getAdapterName());