Skip to content

I
ibzuaa
提交 03dc67fe 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

hebao1234 部署微服务接口 [ibiz-uaa，micorservice]

上级 0f1e693c
隐藏空白字符变更
内嵌 并排
正在显示 包含 35 行增加 和 22 行删除
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java
浏览文件 @ 03dc67fe
......@@ -235,12 +235,12 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(SysRolePermission et){
public void fillParentData(SysRolePermission et){
//实体关系[DER1N_SYS_ROLE_PERMISSION_SYS_PERMISSION_SYS_PERMISSIONID]
if(!ObjectUtils.isEmpty(et.getPermissionid())){
cn.ibizlab.core.uaa.domain.SysPermission permission=et.getPermission();
if(ObjectUtils.isEmpty(permission)){
cn.ibizlab.core.uaa.domain.SysPermission majorEntity=syspermissionService.get(et.getPermissionid());
cn.ibizlab.core.uaa.domain.SysPermission majorEntity=syspermissionService.getById(et.getPermissionid());
et.setPermission(majorEntity);
permission=majorEntity;
}
......@@ -252,7 +252,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
if(!ObjectUtils.isEmpty(et.getRoleid())){
cn.ibizlab.core.uaa.domain.SysRole role=et.getRole();
if(ObjectUtils.isEmpty(role)){
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.get(et.getRoleid());
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.getById(et.getRoleid());
et.setRole(majorEntity);
role=majorEntity;
}
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java
浏览文件 @ 03dc67fe
......@@ -247,12 +247,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(SysRole et){
public void fillParentData(SysRole et){
//实体关系[DER1N_SYS_ROLE_SYS_ROLE_PROLEID]
if(!ObjectUtils.isEmpty(et.getProleid())){
cn.ibizlab.core.uaa.domain.SysRole parent=et.getParent();
if(ObjectUtils.isEmpty(parent)){
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.get(et.getProleid());
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.getById(et.getProleid());
et.setParent(majorEntity);
parent=majorEntity;
}
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserAuthServiceImpl.java
浏览文件 @ 03dc67fe
......@@ -213,12 +213,12 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(SysUserAuth et){
public void fillParentData(SysUserAuth et){
//实体关系[DER1N_SYS_USER_AUTH_SYS_USER_USERID]
if(!ObjectUtils.isEmpty(et.getUserid())){
cn.ibizlab.core.uaa.domain.SysUser user=et.getUser();
if(ObjectUtils.isEmpty(user)){
cn.ibizlab.core.uaa.domain.SysUser majorEntity=sysuserService.get(et.getUserid());
cn.ibizlab.core.uaa.domain.SysUser majorEntity=sysuserService.getById(et.getUserid());
et.setUser(majorEntity);
user=majorEntity;
}
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserRoleServiceImpl.java
浏览文件 @ 03dc67fe
......@@ -230,12 +230,12 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
* 为当前实体填充父数据（外键值文本、外键值附加数据）
* @param et
*/
private void fillParentData(SysUserRole et){
public void fillParentData(SysUserRole et){
//实体关系[DER1N_SYS_USER_ROLE_SYS_ROLE_SYS_ROLEID]
if(!ObjectUtils.isEmpty(et.getRoleid())){
cn.ibizlab.core.uaa.domain.SysRole role=et.getRole();
if(ObjectUtils.isEmpty(role)){
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.get(et.getRoleid());
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.getById(et.getRoleid());
et.setRole(majorEntity);
role=majorEntity;
}
......@@ -245,7 +245,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
if(!ObjectUtils.isEmpty(et.getUserid())){
cn.ibizlab.core.uaa.domain.SysUser user=et.getUser();
if(ObjectUtils.isEmpty(user)){
cn.ibizlab.core.uaa.domain.SysUser majorEntity=sysuserService.get(et.getUserid());
cn.ibizlab.core.uaa.domain.SysUser majorEntity=sysuserService.getById(et.getUserid());
et.setUser(majorEntity);
user=majorEntity;
}
......
ibzuaa-core/src/main/resources/rules/SysUsersaveSysUserRule.drl
浏览文件 @ 03dc67fe
......@@ -20,12 +20,12 @@ ruleflow-group "sysusersavesysuserbegin"
then
end
//逻辑处理节点[保存用户]
rule "deaction1"
ruleflow-group "sysusersavesysuserdeaction1"
//逻辑处理节点[设置用户为管理员]
rule "prepareparam1"
ruleflow-group "sysusersavesysuserprepareparam1"
when
then
sysuserservice.save(sysusersavesysuserdefault);
sysusersavesysuserdefault.set("superuser","1");
update(sysusersavesysuserdefault);//更新fact中变量值
end
......@@ -38,12 +38,12 @@ ruleflow-group "sysusersavesysuserdeaction2"
update(sysusersavesysuserdefault);//更新fact中变量值
end
//逻辑处理节点[设置用户为管理员]
rule "prepareparam1"
ruleflow-group "sysusersavesysuserprepareparam1"
//逻辑处理节点[保存用户]
rule "deaction1"
ruleflow-group "sysusersavesysuserdeaction1"
when
then
sysusersavesysuserdefault.set("superuser","1");
sysuserservice.save(sysusersavesysuserdefault);
update(sysusersavesysuserdefault);//更新fact中变量值
end
ibzuaa-core/src/main/resources/rules/SysUsersaveSysUserRuleFlow.bpmn
浏览文件 @ 03dc67fe
......@@ -12,13 +12,13 @@
<tns:global identifier="sysusersavesysuserdefault" type="cn.ibizlab.core.uaa.domain.SysUser" />
</extensionElements>
<startEvent id="begin" isInterrupting="true"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysusersavesysuserdeaction1" id="deaction1" implementation="http://www.jboss.org/drools/rule" name="保存用户"/>
<endEvent id="deaction1_end" name="end"/>
<sequenceFlow id="deaction1_end_line" sourceRef="deaction1" targetRef="deaction1_end"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysusersavesysuserprepareparam1" id="prepareparam1" implementation="http://www.jboss.org/drools/rule" name="设置用户为管理员"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysusersavesysuserdeaction2" id="deaction2" implementation="http://www.jboss.org/drools/rule" name="保存用户"/>
<endEvent id="deaction2_end" name="end"/>
<sequenceFlow id="deaction2_end_line" sourceRef="deaction2" targetRef="deaction2_end"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysusersavesysuserprepareparam1" id="prepareparam1" implementation="http://www.jboss.org/drools/rule" name="设置用户为管理员"/>
<businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="sysusersavesysuserdeaction1" id="deaction1" implementation="http://www.jboss.org/drools/rule" name="保存用户"/>
<endEvent id="deaction1_end" name="end"/>
<sequenceFlow id="deaction1_end_line" sourceRef="deaction1" targetRef="deaction1_end"/>
<sequenceFlow id="gateway-begin_prepareparam1" sourceRef="gateway-begin" targetRef="prepareparam1">
<conditionExpression language="http://www.jboss.org/drools/rule" ><![CDATA[
$sysusersavesysuserdefault:SysUser();
......
ibzuaa-util/src/main/java/cn/ibizlab/util/cache/RedisCacheConfig.java
浏览文件 @ 03dc67fe
......@@ -27,6 +27,8 @@ import cn.ibizlab.util.cache.cacheManager.LayeringCacheManager;
import cn.ibizlab.util.cache.listener.RedisMessageListener;
import cn.ibizlab.util.cache.redis.CustomJacksonSerializer;
import cn.ibizlab.util.enums.RedisChannelTopic;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.data.redis.LettuceClientConfigurationBuilderCustomizer;
/**
* 缓存配置类
......@@ -127,4 +129,15 @@ public class RedisCacheConfig {
container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_DYNAMICMODEL_TOPIC.getChannelTopic());
return container;
}
@Bean
@ConditionalOnProperty(
value = {"spring.redis.ssl"},
havingValue = "true"
)
public LettuceClientConfigurationBuilderCustomizer lettuceClientConfigurationBuilderCustomizer(){
return (clientConfigurationBuilder) ->{
clientConfigurationBuilder.useSsl().disablePeerVerification();
};
}
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或