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

v 3.3.0

Browse Source
This commit is contained in:
MaxKey
2022-01-18 14:21:49 +08:00
parent d4a8c19c6e
commit ff2cf5b82f
137 changed files with 872 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/InstitutionsMapper.java
+2 -2
View File
@@ -18,11 +18,11 @@
package org.maxkey.persistence.mapper;
import org.apache.ibatis.annotations.Select;
import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.entity.Institutions;
public interface InstitutionsMapper extends IJpaBaseMapper<Institutions> {
@Select("select * from mxk_institutions where domain = #{value} and status = " + ConstantsStatus.ACTIVE)
@Select("select * from mxk_institutions where domain = #{value} and status = " + ConstsStatus.ACTIVE)
public Institutions findByDomain(String domain);
}
maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java
+3 -3
View File
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.entity.Organizations;
import org.maxkey.entity.UserInfo;
import org.maxkey.entity.UserInfoAdjoint;
@@ -37,10 +37,10 @@ public interface UserInfoMapper extends IJpaBaseMapper<UserInfo>{
//login query
public UserInfo findByAppIdAndUsername(UserInfo userInfo);
@Select("select * from mxk_userinfo where username = #{value} and status = " + ConstantsStatus.ACTIVE)
@Select("select * from mxk_userinfo where username = #{value} and status = " + ConstsStatus.ACTIVE)
public UserInfo findByUsername(String username);
@Select("select * from mxk_userinfo where ( email = #{value} or mobile= #{value} ) and status = " + ConstantsStatus.ACTIVE)
@Select("select * from mxk_userinfo where ( email = #{value} or mobile= #{value} ) and status = " + ConstsStatus.ACTIVE)
public UserInfo findByEmailMobile(String emailMobile);
public List<Organizations> findDeptsByUserId(String userId);
maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java
+2 -2
View File
@@ -20,7 +20,7 @@ package org.maxkey.persistence.service;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaBaseService;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.crypto.password.PasswordReciprocal;
import org.maxkey.entity.Accounts;
import org.maxkey.entity.AccountsStrategy;
@@ -144,7 +144,7 @@ public class AccountsService extends JpaBaseService<Accounts>{
account.setRelatedPassword(PasswordReciprocal.getInstance().encode(userInfoService.randomPassword()));
account.setCreateType("automatic");
account.setStatus(ConstantsStatus.ACTIVE);
account.setStatus(ConstsStatus.ACTIVE);
account.setStrategyId(strategy.getId());
insert(account);
maxkey-persistence/src/main/java/org/maxkey/persistence/service/GroupsService.java
+2 -2
View File
@@ -23,7 +23,7 @@ import java.time.LocalTime;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaBaseService;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.entity.Groups;
import org.maxkey.persistence.mapper.GroupsMapper;
import org.maxkey.util.StringUtils;
@@ -76,7 +76,7 @@ public class GroupsService extends JpaBaseService<Groups> implements Serializab
}
public void refreshDynamicGroups(Groups dynamicGroup){
if(dynamicGroup.getDynamic().equals(ConstantsStatus.ACTIVE+"")) {
if(dynamicGroup.getDynamic().equals(ConstsStatus.ACTIVE+"")) {
boolean isDynamicTimeSupport = false;
boolean isBetweenEffectiveTime = false;
if(StringUtils.isNotBlank(dynamicGroup.getResumeTime())
maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
+5 -5
View File
@@ -19,7 +19,7 @@ package org.maxkey.persistence.service;
import org.apache.mybatis.jpa.persistence.JpaBaseService;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.crypto.password.PasswordReciprocal;
import org.maxkey.entity.Accounts;
import org.maxkey.entity.ChangePassword;
@@ -128,7 +128,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
//更新账号状态
public void accountUpdate(UserInfo userInfo) {
if(userInfo.getStatus() != ConstantsStatus.ACTIVE) {
if(userInfo.getStatus() != ConstsStatus.ACTIVE) {
if(accountsService==null) {
accountsService =
WebContext.getBean("accountsService",AccountsService.class);
@@ -136,7 +136,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
Accounts queryAcount =new Accounts();
queryAcount.setUserId(userInfo.getId());
for (Accounts acount : accountsService.query(queryAcount)) {
acount.setStatus(ConstantsStatus.INACTIVE);
acount.setStatus(ConstsStatus.INACTIVE);
accountsService.update(acount);
}
}
@@ -322,7 +322,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
public void updateLocked(UserInfo userInfo) {
try {
if(userInfo != null && StringUtils.isNotEmpty(userInfo.getId())) {
userInfo.setIsLocked(ConstantsStatus.STOP);
userInfo.setIsLocked(ConstsStatus.STOP);
getMapper().updateLocked(userInfo);
}
} catch(Exception e) {
@@ -337,7 +337,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
public void updateLockout(UserInfo userInfo) {
try {
if(userInfo != null && StringUtils.isNotEmpty(userInfo.getId())) {
userInfo.setIsLocked(ConstantsStatus.START);
userInfo.setIsLocked(ConstsStatus.START);
userInfo.setBadPasswordCount(0);
getMapper().updateLockout(userInfo);
}