msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
master
kira 6 years ago
parent 35ff5437c0
commit bd7459810a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java
Unescape View File

@ -67,7 +67,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
account = managerMapper.findDetail(account.getString("manager_id")); account = managerMapper.findDetail(account.getString("manager_id"));
isPartner = false; isPartner = false;
} }
String uid = account.getString("username") + (isPartner ? "(" + client.getString("client_moniker") + ")" : ""); String uid = account.getString("username") + (isPartner ? "_"+ client.getString("client_moniker"): "");
JSONObject saveRecord = new JSONObject(); JSONObject saveRecord = new JSONObject();
saveRecord.put("nick", account.getString("display_name")); saveRecord.put("nick", account.getString("display_name"));
saveRecord.put("password", DigestUtils.md5Hex("uid")); saveRecord.put("password", DigestUtils.md5Hex("uid"));
@ -97,7 +97,7 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
} }
OpenimUserVO result = new OpenimUserVO(); OpenimUserVO result = new OpenimUserVO();
result.setNick(account.getString("display_name")); result.setNick(account.getString("display_name"));
result.setUserid(account.getString("username") + "(" + client.getString("client_moniker") + ")"); result.setUserid(account.getString("username") + "_" + client.getString("client_moniker"));
return result; return result;
} }
@ -121,8 +121,8 @@ public class CustomerServiceServiceImpl implements CustomerServiceService {
List<JSONObject> result = new ArrayList<>(accounts.size()); List<JSONObject> result = new ArrayList<>(accounts.size());
accounts.forEach(p -> { accounts.forEach(p -> {
JSONObject openimUser = new JSONObject(); JSONObject openimUser = new JSONObject();
openimUser.put("userid", p.getString("username") + "(" + p.getString("client_moniker") + ")"); openimUser.put("userid", p.getString("username") + "_" + p.getString("client_moniker"));
openimUser.put("nick", p.getString("username") + "(" + p.getString("client_moniker") + ")"); openimUser.put("nick", p.getString("username") + "_" + p.getString("client_moniker"));
openimUser.put("headimg", p.getString("wechat_headimg")); openimUser.put("headimg", p.getString("wechat_headimg"));
result.add(openimUser); result.add(openimUser);
}); });

2
src/main/ui/static/config/sysconfigs/sysconfigs.js
Unescape View File

@ -75,7 +75,7 @@ define(['angular', 'uiRouter'], function (angular) {
$scope.loadServants(); $scope.loadServants();
$scope.onoff = function (servant) { $scope.onoff = function (servant) {
var param = {onoff:servant.onoff}; var param = {onoff:servant.onoff};
$http.put('/sys/openim/roles/servant',param).then(function (resp) { $http.put('/sys/openim/servant/onoff',param).then(function (resp) {
},function (resp) { },function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
}); });

Write Preview
Loading…
Cancel
Save