Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
W
wecloud_im_server
  • Overview
    • Overview
    • 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
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • hewei
  • wecloud_im_server
  • Merge Requests
  • !14

Merged
Opened Jan 24, 2022 by hewei@hewei 
  • Report abuse
Report abuse

分支合并

1.改造接收实体类型;

2.优化:"type"响应字段数据格式移出content

3."im_message"表增加字段"msg_type"

Edited Jan 24, 2022 by hewei
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature-cluster-wei origin/feature-cluster-wei

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout feature-cluster
git merge --no-ff feature-cluster-wei

Step 4. Push the result of the merge to GitLab

git push origin feature-cluster

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 9
  • Changes 34
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • hewei @hewei

    changed title from 1.改造接收实体类型;2.优化:"type"响应字段数据格式移出content to 分支合并

    Jan 24, 2022

    changed title from 1.改造接收实体类型;2.优化:"type"响应字段数据格式移出content to 分支合并

    changed title from **{-1.改造接收实体类型;2.优化:"type"响应字段数据格式移出content-}** to **{+分支合并+}**
    Toggle commit list
  • hewei @hewei

    changed the description

    Jan 24, 2022

    changed the description

    changed the description
    Toggle commit list
  • hewei @hewei

    added 1 commit

    • 56a61889 - 1.优化雪花算法ID生成,从redis取自增id作为workerId;

    Compare with previous version

    Jan 24, 2022

    added 1 commit

    • 56a61889 - 1.优化雪花算法ID生成,从redis取自增id作为workerId;

    Compare with previous version

    added 1 commit * 56a61889 - 1.优化雪花算法ID生成,从redis取自增id作为workerId; [Compare with previous version](https://gitlab.aillo.cc/hewei/wecloud_im_server/merge_requests/14/diffs?diff_id=3710&start_sha=ff7ce827836a1a7e945db0ea83c4ee0730a11447)
    Toggle commit list
  • hewei @hewei

    merged

    Jan 24, 2022

    merged

    merged
    Toggle commit list
  • hewei @hewei

    mentioned in commit 49239792

    Jan 24, 2022

    mentioned in commit 49239792

    mentioned in commit 492397920ccb83aa881be12250b0a1aa3157d003
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: hewei/wecloud_im_server!14
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.