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

apps status and ExtendAttr

Browse Source
This commit is contained in:
MaxKey
2022-10-16 09:10:00 +08:00
parent 4cae82fa03
commit 2fddb2910c
40 changed files with 1451 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity;
import org.maxkey.constants.ConstsBoolean;
import org.maxkey.crypto.Base64Utils;
import com.fasterxml.jackson.annotation.JsonFormat;
@Entity
@Table(name = "MXK_APPS")
public class Apps extends JpaBaseEntity implements Serializable {
@@ -118,6 +120,7 @@ public class Apps extends JpaBaseEntity implements Serializable {
/*
* extendAttr
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private int isExtendAttr;
private String extendAttr;

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

@@ -107,6 +107,7 @@ public class AppsOAuth20Details extends Apps {
this.setAdapterId(application.getAdapterId());
this.setAdapterName(application.getAdapterName());
this.setFrequently(application.getFrequently());
this.setStatus(application.getStatus());
this.clientSecret = baseClientDetails.getClientSecret();
this.scope = StringUtils

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

@@ -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 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_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)";
protected JdbcTemplate jdbcTemplate;