Commit Graph

1575 Commits

Author SHA1 Message Date
hui
ab38597570 linshi 2025-01-07 11:08:44 +08:00
joshen
a205effce1 Merge remote-tracking branch 'yx/20241118-upframework' into dev250106
# Conflicts:
#	modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java
#	servers/boe-server-all/pom.xml
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/resources/application-pro.properties
#	servers/boe-server-all/src/main/resources/application-test.properties
#	servers/boe-server-all/src/main/resources/application.properties
2025-01-06 13:53:58 +08:00
hui
8cce68632a aoplog 2024-12-23 16:22:59 +08:00
hui
6b060fa6c9 http_path:去掉cdn 2024-12-23 13:16:13 +08:00
hui
393b9b8097 application/json 2024-12-20 11:45:02 +08:00
yang
5698a3ea58 es数据同步 2024-12-19 16:40:24 +08:00
yang
0804c47d22 Merge branch 'refs/heads/zxwy-esSync' into dev1107 2024-12-18 15:26:47 +08:00
yang
aab50a0ff0 es数据同步 2024-12-18 15:26:17 +08:00
yang
c95e0faf63 Merge branch 'refs/heads/zxwy-esSync' into dev1107 2024-12-18 13:39:57 +08:00
yang
9866618110 es数据同步 2024-12-18 13:39:21 +08:00
yang
d6744bb990 Merge branch 'refs/heads/zxwy-esSync' into dev1107 2024-12-18 13:20:53 +08:00
hui
dfee1a9972 接口json 2024-12-17 17:22:57 +08:00
hui
9fe316c76e 接口替换-背水一战 2024-12-17 16:44:46 +08:00
hui
d31269d159 接口替换-背水一战 2024-12-17 11:16:39 +08:00
yang
be18f7477b es数据同步 2024-12-17 10:53:57 +08:00
hui
e979826271 接口替换-背水一战 2024-12-16 17:09:48 +08:00
emcch
ceb8749781 监控出参 2024-12-15 22:24:12 +08:00
yang
e412f5b6eb es数据同步,全量、分页 2024-12-15 20:27:47 +08:00
yang
255b854a08 es数据同步,全量、分页 2024-12-15 19:37:22 +08:00
yang
157e692203 Merge branch 'refs/heads/zxwy-esSync' into dev1107 2024-12-13 20:52:30 +08:00
yang
3343474f33 es数据同步 2024-12-13 20:52:11 +08:00
yang
492032a77a Merge remote-tracking branch 'origin/dev1107' into dev1107 2024-12-13 20:22:00 +08:00
yang
1c6a64e504 Merge branch 'refs/heads/zxwy-esSync' into dev1107 2024-12-13 20:21:17 +08:00
yang
cb8a333b4f es数据同步 2024-12-13 20:20:49 +08:00
Wangxxz
6f861c3d2c Merge remote-tracking branch '121/dev1107' into dev1107 2024-12-13 14:34:08 +08:00
Wangxxz
b701f88586 Merge branch 'yx1101-teacher-l' into dev1107 2024-12-13 14:33:51 +08:00
Wangxxz
6532cf75e3 修改方法名称 2024-12-13 14:33:25 +08:00
Wangxxz
ad357a61b7 修改方法名称 2024-12-13 14:17:48 +08:00
hui
96261cf3f0 接口替换-背水一战 2024-12-13 12:59:37 +08:00
yang
09f64bdb08 es数据同步 2024-12-12 22:21:06 +08:00
yang
f70b4cb32a Merge branch 'refs/heads/zxwy-esSync' into dev1107 2024-12-12 17:53:21 +08:00
yang
4ec4b861f7 es数据同步-在线课 2024-12-12 17:43:58 +08:00
Wangxxz
f577e82551 Merge branch 'yx1101-teacher-l' into dev1107 2024-12-12 11:27:05 +08:00
Wangxxz
ffe232eeb9 注释同步在线课评分 2024-12-12 11:25:28 +08:00
hui
14c5d94c85 接口替换-背水一战 2024-12-10 16:47:17 +08:00
hui
2d2254d14c 接口替换-背水一战 2024-12-10 09:53:55 +08:00
hui
72452d3dff 接口替换 2024-12-09 19:57:39 +08:00
hui
8c494c3c04 接口替换 2024-12-09 18:53:14 +08:00
hui
cc92edd1d8 feign服务封装 2024-12-09 10:56:51 +08:00
hui
b1ed4421d4 feign服务封装 2024-12-06 14:53:52 +08:00
hui
d89de548d2 feign服务封装 2024-12-06 11:47:15 +08:00
hui
a43b05efc5 格式化 2024-12-06 09:07:51 +08:00
tianletd
5e31e1dc91 1.0 2024-12-05 16:33:43 +08:00
joshen
e54c8b457b Merge branch 'yx1101-teacher-l' into master-teacher-1202 2024-12-03 10:23:16 +08:00
Wangxxz
f273e9df4a 加bean字段 2024-12-03 10:22:43 +08:00
Wangxxz
ee25fa40cd Merge remote-tracking branch '121/dev1107' into dev1107 2024-12-03 10:11:18 +08:00
Wangxxz
45d38d6df7 Merge branch 'yx1101-teacher-l' into dev1107 2024-12-03 10:10:20 +08:00
joshen
1a93ab8abd Merge branch 'yx1101-teacher-l' into master-teacher-1202 2024-12-03 10:10:03 +08:00
Wangxxz
aab82de81b 加bean字段 2024-12-03 10:01:31 +08:00
joshen
0b5b882a6c Merge branch 'yx1101-teacher-l' into master-teacher-1202 2024-12-02 17:38:04 +08:00