Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
im-common
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈永峰
im-common
Commits
102a7f69
Commit
102a7f69
authored
Nov 05, 2021
by
yanglbme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: doc conflict
parent
1c3b44ea
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
11 deletions
+2
-11
quickstart.md
docs/guide/quickstart.md
+0
-8
package-lock.json
package-lock.json
+0
-0
package.json
package.json
+1
-2
AccountTest.java
src/test/java/io/github/doocs/im/AccountTest.java
+1
-1
No files found.
docs/guide/quickstart.md
View file @
102a7f69
...
@@ -63,18 +63,10 @@ ImClient client = ImClient.getInstance(appId, identifier, key, config);
...
@@ -63,18 +63,10 @@ ImClient client = ImClient.getInstance(appId, identifier, key, config);
```
java
```
java
AccountImportRequest
request
=
AccountImportRequest
.
builder
()
AccountImportRequest
request
=
AccountImportRequest
.
builder
()
<<<<<<<
Updated
upstream
.
identifier
(
"admin"
)
.
identifier
(
"admin"
)
.
faceUrl
(
"https://avatars.githubusercontent.com/u/43716716?s=200&v=4"
)
.
faceUrl
(
"https://avatars.githubusercontent.com/u/43716716?s=200&v=4"
)
.
nick
(
"doocs"
)
.
nick
(
"doocs"
)
.
build
();
.
build
();
=======
.
identifier
(
"admin"
)
.
faceUrl
(
"https://avatars.githubusercontent.com/u/43716716?s=200&v=4"
)
.
nick
(
"doocs"
)
.
build
();
>>>>>>>
Stashed
changes
AccountImportResult
result
=
client
.
account
.
accountImport
(
request
);
AccountImportResult
result
=
client
.
account
.
accountImport
(
request
);
```
```
package-lock.json
View file @
102a7f69
This source diff could not be displayed because it is too large. You can
view the blob
instead.
package.json
View file @
102a7f69
...
@@ -20,4 +20,4 @@
...
@@ -20,4 +20,4 @@
"devDependencies"
:
{
"devDependencies"
:
{
"
vuepress
"
:
"^2.0.0-beta.27"
"
vuepress
"
:
"^2.0.0-beta.27"
}
}
}
}
\ No newline at end of file
src/test/java/io/github/doocs/im/AccountTest.java
View file @
102a7f69
...
@@ -60,7 +60,7 @@ public class AccountTest {
...
@@ -60,7 +60,7 @@ public class AccountTest {
public
void
testAccountDelete
()
throws
IOException
{
public
void
testAccountDelete
()
throws
IOException
{
AccountDeleteItem
item1
=
AccountDeleteItem
.
builder
().
userId
(
"acbin"
).
build
();
AccountDeleteItem
item1
=
AccountDeleteItem
.
builder
().
userId
(
"acbin"
).
build
();
AccountDeleteItem
item2
=
AccountDeleteItem
.
builder
().
userId
(
"test1"
).
build
();
AccountDeleteItem
item2
=
AccountDeleteItem
.
builder
().
userId
(
"test1"
).
build
();
AccountDeleteRequest
request
=
AccountDeleteRequest
.
builder
().
deleteItemList
(
Collections
.
singletonList
(
item1
)).
build
();
AccountDeleteRequest
request
=
AccountDeleteRequest
.
builder
().
deleteItemList
(
Arrays
.
asList
(
item1
,
item2
)).
build
();
AccountDeleteResult
result
=
client
.
account
.
accountDelete
(
request
);
AccountDeleteResult
result
=
client
.
account
.
accountDelete
(
request
);
System
.
out
.
println
(
result
);
System
.
out
.
println
(
result
);
Assert
.
assertEquals
(
"OK"
,
result
.
getActionStatus
());
Assert
.
assertEquals
(
"OK"
,
result
.
getActionStatus
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment