From 2d0b79878bf2d29b8b877e2b071d4c148964df8f Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Thu, 7 Nov 2024 17:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/elasticsearc/ElasticsearchConfig.java | 2 +- .../src/main/java/com/xboe/api/ThirdApi.java | 2 +- .../module/course/service/impl/CourseServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java index 34591752..6c19f5a8 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java @@ -20,7 +20,7 @@ import com.xboe.common.utils.StringUtil; public class ElasticsearchConfig { @Value("${xboe.elasticsearch.server.ip}") - private String esIp="10.251.88.214"; + private String esIp="127.0.0.1"; @Value("${xboe.elasticsearch.server.port}") private int esPort=9200; diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index 7a55cd36..737a7939 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -74,7 +74,7 @@ public class ThirdApi { //获取例外人员的id public List getUserId(){ - String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316 + String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=136&type=1").execute() //prod 316 .body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("正在获取例外人员工号 responseBody = " + responseBody); try { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 873bcc5d..4a16cbef 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -481,7 +481,7 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "rt.course_id\n" + "FROM\n" + - "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" + + "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" + "\n" + "WHERE\n" + "\n" + @@ -504,7 +504,7 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "pt.course_id\n" + "FROM\n" + - "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" + + "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" + "\n" + "WHERE\n" + "\n" + @@ -561,8 +561,8 @@ public class CourseServiceImpl implements ICourseService { String sql = "SELECT DISTINCT\n" + "\tc.id \n" + "FROM\n" + - "\tboe_new.student s\n" + - "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" + + "\tboe.student s\n" + + "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" + "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" + "WHERE\n" + "\ts.type = 14 \n" +