朱甚洋
|
ef73ad07a8
|
feign
|
2024-12-02 16:51:54 +08:00 |
|
yang
|
3703cfb9c8
|
Merge remote-tracking branch 'origin/dev1107' into dev1107
|
2024-11-30 12:11:41 +08:00 |
|
yang
|
3a1908532e
|
Merge branch 'refs/heads/master-1129' into dev1107
# Conflicts:
# servers/boe-server-all/pom.xml
|
2024-11-30 12:09:09 +08:00 |
|
yang
|
4205912db5
|
定时任务测试
|
2024-11-30 12:08:11 +08:00 |
|
Wangxxz
|
af6efd3151
|
统一讲师查询 还原
|
2024-11-26 13:22:17 +08:00 |
|
Wangxxz
|
963fae8191
|
Merge branch 'yx1101-teacher-l' into dev1107
|
2024-11-26 11:25:33 +08:00 |
|
Wangxxz
|
c724080a3c
|
统一讲师查询
|
2024-11-26 11:24:17 +08:00 |
|
Wangxxz
|
b2bad03ba9
|
Merge branch 'yx1101-teacher-l' into dev1107
|
2024-11-26 11:21:08 +08:00 |
|
Wangxxz
|
aa63a6618f
|
统一讲师查询
|
2024-11-26 11:20:50 +08:00 |
|
Wangxxz
|
4152baf8de
|
Merge branch 'yx1101-teacher-l' into dev1107
|
2024-11-26 10:16:32 +08:00 |
|
Wangxxz
|
d3fcbaeab6
|
统一案例接口
|
2024-11-26 09:26:44 +08:00 |
|
Wangxxz
|
0f2d8af1e4
|
Merge branch 'yx1101-teacher-l' into dev1107
|
2024-11-22 11:42:17 +08:00 |
|
Wangxxz
|
82bf84bbaa
|
未开课在线课同步
|
2024-11-22 11:30:14 +08:00 |
|
hui
|
48982a37c8
|
读取公共的redis配置
|
2024-11-21 16:17:49 +08:00 |
|
hui
|
ee952c5ed5
|
读取公共的redis配置
|
2024-11-21 15:56:30 +08:00 |
|
hui
|
88be7e41a0
|
读取公共的redis配置
|
2024-11-21 15:44:46 +08:00 |
|
hui
|
e5d79affda
|
commons-collections
|
2024-11-21 15:34:32 +08:00 |
|
hui
|
db9c63f13a
|
配置文件放到nacos
|
2024-11-20 19:14:42 +08:00 |
|
hui
|
98111b34f0
|
配置文件放到nacos
|
2024-11-20 15:08:08 +08:00 |
|
hui
|
4d08ca9951
|
整理文件
|
2024-11-20 11:06:01 +08:00 |
|
hui
|
60ce58894f
|
升级mysql-connector-java包
|
2024-11-20 11:03:09 +08:00 |
|
hui
|
10add1bfe6
|
升级jar包
|
2024-11-20 10:56:34 +08:00 |
|
hui
|
698b529726
|
配置改为yml格式
|
2024-11-20 08:58:24 +08:00 |
|
hui
|
6e8959f754
|
配置改为yml格式
|
2024-11-19 19:49:52 +08:00 |
|
hui
|
17623172ef
|
架构升级
|
2024-11-19 18:36:05 +08:00 |
|
hui
|
df2e5a49c6
|
架构升级第一步和测试环境配置
|
2024-11-19 18:15:13 +08:00 |
|
hui
|
1cd136587c
|
替换为生产master分支内容
|
2024-11-19 14:24:39 +08:00 |
|
nisen
|
423b658e04
|
Merge branch 'yx1107-bug-l' into 104-master
|
2024-11-18 20:08:14 +08:00 |
|
Wangxxz
|
acc62c85e0
|
优化
|
2024-11-18 20:07:36 +08:00 |
|
nisen
|
795966d944
|
Merge branch 'yx1107-bug-l' into 104-master
|
2024-11-18 15:46:23 +08:00 |
|
Wangxxz
|
ec00f55606
|
频繁调用finishCheck100进度更新
|
2024-11-18 15:43:01 +08:00 |
|
hui
|
26806152d1
|
清理不用的模块
|
2024-11-18 13:47:44 +08:00 |
|
hui
|
5eb6397174
|
清理不用的模块
|
2024-11-18 13:11:06 +08:00 |
|
hui
|
0f30eba36e
|
已经独立出去不在这里维护的模块
|
2024-11-18 11:39:08 +08:00 |
|
Wangxxz
|
4d161a1d36
|
Merge branch 'yx1101-teacher-l' into dev1107
|
2024-11-16 10:28:06 +08:00 |
|
Wangxxz
|
3f59552c2e
|
提交
|
2024-11-16 10:21:12 +08:00 |
|
zhaolongfei
|
971478f206
|
Merge branch 'zcwy1030-llf' into dev1107-121
|
2024-11-11 15:15:55 +08:00 |
|
zhaolongfei
|
eaafb57b83
|
视频进行工号验证
|
2024-11-11 15:15:28 +08:00 |
|
zhaolongfei
|
ee74f47261
|
视频进行工号验证
|
2024-11-11 15:12:27 +08:00 |
|
zhaolongfei
|
c0a00e9647
|
Merge remote-tracking branch 'origin/dev1107' into dev1107-121
|
2024-11-11 10:49:58 +08:00 |
|
zhaolongfei
|
9d3bbcbf3a
|
Merge branch 'zcwy1108-llf' into dev1107-121
|
2024-11-11 10:49:43 +08:00 |
|
zhaolongfei
|
05dc7b984f
|
注释代码
|
2024-11-11 10:49:04 +08:00 |
|
nisen
|
5b4afdde65
|
Merge remote-tracking branch '121/dev1107' into dev1107-121
|
2024-11-10 20:36:50 +08:00 |
|
nisen
|
53ff0d979e
|
Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
|
2024-11-10 20:36:14 +08:00 |
|
nisen
|
9a28d65c54
|
Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
|
2024-11-10 20:34:58 +08:00 |
|
zhaolongfei
|
32fcc830de
|
Merge branch 'zcwy1108-llf' into dev1107-121
|
2024-11-10 20:32:48 +08:00 |
|
zhaolongfei
|
d0e5f8c329
|
编辑视频时长的时候直接修改文件时长
|
2024-11-10 20:31:47 +08:00 |
|
zhaolongfei
|
9c5941fd6b
|
Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
# servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
|
2024-11-10 19:31:56 +08:00 |
|
zhaolongfei
|
2c94b09199
|
在线课上传视频失败修改
|
2024-11-10 19:25:08 +08:00 |
|
zhaolongfei
|
e5c8dbabed
|
无目录无权限不能报名
|
2024-11-10 14:00:11 +08:00 |
|