Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibznotify
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibznotify
提交
97792e3a
提交
97792e3a
编写于
4月 02, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibiz-notify,通知消息]
上级
1194f1aa
变更
18
展开全部
显示空白字符变更
内嵌
并排
正在显示
18 个修改的文件
包含
84 行增加
和
119 行删除
+84
-119
MsgBodyServiceImpl.java
.../ibizlab/core/notify/service/impl/MsgBodyServiceImpl.java
+2
-3
MsgOpenAccessServiceImpl.java
...ab/core/notify/service/impl/MsgOpenAccessServiceImpl.java
+2
-3
MsgTemplateServiceImpl.java
...zlab/core/notify/service/impl/MsgTemplateServiceImpl.java
+2
-3
MsgUserAccountServiceImpl.java
...b/core/notify/service/impl/MsgUserAccountServiceImpl.java
+2
-3
MsgBodyMapper.xml
...rc/main/resources/mapper/notify/msgbody/MsgBodyMapper.xml
+0
-1
MsgOpenAccessMapper.xml
...urces/mapper/notify/msgopenaccess/MsgOpenAccessMapper.xml
+0
-1
MsgTemplateMapper.xml
...resources/mapper/notify/msgtemplate/MsgTemplateMapper.xml
+0
-1
MsgUserAccountMapper.xml
...ces/mapper/notify/msguseraccount/MsgUserAccountMapper.xml
+0
-1
MsgBodyMapping.java
.../src/main/java/cn/ibizlab/api/mapping/MsgBodyMapping.java
+0
-1
MsgOpenAccessMapping.java
...ain/java/cn/ibizlab/api/mapping/MsgOpenAccessMapping.java
+0
-1
MsgTemplateMapping.java
.../main/java/cn/ibizlab/api/mapping/MsgTemplateMapping.java
+0
-1
MsgUserAccountMapping.java
...in/java/cn/ibizlab/api/mapping/MsgUserAccountMapping.java
+0
-1
DELogicAspect.java
...l/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
+64
-97
IBZWFFeignClient.java
...rc/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
+1
-0
DELogic.java
...fy-util/src/main/java/cn/ibizlab/util/domain/DELogic.java
+2
-1
SearchContextBase.java
...c/main/java/cn/ibizlab/util/filter/SearchContextBase.java
+1
-0
AuthenticationUser.java
...ain/java/cn/ibizlab/util/security/AuthenticationUser.java
+7
-0
AuthorizationTokenFilter.java
...va/cn/ibizlab/util/security/AuthorizationTokenFilter.java
+1
-1
未找到文件。
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgBodyServiceImpl.java
浏览文件 @
97792e3a
...
@@ -100,9 +100,8 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
...
@@ -100,9 +100,8 @@ public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> impl
@Transactional
@Transactional
public
MsgBody
get
(
String
key
)
{
public
MsgBody
get
(
String
key
)
{
MsgBody
et
=
getById
(
key
);
MsgBody
et
=
getById
(
key
);
if
(
et
==
null
){
if
(
et
==
null
)
{
et
=
new
MsgBody
();
throw
new
BadRequestAlertException
(
"数据不存在"
,
this
.
getClass
().
getSimpleName
(),
key
);
et
.
setMsgId
(
key
);
}
}
else
{
else
{
}
}
...
...
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgOpenAccessServiceImpl.java
浏览文件 @
97792e3a
...
@@ -103,9 +103,8 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
...
@@ -103,9 +103,8 @@ public class MsgOpenAccessServiceImpl extends ServiceImpl<MsgOpenAccessMapper, M
@Transactional
@Transactional
public
MsgOpenAccess
get
(
String
key
)
{
public
MsgOpenAccess
get
(
String
key
)
{
MsgOpenAccess
et
=
getById
(
key
);
MsgOpenAccess
et
=
getById
(
key
);
if
(
et
==
null
){
if
(
et
==
null
)
{
et
=
new
MsgOpenAccess
();
throw
new
BadRequestAlertException
(
"数据不存在"
,
this
.
getClass
().
getSimpleName
(),
key
);
et
.
setId
(
key
);
}
}
else
{
else
{
}
}
...
...
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgTemplateServiceImpl.java
浏览文件 @
97792e3a
...
@@ -107,9 +107,8 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
...
@@ -107,9 +107,8 @@ public class MsgTemplateServiceImpl extends ServiceImpl<MsgTemplateMapper, MsgTe
@Transactional
@Transactional
public
MsgTemplate
get
(
String
key
)
{
public
MsgTemplate
get
(
String
key
)
{
MsgTemplate
et
=
getById
(
key
);
MsgTemplate
et
=
getById
(
key
);
if
(
et
==
null
){
if
(
et
==
null
)
{
et
=
new
MsgTemplate
();
throw
new
BadRequestAlertException
(
"数据不存在"
,
this
.
getClass
().
getSimpleName
(),
key
);
et
.
setTid
(
key
);
}
}
else
{
else
{
}
}
...
...
ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgUserAccountServiceImpl.java
浏览文件 @
97792e3a
...
@@ -100,9 +100,8 @@ public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper,
...
@@ -100,9 +100,8 @@ public class MsgUserAccountServiceImpl extends ServiceImpl<MsgUserAccountMapper,
@Transactional
@Transactional
public
MsgUserAccount
get
(
String
key
)
{
public
MsgUserAccount
get
(
String
key
)
{
MsgUserAccount
et
=
getById
(
key
);
MsgUserAccount
et
=
getById
(
key
);
if
(
et
==
null
){
if
(
et
==
null
)
{
et
=
new
MsgUserAccount
();
throw
new
BadRequestAlertException
(
"数据不存在"
,
this
.
getClass
().
getSimpleName
(),
key
);
et
.
setId
(
key
);
}
}
else
{
else
{
}
}
...
...
ibznotify-core/src/main/resources/mapper/notify/msgbody/MsgBodyMapper.xml
浏览文件 @
97792e3a
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgBodyMapper"
>
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgBodyMapper"
>
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
...
...
ibznotify-core/src/main/resources/mapper/notify/msgopenaccess/MsgOpenAccessMapper.xml
浏览文件 @
97792e3a
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgOpenAccessMapper"
>
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgOpenAccessMapper"
>
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
...
...
ibznotify-core/src/main/resources/mapper/notify/msgtemplate/MsgTemplateMapper.xml
浏览文件 @
97792e3a
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgTemplateMapper"
>
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgTemplateMapper"
>
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
...
...
ibznotify-core/src/main/resources/mapper/notify/msguseraccount/MsgUserAccountMapper.xml
浏览文件 @
97792e3a
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgUserAccountMapper"
>
<mapper
namespace=
"cn.ibizlab.core.notify.mapper.MsgUserAccountMapper"
>
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
...
...
ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/mapping/MsgBodyMapping.java
浏览文件 @
97792e3a
...
@@ -12,4 +12,3 @@ public interface MsgBodyMapping extends MappingBase<MsgBodyDTO, MsgBody> {
...
@@ -12,4 +12,3 @@ public interface MsgBodyMapping extends MappingBase<MsgBodyDTO, MsgBody> {
}
}
ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/mapping/MsgOpenAccessMapping.java
浏览文件 @
97792e3a
...
@@ -12,4 +12,3 @@ public interface MsgOpenAccessMapping extends MappingBase<MsgOpenAccessDTO, MsgO
...
@@ -12,4 +12,3 @@ public interface MsgOpenAccessMapping extends MappingBase<MsgOpenAccessDTO, MsgO
}
}
ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/mapping/MsgTemplateMapping.java
浏览文件 @
97792e3a
...
@@ -12,4 +12,3 @@ public interface MsgTemplateMapping extends MappingBase<MsgTemplateDTO, MsgTempl
...
@@ -12,4 +12,3 @@ public interface MsgTemplateMapping extends MappingBase<MsgTemplateDTO, MsgTempl
}
}
ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/mapping/MsgUserAccountMapping.java
浏览文件 @
97792e3a
...
@@ -12,4 +12,3 @@ public interface MsgUserAccountMapping extends MappingBase<MsgUserAccountDTO, Ms
...
@@ -12,4 +12,3 @@ public interface MsgUserAccountMapping extends MappingBase<MsgUserAccountDTO, Ms
}
}
ibznotify-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java
浏览文件 @
97792e3a
此差异已折叠。
点击以展开。
ibznotify-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
浏览文件 @
97792e3a
...
@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
...
@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
JSONObject
wfstart
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
JSONObject
wfstart
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@RequestBody
JSONObject
instance
);
@PathVariable
(
"businessKey"
)
String
businessKey
,
@RequestBody
JSONObject
instance
);
}
}
ibznotify-util/src/main/java/cn/ibizlab/util/domain/DELogic.java
浏览文件 @
97792e3a
...
@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
...
@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
import
lombok.Data
;
import
lombok.Data
;
import
org.flowable.bpmn.model.Process
;
import
org.flowable.bpmn.model.Process
;
import
org.springframework.core.io.Resource
;
import
org.kie.api.runtime.KieContainer
;
import
org.kie.api.runtime.KieContainer
;
import
java.io.File
;
import
java.io.File
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
...
@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
Process
process
;
Process
process
;
KieContainer
container
;
KieContainer
container
;
List
<
DELogic
>
refLogic
;
List
<
DELogic
>
refLogic
;
List
<
Fil
e
>
refRuleFiles
;
List
<
Resourc
e
>
refRuleFiles
;
String
md5
;
String
md5
;
}
}
ibznotify-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java
浏览文件 @
97792e3a
...
@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
...
@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
* 工作流流程标识
* 工作流流程标识
*/
*/
public
String
processDefinitionKey
;
public
String
processDefinitionKey
;
/**
/**
* 获取工作流步骤标识
* 获取工作流步骤标识
*/
*/
...
...
ibznotify-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java
浏览文件 @
97792e3a
...
@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails
...
@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails
* 租户
* 租户
*/
*/
private
String
srfdcid
;
private
String
srfdcid
;
/**
* 系统标识
*/
private
String
srfsystemid
;
/**
/**
/**
* 动态实例标识
* 动态实例标识
*/
*/
...
@@ -254,6 +259,8 @@ public class AuthenticationUser implements UserDetails
...
@@ -254,6 +259,8 @@ public class AuthenticationUser implements UserDetails
if
(
this
.
sessionParams
==
null
)
if
(
this
.
sessionParams
==
null
)
{
{
sessionParams
=
getUserSessionParam
();
sessionParams
=
getUserSessionParam
();
sessionParams
.
put
(
"srfsystemid"
,
this
.
getSrfsystemid
());
sessionParams
.
put
(
"srfdynainstid"
,
this
.
getSrfdynainstid
());
sessionParams
.
put
(
"srfpersonid"
,
this
.
getUserid
());
sessionParams
.
put
(
"srfpersonid"
,
this
.
getUserid
());
sessionParams
.
put
(
"srfpersonname"
,
this
.
getPersonname
());
sessionParams
.
put
(
"srfpersonname"
,
this
.
getPersonname
());
sessionParams
.
put
(
"srforgsectorid"
,
this
.
getMdeptid
());
sessionParams
.
put
(
"srforgsectorid"
,
this
.
getMdeptid
());
...
...
ibznotify-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java
浏览文件 @
97792e3a
...
@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
...
@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
import
io.jsonwebtoken.ExpiredJwtException
;
import
io.jsonwebtoken.ExpiredJwtException
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
cn.ibizlab.util.service.AuthenticationUserService
;
import
cn.ibizlab.util.service.AuthenticationUserService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
import
org.springframework.security.core.context.SecurityContextHolder
;
import
org.springframework.security.core.context.SecurityContextHolder
;
...
@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.*
;
import
java.util.*
;
import
org.springframework.util.StringUtils
;
@Slf4j
@Slf4j
@Component
@Component
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录