 yjz
|
4dbf59538c
|
Merge branch 'thirdApiStage' into fourthStage
# Conflicts:
# laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java
|
2024-01-30 11:18:56 +08:00 |
|
|
yjz
|
7fb995fc3a
|
fix(ASMS): 分标委同步问题修复
|
2024-01-30 09:03:59 +08:00 |
|
|
梁琦涛
|
05d00a906a
|
srms接口修改
|
2024-01-29 19:23:33 +08:00 |
|
|
梁琦涛
|
23240f3f49
|
srms接口添加日志记录
|
2024-01-29 17:39:50 +08:00 |
|
|
yjz
|
5e9b42a48d
|
fix(任务转交): 81351
|
2024-01-29 16:03:13 +08:00 |
|
|
梁琦涛
|
ffe778306d
|
srms接口修改
|
2024-01-29 09:52:27 +08:00 |
|
|
梁琦涛
|
fba591ea38
|
修改对接接口
|
2024-01-25 17:51:53 +08:00 |
|
|
梁琦涛
|
ce698cb30d
|
修改对接接口
|
2024-01-25 17:40:25 +08:00 |
|
|
梁琦涛
|
5daef6739d
|
修改对接接口
|
2024-01-25 17:24:28 +08:00 |
|
|
梁琦涛
|
13e90fa9ff
|
接口 app_key、secret动态获取
|
2024-01-25 15:59:00 +08:00 |
|
|
梁琦涛
|
1189670ffd
|
修改srms接口
|
2024-01-24 14:33:13 +08:00 |
|
|
梁琦涛
|
019cd9bf86
|
添加srms接口
|
2024-01-22 14:11:59 +08:00 |
|
|
梁琦涛
|
4387eed5a2
|
添加srms接口
|
2024-01-19 18:50:50 +08:00 |
|
|
梁琦涛
|
bf6d7fe86a
|
添加srms接口
|
2024-01-19 17:15:38 +08:00 |
|
|
梁琦涛
|
160c6266d3
|
添加srms接口
|
2024-01-19 17:15:07 +08:00 |
|
|
yjz
|
0da2cb2484
|
fix(asms): 同步问题调整
|
2023-12-29 13:52:51 +08:00 |
|
|
yjz
|
93ac4c9a06
|
feat(用户管理、角色管理、iam): 查询过滤admin账号
|
2023-12-21 17:23:07 +08:00 |
|
|
yjz
|
85bfe3e7d7
|
fix(部门): org_code问题修复
|
2023-12-11 18:35:47 +08:00 |
|
|
梁琦涛
|
5967d6249f
|
fix:79093
|
2023-12-07 15:55:23 +08:00 |
|
|
梁琦涛
|
fc78c3c01f
|
Merge remote-tracking branch 'origin/master' into secondStage
# Conflicts:
# laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
# laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java
# laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
# laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
# laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
# laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
|
2023-11-30 17:46:16 +08:00 |
|
|
liao
|
13fdda0706
|
update 标准预警
|
2023-11-29 15:31:49 +08:00 |
|
|
liao
|
6a796e036a
|
update asms同步es数据库
|
2023-11-29 09:08:39 +08:00 |
|
|
yjz
|
bc1d75993d
|
fix(iam): 创建用户默认角色动态配置
(cherry picked from commit a26b046d36)
|
2023-11-28 17:33:50 +08:00 |
|
|
yjz
|
a26b046d36
|
fix(iam): 创建用户默认角色动态配置
|
2023-11-28 17:12:28 +08:00 |
|
|
梁琦涛
|
fc684156d4
|
文件下载加解密
|
2023-11-27 18:23:07 +08:00 |
|
|
梁琦涛
|
aaf1a5c810
|
文件下载加解密
|
2023-11-27 18:22:29 +08:00 |
|
|
梁琦涛
|
9abc636637
|
文件下载加解密
|
2023-11-27 17:13:35 +08:00 |
|
|
梁琦涛
|
12e8a8f419
|
文件下载加解密
|
2023-11-27 13:10:23 +08:00 |
|
|
梁琦涛
|
021426ba4a
|
文件下载加解密
|
2023-11-27 09:40:15 +08:00 |
|
|
梁琦涛
|
86e0040303
|
文件下载加解密
|
2023-11-24 18:19:13 +08:00 |
|
|
liao
|
20eb9aff20
|
update ASMS对接标准拆分字典翻译
|
2023-11-24 10:41:03 +08:00 |
|
|
liao
|
5fed9211fd
|
update 标准征求意见流程
|
2023-11-24 09:42:50 +08:00 |
|
|
yjz
|
b4267f4059
|
fix(iam): 返回jsonString
|
2023-11-23 14:25:42 +08:00 |
|
|
yjz
|
3e85e63b46
|
fix(iam): 返回jsonString
|
2023-11-23 14:25:00 +08:00 |
|
|
yjz
|
d78bc5dd4e
|
fix(iam): 返回信息不加密
(cherry picked from commit 45a7233d12)
|
2023-11-23 13:43:38 +08:00 |
|
|
yjz
|
45a7233d12
|
fix(iam): 返回信息不加密
|
2023-11-23 11:40:23 +08:00 |
|
|
yjz
|
b646061cf5
|
fix(iam): 返回加密信息
|
2023-11-23 11:20:53 +08:00 |
|
|
yjz
|
993d0389d6
|
fix(iam): 完善对接
|
2023-11-21 18:30:28 +08:00 |
|
|
yjz
|
4f483c51a1
|
fix(iam): 完善对接
|
2023-11-21 15:49:24 +08:00 |
|
|
yjz
|
9f3830ab94
|
fix(iam): 完善对接
|
2023-11-21 14:54:56 +08:00 |
|
|
yjz
|
d3cf0ae1fc
|
fix(iam): 完善数据校验
|
2023-11-20 13:58:48 +08:00 |
|
|
fengchenchen
|
078eb93b8d
|
【update】 对接，发送系统消息-messageType 先写死为01
|
2023-11-17 17:15:25 +08:00 |
|
|
梁琦涛
|
fe55c82048
|
一般检索修改
|
2023-11-16 17:43:15 +08:00 |
|
|
liao
|
d474aef1af
|
add 分标委翻译
|
2023-11-16 10:28:18 +08:00 |
|
|
liao
|
833ac1be92
|
update 发送消息
|
2023-11-16 10:08:05 +08:00 |
|
|
yjz
|
41655b2089
|
fix(iam): 去除phone校验
|
2023-11-15 17:05:38 +08:00 |
|
|
liao
|
66277eda5e
|
update 发送消息
|
2023-11-15 16:15:17 +08:00 |
|
|
yjz
|
4b7ae5fe79
|
fix(iam): 用户接口异常捕获
|
2023-11-15 15:59:24 +08:00 |
|
|
liao
|
958816e756
|
add 发送系统消息
|
2023-11-15 15:49:15 +08:00 |
|
|
liao
|
21e362c6ad
|
update 标准征求意见流程
|
2023-11-13 11:39:08 +08:00 |
|