p96170835
/
diboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复打包问题

This commit is contained in:
mazhicheng 2020-03-23 23:47:13 +08:00
parent e9caac1c3f
commit 263a2cd163
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iam-base-starter/src/main/java/com/diboot/iam/service/impl/IamUserServiceImpl.java
View File

@ -175,10 +175,7 @@ public class IamUserServiceImpl extends BaseIamServiceImpl<IamUserMapper, IamUse
.setAuthSecret(userAccountDTO.getPassword())
.setAuthType(Cons.DICTCODE_AUTH_TYPE.PWD.name())
.setStatus(userAccountDTO.getStatus());
// 设置密码
if (V.notEmpty(iamAccount.getAuthSecret())){
IamSecurityUtils.encryptPwd(iamAccount);
}
// 保存账号
iamAccountService.createEntity(iamAccount);
// 批量创建角色关联关系

11
iam-base-starter/src/main/java/com/diboot/iam/starter/IamBaseAutoConfig.java
View File

@ -1,7 +1,6 @@
package com.diboot.iam.starter;
import com.diboot.core.service.impl.DictionaryServiceImpl;
import com.diboot.core.util.DateConverter;
import com.diboot.core.util.V;
import com.diboot.iam.config.Cons;
import com.diboot.iam.jwt.BaseJwtRealm;
@ -24,8 +23,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment;
import org.springframework.format.FormatterRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.servlet.Filter;
import java.util.LinkedHashMap;
@ -46,7 +43,7 @@ import java.util.Map;
IamRoleServiceImpl.class, IamUserServiceImpl.class, IamUserRoleServiceImpl.class, IamAccountServiceImpl.class, IamFrontendPermissionServiceImpl.class,
IamBaseInitializer.class, ShiroProxyConfig.class})
@Order(2)
public class IamBaseAutoConfig implements WebMvcConfigurer {
public class IamBaseAutoConfig{
@Autowired
Environment environment;
@ -137,8 +134,4 @@ public class IamBaseAutoConfig implements WebMvcConfigurer {
return shiroFilterFactoryBean;
}
@Override
public void addFormatters(FormatterRegistry registry) {
registry.addConverter(new DateConverter());
}
}
}