From 50d218f51bd77a83143aa9eb1a7a44a30b996f67 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 19 Jun 2023 10:30:18 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-pre.properties | 3 +++ .../src/main/resources/application-pro.properties | 2 ++ .../src/main/resources/application-test.properties | 3 +++ 3 files changed, 8 insertions(+) diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 74f82771..8398954c 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -4,6 +4,9 @@ spring.redis.host=10.251.160.38 spring.redis.password=qwert!W577 spring.redis.port=6379 +# cloud nacos config +spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 + ## datasource config spring.jpa.hibernate.ddl-auto=update spring.datasource.driverClassName=com.mysql.jdbc.Driver diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties index ce18d282..a85c2499 100644 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ b/servers/boe-server-all/src/main/resources/application-pro.properties @@ -27,6 +27,8 @@ server.tomcat.max-keep-alive-requests=200 # 默认是100， 超过最大连接数，可以接收的排队的请求数量 server.tomcat.accept-count=200 +# cloud nacos config +spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## redis spring.redis.database=2 diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index 59ca15f8..d8dacc6e 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -4,6 +4,9 @@ spring.redis.host=10.251.160.38 spring.redis.password=qwert!W577 spring.redis.port=6379 +# cloud nacos config +spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 + ## datasource config spring.jpa.hibernate.ddl-auto=none spring.datasource.driverClassName=com.mysql.jdbc.Driver From 3677229470874c002ebfef19176b16874a1f4cbf Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 19 Jun 2023 17:08:22 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 23 ++++++++++++++++++- .../main/resources/application-dev.properties | 3 +++ .../main/resources/application-pre.properties | 2 +- .../main/resources/application-pro.properties | 2 +- .../resources/application-test.properties | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 6da188bf..359e2603 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -14,9 +14,30 @@ boe-server-all BOE 项目所有功能启动工程，用于开发 - 1.8 + 1.8 + 2021.0.5 + 2021.0.5.0 + 2.2.0 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring-cloud-alibaba.version} + + + com.alibaba.nacos + nacos-client + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + + com.xboe xboe-api diff --git a/servers/boe-server-all/src/main/resources/application-dev.properties b/servers/boe-server-all/src/main/resources/application-dev.properties index 3b9f7f30..32fc56ed 100644 --- a/servers/boe-server-all/src/main/resources/application-dev.properties +++ b/servers/boe-server-all/src/main/resources/application-dev.properties @@ -4,6 +4,9 @@ spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 +# cloud nacos config +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 + ## datasource config spring.jpa.show-sql = true spring.jpa.hibernate.ddl-auto=update diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 8398954c..45bdeb6d 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -5,7 +5,7 @@ spring.redis.password=qwert!W577 spring.redis.port=6379 # cloud nacos config -spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## datasource config spring.jpa.hibernate.ddl-auto=update diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties index a85c2499..cc7a573b 100644 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ b/servers/boe-server-all/src/main/resources/application-pro.properties @@ -28,7 +28,7 @@ server.tomcat.max-keep-alive-requests=200 server.tomcat.accept-count=200 # cloud nacos config -spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## redis spring.redis.database=2 diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index d8dacc6e..a2b306e0 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -5,7 +5,7 @@ spring.redis.password=qwert!W577 spring.redis.port=6379 # cloud nacos config -spring.application.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## datasource config spring.jpa.hibernate.ddl-auto=none From 69ca8eac0ac8b601df0d230ce184ddb3f9a119c2 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 19 Jun 2023 17:08:42 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-task/pom.xml | 23 ++++++++++++++++++- .../main/resources/application-dev.properties | 3 +++ .../main/resources/application-pre.properties | 3 +++ .../main/resources/application-pro.properties | 3 +++ .../resources/application-test.properties | 3 +++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-task/pom.xml b/servers/boe-server-task/pom.xml index f3f1fd5d..311f08f8 100644 --- a/servers/boe-server-task/pom.xml +++ b/servers/boe-server-task/pom.xml @@ -14,9 +14,30 @@ boe-server-task BOEDX项目的任务处理服务 - 1.8 + 1.8 + 2021.0.5 + 2021.0.5.0 + 2.2.0 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring-cloud-alibaba.version} + + + com.alibaba.nacos + nacos-client + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + + com.xboe xboe-core diff --git a/servers/boe-server-task/src/main/resources/application-dev.properties b/servers/boe-server-task/src/main/resources/application-dev.properties index b2b7e4a5..02cf8006 100644 --- a/servers/boe-server-task/src/main/resources/application-dev.properties +++ b/servers/boe-server-task/src/main/resources/application-dev.properties @@ -4,6 +4,9 @@ spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 +# cloud nacos config +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 + ## datasource config spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver diff --git a/servers/boe-server-task/src/main/resources/application-pre.properties b/servers/boe-server-task/src/main/resources/application-pre.properties index 947c5af9..687cb4c3 100644 --- a/servers/boe-server-task/src/main/resources/application-pre.properties +++ b/servers/boe-server-task/src/main/resources/application-pre.properties @@ -4,6 +4,9 @@ spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 +# cloud nacos config +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 + ## datasource config spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver diff --git a/servers/boe-server-task/src/main/resources/application-pro.properties b/servers/boe-server-task/src/main/resources/application-pro.properties index 947c5af9..687cb4c3 100644 --- a/servers/boe-server-task/src/main/resources/application-pro.properties +++ b/servers/boe-server-task/src/main/resources/application-pro.properties @@ -4,6 +4,9 @@ spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 +# cloud nacos config +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 + ## datasource config spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver diff --git a/servers/boe-server-task/src/main/resources/application-test.properties b/servers/boe-server-task/src/main/resources/application-test.properties index e15562fd..b5d236ae 100644 --- a/servers/boe-server-task/src/main/resources/application-test.properties +++ b/servers/boe-server-task/src/main/resources/application-test.properties @@ -4,6 +4,9 @@ spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 +# cloud nacos config +spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 + ## datasource config spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver From 76cad41b6991236c379ae17b1f84814fe5bb4b2b Mon Sep 17 00:00:00 2001 From: daihh Date: Sun, 25 Jun 2023 14:00:23 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9nacose=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/data/outside/IOutSideDataService.java | 2 +- .../src/main/resources/application-test.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java index b1971f81..8030d19a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java @@ -22,7 +22,7 @@ public interface IOutSideDataService { /** * 获取用户有权限的机构id - * */ + */ UserOrgIds getOrgIds(); } diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index a2b306e0..db5d22b6 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -5,7 +5,7 @@ spring.redis.password=qwert!W577 spring.redis.port=6379 # cloud nacos config -spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 +spring.cloud.nacos.discovery.server-addr=10.251.186.27:8848 ## datasource config spring.jpa.hibernate.ddl-auto=none From d8b56ce45075a2344af1207f209fde03eeae3f86 Mon Sep 17 00:00:00 2001 From: daihh Date: Sun, 25 Jun 2023 15:38:06 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E5=AD=97=E6=AE=B5=E8=A7=A3=E6=9E=90=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 13d24917..3035ae70 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -109,7 +109,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { JsonNode result = rootNode.get("result"); if(result!=null && result.isObject()) { //这里应该是单独的线程去处理 - user.setId(getNodeText(result.get("id"))); + user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId String band=getNodeText(result.get("bandCode")); if(StringUtils.isNotBlank(band) && band.length()>4) { String bandNum=band.substring(4); @@ -119,15 +119,21 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } user.setAvatar(getNodeText(result.get("avatar"))); user.setCode(getNodeText(result.get("userNo"))); + user.setName(result.get("realName").asText()); //user.setDeleted(result.get("deleted").asBoolean());//无此字段 user.setDeleted(false); - user.setDepartId(getNodeText(result.get("departId"))); - user.setDepartName(getNodeText(result.get("departName")));//无此字段 - user.setGender(result.get("gender").asInt());// - user.setKid(getNodeText(result.get("kid"))); - user.setLearningDuration(result.get("learningDuration").asInt()); - user.setName(result.get("realName").asText()); + user.setDepartId(getNodeText(result.get("orgId")));//最新departId改为orgId + user.setDepartName(getNodeText(result.get("orgName")));//无此字段 user.setOrgNamePath(result.get("orgName").asText()); + //新的接口中没有这个字段了,设置为默认是1 + //user.setGender(result.get("gender").asInt());// + user.setGender(1);// + + user.setKid(getNodeText(result.get("kid"))); + //新的字段里没有此字段了，这里设置为0 + //user.setLearningDuration(result.get("learningDuration").asInt()); + user.setLearningDuration(0); + user.setUserType(1);//直接设置为学员 user.setTeacher(false); user.setAdminType(0); From 0ea476a6ea9e9a41c19f7adcf251cd3db0fde560 Mon Sep 17 00:00:00 2001 From: daihh Date: Sun, 25 Jun 2023 16:31:01 +0800 Subject: [PATCH 06/20] =?UTF-8?q?boenewlogin=E5=8A=A0=E5=88=B0=E4=B8=8D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B8=AD=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/UrlSecurityFilterImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java b/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java index 23288a2c..74d44a58 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java @@ -23,6 +23,7 @@ public class UrlSecurityFilterImpl implements IUrlSecurityFilter{ noLoginUrls.add("/xboe/account/captcha"); noLoginUrls.add("/xboe/account/login"); noLoginUrls.add("/xboe/account/boelogin"); + noLoginUrls.add("/xboe/account/boenewlogin"); noLoginUrls.add("/xboe/account/mobile-login"); noLoginUrls.add("/xboe/account/logout"); noLoginUrls.add("/xboe/system/captcha"); From 8f4810837562bb7db47651623edc6867f661259a Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 26 Jun 2023 10:21:31 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 20 +++++++++++++++---- .../main/resources/application-pre.properties | 2 +- .../main/resources/application-pro.properties | 2 +- .../resources/application-test.properties | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 3035ae70..576f6c84 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -124,15 +124,27 @@ public class OutSideDataServiceImpl implements IOutSideDataService { user.setDeleted(false); user.setDepartId(getNodeText(result.get("orgId")));//最新departId改为orgId user.setDepartName(getNodeText(result.get("orgName")));//无此字段 - user.setOrgNamePath(result.get("orgName").asText()); - //新的接口中没有这个字段了,设置为默认是1 + user.setOrgNamePath(result.get("orgNamePath").asText()); + //新的接口中没有这个字段了,设置为默认是1 20230622 //user.setGender(result.get("gender").asInt());// - user.setGender(1);// + //别是1.男；2.女；3其他；4.保密 20230626 + int gender=result.get("gender").asInt(); + if(gender>2) { + gender=1; + } + user.setGender(gender); user.setKid(getNodeText(result.get("kid"))); //新的字段里没有此字段了，这里设置为0 //user.setLearningDuration(result.get("learningDuration").asInt()); - user.setLearningDuration(0); + //user.setLearningDuration(0); + //改为判断 + JsonNode learningNode=result.get("learningDuration"); + if(learningNode!=null) { + user.setLearningDuration(learningNode.asInt()); + }else { + user.setLearningDuration(0); + } user.setUserType(1);//直接设置为学员 user.setTeacher(false); diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 45bdeb6d..ca622bc5 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -1,5 +1,5 @@ ## redis -spring.redis.database=2 +spring.redis.database=1 spring.redis.host=10.251.160.38 spring.redis.password=qwert!W577 spring.redis.port=6379 diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties index cc7a573b..22a0a32c 100644 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ b/servers/boe-server-all/src/main/resources/application-pro.properties @@ -31,7 +31,7 @@ server.tomcat.accept-count=200 spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848 ## redis -spring.redis.database=2 +spring.redis.database=1 spring.redis.host=127.0.0.1 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) spring.redis.port=6379 diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index db5d22b6..cc13d63b 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -1,5 +1,5 @@ ## redis -spring.redis.database=2 +spring.redis.database=1 spring.redis.host=10.251.160.38 spring.redis.password=qwert!W577 spring.redis.port=6379 From 34e0ce022cfcc636cfa5cd7db8f972643466f7ce Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 26 Jun 2023 10:36:34 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20manageOrgIds=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/data/outside/OutSideDataServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 576f6c84..e151df9d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -210,14 +210,23 @@ public class OutSideDataServiceImpl implements IOutSideDataService { uids.getPermissions().put(UserOrgIds.IsSystemAdminKey, isAdminNode.asBoolean()); } } + //根据最新接口修正20230622 result返回的两个数组，mainList ,readOnlyList,只是使用 mainList +// if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { +// JsonNode result = rootNode.get("result"); +// Iterator elements = result.elements(); +// while (elements.hasNext()){ +// orgIds.add(elements.next().toString()); +// } +// } - if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { - JsonNode result = rootNode.get("result"); + if(rootNode.get("result")!=null & rootNode.get("result").get("mainList")!=null) { + JsonNode result = rootNode.get("result").get("mainList"); Iterator elements = result.elements(); while (elements.hasNext()){ orgIds.add(elements.next().toString()); } } + }catch (Exception e){ log.error("获取当前用户有权限的机构id错误",e); } From 2e01a11bed6619e1ef3ee4d0e793534627a755ed Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 27 Jun 2023 10:54:02 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E8=A7=A3=E6=9E=90=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/data/dto/UserData.java | 2 +- .../data/outside/OutSideDataServiceImpl.java | 59 ++++++++++++++----- .../com/xboe/school/api/PortalConsoleApi.java | 1 - 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java index 84331e93..f7493046 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/UserData.java @@ -16,7 +16,7 @@ public class UserData { /**主要是为了兼容之前的使用，新用户可以为空*/ private String kid; - /**用户工号*/ + /**用户工号，用于登录名*/ private String code; private String mobile; diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index e151df9d..f720c9d0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -119,6 +119,17 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } user.setAvatar(getNodeText(result.get("avatar"))); user.setCode(getNodeText(result.get("userNo"))); + + if(StringUtils.isBlank(user.getCode())) { + user.setCode(getNodeText(result.get("loginName"))); + } + + if(StringUtils.isBlank(user.getCode())) { + log.error("通过接口获取当前用户信息【"+user.getId()+"】"+user.getName()+"，工号或登录名为空，不能使用"); + throw new RuntimeException("通过接口获取当前用户信息，工号为空，不能使用"); + } + + user.setName(result.get("realName").asText()); //user.setDeleted(result.get("deleted").asBoolean());//无此字段 user.setDeleted(false); @@ -148,30 +159,50 @@ public class OutSideDataServiceImpl implements IOutSideDataService { user.setUserType(1);//直接设置为学员 user.setTeacher(false); + user.setAdminType(0); + user.setSysAdmin(result.get("isSystemAdmin").asBoolean()); + //前端身份 + JsonNode permissions = result.get("permissionList"); + Iterator permissionNodes=permissions.elements(); + while(permissionNodes.hasNext()) { + JsonNode permission=permissionNodes.next(); + String permissionText=permission.asText(); + if("front-admin".equals(permissionText)) { + user.setAdminType(1);//设置为管理员，但是是非默认管理员 + }else if("front-teacher".equals(permissionText)) { + user.setTeacher(true);//设置为教师 + } + } + + + //处理roleList ,主要是提取默认管理员，非默认管理员，20230627修改 JsonNode roleList = result.get("roleList"); if(roleList!=null){ for(JsonNode jsonNode :roleList) { String roleCode=getNodeText(jsonNode.get("code")); - if(roleCode.equals("system-admin")){ - user.setSysAdmin(true);//系统管理员 - } + //修改为只是设置默认管理员 if(roleCode.equals("learning-admin")){ user.setAdminType(1);//默认管理员 - }else if(roleCode.equals("non-default-admin")) { - user.setAdminType(2);//非默认管理员 - } - if(roleCode.equals("teacher")){ - log.info("用户有教师身份"); - user.setTeacher(true);//是老师 - user.setUserType(2);//教师 } + +// if(roleCode.equals("system-admin")){ +// user.setSysAdmin(true);//系统管理员 +// } +// if(roleCode.equals("learning-admin")){ +// user.setAdminType(1);//默认管理员 +// }else if(roleCode.equals("non-default-admin")) { +// user.setAdminType(2);//非默认管理员 +// } +// if(roleCode.equals("teacher")){ +// log.info("用户有教师身份"); +// user.setTeacher(true);//是老师 +// user.setUserType(2);//教师 +// } } } - if(StringUtils.isBlank(user.getCode())) { - log.error("通过接口获取当前用户信息【"+user.getId()+"】"+user.getName()+"，工号为空，不能使用"); - throw new RuntimeException("通过接口获取当前用户信息，工号为空，不能使用"); - } + + } //System.out.println("用户管理员:"+user.getAdminType()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index 9ced8b26..a315951f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -107,7 +107,6 @@ public class PortalConsoleApi extends ApiBaseController{ //以下是使用的接口数据判断身份 int utype=1;//仅仅是学员 if(userData!=null) { - if(userData.getTeacher()) { utype=2; } From 58a3c63f13ef0c30d3cd2e7e878946effdcca36c Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Jun 2023 11:48:29 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/data/outside/OutSideDataServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index f720c9d0..3eaad33d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -88,6 +88,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { public UserData getUserInfoByUserId(String userId) { String token = TokenProxy.getBoeToken(request); + log.info("请求user/info: "+token); //String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIxMTI3NTUsImV4cCI6MTY3MjExOTk1NSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.1348e0cfbb064d6d348d3976db3618974c1b1e8d2f6c6f45ae8294f09223f9b1"; String type="application/json"; String[] headers=new String[] {"token",token,"Content-Type",type}; @@ -97,6 +98,9 @@ public class OutSideDataServiceImpl implements IOutSideDataService { try { //OkHttpUtil http=new OkHttpUtil(); String responseStr = okHttpUtil.doPostJson(url,"{}", headers); + if(StringUtils.isBlank(responseStr)) { + log.error("获取user/info返回空值"); + } log.info("获取用户信息：",responseStr); //System.out.println(responseStr); JsonNode rootNode= mapper.readTree(responseStr); From 7f029868d51eeb836b02978b19df18778760d5a8 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Jun 2023 14:35:37 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 5 +++- .../com/xboe/school/api/PortalConsoleApi.java | 28 ++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 3eaad33d..a8cd5184 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -114,6 +114,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { if(result!=null && result.isObject()) { //这里应该是单独的线程去处理 user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId + log.info("用户的id="+user.getId()); String band=getNodeText(result.get("bandCode")); if(StringUtils.isNotBlank(band) && band.length()>4) { String bandNum=band.substring(4); @@ -173,8 +174,10 @@ public class OutSideDataServiceImpl implements IOutSideDataService { JsonNode permission=permissionNodes.next(); String permissionText=permission.asText(); if("front-admin".equals(permissionText)) { + log.info("用户是默认管理员"); user.setAdminType(1);//设置为管理员，但是是非默认管理员 }else if("front-teacher".equals(permissionText)) { + log.info("用户有教师身份"); user.setTeacher(true);//设置为教师 } } @@ -209,7 +212,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } - //System.out.println("用户管理员:"+user.getAdminType()); + log.info("用户管理员:"+user.getAdminType()); //System.out.println("老师:"+user.getTeacher()); return user; } catch (Exception e) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index a315951f..a0ad81cd 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -66,22 +66,24 @@ public class PortalConsoleApi extends ApiBaseController{ UserData userData = outsideDataService.getUserInfoByUserId(null); if(userData==null) { log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); - //return error("未能获取当前用户信息"); + return error("未能获取当前用户信息"); } User user = userService.get(getCurrent().getAccountId()); - Organization org = null; + String departName = ""; - String departFullName = ""; - if(StringUtil.isNotBlank(user.getDepartId())) { - org = organizationService.get(user.getDepartId()); - if(org!=null) { - departName = org.getName(); - if(StringUtil.isNotBlank(org.getNamePath())) { - departFullName = org.getNamePath().substring(1); - } - } - } + String departFullName = userData.getOrgNamePath(); + +// Organization org = null; +// if(StringUtil.isNotBlank(user.getDepartId())) { +// org = organizationService.get(user.getDepartId()); +// if(org!=null) { +// departName = org.getName(); +// if(StringUtil.isNotBlank(org.getNamePath())) { +// departFullName = org.getNamePath().substring(1); +// } +// } +// } //检查是否是教师,并计算用户的类型,修改于220507 // Teacher t = teacherService.get(account.getId()); @@ -107,7 +109,7 @@ public class PortalConsoleApi extends ApiBaseController{ //以下是使用的接口数据判断身份 int utype=1;//仅仅是学员 if(userData!=null) { - if(userData.getTeacher()) { + if(userData.getTeacher()!=null && userData.getTeacher()) { utype=2; } if(userData.getAdminType()>0) { From 04b3f82e121aed07f5e4dc2210f282dc808be2ad Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Jun 2023 15:37:30 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/data/outside/OutSideDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index a8cd5184..795ab9ab 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -101,7 +101,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { if(StringUtils.isBlank(responseStr)) { log.error("获取user/info返回空值"); } - log.info("获取用户信息：",responseStr); + log.info("获取用户信息："+responseStr); //System.out.println(responseStr); JsonNode rootNode= mapper.readTree(responseStr); int code = rootNode.get("status").asInt(); From 9d966e7a033dd0938a15729c22d5ad441593a8f7 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Jun 2023 16:52:32 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=8A=8Atoken=E8=BD=AC=E5=8C=96=E6=88=90?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E7=94=A8=E5=A4=96=E9=83=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/data/outside/IOutSideDataService.java | 2 +- .../xboe/data/outside/OutSideDataServiceImpl.java | 13 ++++++------- .../java/com/xboe/school/api/PortalConsoleApi.java | 9 ++++++--- .../java/com/xboe/school/api/PortalLoginApi.java | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java index 8030d19a..ba07653f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java @@ -17,7 +17,7 @@ public interface IOutSideDataService { /** * 通过统一用户id获取用户的信息,如果是空，就是当前登录的用户 */ - UserData getUserInfoByUserId(String userId); + UserData getUserInfoByToken(String token); /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 795ab9ab..28710160 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -42,7 +42,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { @Override public List getUsersByAudienceId(String audienceId){ - String token = TokenProxy.getToken(request); + String token = TokenProxy.getBoeToken(request); String type="application/json"; String[] headers=new String[] {"token",token,"Content-Type",type}; String url= getBaseUrl("/audience/members"); @@ -85,9 +85,9 @@ public class OutSideDataServiceImpl implements IOutSideDataService { // } @Override - public UserData getUserInfoByUserId(String userId) { - - String token = TokenProxy.getBoeToken(request); + public UserData getUserInfoByToken(String token) { + //String token = TokenProxy.getBoeToken(request); + log.info("请求user/info: "+token); //String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIxMTI3NTUsImV4cCI6MTY3MjExOTk1NSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.1348e0cfbb064d6d348d3976db3618974c1b1e8d2f6c6f45ae8294f09223f9b1"; String type="application/json"; @@ -208,9 +208,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService { // } } } - - - + }else { + throw new RuntimeException("通过接口获取用户信息结果result错误："+responseStr); } log.info("用户管理员:"+user.getAdminType()); //System.out.println("老师:"+user.getTeacher()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index a0ad81cd..6b745a70 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -3,6 +3,8 @@ package com.xboe.school.api; import java.util.HashMap; import java.util.Map; +import javax.servlet.http.HttpServletRequest; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -14,6 +16,7 @@ import com.xboe.common.utils.StringUtil; import com.xboe.core.CurrentUser; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; +import com.xboe.core.api.TokenProxy; import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.module.teacher.service.ITeacherService; @@ -53,7 +56,7 @@ public class PortalConsoleApi extends ApiBaseController{ * @return */ @RequestMapping(value="/init",method = {RequestMethod.GET}) - public JsonResponse> init() { + public JsonResponse> init(HttpServletRequest request) { Map map=new HashMap(); try { CurrentUser cuser=getCurrent(); @@ -62,8 +65,8 @@ public class PortalConsoleApi extends ApiBaseController{ log.error("未找到账号id【"+getCurrent().getAccountId()+"】对应的用户"); return error("账号错误，无此账号"); } - - UserData userData = outsideDataService.getUserInfoByUserId(null); + String token = TokenProxy.getBoeToken(request); + UserData userData = outsideDataService.getUserInfoByToken(token); if(userData==null) { log.error("通过api获取用用户信息错误【"+getCurrent().getAccountId()+"】对应的用户"); return error("未能获取当前用户信息"); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java index a68f1264..b3ab534d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalLoginApi.java @@ -211,7 +211,7 @@ public class PortalLoginApi extends ApiBaseController { // return wrap(JsonResponseStatus.TOKEN_NOPASS, "token error"); // } - UserData udata=outsideService.getUserInfoByUserId(null); + UserData udata=outsideService.getUserInfoByToken(token); if(udata==null) { log.error("未获取当前登录人的用户信息"); return wrap(JsonResponseStatus.TOKEN_NOPASS, "用户信息查询失败"); From 64a507b0b46f14aaae6ec4a6e1125ca8b9d919a5 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Jun 2023 16:54:00 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E5=AF=B9result=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=E7=9A=84=E7=9B=B4=E6=8E=A5=E6=89=93=E5=8D=B0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/data/outside/OutSideDataServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 28710160..7856ea68 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -209,7 +209,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } } }else { - throw new RuntimeException("通过接口获取用户信息结果result错误："+responseStr); + log.error("通过接口获取用户信息结果result错误:"+responseStr); + throw new RuntimeException("通过接口获取用户信息结果result错误"); } log.info("用户管理员:"+user.getAdminType()); //System.out.println("老师:"+user.getTeacher()); From d24a572b86d8b49713a259709eeaade38d156e6b Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 3 Jul 2023 11:45:10 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=AA=E6=80=A7=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84id=E9=9B=86=E5=90=88=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/IOutSideDataService.java | 16 ++ .../data/outside/OutSideDataServiceImpl.java | 165 ++++++++++-------- .../com/xboe/system/api/SysConsoleApi.java | 2 +- .../com/xboe/system/user/api/UserApi.java | 31 ++-- 4 files changed, 129 insertions(+), 85 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java index ba07653f..47d4c3f4 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/IOutSideDataService.java @@ -5,6 +5,7 @@ import java.util.List; import com.xboe.data.dto.AudienceUser; import com.xboe.data.dto.UserData; import com.xboe.data.dto.UserOrgIds; +import com.xboe.system.user.vo.UserSimpleVo; public interface IOutSideDataService { @@ -24,5 +25,20 @@ public interface IOutSideDataService { * 获取用户有权限的机构id */ UserOrgIds getOrgIds(); + + /** + * 根据aid集合，从用户中心获取要显示的用户信息 + * @param ids + * @return + */ + List findByIds(List ids); + + /** + * 更新用户的头像，签名 + * @param aid + * @param avatar + * @param sign + */ + void updateUser(String aid,String avatar,String sign); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 7856ea68..924ceb31 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -16,6 +16,7 @@ import com.xboe.core.utils.OkHttpUtil; import com.xboe.data.dto.AudienceUser; import com.xboe.data.dto.UserData; import com.xboe.data.dto.UserOrgIds; +import com.xboe.system.user.vo.UserSimpleVo; import lombok.extern.slf4j.Slf4j; @@ -88,7 +89,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { public UserData getUserInfoByToken(String token) { //String token = TokenProxy.getBoeToken(request); - log.info("请求user/info: "+token); + log.info("请求/userbasic/user/info"); //String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIxMTI3NTUsImV4cCI6MTY3MjExOTk1NSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.1348e0cfbb064d6d348d3976db3618974c1b1e8d2f6c6f45ae8294f09223f9b1"; String type="application/json"; String[] headers=new String[] {"token",token,"Content-Type",type}; @@ -99,9 +100,9 @@ public class OutSideDataServiceImpl implements IOutSideDataService { //OkHttpUtil http=new OkHttpUtil(); String responseStr = okHttpUtil.doPostJson(url,"{}", headers); if(StringUtils.isBlank(responseStr)) { - log.error("获取user/info返回空值"); + log.error("获取/userbasic/user/info返回空值"); } - log.info("获取用户信息："+responseStr); + //log.info("获取用户信息："+responseStr); //System.out.println(responseStr); JsonNode rootNode= mapper.readTree(responseStr); int code = rootNode.get("status").asInt(); @@ -114,7 +115,6 @@ public class OutSideDataServiceImpl implements IOutSideDataService { if(result!=null && result.isObject()) { //这里应该是单独的线程去处理 user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId - log.info("用户的id="+user.getId()); String band=getNodeText(result.get("bandCode")); if(StringUtils.isNotBlank(band) && band.length()>4) { String bandNum=band.substring(4); @@ -174,10 +174,10 @@ public class OutSideDataServiceImpl implements IOutSideDataService { JsonNode permission=permissionNodes.next(); String permissionText=permission.asText(); if("front-admin".equals(permissionText)) { - log.info("用户是默认管理员"); + //log.info("用户是默认管理员"); user.setAdminType(1);//设置为管理员，但是是非默认管理员 }else if("front-teacher".equals(permissionText)) { - log.info("用户有教师身份"); + //log.info("用户有教师身份"); user.setTeacher(true);//设置为教师 } } @@ -212,8 +212,6 @@ public class OutSideDataServiceImpl implements IOutSideDataService { log.error("通过接口获取用户信息结果result错误:"+responseStr); throw new RuntimeException("通过接口获取用户信息结果result错误"); } - log.info("用户管理员:"+user.getAdminType()); - //System.out.println("老师:"+user.getTeacher()); return user; } catch (Exception e) { log.error("获取当前用户信息错误",e); @@ -272,72 +270,6 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } -// public static void main(String[] args) { -//// List orgIds = new ArrayList<>(); -//// String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzUzMDkxMDcsImV4cCI6MTY3NTMxNjMwNywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjdFMDY1NzQxLTkzRUItRTc1Ni02Mzk5LUIwQTA1QUY2NEE3OSIsInVJZCI6Ijk2NTM2OTU4MjM5Mjk3MTI2NCIsInBlcm1pc3Npb24iOiIifQ==.6780daf88206d3f4f2cfc184268f4c1b80f25a916105219a5a6f2e904762b1e8"; -//// String type="application/json"; -//// String[] headers=new String[] {"token",token,"Content-Type",type}; -//// String url= ("https://u.boe.com/userbasic/org/manageOrgIds"); -//// ObjectMapper mapper=new ObjectMapper(); -//// String responseStr=null; -//// try{ -//// OkHttpUtil http=new OkHttpUtil(); -//// responseStr = http.doPostJson(url,"{}", headers); -//// System.out.println(responseStr); -//// JsonNode rootNode= mapper.readTree(responseStr); -//// int code = rootNode.get("status").asInt(); -//// System.out.println("code="+code); -//// if(code!=200) { -//// log.error("获取当前用户拥有权限机构id错误："+responseStr); -//// } -//// -//// if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { -//// JsonNode result = rootNode.get("result"); -//// Iterator elements = result.elements(); -//// while (elements.hasNext()){ -//// orgIds.add(elements.next().toString()); -//// } -//// } -//// for(String str : orgIds) { -//// System.out.println(str); -//// } -//// }catch (Exception e){ -//// log.error("获取当前用户有权限的机构id错误",e); -//// } -// String token="eyJhbGciOiJIUzI1NiIsInR5cGUiOiJ0b2tlbiJ9.eyJpc3MiOiJodHRwOi8vdS5ib2UuY29tIiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVJZCI6OTY1MzQyMDI3NDk3NjA3MTY4LCJ1c2VySWQiOiI2QjA0OUZBRi1DMzE0LTdDQ0YtMEQyOC0wRDIzRjRDNDI1MzEiLCJleHAiOjE2NzUzMzUxNTU3MTZ9.d9f78b2c6bac6001f732015f509eff04f50c6a426e7c01f259f884c8da6ac92c"; -// String url= "https://u-pre.boe.com/userbasic/audience/members"; -// Map params = new HashMap<>(); -// params.put("audienceId", "7008604893867151361"); -// String json = null; -// List list=new ArrayList(); -// ObjectMapper mapper=new ObjectMapper(); -// try { -// -// json = mapper.writeValueAsString(params); -// OkHttpUtil http=new OkHttpUtil(); -// String[] headers=new String[] {"token",token,"Content-Type","application/json"}; -// String responseStr = http.doPostJson(url, json, headers); -// System.out.println(responseStr); -// JsonNode rootNode= mapper.readTree(responseStr); -// -// JsonNode result = rootNode.get("result"); -// if(result!=null && result.isArray()) { -// //这里应该是单独的线程去处理 -// for(JsonNode node :result) { -// AudienceUser au=new AudienceUser(); -// au.setId(node.get("userId").asText()); -// au.setName(node.get("name").asText()); -// au.setCode(node.get("userNo").asText()); -// list.add(au); -// System.out.println(au.getName()); -// } -// } -// } catch (Exception e) { -// log.error("获取受众用户列表错误",e); -// } -// -// } - private String getBaseUrl(String url) { String baseUrl=SysConstant.getConfigValue("xboe.server.userbasic.url"); if(StringUtils.isBlank(baseUrl)) { @@ -348,4 +280,89 @@ public class OutSideDataServiceImpl implements IOutSideDataService { return reqUrl; } + + @Override + public List findByIds(List ids) { + + //请求信息，token加在header中 + String token = TokenProxy.getToken(request); + String type="application/json"; + String[] headers=new String[] {"token",token,"Content-Type",type}; + String url= getBaseUrl("/org/getUserMessageToDai"); + //返回信息 + List uids=new ArrayList(); + ObjectMapper mapper=new ObjectMapper(); + String responseStr=null; + try{ + String idsJson=mapper.writeValueAsString(ids); + log.info("请求的的接口："+url); + log.info("请求的数据："+idsJson); + responseStr = okHttpUtil.doPostJson(url,idsJson, headers); + log.info("返回的数据："+responseStr); + JsonNode rootNode= mapper.readTree(responseStr); + int code = rootNode.get("status").asInt(); + if(code!=200) { + log.error("根据aid集合获取用户信息错误："+code); + return null; + } + + //返回的是集合 + JsonNode result = rootNode.get("result"); + if(result!=null && result.isArray()) { + + Iterator elements = result.elements(); + while (elements.hasNext()){ + JsonNode node=elements.next(); + UserSimpleVo vo=new UserSimpleVo(); + vo.setAid(node.get("aid").asText()); + vo.setAvatar(getNodeText(node.get("avatar"))); + vo.setCode(getNodeText(node.get("code"))); + vo.setName(getNodeText(node.get("name"))); + vo.setOrgInfo(getNodeText(node.get("orgInfo"))); + vo.setSign(getNodeText(node.get("sign"))); + //别是1.男；2.女；3其他；4.保密 20230626 + int gender=result.get("gender").asInt(); + if(gender>2) { + gender=1; + } + vo.setSex(gender); + uids.add(vo); + } + } + + + }catch (Exception e){ + log.error("根据aid集合获取用户信息错误",e); + } + return uids; + } + + + @Override + public void updateUser(String aid, String avatar, String sign) { + + String token = TokenProxy.getToken(request); + String type="application/json"; + String[] headers=new String[] {"token",token,"Content-Type",type}; + String url= getBaseUrl("/org/updateUserMessage"); + //返回信息 + ObjectMapper mapper=new ObjectMapper(); + String responseStr=null; + try{ + String postJson="{\"aid\":\""+aid+"\",\"avatar\":\""+avatar+"\",\"sign\":\""+sign+"\"}"; + log.info("请求的的接口："+url); + log.info("请求的数据："+postJson); + responseStr = okHttpUtil.doPostJson(url,postJson, headers); + log.info("返回的数据："+responseStr); + JsonNode rootNode= mapper.readTree(responseStr); + int code = rootNode.get("status").asInt(); + if(code!=200) { + log.error("根据ai更新用户信息错误："+code); + } + }catch (Exception e){ + log.error("根据aid更新用户信息错误",e); + } + + } + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/api/SysConsoleApi.java index 65810b56..c37613a8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/api/SysConsoleApi.java @@ -33,7 +33,7 @@ public class SysConsoleApi extends ApiBaseController{ Map map=new HashMap(); //获取当前用户数据 CurrentUser cu=super.getCurrent(); - map.put("msg",2);//未读消息提示是0 + map.put("msg",0);//未读消息提示是0 map.put("aid",cu.getAccountId());// map.put("name",cu.getName());// map.put("avatar","");//头像，如果没有就提供一个默认的 diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 937b4f68..f916105c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -24,6 +24,7 @@ import com.xboe.common.utils.StringUtil; import com.xboe.constants.Constants; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; +import com.xboe.data.outside.IOutSideDataService; import com.xboe.externalinterface.system.service.IFwUserService; import com.xboe.module.teacher.entity.Teacher; import com.xboe.module.teacher.service.ITeacherService; @@ -61,6 +62,9 @@ public class UserApi extends ApiBaseController { @Resource IUserService userService; + + @Resource + IOutSideDataService outsideService; /** * 分页查询用户信息 @@ -255,16 +259,23 @@ public class UserApi extends ApiBaseController { public JsonResponse> findByIds(@RequestBody List ids) { List list = null; - //最后从缓存中取，根据用户的id， 缓存用户的头像地址，姓名，机构信息。一期可以先直接查询，缓存可以后续修改 - if (ids != null && ids.size() > 0) { - list = new ArrayList<>(); - for (String id : ids) { - Account account = accountService.get(id); - UserSimpleVo vo = getAuthorVo(account); - if (vo != null) { - list.add(vo); - } - } +// //最后从缓存中取，根据用户的id， 缓存用户的头像地址，姓名，机构信息。一期可以先直接查询，缓存可以后续修改 +// if (ids != null && ids.size() > 0) { +// list = new ArrayList<>(); +// for (String id : ids) { +// Account account = accountService.get(id); +// UserSimpleVo vo = getAuthorVo(account); +// if (vo != null) { +// list.add(vo); +// } +// } +// } + //从用户中心接口中获取 + try { + list=outsideService.findByIds(ids); + }catch(Exception e) { + log.error("从用户中心获取用户信息失败",e); + return badRequest("从用户中心获取用户信息失败"); } return success(list); } From ea6e61b0e5b8ce0ab61f88716c6d0a360d163dff Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 4 Jul 2023 12:11:01 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/data/outside/OutSideDataServiceImpl.java | 4 ++++ .../src/main/java/com/xboe/system/user/api/UserApi.java | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 924ceb31..0502c228 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -298,6 +298,10 @@ public class OutSideDataServiceImpl implements IOutSideDataService { log.info("请求的的接口："+url); log.info("请求的数据："+idsJson); responseStr = okHttpUtil.doPostJson(url,idsJson, headers); + if(StringUtils.isBlank(responseStr)) { + log.error("接口未返回任何内容"); + return null; + } log.info("返回的数据："+responseStr); JsonNode rootNode= mapper.readTree(responseStr); int code = rootNode.get("status").asInt(); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index f916105c..4a60b254 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -1,6 +1,5 @@ package com.xboe.system.user.api; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -273,10 +272,17 @@ public class UserApi extends ApiBaseController { //从用户中心接口中获取 try { list=outsideService.findByIds(ids); + if(list==null) { + log.error("根据id集合从用户中心获取用户数据失败，请查看日志"); + return badRequest("根据id集合从用户中心获取用户数据失败，请查看日志"); + } }catch(Exception e) { log.error("从用户中心获取用户信息失败",e); return badRequest("从用户中心获取用户信息失败"); } + + + return success(list); } From f42ca816e38f5371cff9cf76415251131870cd89 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 4 Jul 2023 14:07:58 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3ids?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/data/outside/OutSideDataServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 0502c228..c7889c79 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -294,7 +294,9 @@ public class OutSideDataServiceImpl implements IOutSideDataService { ObjectMapper mapper=new ObjectMapper(); String responseStr=null; try{ - String idsJson=mapper.writeValueAsString(ids); + Map params=new HashMap(); + params.put("userIdList",ids); + String idsJson=mapper.writeValueAsString(params); log.info("请求的的接口："+url); log.info("请求的数据："+idsJson); responseStr = okHttpUtil.doPostJson(url,idsJson, headers); From f6e6cd2ec899c3296d2ba1634a99e17d8c329fa8 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 5 Jul 2023 18:41:57 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=86=99=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/data/outside/OutSideDataServiceImpl.java | 4 ++-- .../java/com/xboe/module/course/api/CourseManageApi.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index c7889c79..10abdb6c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -288,7 +288,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { String token = TokenProxy.getToken(request); String type="application/json"; String[] headers=new String[] {"token",token,"Content-Type",type}; - String url= getBaseUrl("/org/getUserMessageToDai"); + String url= getBaseUrl("/user/getUserMessageToDai"); //返回信息 List uids=new ArrayList(); ObjectMapper mapper=new ObjectMapper(); @@ -304,7 +304,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { log.error("接口未返回任何内容"); return null; } - log.info("返回的数据："+responseStr); + //log.info("返回的数据："+responseStr); JsonNode rootNode= mapper.readTree(responseStr); int code = rootNode.get("status").asInt(); if(code!=200) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index ee3b25d9..8b011630 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -535,7 +535,7 @@ public class CourseManageApi extends ApiBaseController{ } } - private String createEmailHtml(String name,String orgId, String orgName,String createBy,String courseName) { + private String createEmailHtml(String name,String orgId, String orgName,String createBy,String courseName) throws Exception { StringBuffer htmlMsg=new StringBuffer("
"); htmlMsg.append("
BOE学习平台
"); @@ -549,8 +549,9 @@ public class CourseManageApi extends ApiBaseController{ orgInfo=" "+orgName+" "; }else { //根据orgId获取 - Organization organ = orgService.get(orgId); - orgInfo=" "+organ.getNamePath()+" "; +// Organization organ = orgService.get(orgId); +// orgInfo=" "+organ.getNamePath()+" "; + throw new Exception("无组织机构路径"); } htmlMsg.append("
您负责的"+orgInfo+"组织下， "+createBy+" 提交了一门课程 "+courseName+" ，需要您审核，\r\n" @@ -579,7 +580,7 @@ public class CourseManageApi extends ApiBaseController{ // } Course course = courseService.get(audit.getCourseId()); - if(StringUtils.isBlank(course.getOrgId())) { + if(StringUtils.isBlank(course.getOrgId())){ return badRequest("请先在课程开发中配置用户"); } String error=checkForSubmit(course); From b7085a6b13e8c2f299c89467914bd222cc676dc5 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 6 Jul 2023 09:41:44 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E6=9E=90=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 10abdb6c..73ea84be 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -327,11 +327,18 @@ public class OutSideDataServiceImpl implements IOutSideDataService { vo.setOrgInfo(getNodeText(node.get("orgInfo"))); vo.setSign(getNodeText(node.get("sign"))); //别是1.男；2.女；3其他；4.保密 20230626 - int gender=result.get("gender").asInt(); - if(gender>2) { - gender=1; - } - vo.setSex(gender); + if(node.get("sex")==null) { + log.error("根据aid集合获取用户信息错误[性别字段sex为空]："+code); + vo.setSex(1); + }else { + int gender=node.get("sex").asInt(); + if(gender>2) { + gender=1; + } + vo.setSex(gender); + } + + uids.add(vo); } } From 00a9eb64a5210ce06cf6fffc9a351e172a6d41f3 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 6 Jul 2023 17:17:51 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/course/api/CourseFileApi.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java index 5e2517f5..c644a653 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java @@ -247,11 +247,13 @@ public class CourseFileApi extends ApiBaseController { } String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + file.getFilePath(); if ("mp3,mp4".indexOf(file.getFileType()) > -1){ + log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath()); Encoder encoder = new Encoder(); try { //System.out.println(fileFullPath); MultimediaInfo m = encoder.getInfo(new File(fileFullPath)); Long ls = m.getDuration() / 1000;//秒 + log.info("文件时长 "+ls); //System.out.print("视频时长：" + ls + "秒"); file.setDuration(ls.intValue()); if("mp3".equals(file.getFileType())){// mp3 @@ -260,7 +262,7 @@ public class CourseFileApi extends ApiBaseController { file.setDecoder(m.getVideo().getDecoder()); file.setVideoHeight(m.getVideo().getSize().getHeight()); file.setVideoWidth(m.getVideo().getSize().getWidth()); - + log.info("文件的编码 "+file.getDecoder()); if(StringUtils.isBlank(file.getDecoder()) || !file.getDecoder().equals("h264")) { log.error("编码格式不是h264，不能上传"); return error("编码格式不是h264，请先转码再上传","");