Commit Graph

231 Commits

Author SHA1 Message Date
展思虎
77e5d58ae6 Merge branch 'feature/REQ-2255' into 'master'
add ding talk terminal

See merge request universal/framework/backend/axzo-framework!21
2024-03-29 07:13:07 +00:00
TanJ
4ffe6ce106 add ding talk terminal 2024-03-25 20:41:18 +08:00
TanJ
5b1c8513b7 Merge remote-tracking branch 'origin/feature/REQ-2046' into feature/20240306 2024-03-05 20:14:40 +08:00
zhansihu
01f3bc9aea refactor(2046-terminal): 增加兼容CMS 2024-02-04 17:25:52 +08:00
zhansihu
30eea2ab2b refactor(2046-terminal): 增加兼容判断 2024-02-04 12:05:24 +08:00
TanJ
242dd6032e add live log 2024-01-26 16:11:26 +08:00
zhansihu
29466759bf fix(2046-terminal): 追加一个老terminal 2024-01-25 17:45:18 +08:00
zhansihu
8196c0b389 fix(2046-terminal): remove 2024-01-25 17:30:55 +08:00
zhansihu
2b6d80cd5a feat(2046-terminal): 统一管理端APP判断逻辑 2024-01-25 17:26:13 +08:00
zhansihu
ec661aa9e4 feat(2046-terminal): 定义管理端APP判断逻辑 2024-01-24 20:49:56 +08:00
zhansihu
feb6438689 fix(context): 兼容NPE 2024-01-11 17:09:00 +08:00
zhansihu
7de71dabf0 feat(context): context增加ouTypes和workspaceJoinTypes 2024-01-10 14:02:50 +08:00
TanJ
0c5514889d feat: contextinfo 添加参建单位类型
add contextInfo set workspace join type
2023-10-23 10:57:05 +08:00
TanJ
fb4965c198 feat: 添加参建单位类型
add workspaceJoinType
2023-10-23 10:47:56 +08:00
wangjibo
c2467df19e 本地联调时 访问pudge apisix接口时 接口报错打印错误日志 方便下游业务排查问题 2023-09-21 14:07:40 +08:00
wangjibo
c1d3d03e30 本地联调时 访问pudge apisix接口时 header 添加appVersion 2023-09-18 15:03:37 +08:00
金海洋
f28d05f11d Merge branch 'feature/sub_log' into 'master'
日志长度截取

See merge request universal/framework/backend/axzo-framework!11
2023-08-31 06:28:24 +00:00
tianliyong
7cbf807cd6 日志长度截取 2023-08-31 13:57:35 +08:00
谭杰
7845eab22d Merge branch 'feature_REQ-847_app_merge' into 'master'
Feature req 847 app merge

See merge request universal/framework/backend/axzo-framework!7
2023-08-16 10:16:02 +00:00
谭杰
137cbaf055 Merge branch 'addDevice' into 'master'
loginDevice 字段已经被消费了所以这里需要新创建一个字段 用来设置登录端

See merge request universal/framework/backend/axzo-framework!6
2023-08-16 10:15:48 +00:00
wangjibo
a5f324d853 loginDevice 字段已经被消费了所以这里需要新创建一个字段 用来设置登录端 2023-08-09 20:26:29 +08:00
TanJ
cf22076b51 add app general msg type 2023-07-21 11:14:51 +08:00
TanJ
5811d148da terminal 添加 NT_APP_GENERAL 2023-07-18 16:54:20 +08:00
TanJ
08844bb925 terminal 添加 NT_APP_GENERAL 2023-07-18 16:09:24 +08:00
谭杰
b894f4abf3 Merge branch 'feature/zhaogongzhaohuo' into 'master'
Feature/zhaogongzhaohuo

See merge request infra/axzo-framework!5
2023-05-10 03:34:19 +00:00
陈宁
2e1064b45d Add:appId 2023-04-18 18:18:06 +08:00
陈宁
0ce7835543 Update:AppUserIds 2023-04-18 17:22:59 +08:00
陈宁
6a48bc3430 Add:AppUserId 2023-04-12 14:41:07 +08:00
TanJ
3d94c75e4e cm&5 映射为CP_GENERAL 2023-04-06 15:15:44 +08:00
TanJ
5eb70593cf 添加微信小程序端的simple Terminal 2023-03-30 15:12:07 +08:00
TanJ
df421173bd Merge branch 'feature/REQ-503' into feature/auth
# Conflicts:
#	axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java
2023-03-30 15:10:52 +08:00
TanJ
1d01a34cdf Context info添加两个默认的实现 2023-03-30 14:47:29 +08:00
TanJ
fed63c5607 添加context info Handler 2023-03-29 11:30:13 +08:00
陈宁
519f0c9e13 Add:
1.添加小程序端:NT_MP_WX_GENERAL
2.添加认证状态:VerifyStatusEnum
2023-03-21 16:30:16 +08:00
TanJ
21ae1ab97f setLoginDevice逻辑调整 2023-03-21 14:56:22 +08:00
TanJ
859d6225fe terminalInfo添加接口获取模糊类型的端标识 2023-03-21 14:48:59 +08:00
TanJ
c5cd32decb SystemAndDeviceInfo 添加 loginDevice 2023-03-21 11:03:16 +08:00
TanJ
e7e7d4f2fa add NT_CMP_GENERAL map 2022-12-09 11:31:37 +08:00
周锐
8bcdab3783 Merge branch 'FIX-173' into 'master'
FIX-173:移除pre-new环境elk日志配置

See merge request infra/axzo-framework!3
2022-11-30 10:21:56 +00:00
周锐
d959175928 FIX-173:移除pre-new环境elk日志配置 2022-11-28 10:56:21 +08:00
周锐
b913b8414c Merge branch 'feature/DEV-30' into 'master'
移除pre、master环境下的文件日志

See merge request infra/axzo-framework!2
2022-11-07 09:34:00 +00:00
周锐
f194ff1bc7 移除pre、master环境下的文件日志 2022-11-07 16:32:46 +08:00
zhourui 周锐
2b3930a464 update parent to 2.4.13.4 2022-10-09 19:09:29 +08:00
zhourui 周锐
db438dbd99 update parent 2022-09-26 22:49:42 +08:00
TanJ
7223394a8f PATTERN_CONSOLE ADD TRACE ID 2022-09-21 20:16:03 +08:00
1cfcecc036 update - 调整日志输出的adpater 2022-09-17 11:52:00 +08:00
a7ca6557f1 update - 调整滚动日志输出位置 2022-09-13 19:32:30 +08:00
zhourui 周锐
b20c0df995 调整dev日志记录 2022-09-13 18:48:33 +08:00
zhourui 周锐
47bb243bd7 完善readme 2022-09-12 11:45:00 +08:00
zhourui 周锐
fba88ab67d 调整dev日志 2022-09-11 20:39:51 +08:00