From b4c1240733bc3ceb42850bc6c3f01a0b96c0b784 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Wed, 18 Sep 2024 10:56:08 +0800
Subject: [PATCH] 亿迅对接配置
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 8 ++++++--
dyh-service/dyh-sys/src/main/resources/config/application-prod.yml | 4 +++-
dyh-service/dyh-sys/src/main/resources/config/application-test.yml | 4 +++-
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java | 18 +++++++++++++-----
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
index fc776f2..73f73db 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
@@ -19,7 +19,10 @@
public class GridToDoService {
@Value("${grid.url:http://219.137.166.84:8061}")
private String gridUrl;
-
+ @Value("${grid.username:mtxt0011}")
+ private String userName;
+ @Value("${grid.password}")
+ private String passWord;
public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
HeadVo headVo = initHeadVo();
@@ -55,8 +58,13 @@
throw new RuntimeException(e);
}
log.info("xsd:{}", s);
- gridToDoVo = JSONObject.parseObject(s).getObject("data", GridToDoVo.class);
- return R.ok(gridToDoVo);
+ JSONObject object = JSONObject.parseObject(s);
+ if (object.getInteger("code") != null && object.getInteger("code") == 0) {
+ gridToDoVo = object.getObject("data", GridToDoVo.class);
+ return R.ok(gridToDoVo, "创建待办成功");
+ } else {
+ return R.fail("创建待办失败");
+ }
}
public R<String> deleteToDo(GridIdsVo gridIdsVo) {
@@ -85,8 +93,8 @@
public HeadVo initHeadVo() {
HeadVo headVo = new HeadVo();
- headVo.setUsername("mtxt001");
- headVo.setPassword("aek8CdcaM");
+ headVo.setUsername(userName);
+ headVo.setPassword(passWord);
headVo.setRequestId(UUID.randomUUID().toString());
headVo.setSource("string");
return headVo;
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
index 150be21..b5837d3 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -17,6 +17,10 @@
public class GridUserService {
@Value("${grid.url:http://219.137.166.84:8061}")
private String gridUrl;
+ @Value("${grid.username:mtxt0011}")
+ private String userName;
+ @Value("${grid.password:aek8CdcaM}")
+ private String passWord;
private String testUrl = "http://183.2.142.46:9007";
public R<GridUserVo> getUserInfo(GridTokenVo gridTokenVo) {
@@ -41,8 +45,8 @@
public HeadVo initHeadVo() {
HeadVo headVo = new HeadVo();
- headVo.setUsername("mtxt001");
- headVo.setPassword("kd*cCoAb");
+ headVo.setUsername(userName);
+ headVo.setPassword(passWord);
headVo.setRequestId(UUID.randomUUID().toString());
headVo.setSource("string");
return headVo;
diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml b/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml
index 700c505..0ed851e 100644
--- a/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml
+++ b/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml
@@ -115,4 +115,6 @@
api_key: 9e0a80ed995daf5b194f06ca336080c1
grid:
- url: http://119.32.29.158:8061
\ No newline at end of file
+ url: http://119.32.29.158:8061
+ username: mtxt001
+ password: kd*cCoAb
\ No newline at end of file
diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
index d19168c..85f74e1 100644
--- a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
@@ -115,4 +115,6 @@
api_key: 9e0a80ed995daf5b194f06ca336080c1
grid:
- url: http://219.137.166.84:8061
\ No newline at end of file
+ url: http://219.137.166.84:8061
+ username: mtxt001
+ password: aek8CdcaM
\ No newline at end of file
--
Gitblit v1.8.0