wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-26 11:05:48 +08:00
parent f17e8be5cc 1f6438086c
commit 5c3649f8bd
3 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
View File

@ -391,7 +391,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
newUser.setRealName(m.get("real_name") == null ? "" : m.get("real_name").toString());
newUser.setEmail(m.get("email") == null ? "" : m.get("email").toString());
newUser.setMobile(m.get("mobile") == null ? "" : m.get("mobile").toString());
newUser.setYwMobile(m.get("YwMobile") == null ? "" : m.get("YwMobile").toString());
newUser.setYwMobile(m.get("ywMobile") == null ? "" : m.get("ywMobile").toString());
newUser.setStatus(1);//账号状态 1正常 0停用
//给dept_id赋值
String deptNames = m.get("distinguishedName") == null ? "" : m.get("distinguishedName").toString();

1
renren-admin/src/main/resources/db/V5.5__update_user.sql Normal file
View File

@ -0,0 +1 @@
alter table sys_user add column yw_mobile varchar(100);

72
renren-common/src/main/java/io/renren/common/utils/JhlDAPTool.java
View File

@ -107,8 +107,10 @@ public class JhlDAPTool {
}else if("objectGUID".equals(next.getID())){
String guidStr = next.get().toString();
//Object o = next.get(0);
user.put("id",SingleID.getSingleID(guidStr));
String guid = guidStr.substring(1,guidStr.length() - 1);
String guid = guidObject2String((byte[]) next.get(0));
user.put("id",SingleID.getSingleID(guid));
user.put("guid",guid);
}
}
@ -127,6 +129,72 @@ public class JhlDAPTool {
return lm;
}
private String guidObject2String(byte[] b){
StringBuilder builder = new StringBuilder();
for (int i = 3; i >=0; i--)
{
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1)
{
hex = '0' + hex;
}
builder.append(hex);
}
builder.append('-');
for (int i = 5; i >=4; i--)
{
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1)
{
hex = '0' + hex;
}
builder.append(hex);
}
builder.append('-');
for (int i = 7; i >=6; i--)
{
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1)
{
hex = '0' + hex;
}
builder.append(hex);
}
builder.append('-');
// for (int i = 8; i <9; i++)
// {
// String hex = Integer.toHexString(b[i] & 0xFF);
// if (hex.length() == 1)
// {
// hex = '0' + hex;
// }
// builder.append(hex);
// }
// builder.append('-');
for (int i = 8; i <10; i++)
{
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1)
{
hex = '0' + hex;
}
builder.append(hex);
}
builder.append('-');
for (int i = 10; i <16; i++)
{
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1)
{
hex = '0' + hex;
}
builder.append(hex);
}
return builder.toString().toUpperCase();
}
/**
* 获取管理部门信息
* @param ctx