From c0fa05a5d006e6d8db48f320f0349d8a94e747fe Mon Sep 17 00:00:00 2001 From: IRONICBo <47499836+IRONICBo@users.noreply.github.com> Date: Wed, 28 Jun 2023 18:01:39 +0800 Subject: [PATCH 1/2] fix: Fix CONTRIBUTING. Signed-off-by: IRONICBo <47499836+IRONICBo@users.noreply.github.com> --- CONTRIBUTING.md | 114 ++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8e34456..e5ed3d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to OpenFY +# Contributing to OpenKF -So, you want to hack on OpenFY? Yay! +So, you want to hack on OpenKF? Yay! First of all, thank you for considering contributing to our project! We appreciate your time and effort, and we value any contribution, whether it's reporting a bug, suggesting a new feature, or submitting a pull request. @@ -20,13 +20,13 @@ This document provides guidelines and best practices to help you contribute effe ## What we expect of you -We hope that anyone can join OpenFY , even if you are a student, writer, translator +We hope that anyone can join OpenKF , even if you are a student, writer, translator Please meet the minimum version of the Go language published in [go.mod](./go.mod). If you want to manage the Go language version, we provide tools to install [gvm](https://github.com/moovweb/gvm) in our [Makefile](./Makefile) -You'd better use Linux as the development environment, Linux with [Makefile](./Makefile) can help you quickly build and test OpenFY project. +You'd better use Linux as the development environment, Linux with [Makefile](./Makefile) can help you quickly build and test OpenKF project. -If you are familiar with [Makefile](./Makefile) , you can easily see the clever design of the OpenFY Makefile. Storing the necessary tools such as golangci in the `/tools` directory can avoid some tool version issues. +If you are familiar with [Makefile](./Makefile) , you can easily see the clever design of the OpenKF Makefile. Storing the necessary tools such as golangci in the `/tools` directory can avoid some tool version issues. The [Makefile](./Makefile) is for every developer, even if you don't know how to use the Makefile tool, don't worry, we provide two great commands to get you up to speed with the Makefile architecture, `make help` and `make help-all`, it can reduce problems of the developing environment. @@ -36,7 +36,7 @@ The [Makefile](./Makefile) is for every developer, even if you don't know how to #### Code and doc contribution -Every action to make project OpenFY better is encouraged. On GitHub, every improvement for OpenFY could be via a [PR](https://github.com/OpenFY/pulls) (short for pull request). +Every action to make project OpenKF better is encouraged. On GitHub, every improvement for OpenKF could be via a [PR](https://github.com/OpenKF/pulls) (short for pull request). + If you find a typo, try to fix it! + If you find a bug, try to fix it! @@ -51,22 +51,22 @@ Every action to make project OpenFY better is encouraged. On GitHub, every impro #### Where should I start? -Getting good at GitHub is the first step, we have a [list of labes](https://github.com/OpenIMSDK/OpenFY/labels) and reading some of the [common tags](https://github.com/OpenIMSDK/OpenFY/labels?sort=count-desc) helps us get involved in the community quickly.GitHub allows you to filter out types of issues and pull requests, which helps you discover items in need of triaging. This table includes some predetermined searches for convenience: +Getting good at GitHub is the first step, we have a [list of labes](https://github.com/OpenIMSDK/OpenKF/labels) and reading some of the [common tags](https://github.com/OpenIMSDK/OpenKF/labels?sort=count-desc) helps us get involved in the community quickly.GitHub allows you to filter out types of issues and pull requests, which helps you discover items in need of triaging. This table includes some predetermined searches for convenience: | Search | What it sorts | | ------------------------------------------------------------ | ------------------------------------------------------- | -| [created-asc](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+sort%3Acreated-asc) | Untriaged issues by age | -| [needs-triage](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+no%3Alabel) | Issues that need to be assigned to a Labels | -| [`is:open is:issue`](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aopen+is%3Aissue+sort%3Aupdated-desc) | Newest incoming issues | -| [comments-desc](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+sort%3Acomments-desc) | Busiest untriaged issues, sorted by # of comments | -| [comments-asc](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+sort%3Acomments-asc) | Issues that need more attention, based on # of comments | +| [created-asc](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+sort%3Acreated-asc) | Untriaged issues by age | +| [needs-triage](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+no%3Alabel) | Issues that need to be assigned to a Labels | +| [`is:open is:issue`](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aopen+is%3Aissue+sort%3Aupdated-desc) | Newest incoming issues | +| [comments-desc](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+sort%3Acomments-desc) | Busiest untriaged issues, sorted by # of comments | +| [comments-asc](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+sort%3Acomments-asc) | Issues that need more attention, based on # of comments | We suggest preparing your triage by filtering out the oldest, unlabelled issues and pull requests first. -1. If you are new to the project, don't know how to contribute OpenFY, please check out the [good first issue](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aopen+label%3A"good+first+issue"+sort%3Aupdated-desc) label and [help wanted](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aopen+is%3Aissue+label%3A"help+wanted"+sort%3Aupdated-desc). -2. You should be good at filtering the OpenFY issue tags and finding the ones you like, such as [RFC](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+label%3Akind%2Ffeature+sort%3Aupdated-desc+) proposals, and [bug](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+label%3Akind%2Fbug+sort%3Aupdated-desc+) fixes. -3. If you are looking for something to work on, check out our [open issues](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc). -4. If you have an idea for a new feature, please [open an issue](https://github.com/OpenIMSDK/OpenFY/issues/new/choose), and we can discuss it. +1. If you are new to the project, don't know how to contribute OpenKF, please check out the [good first issue](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aopen+label%3A"good+first+issue"+sort%3Aupdated-desc) label and [help wanted](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aopen+is%3Aissue+label%3A"help+wanted"+sort%3Aupdated-desc). +2. You should be good at filtering the OpenKF issue tags and finding the ones you like, such as [RFC](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+label%3Akind%2Ffeature+sort%3Aupdated-desc+) proposals, and [bug](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+label%3Akind%2Fbug+sort%3Aupdated-desc+) fixes. +3. If you are looking for something to work on, check out our [open issues](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc). +4. If you have an idea for a new feature, please [open an issue](https://github.com/OpenIMSDK/OpenKF/issues/new/choose), and we can discuss it. > **Note** > Reply to `/assign` or `/assign @yourself` with a question you wish to resolve, and we'll assign the question to you and your name will be listed under `Assignees` @@ -75,7 +75,7 @@ We suggest preparing your triage by filtering out the oldest, unlabelled issues #### Design documents -For any substantial design, there should be a well-crafted design document. This document is not just a simple record, but also a detailed description and manifestation, which can help team members better understand the design thinking and grasp the design direction. In the process of writing the design document, we can choose to use tools such as `Google Docs` or `Notion`, and even mark **RFC** in [issues](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) or [discussions](https://github.com/OpenIMSDK/OpenFY/discussions) for better collaboration. Of course, after completing the design document, we should also add it to our [Shared Drive](https://drive.google.com/drive/) and notify the appropriate working group to let everyone know of its existence. Only by doing so can we maximize the effectiveness of the design document and provide strong support for the smooth progress of the project. +For any substantial design, there should be a well-crafted design document. This document is not just a simple record, but also a detailed description and manifestation, which can help team members better understand the design thinking and grasp the design direction. In the process of writing the design document, we can choose to use tools such as `Google Docs` or `Notion`, and even mark **RFC** in [issues](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) or [discussions](https://github.com/OpenIMSDK/OpenKF/discussions) for better collaboration. Of course, after completing the design document, we should also add it to our [Shared Drive](https://drive.google.com/drive/) and notify the appropriate working group to let everyone know of its existence. Only by doing so can we maximize the effectiveness of the design document and provide strong support for the smooth progress of the project. Anybody can access the shared Drive for reading. To get access to comment. Once you've done that, head to the [shared Drive](https://drive.google.com/) and behold all the docs. @@ -86,7 +86,7 @@ When documenting a new design, we recommend a 2-step approach: 1. Use the short-form **RFC** template to outline your ideas and get early feedback. 2. Once you have received sufficient feedback and consensus, you may use the **longer-form design doc template** to specify and discuss your design in more details. -**In order to contribute a feature to OpenFY you'll need to go through the following steps:** +**In order to contribute a feature to OpenKF you'll need to go through the following steps:** + Discuss your idea with the appropriate [working groups]({slack}) on the working group's Slack channel. + Once there is general agreement that the feature is useful, create a GitHub issue to track the discussion. The issue should include information about the requirements and use cases that it is trying to address. @@ -100,17 +100,17 @@ But keep in mind that there is no guarantee of it being accepted and so it is us > **Note** > -> A simple example allows you to quickly contribute your first **PR** to OpenFY. -> To propose PR for the OpenFY item, we assume you have registered a GitHub ID. Then you could finish the preparation in the following steps: +> A simple example allows you to quickly contribute your first **PR** to OpenKF. +> To propose PR for the OpenKF item, we assume you have registered a GitHub ID. Then you could finish the preparation in the following steps: -1. **Fork** the repository(OpenFY) +1. **Fork** the repository(OpenKF) -2. **CLONE** your own repository to master locally. Use `git clone https://github.com//OpenFY.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make. +2. **CLONE** your own repository to master locally. Use `git clone https://github.com//OpenKF.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make. -3. **Set Remote** upstream to be `https://github.com/OpenIMSDK/OpenFY.git` using the following two commands: +3. **Set Remote** upstream to be `https://github.com/OpenIMSDK/OpenKF.git` using the following two commands: ```bash - ❯ git remote add upstream https://github.com/OpenIMSDK/OpenFY.git + ❯ git remote add upstream https://github.com/OpenIMSDK/OpenKF.git ❯ git remote set-url --push upstream no-pushing ``` @@ -118,9 +118,9 @@ But keep in mind that there is no guarantee of it being accepted and so it is us ```go ❯ git remote -v - origin https://github.com//OpenFY.git (fetch) - origin https://github.com//OpenFY.git (push) - upstream https://github.com/OpenIMSDK/OpenFY.git (fetch) + origin https://github.com//OpenKF.git (fetch) + origin https://github.com//OpenKF.git (push) + upstream https://github.com/OpenIMSDK/OpenKF.git (fetch) upstream no-pushing (push) ``` @@ -129,9 +129,9 @@ But keep in mind that there is no guarantee of it being accepted and so it is us 4. Create a new branch for your changes (use a descriptive name, such as `fix/bug-123` or `feature/add-new-xxx` and `release/xxx`). ```bash - ❯ cd OpenFY + ❯ cd OpenKF ❯ git fetch upstream - ❯ git checkout upstream/main + ❯ git checkout -b fix/bug- ``` > **Note** @@ -176,17 +176,17 @@ But keep in mind that there is no guarantee of it being accepted and so it is us ❯ git checkout -b # update some code, feature1 ❯ git add -A - ❯ git commit -m -s "feat: feature one" + ❯ git commit -s -m "feat: feature one" ❯ git push # if it's first time push, run git push --set-upstream origin # then create pull request, and merge # update some new feature, feature2, rebase main branch first. ❯ git rebase upstream/main # rebase the current branch to upstream/main branch ❯ git add -A - ❯ git commit -m -s "feat: feature two" + ❯ git commit -s -m "feat: feature two" # then create pull request, and merge ``` -7. **Open a pull request** to `OpenIMSDK/OpenFY:main` +7. **Open a pull request** to `OpenIMSDK/OpenKF:main` It is recommended to review your changes before filing a pull request. Check if your code doesn't conflict with the main branch and no redundant code is included. @@ -198,39 +198,39 @@ We divide the problem into security and general problems: #### Reporting security issues -Security issues are always treated seriously. As our usual principle, we discourage anyone to spread security issues. If you find a security issue of OpenFY, please do not discuss it in public and even do not open a public issue. +Security issues are always treated seriously. As our usual principle, we discourage anyone to spread security issues. If you find a security issue of OpenKF, please do not discuss it in public and even do not open a public issue. Instead we encourage you to send us a private email to {email} to report this. #### Reporting general issues -To be honest, we regard every user of OpenFYas a very kind contributor. After experiencing OpenFY, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://github.com/OpenIMSDK/OpenFY/issues/new/choose). +To be honest, we regard every user of OpenKFas a very kind contributor. After experiencing OpenKF, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://github.com/OpenIMSDK/OpenKF/issues/new/choose). -Since we collaborate project OpenFY in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one. +Since we collaborate project OpenKF in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one. -To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](https://github.com/OpenIMSDK/OpenFY/tree/main/.github/ISSUE_TEMPLATE) for issue reporters. You can find three kinds of issue templates there: question, bug report and feature request. Please **BE SURE** to follow the instructions to fill fields in template. +To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](https://github.com/OpenIMSDK/OpenKF/tree/main/.github/ISSUE_TEMPLATE) for issue reporters. You can find three kinds of issue templates there: question, bug report and feature request. Please **BE SURE** to follow the instructions to fill fields in template. **There are a lot of cases when you could open an issue:** + bug report + feature request -+ OpenFY performance issues ++ OpenKF performance issues + feature proposal + feature design + help wanted + doc incomplete + test improvement -+ any questions on OpenFY project ++ any questions on OpenKF project + and so on -Also, we must be reminded when submitting a new question about OpenFY, please remember to remove the sensitive data from your post. Sensitive data could be password, secret key, network locations, private business data and so on. +Also, we must be reminded when submitting a new question about OpenKF, please remember to remove the sensitive data from your post. Sensitive data could be password, secret key, network locations, private business data and so on. > **Note** > We have requirements for **Commits**, **PR**, **Docs**, and good standards help us collaborate better and understand what you're doing. #### Commit Rules -Actually in OpenFY, we take two rules serious when committing: +Actually in OpenKF, we take two rules serious when committing: **🥇 Commit Message:** @@ -273,9 +273,9 @@ An example for this could be: #### PR Description -PR is the only way to make change to OpenFY project files. To help reviewers better get your purpose, **PR** description could not be too detailed. We encourage contributors to follow the [PR template](https://github.com/OpenIMSDK/OpenFY/tree/main/.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request. +PR is the only way to make change to OpenKF project files. To help reviewers better get your purpose, **PR** description could not be too detailed. We encourage contributors to follow the [PR template](https://github.com/OpenIMSDK/OpenKF/tree/main/.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request. -You can find some very formal PR in [RFC](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) issues and learn about them. +You can find some very formal PR in [RFC](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) issues and learn about them. **📖 Opening PRs:** @@ -333,18 +333,18 @@ git() { #### CI actions -We host CI on [GitHub Actions](https://github.com/OpenIMSDK/OpenFY/actions), we will make sure PR pass tests before we can merge it. +We host CI on [GitHub Actions](https://github.com/OpenIMSDK/OpenKF/actions), we will make sure PR pass tests before we can merge it. These two kind of tests: `lint` and `unit test` -`lint` tests if your code matches our code conventions, please consult [golangci-lint](https://golangci-lint.run/) and [lint config](https://github.com/OpenIMSDK/OpenFY/blob/main/.golangci.yml) +`lint` tests if your code matches our code conventions, please consult [golangci-lint](https://golangci-lint.run/) and [lint config](https://github.com/OpenIMSDK/OpenKF/blob/main/.golangci.yml) > **Note** > > You can use the [Makefile](./Makefile) to run Lint with the command `make lint`. -`unit test` runs all the test in code, and the code coverage should not less than 60 percent, record us in [codeclimate](https://codeclimate.com/github/OpenIMSDK/OpenFY) OpenFY the unit test coverage data. +`unit test` runs all the test in code, and the code coverage should not less than 60 percent, record us in [codeclimate](https://codeclimate.com/github/OpenIMSDK/OpenKF) OpenKF the unit test coverage data. > **Note** @@ -355,12 +355,12 @@ Try your best to keep every function has been tested, it keeps the function beha #### Docs Contribution -**The documentation for OpenFY includes:** +**The documentation for OpenKF includes:** -+ [README.md](https://github.com/OpenIMSDK/OpenFY/blob/main/README.md): This file includes the basic information and instructions for getting started with OpenFY. -+ [CONTRIBUTING.md](https://github.com/OpenIMSDK/OpenFY/blob/main/CONTRIBUTING.md): This file contains guidelines for contributing to OpenFY's codebase, such as how to submit issues, pull requests, and code reviews. -+ [DEVELOPGUIDE.md](https://github.com/OpenIMSDK/OpenFY/blob/main/DEVELOPGUIDE.md): This file provides a more in-depth guide to developing OpenFY, including information on the project's architecture, coding conventions, and testing practices. -+ [Official Documentation]({blog}): This is the official documentation for OpenFY, which includes comprehensive information on all of its features, configuration options, and troubleshooting tips. ++ [README.md](https://github.com/OpenIMSDK/OpenKF/blob/main/README.md): This file includes the basic information and instructions for getting started with OpenKF. ++ [CONTRIBUTING.md](https://github.com/OpenIMSDK/OpenKF/blob/main/CONTRIBUTING.md): This file contains guidelines for contributing to OpenKF's codebase, such as how to submit issues, pull requests, and code reviews. ++ [DEVELOPGUIDE.md](https://github.com/OpenIMSDK/OpenKF/blob/main/DEVELOPGUIDE.md): This file provides a more in-depth guide to developing OpenKF, including information on the project's architecture, coding conventions, and testing practices. ++ [Official Documentation]({blog}): This is the official documentation for OpenKF, which includes comprehensive information on all of its features, configuration options, and troubleshooting tips. **Please obey the following rules to better format the docs, which would greatly improve the reading experience.** @@ -382,14 +382,14 @@ We integrated in the CICD actions [markdownlint](https://github.com/markdownlint ## Engage to help anything -We choose GitHub as the primary place for OpenFY to collaborate. So the latest updates of OpenFY are always here. Although contributions via **PR** is an explicit way to help, we still call for any other ways. +We choose GitHub as the primary place for OpenKF to collaborate. So the latest updates of OpenKF are always here. Although contributions via **PR** is an explicit way to help, we still call for any other ways. -+ reply to other's [issues](https://github.com/OpenIMSDK/OpenFY/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) if you could; ++ reply to other's [issues](https://github.com/OpenIMSDK/OpenKF/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) if you could; + help solve other user's problems; -+ help review other's [PR](https://github.com/OpenIMSDK/OpenFY/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) design; -+ discuss about OpenFY to make things clearer; -+ advocate [OpenFY](google.com/search?q=OpenFY) technology beyond GitHub; -+ write blogs on OpenFY and so on. ++ help review other's [PR](https://github.com/OpenIMSDK/OpenKF/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) design; ++ discuss about OpenKF to make things clearer; ++ advocate [OpenKF](google.com/search?q=OpenKF) technology beyond GitHub; ++ write blogs on OpenKF and so on. In a word, **ANY HELP IS CONTRIBUTION.** @@ -397,7 +397,7 @@ In a word, **ANY HELP IS CONTRIBUTION.** ## Release version -Releases of OpenFY are done using [Release Please](https://github.com/googleapis/release-please) and [GoReleaser](https://goreleaser.com/). The workflow looks like this: +Releases of OpenKF are done using [Release Please](https://github.com/googleapis/release-please) and [GoReleaser](https://goreleaser.com/). The workflow looks like this: 🎯 **A PR is merged to the `main` branch:** From 0883c127e4b1e25b478a58b5451612f5d8e0e1a1 Mon Sep 17 00:00:00 2001 From: IRONICBo <47499836+IRONICBo@users.noreply.github.com> Date: Wed, 28 Jun 2023 18:07:53 +0800 Subject: [PATCH 2/2] fix: Fix source code headers. --- server/internal/api/auth.go | 14 ++++++++++++-- server/internal/api/mail.go | 14 ++++++++++++-- server/internal/common/response/response.go | 14 ++++++++++++-- server/internal/models/base.go | 14 ++++++++++++-- server/internal/models/user.go | 14 ++++++++++++-- server/internal/param/mail.go | 14 ++++++++++++-- server/internal/service/init.go | 14 ++++++++++++-- server/internal/service/mail.go | 14 ++++++++++++-- server/internal/utils/code.go | 14 ++++++++++++-- web/src/api/openim.js | 14 ++++++++++++-- web/src/constant/constant.js | 14 ++++++++++++-- 11 files changed, 132 insertions(+), 22 deletions(-) diff --git a/server/internal/api/auth.go b/server/internal/api/auth.go index b784ea7..53cbe8c 100644 --- a/server/internal/api/auth.go +++ b/server/internal/api/auth.go @@ -1,5 +1,15 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package api diff --git a/server/internal/api/mail.go b/server/internal/api/mail.go index 908d260..de23997 100644 --- a/server/internal/api/mail.go +++ b/server/internal/api/mail.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package api diff --git a/server/internal/common/response/response.go b/server/internal/common/response/response.go index 32a9020..0a13308 100644 --- a/server/internal/common/response/response.go +++ b/server/internal/common/response/response.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package response diff --git a/server/internal/models/base.go b/server/internal/models/base.go index ae280ec..9b7ac7f 100644 --- a/server/internal/models/base.go +++ b/server/internal/models/base.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package models diff --git a/server/internal/models/user.go b/server/internal/models/user.go index 9dfa93b..f7351f2 100644 --- a/server/internal/models/user.go +++ b/server/internal/models/user.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package models diff --git a/server/internal/param/mail.go b/server/internal/param/mail.go index b57350e..bb2a95a 100644 --- a/server/internal/param/mail.go +++ b/server/internal/param/mail.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package param diff --git a/server/internal/service/init.go b/server/internal/service/init.go index 8c52556..f65c6ee 100644 --- a/server/internal/service/init.go +++ b/server/internal/service/init.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package service diff --git a/server/internal/service/mail.go b/server/internal/service/mail.go index bf29f4c..15dfafc 100644 --- a/server/internal/service/mail.go +++ b/server/internal/service/mail.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package service diff --git a/server/internal/utils/code.go b/server/internal/utils/code.go index 328a694..2c5942a 100644 --- a/server/internal/utils/code.go +++ b/server/internal/utils/code.go @@ -1,6 +1,16 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package utils diff --git a/web/src/api/openim.js b/web/src/api/openim.js index 4f1c239..d3155cc 100644 --- a/web/src/api/openim.js +++ b/web/src/api/openim.js @@ -1,3 +1,13 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. diff --git a/web/src/constant/constant.js b/web/src/constant/constant.js index 4f1c239..d3155cc 100644 --- a/web/src/constant/constant.js +++ b/web/src/constant/constant.js @@ -1,3 +1,13 @@ -// Copyright © 2023 OpenIMSDK open source community. All rights reserved. -// Licensed under the MIT License (the "License"); +// Copyright © 2023 OpenIM open source community. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License.