From 89d1d26a4a4289ba4ef2ca32be5024792c2360fd Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 23 Jul 2018 11:00:42 +0800
Subject: [PATCH] update
---
.../royalpay/payment/manage/openim/core/OpenimClient.java | 2 --
.../openim/core/impl/CustomerServiceServiceImpl.java | 4 ++++
src/main/resources/application.properties | 6 ++----
src/main/ui/service_client.html | 8 ++------
src/main/ui/service_customer.html | 4 ++--
src/main/ui/static/boot/managerMainApp.js | 2 +-
6 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java b/src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java
index c31e0d627..8c48b6414 100644
--- a/src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java
+++ b/src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java
@@ -37,8 +37,6 @@ public class OpenimClient {
private String appkey;
@Value("${im.openim.secret}")
private String secret;
-// private final String appkey = "24962653";
-// private final String secret = "1c1a1320c4e6f24df24e3fe41c3fc00a";
private final String url = "https://eco.taobao.com/router/rest";
public JSONObject getUser(String userId) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
index 3be3c1ad2..6a4b52c6c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -41,6 +42,8 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
@Resource
private SysCustomerServiceMapper sysCustomerServiceMapper;
+ @Value("${im.openim.appkey}")
+ private String appkey;
@Override
public JSONObject checkAndSave(JSONObject account) {
JSONObject client = null;
@@ -68,6 +71,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
saveRecord.put("user_id", uid);
}
openimApi.addUser(saveRecord);
+ saveRecord.put("appkey",appkey);
return saveRecord;
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 08a52b830..a533935d1 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -112,11 +112,9 @@ mail.mailgun.default.merchantlist=merchants@mail.royalpay.com.au
royalpay.sms.appid=1400094878
royalpay.sms.appkey=43390d81e20c5191c278fbf4cd275be2
-im.openim.appkey=24960261
-im.openim.secret=7639427973bd671be15c9d0c1e9c90b4
+im.openim.appkey=24980715
+im.openim.secret=60b1ba680a6f27ffc701f10b6d5be00e
-#im.openim.appkey=24962653
-#im.openim.secret=1c1a1320c4e6f24df24e3fe41c3fc00a
#清算银行配置
settle.abafile.default-bank=CBA
diff --git a/src/main/ui/service_client.html b/src/main/ui/service_client.html
index 12f078bd1..bf008b3ce 100644
--- a/src/main/ui/service_client.html
+++ b/src/main/ui/service_client.html
@@ -10,21 +10,17 @@
charset="utf-8">