build

perf: 更新icon图标库

.env.docker

@@ -1,17 +1,19 @@
-APP_NAME=Dootask
+APP_NAME=DooTask
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
+APP_SCHEME=auto
 APP_URL=http://localhost
 
+APP_ID=
+APP_IPPR=
 APP_PORT=2222
-APP_PORT_SSL=2223
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=10.22.22.5
+DB_HOST="${APP_IPPR}.5"
 DB_PORT=3306
 DB_DATABASE=dootask
 DB_USERNAME=dootask
@@ -28,7 +30,7 @@ SESSION_LIFETIME=120
 
 MEMCACHED_HOST=127.0.0.1
 
-REDIS_HOST=10.22.22.4
+REDIS_HOST="${APP_IPPR}.4"
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
@@ -56,5 +58,3 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 LARAVELS_LISTEN_IP=0.0.0.0
 LARAVELS_LISTEN_PORT=20000
-
-DOCKER_ID=

.env.example

@@ -2,10 +2,10 @@ APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
+APP_SCHEME=auto
 APP_URL=http://localhost
 
 APP_PORT=2222
-APP_PORT_SSL=2223
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug

.github/workflows/electron-generic.yml

@@ -0,0 +1,85 @@
+name: Build Generic
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-mac:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: macos-latest
+    environment: build
+
+    if: startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Create changelog text
+        id: changelog
+        uses: loopwerk/tag-changelog@v1
+        with:
+          token: ${{ secrets.GH_PAT }}
+          exclude_types: other,chore,build
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for MacOS
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "generic"
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          RELEASE_BODY: ${{ steps.changelog.outputs.changes }}
+        run: ./cmd electron build-mac
+
+  build-win:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: windows-latest
+    environment: build
+
+    if: startsWith(github.event.ref, 'refs/tags/v')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Create changelog text
+        id: changelog
+        uses: loopwerk/tag-changelog@v1
+        with:
+          token: ${{ secrets.GH_PAT }}
+          exclude_types: other,chore,build
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for Windows
+        shell: powershell
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "generic"
+          RELEASE_BODY: ${{ steps.changelog.outputs.changes }}
+        run: |
+          npm install
+          cd electron
+          npm install
+          cd ../
+          mkdir -p ./electron/public
+          cp ./electron/index.html ./electron/public/index.html
+          npx mix --production -- --env --electron
+          node ./electron/build.js build-win
+

.github/workflows/electron-github.yml

@@ -0,0 +1,97 @@
+name: Build Github
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Create changelog text
+        id: changelog
+        uses: loopwerk/tag-changelog@v1
+        with:
+          token: ${{ secrets.GH_PAT }}
+          exclude_types: other,chore,build
+
+      - name: Create release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: ${{ steps.changelog.outputs.changes }}
+
+  build-mac:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: macos-latest
+    environment: build
+
+    if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for MacOS
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "github"
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          GH_TOKEN: ${{ secrets.GH_PAT }}
+          EP_PRE_RELEASE: true
+        run: ./cmd electron build-mac
+
+  build-win:
+    strategy:
+      fail-fast: false
+      matrix:
+        id: [ "com.dootask.task", "com.hitosea.task" ]
+    runs-on: windows-latest
+    environment: build
+
+    if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Build for Windows
+        shell: powershell
+        env:
+          APPID: ${{ matrix.id }}
+          PROVIDER: "github"
+          GH_TOKEN: ${{ secrets.GH_PAT }}
+          EP_PRE_RELEASE: true
+        run: |
+          npm install
+          cd electron
+          npm install
+          cd ../
+          mkdir -p ./electron/public
+          cp ./electron/index.html ./electron/public/index.html
+          npx mix --production -- --env --electron
+          node ./electron/build.js build-win
+

.gitignore

@@ -8,6 +8,7 @@
 /vendor
 /build
 /tmp
+/CHANGELOG.md
 ._*
 .env
 .idea
@@ -19,7 +20,6 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 test.*
-composer.lock
 package-lock.json
 laravels-timer-process.pid
 .DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "resources/drawio"]
+	path = resources/drawio
+	url = https://github.com/jgraph/drawio.git

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

README.md

@@ -5,41 +5,44 @@ English | **[中文文档](./README_CN.md)**
 - [Screenshot Preview](README_PREVIEW.md)
 - [Demo site](http://www.dootask.com/)
 
+**QQ Group**
+
+Group No.: `546574618`
+
 ## Setup
 
-> `Docker` & `Docker Compose` must be installed
-
+- `Docker` & `Docker Compose v2.0+` must be installed
+- System: `Centos/Debian/Ubuntu/macOS`
+- Hardware suggestion: 2 cores and above 4G memory
 
 ### Deployment project
 
 ```bash
 # 1、Clone the repository
 
-# using ssh
-git clone git@github.com:kuaifan/dootask.git
-# or you can use https
-git clone https://github.com/kuaifan/dootask.git
+# Clone projects on github
+git clone --depth=1 https://github.com/kuaifan/dootask.git
+# Or you can use gitee
+git clone --depth=1 https://gitee.com/aipaw/dootask.git
 
-# 2、enter directory
+# 2、Enter directory
 cd dootask
 
-# 3、Build project
+# 3、Installation（Custom port installation: ./cmd install --port 2222）
 ./cmd install
 ```
-Installed, project url: **`http://IP:PORT`**（`PORT`Default is`2222`）。
 
-### Default Account
+### Reset password
 
-```text
-account: admin@dootask.com
-password: 123456
+```bash
+# Reset default account password
+./cmd repassword
 ```
 
 ### Change port
 
 ```bash
-./cmd php bin/run --port=2222
-./cmd up -d
+./cmd port 2222
 ```
 
 ### Stop server
@@ -51,18 +54,40 @@ password: 123456
 ./cmd start
 ```
 
+### Development compilation
+
+```bash
+# Development mode, Mac OS only
+./cmd dev
+   
+# Production projects, macOS only
+./cmd prod  
+```
+
 ### Shortcuts for running command
 
 ```bash
 # You can do this using the following command
-./cmd artisan "your command"          // To run a artisan command
-./cmd php "your command"              // To run a php command
-./cmd composer "your command"         // To run a composer command
-./cmd supervisorctl "your command"    // To run a supervisorctl command
-./cmd test "your command"             // To run a phpunit command
-./cmd npm "your command"              // To run a npm command
-./cmd yarn "your command"             // To run a yarn command
-./cmd mysql "your command"            // To run a mysql command (use `./cmd mysql bak` Backup database)
+./cmd artisan "your command"          # To run a artisan command
+./cmd php "your command"              # To run a php command
+./cmd nginx "your command"            # To run a nginx command
+./cmd redis "your command"            # To run a redis command
+./cmd composer "your command"         # To run a composer command
+./cmd supervisorctl "your command"    # To run a supervisorctl command
+./cmd test "your command"             # To run a phpunit command
+./cmd mysql "your command"            # To run a mysql command (backup: Backup database, recovery: Restore database)
+```
+
+### NGINX PROXY SSL
+
+```bash 
+# 1、Nginx config add
+proxy_set_header X-Forwarded-Host $http_host;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+# 2、Running commands in a project
+./cmd https
 ```
 
 ## Upgrade
@@ -70,13 +95,41 @@ password: 123456
 **Note: Please back up your data before upgrading!**
 
 ```bash
-# Enter directory and run command
+# Method 1: Running commands in a project
 ./cmd update
+
+# Or method 2: use this method if method 1 fails
+git pull
+./cmd mysql backup
+./cmd uninstall
+./cmd install
+./cmd mysql recovery
+```
+
+If 502 after the upgrade please run `./cmd restart` restart the service.
+
+## Transfer
+
+Follow these steps to complete the project migration after the new project is installed:
+
+1. Backup original database
+
+```bash
+# Run command under old project
+./cmd mysql backup
+```
+
+2. Copy `database backup file` and `public/uploads` directory to the new project.
+
+3. Restore database to new project
+```bash
+# Run command under new project
+./cmd mysql recovery
 ```
 
 ## Uninstall
 
 ```bash
-# Enter directory and run command
+# Running commands in a project
 ./cmd uninstall
 ```

README_CN.md

@@ -5,41 +5,44 @@
 - [截图预览](README_PREVIEW.md)
 - [演示站点](http://www.dootask.com/)
 
+**QQ交流群**
+
+- QQ群号: `546574618`
+
 ## 安装程序
 
-> 必须安装 `Docker` 和 `Docker Compose`
-
+- 必须安装：`Docker` 和 `Docker Compose v2.0+`
+- 支持环境：`Centos/Debian/Ubuntu/macOS`
+- 硬件建议：2核4G以上
 
 ### 部署项目
 
 ```bash
 # 1、克隆项目到您的本地或服务器
 
-# 使用ssh
-git clone git@github.com:kuaifan/dootask.git
-# 或者你也可以使用https
-git clone https://github.com/kuaifan/dootask.git
+# 通过github克隆项目
+git clone --depth=1 https://github.com/kuaifan/dootask.git
+# 或者你也可以使用gitee
+git clone --depth=1 https://gitee.com/aipaw/dootask.git
 
 # 2、进入目录
 cd dootask
 
-# 3、一键构建项目
+# 3、一键安装项目（自定义端口安装 ./cmd install --port 2222）
 ./cmd install
 ```
-安装完毕，项目地址为：**`http://IP:PORT`**（`PORT`默认为`2222`）。
 
-### 默认账号
+### 重置密码
 
-```text
-account: admin@dootask.com
-password: 123456
+```bash
+# 重置默认管理员密码
+./cmd repassword
 ```
 
 ### 更换端口
 
 ```bash
-./cmd php bin/run --port=2222
-./cmd up -d
+./cmd port 2222
 ```
 
 ### 停止服务
@@ -51,18 +54,41 @@ password: 123456
 ./cmd start
 ```
 
+### 开发编译
+
+```bash
+# 开发模式，仅限macOS
+./cmd dev
+   
+# 编译项目，仅限macOS
+./cmd prod  
+```
+
+
 ### 运行命令的快捷方式
 
 ```bash
 # 你可以使用以下命令来执行
-./cmd artisan "your command"          // 运行 artisan 命令
-./cmd php "your command"              // 运行 php 命令
-./cmd composer "your command"         // 运行 composer 命令
-./cmd supervisorctl "your command"    // 运行 supervisorctl 命令
-./cmd test "your command"             // 运行 phpunit 命令
-./cmd npm "your command"              // 运行 npm 命令
-./cmd yarn "your command"             // 运行 yarn 命令
-./cmd mysql "your command"            // 运行 mysql 命令 (可以使用 `./cmd mysql bak` 命令来备份数据库)
+./cmd artisan "your command"          # 运行 artisan 命令
+./cmd php "your command"              # 运行 php 命令
+./cmd nginx "your command"            # 运行 nginx 命令
+./cmd redis "your command"            # 运行 redis 命令
+./cmd composer "your command"         # 运行 composer 命令
+./cmd supervisorctl "your command"    # 运行 supervisorctl 命令
+./cmd test "your command"             # 运行 phpunit 命令
+./cmd mysql "your command"            # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
+```
+
+### NGINX 代理 SSL
+
+```bash 
+# 1、Nginx 代理配置添加
+proxy_set_header X-Forwarded-Host $http_host;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+# 2、在项目下运行命令
+./cmd https
 ```
 
 ## 升级更新
@@ -70,13 +96,41 @@ password: 123456
 **注意：在升级之前请备份好你的数据！**
 
 ```bash
-# 进入项目所在目录，运行一下命令即可
+# 方法1：在项目下运行命令
 ./cmd update
+
+# （或者）方法2：如果方法1失败请使用此方法
+git pull
+./cmd mysql backup
+./cmd uninstall
+./cmd install
+./cmd mysql recovery
+```
+
+如果升级后出现502请运行 `./cmd restart` 重启服务即可。
+
+## 迁移项目
+
+在新项目安装好之后按照以下步骤完成项目迁移：
+
+1、备份原数据库
+
+```bash
+# 在旧的项目下运行命令
+./cmd mysql backup
+```
+
+2、将`数据库备份文件`及`public/uploads`目录拷贝至新项目
+
+3、还原数据库至新项目
+```bash
+# 在新的项目下运行命令
+./cmd mysql recovery
 ```
 
 ## 卸载项目
 
 ```bash
-# 进入项目所在目录，运行一下命令即可
+# 在项目下运行命令
 ./cmd uninstall
 ```

README_PUBLISH.md

@@ -0,0 +1,17 @@
+# 发布说明
+
+## 通过 GitHub Actions 发布
+
+1. 执行 `./cmd prod` 编译
+2. 执行 `node ./version.js` 制作版本
+3. 执行 `git commit` 相关操作
+4. 制作标签
+5. 推送标签
+
+## 本地发布
+
+1. 执行 `./cmd prod` 编译
+2. 执行 `node ./version.js` 制作版本
+3. 执行 `git commit` 相关操作
+4. 制作标签
+5. 执行 `./cmd electron` 相关操作

app/Exceptions/Handler.php

@@ -5,6 +5,7 @@ namespace App\Exceptions;
 use App\Module\Base;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Support\Facades\Log;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -57,4 +58,18 @@ class Handler extends ExceptionHandler
         }
         return parent::render($request, $e);
     }
+
+    /**
+     * 重写report优雅记录
+     * @param Throwable $e
+     * @throws Throwable
+     */
+    public function report(Throwable $e)
+    {
+        if ($e instanceof ApiException) {
+            Log::error($e->getMessage(), ['exception' => ' at ' . $e->getFile() .':' . $e->getLine()]);
+        } else {
+            parent::report($e);
+        }
+    }
 }

app/Helpers/Function.php

@@ -10,8 +10,15 @@ if (!function_exists('asset_main')) {
 if (!function_exists('seeders_at')) {
     function seeders_at($data)
     {
-        $diff = time() - strtotime("2021-07-01");
+        $diff = time() - strtotime("2021-07-02");
         $time = strtotime($data) + $diff;
         return date("Y-m-d H:i:s", $time);
     }
 }
+
+if (!function_exists('md5s')) {
+    function md5s($val, $len = 16)
+    {
+        return substr(md5($val), 32 - $len);
+    }
+}

app/Http/Controllers/Api/DialogController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Models\File;
 use App\Models\ProjectTask;
 use App\Models\ProjectTaskFile;
 use App\Models\User;
@@ -10,7 +11,10 @@ use App\Models\WebSocketDialogMsg;
 use App\Models\WebSocketDialogMsgRead;
 use App\Models\WebSocketDialogUser;
 use App\Module\Base;
+use Carbon\Carbon;
+use DB;
 use Request;
+use Response;
 
 /**
  * @apiDefine dialog
@@ -20,31 +24,50 @@ use Request;
 class DialogController extends AbstractController
 {
     /**
-     * 对话列表
+     * @api {get} api/dialog/lists          01. 对话列表
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName lists
      *
      * @apiParam {Number} [page]            当前页，默认:1
      * @apiParam {Number} [pagesize]        每页显示数量，默认:100，最大:200
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function lists()
     {
         $user = User::auth();
         //
-        $list = WebSocketDialog::select(['web_socket_dialogs.*'])
+        $list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread'])
             ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
             ->where('u.userid', $user->userid)
+            ->orderByDesc('u.top_at')
             ->orderByDesc('web_socket_dialogs.last_at')
             ->paginate(Base::getPaginate(200, 100));
         $list->transform(function (WebSocketDialog $item) use ($user) {
-            return WebSocketDialog::formatData($item, $user->userid);
+            return $item->formatData($user->userid);
         });
         //
         return Base::retSuccess('success', $list);
     }
 
     /**
-     * 获取单个会话信息
+     * @api {get} api/dialog/one          02. 获取单个会话信息
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName one
      *
      * @apiParam {Number} dialog_id         对话ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function one()
     {
@@ -52,22 +75,31 @@ class DialogController extends AbstractController
         //
         $dialog_id = intval(Request::input('dialog_id'));
         //
-        $item = WebSocketDialog::select(['web_socket_dialogs.*'])
+        $item = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread'])
             ->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
             ->where('web_socket_dialogs.id', $dialog_id)
             ->where('u.userid', $user->userid)
             ->first();
         if ($item) {
-            $item = WebSocketDialog::formatData($item, $user->userid);
+            $item = $item->formatData($user->userid);
         }
         //
         return Base::retSuccess('success', $item);
     }
 
     /**
-     * 打开会话
+     * @api {get} api/dialog/msg/user          03. 打开会话
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName open__user
      *
      * @apiParam {Number} userid         对话会员ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function open__user()
     {
@@ -82,7 +114,7 @@ class DialogController extends AbstractController
         if (empty($dialog)) {
             return Base::retError('打开会话失败');
         }
-        $data = WebSocketDialog::formatData(WebSocketDialog::find($dialog->id), $user->userid);
+        $data = WebSocketDialog::find($dialog->id)?->formatData($user->userid);
         if (empty($data)) {
             return Base::retError('打开会话错误');
         }
@@ -90,12 +122,21 @@ class DialogController extends AbstractController
     }
 
     /**
-     * 获取消息列表
+     * @api {get} api/dialog/msg/lists          04. 获取消息列表
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__lists
      *
      * @apiParam {Number} dialog_id         对话ID
      *
      * @apiParam {Number} [page]            当前页，默认:1
      * @apiParam {Number} [pagesize]        每页显示数量，默认:50，最大:100
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function msg__lists()
     {
@@ -105,80 +146,146 @@ class DialogController extends AbstractController
         //
         $dialog = WebSocketDialog::checkDialog($dialog_id);
         //
-        $list = WebSocketDialogMsg::whereDialogId($dialog_id)->orderByDesc('id')->paginate(Base::getPaginate(100, 50));
-        $list->transform(function (WebSocketDialogMsg $item) use ($user) {
-            $item->is_read = $item->userid === $user->userid || WebSocketDialogMsgRead::whereMsgId($item->id)->whereUserid($user->userid)->value('read_at');
-            return $item;
-        });
+        $list = WebSocketDialogMsg::select([
+            'web_socket_dialog_msgs.*',
+            'read.mention',
+            'read.read_at',
+        ])->leftJoin('web_socket_dialog_msg_reads as read', function ($leftJoin) use ($user) {
+            $leftJoin
+                ->on('read.userid', '=', DB::raw($user->userid))
+                ->on('read.msg_id', '=', 'web_socket_dialog_msgs.id');
+        })->where('web_socket_dialog_msgs.dialog_id', $dialog_id)->orderByDesc('web_socket_dialog_msgs.id')->paginate(Base::getPaginate(100, 50));
         //
         if ($dialog->type == 'group' && $dialog->group_type == 'task') {
             $user->task_dialog_id = $dialog->id;
             $user->save();
         }
+        //去掉标记未读
+        $isMarkDialogUser = WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($user->userid)->whereMarkUnread(1)->first();
+        if ($isMarkDialogUser) {
+            $isMarkDialogUser->mark_unread = 0;
+            $isMarkDialogUser->save();
+        }
         //
         $data = $list->toArray();
         if ($list->currentPage() === 1) {
-            $data['dialog'] = WebSocketDialog::formatData($dialog, $user->userid);
+            $data['dialog'] = $dialog->formatData($user->userid);
         }
         return Base::retSuccess('success', $data);
     }
 
     /**
-     * 未读消息
+     * @api {get} api/dialog/msg/unread          05. 获取未读消息数量
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__unread
+     *
+     * @apiParam {Number} [dialog_id]         对话ID，留空获取总未读消息数量
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function msg__unread()
     {
-        $unread = WebSocketDialogMsgRead::whereUserid(User::userid())->whereReadAt(null)->count();
+        $dialog_id = intval(Request::input('dialog_id'));
+        //
+        $builder = WebSocketDialogMsgRead::whereUserid(User::userid())->whereReadAt(null);
+        if ($dialog_id > 0) {
+            $builder->whereDialogId($dialog_id);
+        }
+        $unread = $builder->count();
         return Base::retSuccess('success', [
             'unread' => $unread,
         ]);
     }
 
     /**
-     * 发送消息
+     * @api {post} api/dialog/msg/sendtext          06. 发送消息
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__sendtext
      *
      * @apiParam {Number} dialog_id         对话ID
      * @apiParam {String} text              消息内容
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function msg__sendtext()
     {
+        Base::checkClientVersion('0.13.33');
         $user = User::auth();
         //
-        $dialog_id = intval(Request::input('dialog_id'));
-        $text = trim(Request::input('text'));
+        $chat_nickname = Base::settingFind('system', 'chat_nickname');
+        if ($chat_nickname == 'required') {
+            $nickname = User::select(['nickname as nickname_original'])->whereUserid($user->userid)->value('nickname_original');
+            if (empty($nickname)) {
+                return Base::retError('请设置昵称', [], -2);
+            }
+        }
         //
+        $dialog_id = Base::getPostInt('dialog_id');
+        $text = trim(Base::getPostValue('text'));
+        //
+        WebSocketDialog::checkDialog($dialog_id);
+        //
+        $text = WebSocketDialogMsg::formatMsg($text, $dialog_id);
         if (mb_strlen($text) < 1) {
             return Base::retError('消息内容不能为空');
         } elseif (mb_strlen($text) > 20000) {
             return Base::retError('消息内容最大不能超过20000字');
         }
+        if (mb_strlen($text) > 2000) {
+            $array = mb_str_split($text, 2000);
+        } else {
+            $array = [$text];
+        }
         //
-        WebSocketDialog::checkDialog($dialog_id);
+        $list = [];
+        foreach ($array as $item) {
+            $res = WebSocketDialogMsg::sendMsg($dialog_id, 'text', ['text' => $item], $user->userid);
+            if (Base::isSuccess($res)) {
+                $list[] = $res['data'];
+            }
+        }
         //
-        $msg = [
-            'text' => $text
-        ];
-        //
-        return WebSocketDialogMsg::sendMsg($dialog_id, 'text', $msg, $user->userid);
+        return Base::retSuccess('发送成功', $list);
     }
 
     /**
-     * {post}文件上传
+     * @api {post} api/dialog/msg/sendfile          07. 文件上传
      *
-     * @apiParam {Number} dialog_id         对话ID
-     * @apiParam {String} [filename]        post-文件名称
-     * @apiParam {String} [image64]         post-base64图片（二选一）
-     * @apiParam {File} [files]             post-文件对象（二选一）
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__sendfile
+     *
+     * @apiParam {Number} dialog_id             对话ID
+     * @apiParam {Number} [image_attachment]    图片是否也存到附件
+     * @apiParam {String} [filename]            post-文件名称
+     * @apiParam {String} [image64]             post-base64图片（二选一）
+     * @apiParam {File} [files]                 post-文件对象（二选一）
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function msg__sendfile()
     {
         $user = User::auth();
         //
         $dialog_id = Base::getPostInt('dialog_id');
+        $image_attachment = Base::getPostInt('image_attachment');
         //
         $dialog = WebSocketDialog::checkDialog($dialog_id);
         //
-        $path = "uploads/chat/" . $user->userid . "/";
+        $path = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
         $image64 = Base::getPostValue('image64');
         $fileName = Base::getPostValue('filename');
         if ($image64) {
@@ -190,7 +297,7 @@ class DialogController extends AbstractController
         } else {
             $data = Base::upload([
                 "file" => Request::file('files'),
-                "type" => 'file',
+                "type" => 'more',
                 "path" => $path,
                 "fileName" => $fileName,
             ]);
@@ -203,8 +310,8 @@ class DialogController extends AbstractController
             $fileData['thumb'] = Base::unFillUrl($fileData['thumb']);
             $fileData['size'] *= 1024;
             //
-            if ($dialog->type === 'group') {
-                if ($dialog->group_type === 'task') {
+            if ($dialog->type === 'group' && $dialog->group_type === 'task') {                       // 任务群组保存文件
+                if ($image_attachment || !in_array($fileData['ext'], File::imageExt)) {     // 如果是图片不保存
                     $task = ProjectTask::whereDialogId($dialog->id)->first();
                     if ($task) {
                         $file = ProjectTaskFile::createInstance([
@@ -233,9 +340,18 @@ class DialogController extends AbstractController
     }
 
     /**
-     * 获取消息阅读情况
+     * @api {get} api/dialog/msg/readlist          08. 获取消息阅读情况
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__readlist
      *
      * @apiParam {Number} msg_id            消息ID（需要是消息的发送人）
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function msg__readlist()
     {
@@ -251,4 +367,424 @@ class DialogController extends AbstractController
         $read = WebSocketDialogMsgRead::whereMsgId($msg_id)->get();
         return Base::retSuccess('success', $read ?: []);
     }
+
+    /**
+     * @api {get} api/dialog/msg/detail          09. 消息详情
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__detail
+     *
+     * @apiParam {Number} msg_id            消息ID
+     * @apiParam {String} only_update_at    仅获取update_at字段
+     * - no (默认)
+     * - yes
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__detail()
+    {
+        User::auth();
+        //
+        $msg_id = intval(Request::input('msg_id'));
+        $only_update_at = Request::input('only_update_at', 'no');
+        //
+        $dialogMsg = WebSocketDialogMsg::whereId($msg_id)->first();
+        if (empty($dialogMsg)) {
+            return Base::retError("文件不存在");
+        }
+        //
+        if ($only_update_at == 'yes') {
+            return Base::retSuccess('success', [
+                'id' => $dialogMsg->id,
+                'update_at' => Carbon::parse($dialogMsg->updated_at)->toDateTimeString()
+            ]);
+        }
+        //
+        $data = $dialogMsg->toArray();
+        //
+        if ($data['type'] == 'file') {
+            $msg = Base::json2array($dialogMsg->getRawOriginal('msg'));
+            $msg = File::formatFileData($msg);
+            $data['content'] = $msg['content'];
+            $data['file_mode'] = $msg['file_mode'];
+        }
+        //
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/download          10. 文件下载
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__download
+     *
+     * @apiParam {Number} msg_id            消息ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__download()
+    {
+        User::auth();
+        //
+        $msg_id = intval(Request::input('msg_id'));
+        //
+        $msg = WebSocketDialogMsg::whereId($msg_id)->first();
+        if (empty($msg)) {
+            abort(403, "This file not exist.");
+        }
+        if ($msg->type != 'file') {
+            abort(403, "This file not support download.");
+        }
+        $array = Base::json2array($msg->getRawOriginal('msg'));
+        //
+        return Response::download(public_path($array['path']), $array['name']);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/withdraw          11. 聊天消息撤回
+     *
+     * @apiDescription 消息撤回限制24小时内，需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__withdraw
+     *
+     * @apiParam {Number} msg_id            消息ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__withdraw()
+    {
+        $user = User::auth();
+        $msg_id = intval(Request::input("msg_id"));
+        $msg = WebSocketDialogMsg::whereId($msg_id)->whereUserid($user->userid)->first();
+        if (empty($msg)) {
+            return Base::retError("消息不存在或已被删除");
+        }
+        $msg->deleteMsg();
+        return Base::retSuccess("success");
+    }
+
+    /**
+     * @api {get} api/dialog/top          12. 会话置顶
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName top
+     *
+     * @apiParam {Number} dialog_id            会话ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function top()
+    {
+        $user = User::auth();
+        $dialogId = intval(Request::input('dialog_id'));
+        $dialogUser = WebSocketDialogUser::whereUserid($user->userid)->whereDialogId($dialogId)->first();
+        if (!$dialogUser) {
+            return Base::retError("会话不存在");
+        }
+        $dialogUser->top_at = $dialogUser->top_at ? null : Carbon::now();
+        $dialogUser->save();
+        return Base::retSuccess("success", [
+            'id' => $dialogUser->dialog_id,
+            'top_at' => $dialogUser->top_at?->toDateTimeString(),
+        ]);
+    }
+
+    /**
+     * @api {get} api/dialog/msg/mark          13. 消息标记操作
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName msg__mark
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {String} type                  类型
+     * - read
+     * - unread
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function msg__mark()
+    {
+        $user = User::auth();
+        $dialogId = intval(Request::input('dialog_id'));
+        $type = Request::input('type');
+        $dialogUser = WebSocketDialogUser::whereUserid($user->userid)->whereDialogId($dialogId)->first();
+        if (!$dialogUser) {
+            return Base::retError("会话不存在");
+        }
+        switch ($type) {
+            case 'read':
+                WebSocketDialogMsgRead::whereUserid($user->userid)
+                    ->whereReadAt(null)
+                    ->whereDialogId($dialogId)
+                    ->chunkById(100, function ($list) {
+                        WebSocketDialogMsgRead::onlyMarkRead($list);
+                    });
+                $dialogUser->mark_unread = 0;
+                $dialogUser->save();
+                break;
+
+            case 'unread':
+                $dialogUser->mark_unread = 1;
+                $dialogUser->save();
+                break;
+
+            default:
+                return Base::retError("参数错误");
+        }
+        return Base::retSuccess("success", [
+            'id' => $dialogId,
+            'mark_unread' => $dialogUser->mark_unread,
+        ]);
+    }
+
+    /**
+     * @api {get} api/dialog/group/add          14. 新增群组
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__add
+     *
+     * @apiParam {Array} userids                群成员，格式: [userid1, userid2, userid3]
+     * @apiParam {String} chat_name             群名称
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__add()
+    {
+        $user = User::auth();
+        //
+        $userids = Request::input('userids');
+        $chatName = trim(Request::input('chat_name'));
+        //
+        if (!is_array($userids)) {
+            return Base::retError('请选择群成员');
+        }
+        $userids = array_merge([$user->userid], $userids);
+        $userids = array_values(array_filter(array_unique($userids)));
+        if (count($userids) < 2) {
+            return Base::retError('群成员至少2人');
+        }
+        //
+        if (empty($chatName)) {
+            $array = [];
+            foreach ($userids as $userid) {
+                $array[] = User::userid2nickname($userid);
+                if (count($array) >= 8 || strlen(implode(", ", $array)) > 100) {
+                    $array[] = "...";
+                    break;
+                }
+            }
+            $chatName = implode(", ", $array);
+        }
+        $dialog = WebSocketDialog::createGroup($chatName, $userids, 'user', $user->userid);
+        if (empty($dialog)) {
+            return Base::retError('创建群组失败');
+        }
+        $data = WebSocketDialog::find($dialog->id)?->formatData($user->userid);
+        $dialog->pushMsg("groupAdd", $data, $userids);
+        return Base::retSuccess('创建成功', $data);
+    }
+
+    /**
+     * @api {get} api/dialog/group/edit          15. 修改群组
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__edit
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {String} chat_name             群名称
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__edit()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $chatName = trim(Request::input('chat_name'));
+        //
+        if (mb_strlen($chatName) < 2) {
+            return Base::retError('群名称至少2个字');
+        }
+        if (mb_strlen($chatName) > 100) {
+            return Base::retError('群名称最长限制100个字');
+        }
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, true);
+        //
+        $dialog->name = $chatName;
+        $dialog->save();
+        return Base::retSuccess('修改成功', [
+            'id' => $dialog->id,
+            'name' => $dialog->name,
+        ]);
+    }
+
+    /**
+     * @api {get} api/dialog/group/user          16. 获取群成员
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__user
+     *
+     * @apiParam {Number} dialog_id            会话ID
+     * @apiParam {Number} [getuser]            获取会员详情（1: 返回会员昵称、邮箱等基本信息，0: 默认不返回）
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__user()
+    {
+        User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $getuser = intval(Request::input('getuser', 0));
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id);
+        //
+        $data = $dialog->dialogUser->toArray();
+        if ($getuser === 1) {
+            $array = [];
+            foreach ($data as $item) {
+                $res = User::userid2basic($item['userid']);
+                if ($res) {
+                    $array[] = array_merge($item, $res->toArray());
+                }
+            }
+            $data = $array;
+        }
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/dialog/group/adduser          17. 添加群成员
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__adduser
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {Array} userids                新增的群成员，格式: [userid1, userid2, userid3]
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__adduser()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $userids = Request::input('userids');
+        //
+        if (!is_array($userids)) {
+            return Base::retError('请选择群成员');
+        }
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, true);
+        //
+        $dialog->checkGroup();
+        $dialog->joinGroup($userids);
+        $dialog->pushMsg("groupJoin", $dialog->formatData($user->userid), $userids);
+        return Base::retSuccess('添加成功');
+    }
+
+    /**
+     * @api {get} api/dialog/group/deluser          18. 移出（退出）群成员
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__adduser
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     * @apiParam {Array} userids                移出的群成员，格式: [userid1, userid2, userid3]
+     * - 留空表示自己退出
+     * - 有值表示移出，仅限群主操作
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__deluser()
+    {
+        $user = User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        $userids = Request::input('userids');
+        //
+        $type = 'remove';
+        if (empty($userids)) {
+            $type = 'exit';
+            $userids = [$user->userid];
+        }
+        //
+        if (!is_array($userids)) {
+            return Base::retError('请选择群成员');
+        }
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, $type === 'remove');
+        //
+        $dialog->checkGroup();
+        $dialog->exitGroup($userids);
+        $dialog->pushMsg("groupExit", null, $userids);
+        return Base::retSuccess($type === 'remove' ? '移出成功' : '退出成功');
+    }
+
+    /**
+     * @api {get} api/dialog/group/disband          19. 解散群组
+     *
+     * @apiDescription  需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup dialog
+     * @apiName group__disband
+     *
+     * @apiParam {Number} dialog_id             会话ID
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function group__disband()
+    {
+        User::auth();
+        //
+        $dialog_id = intval(Request::input('dialog_id'));
+        //
+        $dialog = WebSocketDialog::checkDialog($dialog_id, true);
+        //
+        $dialog->checkGroup();
+        $dialog->deleteDialog();
+        $dialog->pushMsg("groupDelete");
+        return Base::retSuccess('解散成功');
+    }
 }

app/Http/Controllers/Api/ReportController.php

@@ -0,0 +1,474 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Exceptions\ApiException;
+use App\Models\AbstractModel;
+use App\Models\ProjectTask;
+use App\Models\Report;
+use App\Models\ReportReceive;
+use App\Models\User;
+use App\Module\Base;
+use App\Tasks\PushTask;
+use Carbon\Carbon;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Validation\Rule;
+use Request;
+use Illuminate\Support\Facades\Validator;
+
+/**
+ * @apiDefine report
+ *
+ * 汇报
+ */
+class ReportController extends AbstractController
+{
+    /**
+     * @api {get} api/report/my          01. 我发送的汇报
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName my
+     *
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
+     * @apiParam {Number} [page]        当前页，默认:1
+     * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function my(): array
+    {
+        $user = User::auth();
+        //
+        $builder = Report::with(['receivesUser'])->whereUserid($user->userid);
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
+                $builder->whereType($keys['type']);
+            }
+            if (is_array($keys['created_at'])) {
+                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($keys['created_at'][0])));
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($keys['created_at'][1])));
+            }
+        }
+        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        return Base::retSuccess('success', $list);
+    }
+
+    /**
+     * @api {get} api/report/receive          02. 我接收的汇报
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName receive
+     *
+     * @apiParam {Object} [keys]             搜索条件
+     * - keys.key: 关键词
+     * - keys.type: 汇报类型，weekly:周报，daily:日报
+     * - keys.created_at: 汇报时间
+     * @apiParam {Number} [page]        当前页，默认:1
+     * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function receive(): array
+    {
+        $user = User::auth();
+        $builder = Report::with(['receivesUser']);
+        $builder->whereHas("receivesUser", function ($query) use ($user) {
+            $query->where("report_receives.userid", $user->userid);
+        });
+        $keys = Request::input('keys');
+        if (is_array($keys)) {
+            if ($keys['key']) {
+                $builder->where(function($query) use ($keys) {
+                    $query->whereHas('sendUser', function ($q2) use ($keys) {
+                        $q2->where("users.email", "LIKE", "%{$keys['key']}%");
+                    })->orWhere("title", "LIKE", "%{$keys['key']}%");
+                });
+            }
+            if (in_array($keys['type'], [Report::WEEKLY, Report::DAILY])) {
+                $builder->whereType($keys['type']);
+            }
+            if (is_array($keys['created_at'])) {
+                if ($keys['created_at'][0] > 0) $builder->where('created_at', '>=', date('Y-m-d H:i:s', Base::dayTimeF($keys['created_at'][0])));
+                if ($keys['created_at'][1] > 0) $builder->where('created_at', '<=', date('Y-m-d H:i:s', Base::dayTimeE($keys['created_at'][1])));
+            }
+        }
+        $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        if ($list->items()) {
+            foreach ($list->items() as $item) {
+                $item->receive_time = ReportReceive::query()->whereRid($item["id"])->whereUserid($user->userid)->value("receive_time");
+            }
+        }
+        return Base::retSuccess('success', $list);
+    }
+
+    /**
+     * @api {get} api/report/store          03. 保存并发送工作汇报
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName store
+     *
+     * @apiParam {Number} [id]           汇报ID
+     * @apiParam {String} [title]        汇报标题
+     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
+     * @apiParam {Number} [content]      内容
+     * @apiParam {Number} [receive]      汇报对象
+     * @apiParam {Number} [offset]       偏移量
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function store(): array
+    {
+        $input = [
+            "id" => Base::getPostValue("id", 0),
+            "title" => Base::getPostValue("title"),
+            "type" => Base::getPostValue("type"),
+            "content" => Base::getPostValue("content"),
+            "receive" => Base::getPostValue("receive"),
+            // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
+            "offset" => Base::getPostValue("offset", 0),
+        ];
+        $validator = Validator::make($input, [
+            'id' => 'numeric',
+            'title' => 'required',
+            'type' => ['required', Rule::in([Report::WEEKLY, Report::DAILY])],
+            'content' => 'required',
+            'receive' => 'required',
+            'offset' => ['numeric', 'max:0'],
+        ], [
+            'id.numeric' => 'ID只能是数字',
+            'title.required' => '请填写标题',
+            'type.required' => '请选择汇报类型',
+            'type.in' => '汇报类型错误',
+            'content.required' => '请填写汇报内容',
+            'receive.required' => '请选择接收人',
+            'offset.numeric' => '工作汇报周期格式错误，只能是数字',
+            'offset.max' => '只能提交当天/本周或者之前的的工作汇报',
+        ]);
+        if ($validator->fails())
+            return Base::retError($validator->errors()->first());
+
+        $user = User::auth();
+        // 接收人
+        if (is_array($input["receive"])) {
+            // 删除当前登录人
+            $input["receive"] = array_diff($input["receive"], [$user->userid]);
+
+            // 查询用户是否存在
+            if (count($input["receive"]) !== User::whereIn("userid", $input["receive"])->count())
+                return Base::retError("用户不存在");
+
+            foreach ($input["receive"] as $userid) {
+                $input["receive_content"][] = [
+                    "receive_time" => Carbon::now()->toDateTimeString(),
+                    "userid" => $userid,
+                    "read" => 0,
+                ];
+            }
+        }
+
+        // 在事务中运行
+        return AbstractModel::transaction(function () use ($input, $user) {
+            $id = $input["id"];
+            if ($id) {
+                // 编辑
+                $report = Report::getOne($id);
+                $report->updateInstance([
+                    "title" => $input["title"],
+                    "type" => $input["type"],
+                    "content" => htmlspecialchars($input["content"]),
+                ]);
+            } else {
+                // 生成唯一标识
+                $sign = Report::generateSign($input["type"], $input["offset"]);
+                // 检查唯一标识是否存在
+                if (empty($input["id"])) {
+                    if (Report::query()->whereSign($sign)->whereType($input["type"])->count() > 0)
+                        throw new ApiException("请勿重复提交工作汇报");
+                }
+                $report = Report::createInstance([
+                    "title" => $input["title"],
+                    "type" => $input["type"],
+                    "content" => htmlspecialchars($input["content"]),
+                    "userid" => $user->userid,
+                    "sign" => $sign,
+                ]);
+            }
+
+            $report->save();
+            if (!empty($input["receive_content"])) {
+                // 删除关联
+                $report->Receives()->delete();
+                // 保存接收人
+                $report->Receives()->createMany($input["receive_content"]);
+            }
+
+            // 推送消息
+            $userids = [];
+            foreach ($input["receive_content"] as $item) {
+                $userids[] = $item['userid'];
+            }
+            if ($userids) {
+                $params = [
+                    'ignoreFd' => Request::header('fd'),
+                    'userid' => $userids,
+                    'msg' => [
+                        'type' => 'report',
+                        'action' => 'unreadUpdate',
+                    ]
+                ];
+                Task::deliver(new PushTask($params, false));
+            }
+            //
+            return Base::retSuccess('保存成功', $report);
+        });
+    }
+
+    /**
+     * @api {get} api/report/template          04. 生成汇报模板
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName template
+     *
+     * @apiParam {Array}  [type]         汇报类型，weekly:周报，daily:日报
+     * @apiParam {Number} [offset]       偏移量
+     * @apiParam {String} [date]         时间
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function template(): array
+    {
+        $user = User::auth();
+        $type = trim(Request::input("type"));
+        $offset = abs(intval(Request::input("offset", 0)));
+        $id = intval(Request::input("offset", 0));
+        $now_dt = trim(Request::input("date")) ? Carbon::parse(Request::input("date")) : Carbon::now();
+        // 获取开始时间
+        if ($type === Report::DAILY) {
+            $start_time = Carbon::today();
+            if ($offset > 0) {
+                // 将当前时间调整为偏移量当天结束
+                $now_dt->subDays($offset)->endOfDay();
+                // 开始时间偏移量计算
+                $start_time->subDays($offset);
+            }
+            $end_time = Carbon::instance($start_time)->endOfDay();
+        } else {
+            $start_time = Carbon::now();
+            if ($offset > 0) {
+                // 将当前时间调整为偏移量当周结束
+                $now_dt->subWeeks($offset)->endOfDay();
+                // 开始时间偏移量计算
+                $start_time->subWeeks($offset);
+            }
+            $start_time->startOfWeek();
+            $end_time = Carbon::instance($start_time)->endOfWeek();
+        }
+        // 生成唯一标识
+        $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
+        $one = Report::whereSign($sign)->whereType($type)->first();
+        // 如果已经提交了相关汇报
+        if ($one && $id > 0) {
+            return Base::retSuccess('success', [
+                "content" => $one->content,
+                "title" => $one->title,
+                "id" => $one->id,
+            ]);
+        }
+
+        // 已完成的任务
+        $completeContent = "";
+        $complete_task = ProjectTask::query()
+            ->whereNotNull("complete_at")
+            ->whereBetween("complete_at", [$start_time->toDateTimeString(), $end_time->toDateTimeString()])
+            ->whereHas("taskUser", function ($query) use ($user) {
+                $query->where("userid", $user->userid);
+            })
+            ->orderByDesc("id")
+            ->get();
+        if ($complete_task->isNotEmpty()) {
+            foreach ($complete_task as $task) {
+                $complete_at = Carbon::parse($task->complete_at);
+                $pre = $type == Report::WEEKLY ? ('<span>[' . Base::Lang('周' . ['日', '一', '二', '三', '四', '五', '六'][$complete_at->dayOfWeek]) . ']</span>&nbsp;') : '';
+                $completeContent .= '<li>' . $pre . $task->name . '</li>';
+            }
+        } else {
+            $completeContent = '<li>&nbsp;</li>';
+        }
+
+        // 未完成的任务
+        $unfinishedContent = "";
+        $unfinished_task = ProjectTask::query()
+            ->whereNull("complete_at")
+            ->whereNotNull("start_at")
+            ->where("end_at", "<", $end_time->toDateTimeString())
+            ->whereHas("taskUser", function ($query) use ($user) {
+                $query->where("userid", $user->userid);
+            })
+            ->orderByDesc("id")
+            ->get();
+        if ($unfinished_task->isNotEmpty()) {
+            foreach ($unfinished_task as $task) {
+                empty($task->end_at) || $end_at = Carbon::parse($task->end_at);
+                $pre = (!empty($end_at) && $end_at->lt($now_dt)) ? '<span style="color:#ff0000;">[' . Base::Lang('超期') . ']</span>&nbsp;' : '';
+                $unfinishedContent .= '<li>' . $pre . $task->name . '</li>';
+            }
+        } else {
+            $unfinishedContent = '<li>&nbsp;</li>';
+        }
+        // 生成标题
+        if ($type === Report::WEEKLY) {
+            $title = $user->nickname . "的周报[" . $start_time->format("m/d") . "-" . $end_time->format("m/d") . "]";
+            $title .= "[" . $start_time->month . "月第" . $start_time->weekOfMonth . "周]";
+        } else {
+            $title = $user->nickname . "的日报[" . $start_time->format("Y/m/d") . "]";
+        }
+        $data = [
+            "time" => $start_time->toDateTimeString(),
+            "complete_task" => $complete_task,
+            "unfinished_task" => $unfinished_task,
+            "content" => '<h2>' . Base::Lang('已完成工作') . '</h2><ol>' .
+                $completeContent . '</ol><h2>' .
+                Base::Lang('未完成的工作') . '</h2><ol>' .
+                $unfinishedContent . '</ol>',
+            "title" => $title,
+        ];
+        if ($one) {
+            $data['id'] = $one->id;
+        }
+        return Base::retSuccess('success', $data);
+    }
+
+    /**
+     * @api {get} api/report/detail          05. 报告详情
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName detail
+     *
+     * @apiParam {Number} [id]           报告id
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function detail(): array
+    {
+        $user = User::auth();
+        $id = intval(trim(Request::input("id")));
+        if (empty($id))
+            return Base::retError("缺少ID参数");
+
+        $one = Report::getOne($id);
+        $one->type_val = $one->getRawOriginal("type");
+
+        // 标记为已读
+        if (!empty($one->receivesUser)) {
+            foreach ($one->receivesUser as $item) {
+                if ($item->userid === $user->userid && $item->pivot->read === 0) {
+                    $one->receivesUser()->updateExistingPivot($user->userid, [
+                        "read" => 1,
+                    ]);
+                }
+            }
+        }
+
+        return Base::retSuccess("success", $one);
+    }
+
+    /**
+     * @api {get} api/report/last_submitter          06. 获取最后一次提交的接收人
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName last_submitter
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function last_submitter(): array
+    {
+        $one = Report::getLastOne();
+        return Base::retSuccess("success", empty($one["receives"]) ? [] : $one["receives"]);
+    }
+
+    /**
+     * @api {get} api/report/unread          07. 获取未读
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName unread
+     *
+     * @apiParam {Number} [userid]          用户id
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function unread(): array
+    {
+        $userid = intval(trim(Request::input("userid")));
+        $user = empty($userid) ? User::auth() : User::find($userid);
+
+        $data = Report::whereHas("Receives", function (Builder $query) use ($user) {
+            $query->where("userid", $user->userid)->where("read", 0);
+        })->orderByDesc('created_at')->paginate(Base::getPaginate(50, 20));
+        return Base::retSuccess("success", $data);
+    }
+
+    /**
+     * @api {get} api/report/read          08. 标记汇报已读，可批量
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup report
+     * @apiName read
+     *
+     * @apiParam {String} [ids]      报告id
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function read(): array
+    {
+        $user = User::auth();
+        $ids = Request::input("ids");
+        if (!is_array($ids) && !is_string($ids)) {
+            return Base::retError("请传入正确的工作汇报Id");
+        }
+
+        if (is_string($ids)) {
+            $ids = explode(",", $ids);
+        }
+
+        $data = Report::with(["receivesUser" => function (BelongsToMany $query) use ($user) {
+            $query->where("report_receives.userid", $user->userid)->where("read", 0);
+        }])->whereIn("id", $ids)->get();
+
+        if ($data->isNotEmpty()) {
+            foreach ($data as $item) {
+                (!empty($item->receivesUser) && $item->receivesUser->isNotEmpty()) && $item->receivesUser()->updateExistingPivot($user->userid, [
+                    "read" => 1,
+                ]);
+            }
+        }
+        return Base::retSuccess("success", $data);
+    }
+}

app/Http/Controllers/Api/SystemController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Api;
 
 use App\Models\User;
 use App\Module\Base;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
 use Request;
 use Response;
 
@@ -24,7 +26,8 @@ class SystemController extends AbstractController
      *
      * @apiParam {String} type
      * - get: 获取（默认）
-     * - save: 保存设置（参数：reg、login_code）
+     * - all: 获取所有（需要管理员权限）
+     * - save: 保存设置（参数：['reg', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_nickname', 'auto_archived', 'archived_day', 'start_home', 'home_footer']）
 
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -37,32 +40,146 @@ class SystemController extends AbstractController
             if (env("SYSTEM_SETTING") == 'disabled') {
                 return Base::retError('当前环境禁止修改');
             }
-            $user = User::auth();
-            $user->isAdmin();
+            User::auth('admin');
             $all = Request::input();
             foreach ($all AS $key => $value) {
-                if (!in_array($key, ['reg', 'login_code'])) {
+                if (!in_array($key, [
+                    'reg',
+                    'reg_invite',
+                    'login_code',
+                    'password_policy',
+                    'project_invite',
+                    'chat_nickname',
+                    'auto_archived',
+                    'archived_day',
+                    'start_home',
+                    'home_footer'
+                ])) {
                     unset($all[$key]);
                 }
             }
+            $all['archived_day'] = floatval($all['archived_day']);
+            if ($all['auto_archived'] == 'open') {
+                if ($all['archived_day'] <= 0) {
+                    return Base::retError('自动归档时间不可小于1天！');
+                } elseif ($all['archived_day'] > 100) {
+                    return Base::retError('自动归档时间不可大于100天！');
+                }
+            }
             $setting = Base::setting('system', Base::newTrim($all));
         } else {
             $setting = Base::setting('system');
         }
         //
+        if ($type == 'all' || $type == 'save') {
+            User::auth('admin');
+            $setting['reg_invite'] = $setting['reg_invite'] ?: Base::generatePassword(8);
+        } else {
+            if (isset($setting['reg_invite'])) unset($setting['reg_invite']);
+        }
+        //
         $setting['reg'] = $setting['reg'] ?: 'open';
         $setting['login_code'] = $setting['login_code'] ?: 'auto';
+        $setting['password_policy'] = $setting['password_policy'] ?: 'simple';
+        $setting['project_invite'] = $setting['project_invite'] ?: 'open';
+        $setting['chat_nickname'] = $setting['chat_nickname'] ?: 'optional';
+        $setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
+        $setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
+        $setting['start_home'] = $setting['start_home'] ?: 'close';
         //
         return Base::retSuccess('success', $setting ?: json_decode('{}'));
     }
 
     /**
-     * @api {post} api/system/priority          02. 获取优先级、保存优先级
+     * @api {get} api/system/setting/email          02. 获取邮箱设置、保存邮箱设置（限管理员）
      *
      * @apiVersion 1.0.0
      * @apiGroup system
+     * @apiName setting__email
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存设置（参数：['smtp_server', 'port', 'account', 'password', 'reg_verify', 'notice', 'task_remind_hours', 'task_remind_hours2']）
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function setting__email()
+    {
+        User::auth('admin');
+        //
+        $type = trim(Request::input('type'));
+        if ($type == 'save') {
+            if (env("SYSTEM_SETTING") == 'disabled') {
+                return Base::retError('当前环境禁止修改');
+            }
+            $all = Request::input();
+            foreach ($all as $key => $value) {
+                if (!in_array($key, [
+                    'smtp_server',
+                    'port',
+                    'account',
+                    'password',
+                    'reg_verify',
+                    'notice',
+                    'task_remind_hours',
+                    'task_remind_hours2'
+                ])) {
+                    unset($all[$key]);
+                }
+            }
+            $setting = Base::setting('emailSetting', Base::newTrim($all));
+        } else {
+            $setting = Base::setting('emailSetting');
+        }
+        //
+        $setting['smtp_server'] = $setting['smtp_server'] ?: '';
+        $setting['port'] = $setting['port'] ?: '';
+        $setting['account'] = $setting['account'] ?: '';
+        $setting['password'] = $setting['password'] ?: '';
+        $setting['reg_verify'] = $setting['reg_verify'] ?: 'close';
+        $setting['notice'] = $setting['notice'] ?: 'open';
+        $setting['task_remind_hours'] = floatval($setting['task_remind_hours']) ?: 0;
+        $setting['task_remind_hours2'] = floatval($setting['task_remind_hours2']) ?: 0;
+        //
+        return Base::retSuccess('success', $setting ?: json_decode('{}'));
+    }
+
+    /**
+     * @api {get} api/system/demo          03. 获取演示帐号
+     *
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName demo
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function demo()
+    {
+        $demo_account = env('DEMO_ACCOUNT');
+        $demo_password = env('DEMO_PASSWORD');
+        if (empty($demo_account) || empty($demo_password)) {
+            return Base::retError('No demo account');
+        }
+        return Base::retSuccess('success', [
+            'account' => $demo_account,
+            'password' => $demo_password,
+        ]);
+    }
+
+    /**
+     * @api {post} api/system/priority          04. 任务优先级
+     *
+     * @apiDescription 获取任务优先级、保存任务优先级
+     * @apiVersion 1.0.0
+     * @apiGroup system
      * @apiName priority
      *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存（限管理员）
      * @apiParam {Array} list   优先级数据，格式：[{name,color,days,priority}]
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
@@ -73,15 +190,14 @@ class SystemController extends AbstractController
     {
         $type = trim(Request::input('type'));
         if ($type == 'save') {
-            $user = User::auth();
-            $user->isAdmin();
+            User::auth('admin');
             $list = Base::getPostValue('list');
             $array = [];
             if (empty($list) || !is_array($list)) {
                 return Base::retError('参数错误');
             }
             foreach ($list AS $item) {
-                if (empty($item['name']) || empty($item['color']) || empty($item['days']) || empty($item['priority'])) {
+                if (empty($item['name']) || empty($item['color']) || empty($item['priority'])) {
                     continue;
                 }
                 $array[] = [
@@ -103,7 +219,54 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/info          03. 获取终端详细信息
+     * @api {post} api/system/column/template          05. 创建项目模板
+     *
+     * @apiDescription 获取创建项目模板、保存创建项目模板
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName column__template
+     *
+     * @apiParam {String} type
+     * - get: 获取（默认）
+     * - save: 保存（限管理员）
+     * @apiParam {Array} list   优先级数据，格式：[{name,columns}]
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function column__template()
+    {
+        $type = trim(Request::input('type'));
+        if ($type == 'save') {
+            User::auth('admin');
+            $list = Base::getPostValue('list');
+            $array = [];
+            if (empty($list) || !is_array($list)) {
+                return Base::retError('参数错误');
+            }
+            foreach ($list AS $item) {
+                if (empty($item['name']) || empty($item['columns'])) {
+                    continue;
+                }
+                $array[] = [
+                    'name' => $item['name'],
+                    'columns' => array_values(array_filter(array_unique(explode(",", $item['columns']))))
+                ];
+            }
+            if (empty($array)) {
+                return Base::retError('参数为空');
+            }
+            $setting = Base::setting('columnTemplate', $array);
+        } else {
+            $setting = Base::setting('columnTemplate');
+        }
+        //
+        return Base::retSuccess('success', $setting);
+    }
+
+    /**
+     * @api {get} api/system/get/info          06. 获取终端详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -132,7 +295,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ip          04. 获取IP地址
+     * @api {get} api/system/get/ip          07. 获取IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -147,7 +310,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/cnip          05. 是否中国IP地址
+     * @api {get} api/system/get/cnip          08. 是否中国IP地址
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -164,7 +327,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipgcj02          06. 获取IP地址经纬度
+     * @api {get} api/system/get/ipgcj02          09. 获取IP地址经纬度
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -181,7 +344,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/ipinfo          07. 获取IP地址详细信息
+     * @api {get} api/system/get/ipinfo          10. 获取IP地址详细信息
      *
      * @apiVersion 1.0.0
      * @apiGroup system
@@ -198,90 +361,22 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/appinfo          08. 获取应用下载信息
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName get__appinfo
-     *
-     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
-     * @apiSuccess {String} msg     返回信息（错误描述）
-     * @apiSuccess {Object} data    返回数据
-     */
-    public function get__appinfo() {
-        $array = [
-            'name' => '',
-            'version' => '',
-            'list' => [],
-        ];
-        //
-        $file = base_path("electron/package.json");
-        $dist = base_path("electron/dist");
-        if (file_exists($file)) {
-            $packageArray = json_decode(file_get_contents($file), true);
-            $array['name'] = $packageArray['name'] ?? 'No app';
-            $array['version'] = $packageArray['version'] ?? '';
-            //
-            $list = [
-                [
-                    'icon' => 'logo-apple',
-                    'name' => 'macOS Intel',
-                    'file' => "{$array['name']}-{$array['version']}.dmg"
-                ],
-                [
-                    'icon' => 'logo-apple',
-                    'name' => 'macOS M1',
-                    'file' => "{$array['name']}-{$array['version']}-arm64.dmg"
-                ],
-                [
-                    'icon' => 'logo-windows',
-                    'name' => 'Windows x64',
-                    'file' => "{$array['name']} Setup {$array['version']}.exe"
-                ]
-            ];
-            foreach ($list as $item) {
-                if (file_exists("{$dist}/{$item['file']}")) {
-                    $item['url'] = Base::fillUrl('api/system/get/appdown?file=' . urlencode($item['file']));
-                    $item['size'] = filesize("{$dist}/{$item['file']}");
-                    $array['list'][] = $item;
-                }
-            }
-        }
-        //
-        if (count($array['list']) == 0) {
-            return Base::retError('No file');
-        }
-        return Base::retSuccess('success', $array);
-    }
-
-    /**
-     * @api {get} api/system/get/appdown          09. 下载应用
-     *
-     * @apiVersion 1.0.0
-     * @apiGroup system
-     * @apiName get__appdown
-     *
-     * @apiParam {String} file        文件名称
-     */
-    public function get__appdown() {
-        $file = Request::input("file");
-        $path = base_path("electron/dist/" . $file);
-        if (!file_exists($path)) {
-            return Base::ajaxError("No file");
-        }
-        return Response::download($path);
-    }
-
-    /**
-     * @api {post} api/system/imgupload          10. 上传图片
+     * @api {post} api/system/imgupload          11. 上传图片
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup system
      * @apiName imgupload
      *
-     * @apiParam {String} image64         图片base64
-     * @apiParam {String} filename        文件名
+     * @apiParam {File} image               post-图片对象
+     * @apiParam {String} [image64]         post-图片base64（与'image'二选一）
+     * @apiParam {String} filename          post-文件名
+     * @apiParam {Number} [width]           压缩图片宽（默认0）
+     * @apiParam {Number} [height]          压缩图片高（默认0）
+     * @apiParam {String} [whcut]           压缩方式
+     * - 1：裁切（默认，宽、高非0有效）
+     * - 0：缩放
+     * - -1或'auto'：保持等比裁切
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -292,11 +387,14 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $scale = [intval(Request::input('width')), intval(Request::input('height'))];
-        if (!$scale[0] && !$scale[1]) {
-            $scale = [2160, 4160, -1];
+        $width = intval(Request::input('width'));
+        $height = intval(Request::input('height'));
+        $whcut = intval(Request::input('whcut', 1));
+        $scale = [2160, 4160, -1];
+        if ($width > 0 || $height > 0) {
+            $scale = [$width, $height, $whcut];
         }
-        $path = "uploads/picture/" . User::userid() . "/" . date("Ym") . "/";
+        $path = "uploads/user/picture/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Base::getPostValue('image64'));
         $fileName = trim(Base::getPostValue('filename'));
         if ($image64) {
@@ -323,7 +421,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {get} api/system/get/imgview          11. 浏览图片空间
+     * @api {get} api/system/get/imgview          12. 浏览图片空间
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -341,7 +439,7 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $publicPath = "uploads/picture/" . User::userid() . "/";
+        $publicPath = "uploads/user/picture/" . User::userid() . "/";
         $dirPath = public_path($publicPath);
         $dirs = $files = [];
         //
@@ -419,7 +517,7 @@ class SystemController extends AbstractController
     }
 
     /**
-     * @api {post} api/system/fileupload          12. 上传文件
+     * @api {post} api/system/fileupload          13. 上传文件
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -439,7 +537,7 @@ class SystemController extends AbstractController
         if (User::userid() === 0) {
             return Base::retError('身份失效，等重新登录');
         }
-        $path = "uploads/files/" . User::userid() . "/" . date("Ym") . "/";
+        $path = "uploads/user/file/" . User::userid() . "/" . date("Ym") . "/";
         $image64 = trim(Base::getPostValue('image64'));
         $fileName = trim(Base::getPostValue('filename'));
         if ($image64) {
@@ -459,4 +557,66 @@ class SystemController extends AbstractController
         //
         return $data;
     }
+
+    /**
+     * @api {get} api/system/get/starthome          14. 启动首页设置信息
+     *
+     * @apiDescription 用于判断注册是否需要启动首页
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName get__starthome
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function get__starthome()
+    {
+        return Base::retSuccess('success', [
+            'need_start' => Base::settingFind('system', 'start_home') == 'open',
+            'home_footer' => Base::settingFind('system', 'home_footer')
+        ]);
+    }
+
+    /**
+     * @api {get} api/system/email/check          15. 邮件发送测试（限管理员）
+     *
+     * @apiDescription 测试配置邮箱是否能发送邮件
+     * @apiVersion 1.0.0
+     * @apiGroup system
+     * @apiName email__check
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function email__check()
+    {
+        User::auth('admin');
+        //
+        $all = Request::input();
+        if (!Base::isEmail($all['to'])) {
+            return Base::retError('请输入正确的收件人地址');
+        }
+        try {
+            Factory::mailer()
+                ->setDsn("smtp://{$all['account']}:{$all['password']}@{$all['smtp_server']}:{$all['port']}?verify_peer=0")
+                ->setMessage(EmailMessage::create()
+                    ->from(env('APP_NAME', 'Task') . " <{$all['account']}>")
+                    ->to($all['to'])
+                    ->subject('Mail sending test')
+                    ->html('<p>收到此电子邮件意味着您的邮箱配置正确。</p><p>Receiving this email means that your mailbox is configured correctly.</p>'))
+                ->send();
+            return Base::retSuccess('成功发送');
+        } catch (\Exception $e) {
+            // 一般是请求超时
+            if (str_contains($e->getMessage(), "Timed Out")) {
+                return Base::retError("language.TimedOut");
+            } elseif ($e->getCode() === 550) {
+                return Base::retError('邮件内容被拒绝，请检查邮箱是否开启接收功能');
+            } else {
+                return Base::retError($e->getMessage());
+            }
+        }
+    }
 }

app/Http/Controllers/Api/UsersController.php

@@ -2,7 +2,10 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Models\AbstractModel;
 use App\Models\User;
+use App\Models\UserEmailVerification;
+use App\Models\UserTransfer;
 use App\Module\Base;
 use Arr;
 use Cache;
@@ -31,7 +34,7 @@ class UsersController extends AbstractController
      * @apiParam {String} email          邮箱
      * @apiParam {String} password       密码
      * @apiParam {String} [code]         登录验证码
-     * @apiParam {String} [key]          登陆验证码key
+     * @apiParam {String} [invite]       注册邀请码
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -42,49 +45,56 @@ class UsersController extends AbstractController
         $type = trim(Request::input('type'));
         $email = trim(Request::input('email'));
         $password = trim(Request::input('password'));
+        $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
         if ($type == 'reg') {
             $setting = Base::setting('system');
             if ($setting['reg'] == 'close') {
                 return Base::retError('未开放注册');
+            } elseif ($setting['reg'] == 'invite') {
+                $invite = trim(Request::input('invite'));
+                if (empty($invite) || $invite != $setting['reg_invite']) {
+                    return Base::retError('请输入正确的邀请码');
+                }
             }
             $user = User::reg($email, $password);
+            if ($isRegVerify) {
+                UserEmailVerification::userEmailSend($user);
+                return Base::retError('注册成功，请验证邮箱后登录', ['code' => 'email']);
+            }
         } else {
             $needCode = !Base::isError(User::needCode($email));
             if ($needCode) {
                 $code = trim(Request::input('code'));
-                $key = trim(Request::input('key'));
                 if (empty($code)) {
                     return Base::retError('请输入验证码', ['code' => 'need']);
                 }
-                if (empty($key)) {
-                    if (!Captcha::check($code)) {
-                        return Base::retError('请输入正确的验证码', ['code' => 'need']);
-                    }
-                } else {
-                    if (!Captcha::check_api($code, $key)) {
-                        return Base::retError('请输入正确的验证码', ['code' => 'need']);
-                    }
+                if (!Captcha::check($code)) {
+                    return Base::retError('请输入正确的验证码', ['code' => 'need']);
                 }
             }
             //
             $retError = function ($msg) use ($email) {
                 Cache::forever("code::" . $email, "need");
                 $needCode = !Base::isError(User::needCode($email));
-                $needData = [ 'code' => $needCode ? 'need' : 'no' ];
+                $needData = ['code' => $needCode ? 'need' : 'no'];
                 return Base::retError($msg, $needData);
             };
             $user = User::whereEmail($email)->first();
             if (empty($user)) {
-                return $retError('账号或密码错误');
+                return $retError('帐号或密码错误');
             }
             if ($user->password != Base::md52($password, $user->encrypt)) {
-                return $retError('账号或密码错误');
+                return $retError('帐号或密码错误');
             }
             //
             if (in_array('disable', $user->identity)) {
                 return $retError('帐号已停用...');
             }
             Cache::forget("code::" . $email);
+            if ($isRegVerify && $user->email_verity === 0) {
+                UserEmailVerification::userEmailSend($user);
+                return Base::retError('您还没有验证邮箱，请先登录邮箱通过验证邮件验证邮箱', ['code' => 'email']);
+            }
         }
         //
         $array = [
@@ -127,8 +137,6 @@ class UsersController extends AbstractController
      * @apiGroup users
      * @apiName login__codeimg
      *
-     * @apiParam {String} email       用户名
-     *
      * @apiSuccess {Image} data     返回数据（直接输出图片）
      */
     public function login__codeimg()
@@ -155,7 +163,26 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/info          05. 获取我的信息
+     * @api {get} api/users/reg/needinvite          05. 是否需要邀请码
+     *
+     * @apiDescription 用于判断注册是否需要邀请码
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName reg__needinvite
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
+     */
+    public function reg__needinvite()
+    {
+        return Base::retSuccess('success', [
+            'need' => Base::settingFind('system', 'reg') == 'invite'
+        ]);
+    }
+
+    /**
+     * @api {get} api/users/info          06. 获取我的信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -175,9 +202,9 @@ class UsersController extends AbstractController
         "userimg": "",
         "login_num": 10,
         "changepass": 0,
-        "last_ip": "10.22.22.1",
+        "last_ip": "127.0.0.1",
         "last_at": "2021-06-01 12:00:00",
-        "line_ip": "10.22.22.1",
+        "line_ip": "127.0.0.1",
         "line_at": "2021-06-01 12:00:00",
         "created_ip": "",
     }
@@ -187,11 +214,13 @@ class UsersController extends AbstractController
         $user = User::auth();
         User::token($user);
         //
-        return Base::retSuccess('success', $user);
+        $data = $user->toArray();
+        $data['nickname_original'] = $user->getRawOriginal('nickname');
+        return Base::retSuccess('success', $data);
     }
 
     /**
-     * @api {get} api/users/editdata          06. 修改自己的资料
+     * @api {get} api/users/editdata          07. 修改自己的资料
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -210,6 +239,7 @@ class UsersController extends AbstractController
     {
         $user = User::auth();
         $data = Request::all();
+        $user->checkSystem(1);
         //头像
         if (Arr::exists($data, 'userimg')) {
             $userimg = Request::input('userimg');
@@ -217,13 +247,13 @@ class UsersController extends AbstractController
                 $userimg = is_array($userimg) ? $userimg[0]['path'] : $userimg;
                 $user->userimg = Base::unFillUrl($userimg);
             } else {
-                $user->userimg = '';
+                $user->userimg = $user->getUserimgAttribute(null);
             }
         }
         //昵称
         if (Arr::exists($data, 'nickname')) {
             $nickname = trim(Request::input('nickname'));
-            if (mb_strlen($nickname) < 2) {
+            if ($nickname && mb_strlen($nickname) < 2) {
                 return Base::retError('昵称不可以少于2个字');
             } elseif (mb_strlen($nickname) > 20) {
                 return Base::retError('昵称最多只能设置20个字');
@@ -234,7 +264,7 @@ class UsersController extends AbstractController
         //职位/职称
         if (Arr::exists($data, 'profession')) {
             $profession = trim(Request::input('profession'));
-            if (mb_strlen($profession) < 2) {
+            if ($profession && mb_strlen($profession) < 2) {
                 return Base::retError('职位/职称不可以少于2个字');
             } elseif (mb_strlen($profession) > 20) {
                 return Base::retError('职位/职称最多只能设置20个字');
@@ -250,7 +280,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/editpass          07. 修改自己的密码
+     * @api {get} api/users/editpass          08. 修改自己的密码
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -267,26 +297,14 @@ class UsersController extends AbstractController
     public function editpass()
     {
         $user = User::auth();
+        $user->checkSystem();
         //
         $oldpass = trim(Request::input('oldpass'));
         $newpass = trim(Request::input('newpass'));
-        if (strlen($newpass) < 6) {
-            return Base::retError('密码设置不能小于6位数');
-        } elseif (strlen($newpass) > 32) {
-            return Base::retError('密码最多只能设置32位数');
-        }
         if ($oldpass == $newpass) {
             return Base::retError('新旧密码一致');
         }
-        //
-        if (env("PASSWORD_ADMIN") == 'disabled') {
-            if ($user->userid == 1) {
-                return Base::retError('当前环境禁止修改密码');
-            }
-        }
-        if (env("PASSWORD_OWNER") == 'disabled') {
-            return Base::retError('当前环境禁止修改密码');
-        }
+        User::passwordPolicy($newpass);
         //
         $verify = User::whereUserid($user->userid)->wherePassword(Base::md52($oldpass, User::token2encrypt()))->count();
         if (empty($verify)) {
@@ -302,7 +320,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/search          08. 搜索会员列表
+     * @api {get} api/users/search          09. 搜索会员列表
      *
      * @apiDescription 搜索会员列表
      * @apiVersion 1.0.0
@@ -310,10 +328,16 @@ class UsersController extends AbstractController
      * @apiName searchinfo
      *
      * @apiParam {Object} keys          搜索条件
-     * - keys.key               昵称、邮箱
-     * - keys.project_id        在指定项目ID
-     * - keys.no_project_id     不在指定项目ID
+     * - keys.key                           昵称、邮箱关键字
+     * - keys.disable                       0-排除禁止（默认），1-含禁止，2-仅禁止
+     * - keys.project_id                    在指定项目ID
+     * - keys.no_project_id                 不在指定项目ID
+     * @apiParam {Object} sorts         排序方式
+     * - sorts.az                           按字母：asc|desc
+     *
      * @apiParam {Number} [take]        获取数量，10-100
+     * @apiParam {Number} [page]        当前页，默认:1（赋值分页模式，take参数无效）
+     * @apiParam {Number} [pagesize]    每页显示数量，默认:10，最大:100
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -324,38 +348,52 @@ class UsersController extends AbstractController
         $builder = User::select(['userid', 'email', 'nickname', 'profession', 'userimg', 'az']);
         //
         $keys = Request::input('keys');
-        if (is_array($keys)) {
-            if ($keys['key']) {
-                $builder->where(function($query) use ($keys) {
-                    $query->where("email", "like", "%{$keys['key']}%")
-                        ->orWhere("nickname", "like", "%{$keys['key']}%");
-                });
-            }
-            if (intval($keys['project_id']) > 0) {
-                $builder->whereIn('userid', function ($query) use ($keys) {
-                    $query->select('userid')->from('project_users')->where('project_id', $keys['project_id']);
-                });
-            }
-            if (intval($keys['no_project_id']) > 0) {
-                $builder->whereNotIn('userid', function ($query) use ($keys) {
-                    $query->select('userid')->from('project_users')->where('project_id', $keys['no_project_id']);
-                });
-            }
+        $sorts = Request::input('sorts');
+        $keys = is_array($keys) ? $keys : [];
+        $sorts = is_array($sorts) ? $sorts : [];
+        //
+        if ($keys['key']) {
+            $builder->where(function($query) use ($keys) {
+                $query->where("email", "like", "%{$keys['key']}%")
+                    ->orWhere("nickname", "like", "%{$keys['key']}%");
+            });
+        }
+        if (intval($keys['disable']) == 0) {
+            $builder->whereNull("disable_at");
+        } elseif (intval($keys['disable']) == 2) {
+            $builder->whereNotNull("disable_at");
+        }
+        if (intval($keys['project_id']) > 0) {
+            $builder->whereIn('userid', function ($query) use ($keys) {
+                $query->select('userid')->from('project_users')->where('project_id', $keys['project_id']);
+            });
+        }
+        if (intval($keys['no_project_id']) > 0) {
+            $builder->whereNotIn('userid', function ($query) use ($keys) {
+                $query->select('userid')->from('project_users')->where('project_id', $keys['no_project_id']);
+            });
+        }
+        if (in_array($sorts['az'], ['asc', 'desc'])) {
+            $builder->orderBy('az', $sorts['az']);
         }
         //
-        $list = $builder->orderBy('userid')->take(Base::getPaginate(100, 10, 'take'))->get();
+        if (Request::exists('page')) {
+            $list = $builder->orderBy('userid')->paginate(Base::getPaginate(100, 10));
+        } else {
+            $list = $builder->orderBy('userid')->take(Base::getPaginate(100, 10, 'take'))->get();
+        }
         return Base::retSuccess('success', $list);
     }
 
     /**
-     * @api {get} api/users/basic          09. 获取指定会员基础信息
+     * @api {get} api/users/basic          10. 获取指定会员基础信息
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
      * @apiGroup users
      * @apiName basic
      *
-     * @apiParam {Number} userid          会员ID(多个格式：jsonArray，一次最多30个)
+     * @apiParam {Number} userid          会员ID(多个格式：jsonArray，一次最多50个)
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -382,14 +420,34 @@ class UsersController extends AbstractController
     }
 
     /**
-     * 会员列表（限管理员）
+     * @api {get} api/users/lists          11. 会员列表（限管理员）
+     *
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName lists
      *
      * @apiParam {Object} [keys]        搜索条件
+     * - keys.key               邮箱/昵称/职位（赋值后keys.email、keys.nickname、keys.profession失效）
      * - keys.email             邮箱
      * - keys.nickname          昵称
      * - keys.profession        职位
+     * - keys.identity          身份（如：admin、noadmin）
+     * - keys.disable           是否离职
+     *   - yes:     仅离职
+     *   - all:     全部
+     *   - 其他值:   仅在职（默认）
+     * - keys.email_verity      邮箱是否认证
+     *   - yes:     已认证
+     *   - no:      未认证
+     *   - 其他值:   全部（默认）
+     *
      * @apiParam {Number} [page]        当前页，默认:1
      * @apiParam {Number} [pagesize]    每页显示数量，默认:20，最大:50
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function lists()
     {
@@ -399,14 +457,26 @@ class UsersController extends AbstractController
         //
         $keys = Request::input('keys');
         if (is_array($keys)) {
-            if ($keys['email']) {
-                $builder->where("email", "like", "%{$keys['email']}%");
-            }
-            if ($keys['nickname']) {
-                $builder->where("nickname", "like", "%{$keys['nickname']}%");
-            }
-            if ($keys['profession']) {
-                $builder->where("profession", "like", "%{$keys['profession']}%");
+            if ($keys['key']) {
+                if (str_contains($keys['key'], "@")) {
+                    $builder->where("email", "like", "%{$keys['key']}%");
+                } else {
+                    $builder->where(function($query) use ($keys) {
+                        $query->where("email", "like", "%{$keys['key']}%")
+                            ->orWhere("nickname", "like", "%{$keys['key']}%")
+                            ->orWhere("profession", "like", "%{$keys['key']}%");
+                    });
+                }
+            } else {
+                if ($keys['email']) {
+                    $builder->where("email", "like", "%{$keys['email']}%");
+                }
+                if ($keys['nickname']) {
+                    $builder->where("nickname", "like", "%{$keys['nickname']}%");
+                }
+                if ($keys['profession']) {
+                    $builder->where("profession", "like", "%{$keys['profession']}%");
+                }
             }
             if ($keys['identity']) {
                 if (Base::leftExists($keys['identity'], "no")) {
@@ -415,6 +485,18 @@ class UsersController extends AbstractController
                     $builder->where("identity", "like", "%,{$keys['identity']},%");
                 }
             }
+            if ($keys['disable'] === 'yes') {
+                $builder->whereNotNull('disable_at');
+            } elseif ($keys['disable'] !== 'all') {
+                $builder->whereNull('disable_at');
+            }
+            if ($keys['email_verity'] === 'yes') {
+                $builder->whereEmailVerity(1);
+            } elseif ($keys['email_verity'] === 'no') {
+                $builder->whereEmailVerity(0);
+            }
+        } else {
+            $builder->whereNull('disable_at');
         }
         $list = $builder->orderByDesc('userid')->paginate(Base::getPaginate(50, 20));
         //
@@ -422,22 +504,33 @@ class UsersController extends AbstractController
     }
 
     /**
-     * 操作会员（限管理员）
+     * @api {get} api/users/operation          12. 操作会员（限管理员）
      *
-     * @apiParam {Number} userid          会员ID
-     * @apiParam {String} [type]          操作
+     * @apiDescription 需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName operation
+     *
+     * @apiParam {Number} userid                会员ID
+     * @apiParam {String} [type]                操作
      * - setadmin             设为管理员
      * - clearadmin           取消管理员
-     * - setdisable           设为禁用
-     * - cleardisable         取消禁用
+     * - setdisable           设为离职（需要参数 disable_time、transfer_userid）
+     * - cleardisable         取消离职
      * - delete               删除会员
-     * @apiParam {String} [password]      新的密码
-     * @apiParam {String} [nickname]      昵称
-     * @apiParam {String} [profession]    职位
+     * @apiParam {String} [password]            新的密码
+     * @apiParam {String} [nickname]            昵称
+     * @apiParam {String} [profession]          职位
+     * @apiParam {String} [disable_time]        离职时间
+     * @apiParam {String} [transfer_userid]     离职交接人
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据
      */
     public function operation()
     {
-        User::auth('admin');
+        $user = User::auth('admin');
         //
         $data = Request::all();
         $userid = intval($data['userid']);
@@ -447,8 +540,10 @@ class UsersController extends AbstractController
         if (empty($userInfo)) {
             return Base::retError('会员不存在或已被删除');
         }
+        $userInfo->checkSystem(1);
         //
         $upArray = [];
+        $transferUser = null;
         switch ($type) {
             case 'setadmin':
                 $upArray['identity'] = array_diff($userInfo->identity, ['admin']);
@@ -460,16 +555,35 @@ class UsersController extends AbstractController
                 break;
 
             case 'setdisable':
+                if ($userInfo->userid === $user->userid) {
+                    return Base::retError('不能操作自己离职');
+                }
                 $upArray['identity'] = array_diff($userInfo->identity, ['disable']);
                 $upArray['identity'][] = 'disable';
+                $upArray['disable_at'] = Carbon::parse($data['disable_time']);
+                $transferUserid = is_array($data['transfer_userid']) ? $data['transfer_userid'][0] : $data['transfer_userid'];
+                $transferUser = User::find(intval($transferUserid));
+                if (empty($transferUser)) {
+                    return Base::retError('请选择正确的交接人');
+                }
+                if ($transferUser->userid === $userInfo->userid) {
+                    return Base::retError('不能移交给自己');
+                }
+                if (in_array('disable', $transferUser->identity)) {
+                    return Base::retError('交接人已离职，请选择另一个交接人');
+                }
                 break;
 
             case 'cleardisable':
                 $upArray['identity'] = array_diff($userInfo->identity, ['disable']);
+                $upArray['disable_at'] = null;
                 break;
 
             case 'delete':
-                $userInfo->delete();
+                if ($userInfo->userid === $user->userid) {
+                    return Base::retError('不能删除自己');
+                }
+                $userInfo->deleteUser();
                 break;
         }
         if (isset($upArray['identity'])) {
@@ -478,11 +592,7 @@ class UsersController extends AbstractController
         // 密码
         if (Arr::exists($data, 'password')) {
             $password = trim($data['password']);
-            if (strlen($password) < 6) {
-                return Base::retError('密码设置不能小于6位数');
-            } elseif (strlen($password) > 32) {
-                return Base::retError('密码最多只能设置32位数');
-            }
+            User::passwordPolicy($password);
             $upArray['encrypt'] = Base::generatePassword(6);
             $upArray['password'] = Base::md52($password, $upArray['encrypt']);
             $upArray['changepass'] = 1;
@@ -490,7 +600,7 @@ class UsersController extends AbstractController
         // 昵称
         if (Arr::exists($data, 'nickname')) {
             $nickname = trim($data['nickname']);
-            if (mb_strlen($nickname) < 2) {
+            if ($nickname && mb_strlen($nickname) < 2) {
                 return Base::retError('昵称不可以少于2个字');
             } elseif (mb_strlen($nickname) > 20) {
                 return Base::retError('昵称最多只能设置20个字');
@@ -501,7 +611,7 @@ class UsersController extends AbstractController
         // 职位/职称
         if (Arr::exists($data, 'profession')) {
             $profession = trim($data['profession']);
-            if (mb_strlen($profession) < 2) {
+            if ($profession && mb_strlen($profession) < 2) {
                 return Base::retError('职位/职称不可以少于2个字');
             } elseif (mb_strlen($profession) > 20) {
                 return Base::retError('职位/职称最多只能设置20个字');
@@ -510,10 +620,68 @@ class UsersController extends AbstractController
             }
         }
         if ($upArray) {
-            $userInfo->updateInstance($upArray);
-            $userInfo->save();
+            AbstractModel::transaction(function() use ($type, $upArray, $userInfo, $transferUser) {
+                $userInfo->updateInstance($upArray);
+                $userInfo->save();
+                if ($type === 'setdisable') {
+                    $userTransfer = UserTransfer::createInstance([
+                        'original_userid' => $userInfo->userid,
+                        'new_userid' => $transferUser->userid,
+                    ]);
+                    $userTransfer->save();
+                    $userTransfer->start();
+                }
+            });
         }
         //
         return Base::retSuccess('修改成功', $userInfo);
     }
+
+    /**
+     * @api {get} api/users/email/verification          13. 邮箱验证
+     *
+     * @apiDescription 不需要token身份
+     * @apiVersion 1.0.0
+     * @apiGroup users
+     * @apiName email__verification
+     *
+     * @apiParam {String} code           验证参数
+     *
+     * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
+     * @apiSuccess {String} msg     返回信息（错误描述）
+     * @apiSuccess {Object} data    返回数据（同"获取我的信息"接口）
+     */
+    public function email__verification()
+    {
+        $data = Request::input();
+        // 表单验证
+        Base::validator($data, [
+            'code.required' => '验证码不能为空',
+        ]);
+        //
+        $res = UserEmailVerification::whereCode($data['code'])->first();
+        if (empty($res)) {
+            return Base::retError('无效连接,请重新注册');
+        }
+
+        // 如果已经校验过
+        if (intval($res->status) === 1)
+            return Base::retError('链接已经使用过', ['code' => 2]);
+
+        $oldTime = Carbon::parse($res->created_at)->timestamp;
+        $time = Base::Time();
+
+        // 30分钟失效
+        if (abs($time - $oldTime) > 1800) {
+            return Base::retError("链接已失效，请重新登录/注册");
+        }
+        UserEmailVerification::whereCode($data['code'])->update([
+            'status' => 1
+        ]);
+        User::whereUserid($res->userid)->update([
+            'email_verity' => 1
+        ]);
+
+        return Base::retSuccess('绑定邮箱成功');
+    }
 }

app/Http/Controllers/Api/apidoc.php

@@ -4,7 +4,7 @@
  * 给apidoc项目增加顺序编号
  */
 
-error_reporting(E_ALL & ~E_NOTICE);
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
 
 $path = dirname(__FILE__). '/';
 $lists = scandir($path);

app/Http/Controllers/IndexController.php

@@ -3,9 +3,13 @@
 namespace App\Http\Controllers;
 
 use App\Module\Base;
+use App\Tasks\AutoArchivedTask;
 use App\Tasks\DeleteTmpTask;
+use App\Tasks\OverdueRemindEmailTask;
+use Arr;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Redirect;
+use Request;
 
 
 /**
@@ -21,6 +25,10 @@ class IndexController extends InvokeController
         if ($action) {
             $app .= "__" . $action;
         }
+        if ($app === 'manifest.txt') {
+            $app = 'manifest';
+            $child = 'txt';
+        }
         if (!method_exists($this, $app)) {
             $app = method_exists($this, $method) ? $method : 'main';
         }
@@ -29,11 +37,88 @@ class IndexController extends InvokeController
 
     /**
      * 首页
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return \Illuminate\Http\Response
      */
     public function main()
     {
-        return view('main', ['version' => Base::getVersion()]);
+        $hash = 'no';
+        $path = public_path('js/hash');
+        $murl = url('manifest.txt');
+        if (file_exists($path)) {
+            $hash = trim(file_get_contents(public_path('js/hash')));
+            if (strlen($hash) > 16) {
+                $hash = 'long';
+            }
+        }
+        return response()->view('main', [
+            'version' => Base::getVersion(),
+            'hash' => $hash
+        ])->header('Link', "<{$murl}>; rel=\"prefetch\"");
+    }
+
+    /**
+     * Manifest
+     * @param $child
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|string
+     */
+    public function manifest($child = '')
+    {
+        if (empty($child)) {
+            $murl = url('manifest.txt');
+            return response($murl)->header('Link', "<{$murl}>; rel=\"prefetch\"");
+        }
+        $array = [
+            "office/web-apps/apps/api/documents/api.js?hash=" . Base::getVersion(),
+            "office/7.0.1-37/web-apps/vendor/requirejs/require.js",
+            "office/7.0.1-37/web-apps/apps/api/documents/api.js",
+            "office/7.0.1-37/sdkjs/common/AllFonts.js",
+            "office/7.0.1-37/web-apps/vendor/xregexp/xregexp-all-min.js",
+            "office/7.0.1-37/web-apps/vendor/sockjs/sockjs.min.js",
+            "office/7.0.1-37/web-apps/vendor/jszip/jszip.min.js",
+            "office/7.0.1-37/web-apps/vendor/jszip-utils/jszip-utils.min.js",
+            "office/7.0.1-37/sdkjs/common/libfont/wasm/fonts.js",
+            "office/7.0.1-37/sdkjs/common/Charts/ChartStyles.js",
+            "office/7.0.1-37/sdkjs/slide/themes//themes.js",
+
+            "office/7.0.1-37/web-apps/apps/presentationeditor/main/app.js",
+            "office/7.0.1-37/sdkjs/slide/sdk-all-min.js",
+            "office/7.0.1-37/sdkjs/slide/sdk-all.js",
+
+            "office/7.0.1-37/web-apps/apps/documenteditor/main/app.js",
+            "office/7.0.1-37/sdkjs/word/sdk-all-min.js",
+            "office/7.0.1-37/sdkjs/word/sdk-all.js",
+
+            "office/7.0.1-37/web-apps/apps/spreadsheeteditor/main/app.js",
+            "office/7.0.1-37/sdkjs/cell/sdk-all-min.js",
+            "office/7.0.1-37/sdkjs/cell/sdk-all.js",
+        ];
+        foreach ($array as &$item) {
+            $item = url($item);
+        }
+        return implode(PHP_EOL, $array);
+    }
+
+    /**
+     * 获取版本号
+     * @return array
+     */
+    public function version()
+    {
+        $url = url('');
+        $package = Base::getPackage();
+        $array = [
+            'version' => Base::getVersion(),
+            'publish' => Arr::get($package, 'app.0.publish'),
+        ];
+        if (is_array($package['app'])) {
+            foreach ($package['app'] as $item) {
+                $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url'];
+                if (is_array($item['publish']) && Base::hostContrast($url, $urls)) {
+                    $array['publish'] = $item['publish'];
+                }
+            }
+        }
+        return $array;
     }
 
     /**
@@ -51,24 +136,88 @@ class IndexController extends InvokeController
      */
     public function crontab()
     {
-        if (!Base::is_internal_ip()) {
+        if (!Base::is_internal_ip(Base::getIp())) {
             // 限制内网访问
             return "Forbidden Access";
         }
         // 删除过期的临时表数据
         Task::deliver(new DeleteTmpTask('wg_tmp_msgs', 1));
         Task::deliver(new DeleteTmpTask('tmp', 24));
+        // 自动归档任务
+        Task::deliver(new AutoArchivedTask());
+        // 任务到期邮件提醒
+        Task::deliver(new OverdueRemindEmailTask());
 
         return "success";
     }
 
+    /**
+     * 桌面客户端发布
+     */
+    public function desktop__publish($name = '')
+    {
+        $genericVersion = Request::header('generic-version');
+        $latestFile = public_path("uploads/desktop/latest");
+        $latestVersion = file_exists($latestFile) ? trim(file_get_contents($latestFile)) : "0.0.1";
+        if (strtolower($name) === 'latest') {
+            $name = $latestVersion;
+        }
+        // 上传
+        if (preg_match("/^\d+\.\d+\.\d+$/", $genericVersion)) {
+            if (version_compare($genericVersion, $latestVersion) > -1) {    // 限制上传版本必须 ≥ 当前版本
+                $genericPath = "uploads/desktop/{$genericVersion}/";
+                $res = Base::upload([
+                    "file" => Request::file('file'),
+                    "type" => 'desktop',
+                    "path" => $genericPath,
+                    "fileName" => true
+                ]);
+                if (Base::isSuccess($res)) {
+                    file_put_contents($latestFile, $genericVersion);
+                }
+                return $res;
+            }
+        }
+        // 列表
+        if (preg_match("/^\d+\.\d+\.\d+$/", $name)) {
+            $path = "uploads/desktop/{$name}";
+            $dirPath = public_path($path);
+            $lists = Base::readDir($dirPath);
+            $files = [];
+            foreach ($lists as $file) {
+                if (str_ends_with($file, '.yml') || str_ends_with($file, '.yaml')) {
+                    continue;
+                }
+                $fileName = Base::leftDelete($file, $dirPath);
+                $files[] = [
+                    'name' => substr($fileName, 1),
+                    'time' => date("Y-m-d H:i:s", fileatime($file)),
+                    'size' => Base::readableBytes(filesize($file)),
+                    'url' => Base::fillUrl($path . $fileName),
+                ];
+            }
+            return view('desktop', ['version' => $name, 'files' => $files]);
+        }
+        // 下载
+        if ($name && file_exists($latestFile)) {
+            $genericVersion = file_get_contents($latestFile);
+            if (preg_match("/^\d+\.\d+\.\d+$/", $genericVersion)) {
+                $filePath = public_path("uploads/desktop/{$genericVersion}/{$name}");
+                if (file_exists($filePath)) {
+                    return response()->download($filePath);
+                }
+            }
+        }
+        return abort(404);
+    }
+
     /**
      * 提取所有中文
      * @return array|string
      */
     public function allcn()
     {
-        if (!Base::is_internal_ip()) {
+        if (!Base::is_internal_ip(Base::getIp())) {
             // 限制内网访问
             return "Forbidden Access";
         }
@@ -92,7 +241,7 @@ class IndexController extends InvokeController
      */
     public function allcn__php()
     {
-        if (!Base::is_internal_ip()) {
+        if (!Base::is_internal_ip(Base::getIp())) {
             // 限制内网访问
             return "Forbidden Access";
         }

app/Http/Middleware/VerifyCsrfToken.php

@@ -21,14 +21,20 @@ class VerifyCsrfToken extends Middleware
         // 保存任务优先级
         'api/system/priority/',
 
+        // 保存创建项目列表模板
+        'api/system/column/template/',
+
         // 添加任务
         'api/project/task/add/',
 
+        // 保存工作流
+        'api/project/flow/save/',
+
         // 修改任务
         'api/project/task/update/',
 
-        // 上传任务问题
-        'api/project/task/upload/',
+        // 聊天发文本
+        'api/dialog/msg/sendtext/',
 
         // 聊天发文件
         'api/dialog/msg/sendfile/',
@@ -41,5 +47,11 @@ class VerifyCsrfToken extends Middleware
 
         // 保存文件内容（上传）
         'api/file/content/upload/',
+
+        // 保存汇报
+        'api/report/store/',
+
+        // 发布桌面端
+        'desktop/publish/',
     ];
 }

app/Http/Middleware/WebApi.php

@@ -6,7 +6,6 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Request;
-use URL;
 
 class WebApi
 {
@@ -28,13 +27,9 @@ class WebApi
             header('Access-Control-Allow-Headers:Content-Type, platform, platform-channel, token, release, Access-Control-Allow-Origin');
         }
 
-        $APP_FORCE_URL_SCHEME = env('APP_FORCE_URL_SCHEME', 'auto');
-        if ($APP_FORCE_URL_SCHEME == 'https' || $APP_FORCE_URL_SCHEME === true) {
-            URL::forceScheme('https');
-        } elseif ($APP_FORCE_URL_SCHEME == 'http' || $APP_FORCE_URL_SCHEME === false) {
-            URL::forceScheme('http');
-        } elseif (Request::header('x-forwarded-server-port', 80) == 443) {
-            URL::forceScheme('https');
+        $APP_SCHEME = env('APP_SCHEME', 'auto');
+        if (in_array(strtolower($APP_SCHEME), ['https', 'on', 'ssl', '1', 'true', 'yes'], true)) {
+            $request->setTrustedProxies([$request->getClientIp()], $request::HEADER_X_FORWARDED_PROTO);
         }
 
         return $next($request);

app/Models/AbstractModel.php

@@ -10,13 +10,15 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 /**
- * App\Model\AbstractModel
+ * App\Models\AbstractModel
  *
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel query()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
+ * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Model|object|static|null cancelHidden()
  * @method static \Illuminate\Database\Eloquent\Builder|static with($relations)
  * @method static \Illuminate\Database\Query\Builder|static select($columns = [])
  * @method static \Illuminate\Database\Query\Builder|static whereNotIn($column, $values, $boolean = 'and')
@@ -62,6 +64,24 @@ class AbstractModel extends Model
         return $this->$key;
     }
 
+    /**
+     * 取消附加值
+     * @return static
+     */
+    protected function scopeCancelAppend()
+    {
+        return $this->setAppends([]);
+    }
+
+    /**
+     * 取消隐藏值
+     * @return static
+     */
+    protected function scopeCancelHidden()
+    {
+        return $this->setHidden([]);
+    }
+
     /**
      * 为数组 / JSON 序列化准备日期。
      * @param DateTimeInterface $date
@@ -133,16 +153,23 @@ class AbstractModel extends Model
      * @param $where
      * @param array $update 存在时更新的内容
      * @param array $insert 不存在时插入的内容，如果没有则插入更新内容
+     * @param bool $isInsert 是否是插入数据
      * @return AbstractModel|\Illuminate\Database\Eloquent\Builder|Model|object|static|null
      */
-    public static function updateInsert($where, $update = [], $insert = [])
+    public static function updateInsert($where, $update = [], $insert = [], &$isInsert = true)
     {
         $row = static::where($where)->first();
         if (empty($row)) {
             $row = new static;
-            $row->updateInstance(array_merge($where, $insert ?: $update));
+            $array = array_merge($where, $insert ?: $update);
+            if (isset($array[$row->primaryKey])) {
+                unset($array[$row->primaryKey]);
+            }
+            $row->updateInstance($array);
+            $isInsert = true;
         } elseif ($update) {
             $row->updateInstance($update);
+            $isInsert = false;
         }
         if (!$row->save()) {
             return null;

app/Models/File.php

@@ -10,18 +10,19 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * Class File
+ * App\Models\File
  *
- * @package App\Models
  * @property int $id
+ * @property string|null $pids 上级ID递归
  * @property int|null $pid 上级ID
  * @property int|null $cid 复制ID
  * @property string|null $name 名称
  * @property string|null $type 类型
+ * @property string|null $ext 后缀名
  * @property int|null $size 大小(B)
  * @property int|null $userid 拥有者ID
- * @property int|null $share 是否共享(1:共享所有人,2:指定成员)
- * @property int|null $created_id 创建者ID
+ * @property int|null $share 是否共享
+ * @property int|null $created_id 创建者
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
@@ -33,9 +34,11 @@ use Request;
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereCreatedId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|File whereExt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File wherePid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|File wherePids($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereShare($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereSize($value)
  * @method static \Illuminate\Database\Eloquent\Builder|File whereType($value)
@@ -50,43 +53,68 @@ class File extends AbstractModel
     use SoftDeletes;
 
     /**
-     * 是否有访问权限（没有时抛出异常）
-     * @param $userid
+     * 文件文件
      */
-    public function exceAllow($userid)
-    {
-        if (!$this->chackAllow($userid)) {
-            throw new ApiException('没有访问权限');
-        }
-    }
+    const codeExt = [
+        'txt',
+        'htaccess', 'htgroups', 'htpasswd', 'conf', 'bat', 'cmd', 'cpp', 'c', 'cc', 'cxx', 'h', 'hh', 'hpp', 'ino', 'cs', 'css',
+        'dockerfile', 'go', 'golang', 'html', 'htm', 'xhtml', 'vue', 'we', 'wpy', 'java', 'js', 'jsm', 'jsx', 'json', 'jsp', 'less', 'lua', 'makefile', 'gnumakefile',
+        'ocamlmakefile', 'make', 'mysql', 'nginx', 'ini', 'cfg', 'prefs', 'm', 'mm', 'pl', 'pm', 'p6', 'pl6', 'pm6', 'pgsql', 'php',
+        'inc', 'phtml', 'shtml', 'php3', 'php4', 'php5', 'phps', 'phpt', 'aw', 'ctp', 'module', 'ps1', 'py', 'r', 'rb', 'ru', 'gemspec', 'rake', 'guardfile', 'rakefile',
+        'gemfile', 'rs', 'sass', 'scss', 'sh', 'bash', 'bashrc', 'sql', 'sqlserver', 'swift', 'ts', 'typescript', 'str', 'vbs', 'vb', 'v', 'vh', 'sv', 'svh', 'xml',
+        'rdf', 'rss', 'wsdl', 'xslt', 'atom', 'mathml', 'mml', 'xul', 'xbl', 'xaml', 'yaml', 'yml',
+        'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx'
+    ];
+
+    /**
+     * office文件
+     */
+    const officeExt = [
+        'doc', 'docx',
+        'xls', 'xlsx',
+        'ppt', 'pptx',
+    ];
+
+    /**
+     * 图片文件
+     */
+    const imageExt = [
+        'jpg', 'jpeg', 'png', 'gif', 'bmp'
+    ];
+
+    /**
+     * 本地媒体文件
+     */
+    const localExt = [
+        'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw',
+        'tif', 'tiff',
+        'mp3', 'wav', 'mp4', 'flv',
+        'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
+    ];
 
     /**
      * 是否有访问权限
-     *  ① 自己的文件夹
-     *  ② 共享所有人的文件夹
-     *  ③ 在指定共享人员内
      * @param $userid
-     * @return bool
+     * @return int -1:没有权限，0:访问权限，1:读写权限，1000:所有者或创建者
      */
-    public function chackAllow($userid)
+    public function getPermission($userid)
     {
-        if ($userid == $this->userid) {
-            // ① 自己的文件夹
-            return true;
+        if ($userid == $this->userid || $userid == $this->created_id) {
+            // ① 自己的文件夹 或 自己创建的文件夹
+            return 1000;
         }
         $row = $this->getShareInfo();
         if ($row) {
-            if ($row->share == 1) {
-                // ② 共享所有人的文件夹
-                return true;
-            } elseif ($row->share == 2) {
-                // ③ 在指定共享人员内
-                if (FileUser::whereFileId($row->id)->whereUserid($userid)->exists()) {
-                    return true;
-                }
+            $fileUser = FileUser::whereFileId($row->id)->where(function ($query) use ($userid) {
+                $query->where('userid', 0);
+                $query->orWhere('userid', $userid);
+            })->orderByDesc('permission')->first();
+            if ($fileUser) {
+                // ② 在指定共享成员内
+                return $fileUser->permission;
             }
         }
-        return false;
+        return -1;
     }
 
     /**
@@ -95,7 +123,7 @@ class File extends AbstractModel
      */
     public function getShareInfo()
     {
-        if ($this->share > 0) {
+        if ($this->share) {
             return $this;
         }
         $pid = $this->pid;
@@ -104,7 +132,7 @@ class File extends AbstractModel
             if (empty($row)) {
                 break;
             }
-            if ($row->share > 0) {
+            if ($row->share) {
                 return $row;
             }
             $pid = $row->pid;
@@ -114,7 +142,7 @@ class File extends AbstractModel
 
     /**
      * 是否处于共享文件夹内（不含自身）
-     * @return bool
+     * @return File|false
      */
     public function isNnShare()
     {
@@ -124,8 +152,8 @@ class File extends AbstractModel
             if (empty($row)) {
                 break;
             }
-            if ($row->share > 0) {
-                return true;
+            if ($row->share) {
+                return $row;
             }
             $pid = $row->pid;
         }
@@ -137,18 +165,60 @@ class File extends AbstractModel
      * @param $share
      * @return bool
      */
-    public function setShare($share)
+    public function updataShare($share = null)
     {
-        AbstractModel::transaction(function () use ($share) {
-            $this->share = $share;
-            $this->save();
-            $list = self::wherePid($this->id)->get();
-            if ($list->isNotEmpty()) {
-                foreach ($list as $item) {
-                    $item->setShare(0);
+        if ($share === null) {
+            $share = FileUser::whereFileId($this->id)->count() == 0 ? 0 : 1;
+        }
+        if ($this->share != $share) {
+            AbstractModel::transaction(function () use ($share) {
+                $this->share = $share;
+                $this->save();
+                if ($share === 0) {
+                    FileUser::deleteFileAll($this->id, $this->userid);
                 }
-            }
-        });
+                $list = self::wherePid($this->id)->get();
+                if ($list->isNotEmpty()) {
+                    foreach ($list as $item) {
+                        $item->updataShare(0);
+                    }
+                }
+            });
+        }
+        return true;
+    }
+
+    /**
+     * 保存前更新pids
+     * @return bool
+     */
+    public function saveBeforePids()
+    {
+        $pid = $this->pid;
+        $array = [];
+        while ($pid > 0) {
+            $array[] = $pid;
+            $pid = intval(self::whereId($pid)->value('pid'));
+        }
+        $opids = $this->pids;
+        if ($array) {
+            $array = array_values(array_reverse($array));
+            $this->pids = ',' . implode(',', $array) . ',';
+        } else {
+            $this->pids = '';
+        }
+        if (!$this->save()) {
+            return false;
+        }
+        // 更新子文件（夹）
+        if ($opids != $this->pids) {
+            self::wherePid($this->id)->chunkById(100, function ($lists) {
+                /** @var self $item */
+                foreach ($lists as $item) {
+                    $item->saveBeforePids();
+                }
+            });
+        }
         return true;
     }
 
@@ -161,6 +231,7 @@ class File extends AbstractModel
         AbstractModel::transaction(function () {
             $this->delete();
             $this->pushMsg('delete');
+            FileUser::deleteFileAll($this->id);
             FileContent::whereFid($this->id)->delete();
             $list = self::wherePid($this->id)->get();
             if ($list->isNotEmpty()) {
@@ -188,15 +259,15 @@ class File extends AbstractModel
         //
         if ($userid === null) {
             $userid = [$this->userid];
-            if ($this->share == 1) {
-                $builder = WebSocket::select(['userid']);
-                if ($action == 'content') {
-                    $builder->wherePath('file/content/' . $this->id);
-                }
-                $userid = array_merge($userid, $builder->pluck('userid')->toArray());
-            } elseif ($this->share == 2) {
-                $userid = array_merge($userid, FileUser::whereFileId($this->id)->pluck('userid')->toArray());
+            $builder = WebSocket::select(['userid']);
+            if ($action == 'content') {
+                $builder->wherePath("/single/file/{$this->id}");
+            } elseif ($this->pid > 0) {
+                $builder->wherePath("/manage/file/{$this->pid}");
+            } else {
+                $builder->wherePath("/manage/file");
             }
+            $userid = array_merge($userid, $builder->pluck('userid')->toArray());
             $userid = array_values(array_filter(array_unique($userid)));
         }
         if (empty($userid)) {
@@ -221,19 +292,178 @@ class File extends AbstractModel
         Task::deliver($task);
     }
 
+    /**
+     * 处理返回图片地址
+     * @param array $item
+     * @return array
+     */
+    public static function handleImageUrl($item)
+    {
+        if (in_array($item['ext'], self::imageExt) ) {
+            $content = Base::json2array(FileContent::whereFid($item['id'])->orderByDesc('id')->value('content'));
+            if ($content) {
+                $item['image_url'] = Base::fillUrl($content['url']);
+            }
+        }
+        return $item;
+    }
+
     /**
      * 获取文件并检测权限
      * @param $id
-     * @param null $noExistTis
+     * @param int $limit 要求权限: 0-访问权限、1-读写权限、1000-所有者或创建者
+     * @param $permission
      * @return File
      */
-    public static function allowFind($id, $noExistTis = null)
+    public static function permissionFind($id, $limit = 0, &$permission = -1)
     {
         $file = File::find($id);
         if (empty($file)) {
-            throw new ApiException($noExistTis ?: '文件不存在或已被删除');
+            throw new ApiException('文件不存在或已被删除');
+        }
+        //
+        $permission = $file->getPermission(User::userid());
+        if ($permission < $limit) {
+            $msg = match ($limit) {
+                1000 => '仅限所有者或创建者操作',
+                1 => '没有修改写入权限',
+                default => '没有查看访问权限',
+            };
+            throw new ApiException($msg);
         }
-        $file->exceAllow(User::userid());
         return $file;
     }
+
+    /**
+     * 格式化内容数据
+     * @param array $data [path, size, ext, name]
+     * @return array
+     */
+    public static function formatFileData(array $data)
+    {
+        $filePath = $data['path'];
+        $fileSize = $data['size'];
+        $fileExt = $data['ext'];
+        $publicPath = public_path($filePath);
+        //
+        switch ($fileExt) {
+            case 'md':
+            case 'text':
+                // 文本
+                $data['content'] = [
+                    'type' => $fileExt,
+                    'content' => file_get_contents($publicPath) ?: 'Content deleted',
+                ];
+                $data['file_mode'] = $fileExt;
+                break;
+
+            case 'drawio':
+                // 图表
+                $data['content'] = [
+                    'xml' => file_get_contents($publicPath)
+                ];
+                $data['file_mode'] = $fileExt;
+                break;
+
+            case 'mind':
+                // 思维导图
+                $data['content'] = Base::json2array(file_get_contents($publicPath));
+                $data['file_mode'] = $fileExt;
+                break;
+
+            default:
+                if (in_array($fileExt, self::codeExt) && $fileSize < 2 * 1024 * 1024)
+                {
+                    // 文本预览，限制2M内的文件
+                    $data['content'] = [
+                        'content' => file_get_contents($publicPath) ?: 'Content deleted',
+                    ];
+                    $data['file_mode'] = 'code';
+                }
+                elseif (in_array($fileExt, File::officeExt))
+                {
+                    // office预览
+                    $data['content'] = json_decode('{}');
+                    $data['file_mode'] = 'office';
+                }
+                else
+                {
+                    // 其他预览
+                    if (in_array($fileExt, File::localExt)) {
+                        $url = Base::fillUrl($filePath);
+                    } else {
+                        $url = 'http://' . env('APP_IPPR') . '.3/' . $filePath;
+                    }
+                    if ($fileExt != 'pdf') {
+                        $fileDotExt = ".{$fileExt}";
+                        $fileName = Base::rightDelete($data['name'], $fileDotExt) . $fileDotExt;
+                        $url = Base::urlAddparameter($url, [
+                            'fullfilename' => $fileName
+                        ]);
+                    }
+                    $data['content'] = [
+                        'preview' => true,
+                        'url' => base64_encode($url),
+                    ];
+                    $data['file_mode'] = 'preview';
+                }
+                break;
+        }
+        return $data;
+    }
+
+    /**
+     * 移交文件
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        if (!self::whereUserid($originalUserid)->exists()) {
+            return;
+        }
+
+        // 创建一个文件夹存放移交的文件
+        $name = User::userid2nickname($originalUserid) ?: ('ID:' . $originalUserid);
+        $file = File::createInstance([
+            'pid' => 0,
+            'name' => "【{$name}】移交的文件",
+            'type' => "folder",
+            'ext' => "",
+            'userid' => $newUserid,
+            'created_id' => 0,
+        ]);
+        $file->saveBeforePids();
+
+        // 移交文件
+        self::whereUserid($originalUserid)->chunkById(100, function($list) use ($file, $newUserid) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                if ($item->pid === 0) {
+                    $item->pid = $file->id;
+                }
+                $item->userid = $newUserid;
+                $item->saveBeforePids();
+            }
+        });
+
+        // 移交文件权限
+        FileUser::whereUserid($originalUserid)->chunkById(100, function ($list) use ($newUserid) {
+            /** @var FileUser $item */
+            foreach ($list as $item) {
+                $row = FileUser::whereFileId($item->file_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->permission = max($row->permission, $item->permission);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+            }
+        });
+    }
 }

app/Models/FileContent.php

@@ -8,9 +8,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Response;
 
 /**
- * Class FileContent
+ * App\Models\FileContent
  *
- * @package App\Models
  * @property int $id
  * @property int|null $fid 文件ID
  * @property string|null $content 内容
@@ -42,41 +41,53 @@ class FileContent extends AbstractModel
     use SoftDeletes;
 
     /**
-     * 获取格式内容
-     * @param $type
+     * 获取格式内容（或下载）
+     * @param File $file
      * @param $content
+     * @param $download
      * @return array|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public static function formatContent($type, $content)
+    public static function formatContent($file, $content, $download = false)
     {
-        $content = Base::json2array($content);
-        if (in_array($type, ['word', 'excel', 'ppt'])) {
+        $name = $file->ext ? "{$file->name}.{$file->ext}" : null;
+        $content = Base::json2array($content ?: []);
+        if (in_array($file->type, ['word', 'excel', 'ppt'])) {
             if (empty($content)) {
-                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type)));
+                return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $file->type)), $name);
             }
-            return Response::download(public_path($content['url']));
+            return Response::download(public_path($content['url']), $name);
         }
         if (empty($content)) {
-            switch ($type) {
-                case 'document':
-                    $content = [
-                        "type" => "md",
-                        "content" => "",
-                    ];
-                    break;
-
-                case 'sheet':
-                    $content = [
-                        [
-                            "name" => "Sheet1",
-                            "config" => json_decode('{}'),
-                        ]
-                    ];
-                    break;
-
-                default:
-                    $content = json_decode('{}');
-                    break;
+            $content = match ($file->type) {
+                'document' => [
+                    "type" => $file->ext,
+                    "content" => "",
+                ],
+                default => json_decode('{}'),
+            };
+            if ($download) {
+                abort(403, "This file is empty.");
+            }
+        } else {
+            $path = $content['url'];
+            if ($file->ext) {
+                $res = File::formatFileData([
+                    'path' => $path,
+                    'ext' => $file->ext,
+                    'size' => $file->size,
+                    'name' => $file->name,
+                ]);
+                $content = $res['content'];
+            } else {
+                $content['preview'] = false;
+            }
+            if ($download) {
+                $filePath = public_path($path);
+                if (isset($filePath)) {
+                    return Response::download($filePath, $name);
+                } else {
+                    abort(403, "This file not support download.");
+                }
             }
         }
         return Base::retSuccess('success', [ 'content' => $content ]);

app/Models/FileLink.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\FileLink
+ *
+ * @property int $id
+ * @property int|null $file_id 文件ID
+ * @property int|null $num 累计访问
+ * @property string|null $code 链接码
+ * @property int|null $userid 会员ID
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\File|null $file
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink query()
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereFileId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereNum($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileLink whereUserid($value)
+ * @mixin \Eloquent
+ */
+class FileLink extends AbstractModel
+{
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function file(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(File::class, 'id', 'file_id');
+    }
+}

app/Models/FileUser.php

@@ -4,12 +4,12 @@ namespace App\Models;
 
 
 /**
- * Class FileUser
+ * App\Models\FileUser
  *
- * @package App\Models
  * @property int $id
  * @property int|null $file_id 项目ID
  * @property int|null $userid 成员ID
+ * @property int|null $permission 权限：0只读，1读写
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser newModelQuery()
@@ -18,10 +18,41 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereFileId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileUser wherePermission($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|FileUser whereUserid($value)
  * @mixin \Eloquent
  */
 class FileUser extends AbstractModel
 {
+    /**
+     * 删除所有共享成员（同时删除成员分享的链接）
+     * @param $file_id
+     * @param int $retain_link_userid       保留指定会员的链接
+     * @return mixed
+     */
+    public static function deleteFileAll($file_id, $retain_link_userid = 0)
+    {
+        return AbstractModel::transaction(function() use ($retain_link_userid, $file_id) {
+            if ($retain_link_userid > 0) {
+                FileLink::whereFileId($file_id)->where('userid', '!=', $retain_link_userid)->delete();
+            } else {
+                FileLink::whereFileId($file_id)->delete();
+            }
+            FileUser::whereFileId($file_id)->delete();
+        });
+    }
+    /**
+     * 删除指定共享成员（同时删除成员分享的链接）
+     * @param $file_id
+     * @param $userid
+     * @return mixed
+     */
+    public static function deleteFileUser($file_id, $userid)
+    {
+        return AbstractModel::transaction(function() use ($userid, $file_id) {
+            FileLink::whereFileId($file_id)->whereUserid($userid)->delete();
+            return self::whereFileId($file_id)->whereUserid($userid)->delete();
+        });
+    }
 }

app/Models/Project.php

@@ -3,40 +3,36 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Module\Base;
 use App\Tasks\PushTask;
 use Carbon\Carbon;
+use DB;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * Class Project
+ * App\Models\Project
  *
- * @package App\Models
  * @property int $id
  * @property string|null $name 名称
  * @property string|null $desc 描述、备注
  * @property int|null $userid 创建人
- * @property int|mixed $dialog_id 聊天会话ID
+ * @property int|null $dialog_id 聊天会话ID
  * @property string|null $archived_at 归档时间
  * @property int|null $archived_userid 归档会员
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int $owner_userid
- * @property-read int $task_complete
- * @property-read int $task_my_complete
- * @property-read int $task_my_num
- * @property-read int $task_my_percent
- * @property-read int $task_num
- * @property-read int $task_percent
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectColumn[] $projectColumn
  * @property-read int|null $project_column_count
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectLog[] $projectLog
  * @property-read int|null $project_log_count
  * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectUser[] $projectUser
  * @property-read int|null $project_user_count
- * @method static \Illuminate\Database\Eloquent\Builder|Project authData($userid = null)
+ * @method static \Illuminate\Database\Eloquent\Builder|Project allData($userid = null)
+ * @method static \Illuminate\Database\Eloquent\Builder|Project authData($userid = null, $owner = null)
  * @method static \Illuminate\Database\Eloquent\Builder|Project newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Project newQuery()
  * @method static \Illuminate\Database\Query\Builder|Project onlyTrashed()
@@ -59,99 +55,14 @@ class Project extends AbstractModel
 {
     use SoftDeletes;
 
-    const projectSelect = [
-        'projects.*',
-        'project_users.owner',
+    protected $hidden = [
+        'deleted_at',
     ];
 
     protected $appends = [
-        'task_num',
-        'task_complete',
-        'task_percent',
-        'task_my_num',
-        'task_my_complete',
-        'task_my_percent',
         'owner_userid',
     ];
 
-    /**
-     * 生成任务数据
-     */
-    private function generateTaskData()
-    {
-        if (!isset($this->appendattrs['task_num'])) {
-            $builder = ProjectTask::whereProjectId($this->id)->whereParentId(0)->whereNull('archived_at');
-            $this->appendattrs['task_num'] = $builder->count();
-            $this->appendattrs['task_complete'] = $builder->whereNotNull('complete_at')->count();
-            $this->appendattrs['task_percent'] = $this->appendattrs['task_num'] ? intval($this->appendattrs['task_complete'] / $this->appendattrs['task_num'] * 100) : 0;
-            //
-            $builder = ProjectTask::whereProjectId($this->id)->whereParentId(0)->authData(User::userid())->whereNull('archived_at');
-            $this->appendattrs['task_my_num'] = $builder->count();
-            $this->appendattrs['task_my_complete'] = $builder->whereNotNull('complete_at')->count();
-            $this->appendattrs['task_my_percent'] = $this->appendattrs['task_my_num'] ? intval($this->appendattrs['task_my_complete'] / $this->appendattrs['task_my_num'] * 100) : 0;
-        }
-    }
-
-    /**
-     * 任务数量
-     * @return int
-     */
-    public function getTaskNumAttribute()
-    {
-        $this->generateTaskData();
-        return $this->appendattrs['task_num'];
-    }
-
-    /**
-     * 任务完成数量
-     * @return int
-     */
-    public function getTaskCompleteAttribute()
-    {
-        $this->generateTaskData();
-        return $this->appendattrs['task_complete'];
-    }
-
-    /**
-     * 任务完成率
-     * @return int
-     */
-    public function getTaskPercentAttribute()
-    {
-        $this->generateTaskData();
-        return $this->appendattrs['task_percent'];
-    }
-
-    /**
-     * 任务数量（我的）
-     * @return int
-     */
-    public function getTaskMyNumAttribute()
-    {
-        $this->generateTaskData();
-        return $this->appendattrs['task_my_num'];
-    }
-
-    /**
-     * 任务完成数量（我的）
-     * @return int
-     */
-    public function getTaskMyCompleteAttribute()
-    {
-        $this->generateTaskData();
-        return $this->appendattrs['task_my_complete'];
-    }
-
-    /**
-     * 任务完成率（我的）
-     * @return int
-     */
-    public function getTaskMyPercentAttribute()
-    {
-        $this->generateTaskData();
-        return $this->appendattrs['task_my_percent'];
-    }
-
     /**
      * 负责人会员ID
      * @return int
@@ -159,7 +70,7 @@ class Project extends AbstractModel
     public function getOwnerUseridAttribute()
     {
         if (!isset($this->appendattrs['owner_userid'])) {
-            $ownerUser = $this->projectUser->where('owner', 1)->first();
+            $ownerUser = ProjectUser::whereProjectId($this->id)->whereOwner(1)->first();
             $this->appendattrs['owner_userid'] = $ownerUser ? $ownerUser->userid : 0;
         }
         return $this->appendattrs['owner_userid'];
@@ -190,19 +101,73 @@ class Project extends AbstractModel
     }
 
     /**
-     * 查询自己的项目
+     * 查询所有项目（与正常查询多返回owner字段）
      * @param self $query
      * @param null $userid
      * @return self
      */
-    public function scopeAuthData($query, $userid = null)
+    public function scopeAllData($query, $userid = null)
     {
         $userid = $userid ?: User::userid();
-        $query->join('project_users', 'projects.id', '=', 'project_users.project_id')
-            ->where('project_users.userid', $userid);
+        $query
+            ->select([
+                'projects.*',
+                'project_users.owner',
+                'project_users.top_at',
+            ])
+            ->leftJoin('project_users', function ($leftJoin) use ($userid) {
+                $leftJoin
+                    ->on('project_users.userid', '=', DB::raw($userid))
+                    ->on('projects.id', '=', 'project_users.project_id');
+            });
         return $query;
     }
 
+    /**
+     * 查询自己负责或参与的项目
+     * @param self $query
+     * @param null $userid
+     * @param null $owner
+     * @return self
+     */
+    public function scopeAuthData($query, $userid = null, $owner = null)
+    {
+        $userid = $userid ?: User::userid();
+        $query
+            ->select([
+                'projects.*',
+                'project_users.owner',
+                'project_users.top_at',
+            ])
+            ->join('project_users', 'projects.id', '=', 'project_users.project_id')
+            ->where('project_users.userid', $userid);
+        if ($owner !== null) {
+            $query->where('project_users.owner', $owner);
+        }
+        return $query;
+    }
+
+    /**
+     * 获取任务统计数据
+     * @param $userid
+     * @return array
+     */
+    public function getTaskStatistics($userid)
+    {
+        $array = [];
+        $builder = ProjectTask::whereProjectId($this->id)->whereNull('archived_at');
+        $array['task_num'] = $builder->count();
+        $array['task_complete'] = $builder->whereNotNull('complete_at')->count();
+        $array['task_percent'] = $array['task_num'] ? intval($array['task_complete'] / $array['task_num'] * 100) : 0;
+        //
+        $builder = ProjectTask::authData($userid, 1)->where('project_tasks.project_id', $this->id)->whereNull('project_tasks.archived_at');
+        $array['task_my_num'] = $builder->count();
+        $array['task_my_complete'] = $builder->whereNotNull('project_tasks.complete_at')->count();
+        $array['task_my_percent'] = $array['task_my_num'] ? intval($array['task_my_complete'] / $array['task_my_num'] * 100) : 0;
+        //
+        return $array;
+    }
+
     /**
      * 加入项目
      * @param int $userid   加入的会员ID
@@ -249,7 +214,7 @@ class Project extends AbstractModel
      */
     public function relationUserids()
     {
-        return $this->projectUser->pluck('userid')->toArray();
+        return ProjectUser::whereProjectId($this->id)->orderBy('id')->pluck('userid')->toArray();
     }
 
     /**
@@ -267,7 +232,7 @@ class Project extends AbstractModel
     }
 
     /**
-     * 归档任务、取消归档
+     * 归档项目、取消归档
      * @param Carbon|null $archived_at 归档时间
      * @return bool
      */
@@ -277,14 +242,23 @@ class Project extends AbstractModel
             if ($archived_at === null) {
                 // 取消归档
                 $this->archived_at = null;
+                $this->archived_userid = User::userid();
                 $this->addLog("项目取消归档");
                 $this->pushMsg('add', $this);
+                ProjectTask::whereProjectId($this->id)->whereArchivedFollow(1)->update([
+                    'archived_at' => null,
+                    'archived_follow' => 0
+                ]);
             } else {
-                // 归档任务
+                // 归档项目
                 $this->archived_at = $archived_at;
                 $this->archived_userid = User::userid();
                 $this->addLog("项目归档");
                 $this->pushMsg('archived');
+                ProjectTask::whereProjectId($this->id)->whereArchivedAt(null)->update([
+                    'archived_at' => $archived_at,
+                    'archived_follow' => 1
+                ]);
             }
             $this->save();
         });
@@ -299,9 +273,7 @@ class Project extends AbstractModel
     {
         AbstractModel::transaction(function () {
             $dialog = WebSocketDialog::find($this->dialog_id);
-            if ($dialog) {
-                $dialog->deleteDialog();
-            }
+            $dialog?->deleteDialog();
             $columns = ProjectColumn::whereProjectId($this->id)->get();
             foreach ($columns as $column) {
                 $column->deleteColumn(false);
@@ -316,18 +288,23 @@ class Project extends AbstractModel
     /**
      * 添加项目日志
      * @param string $detail
+     * @param array $record
      * @param int $userid
      * @return ProjectLog
      */
-    public function addLog($detail, $userid = 0)
+    public function addLog($detail, $record = [], $userid = 0)
     {
-        $log = ProjectLog::createInstance([
+        $array = [
             'project_id' => $this->id,
             'column_id' => 0,
             'task_id' => 0,
             'userid' => $userid ?: User::userid(),
             'detail' => $detail,
-        ]);
+        ];
+        if ($record) {
+            $array['record'] = $record;
+        }
+        $log = ProjectLog::createInstance($array);
         $log->save();
         return $log;
     }
@@ -335,45 +312,179 @@ class Project extends AbstractModel
     /**
      * 推送消息
      * @param string $action
-     * @param array $data       发送内容，默认为[id=>项目ID]
-     * @param array $userid     指定会员，默认为项目所有成员
+     * @param array|self $data      发送内容，默认为[id=>项目ID]
+     * @param array $userid         指定会员，默认为项目所有成员
      */
     public function pushMsg($action, $data = null, $userid = null)
     {
         if ($data === null) {
             $data = ['id' => $this->id];
+        } elseif ($data instanceof self) {
+            $data = $data->toArray();
         }
+        //
+        $array = [$userid, []];
         if ($userid === null) {
-            $userid = $this->relationUserids();
+            $array[0] = $this->relationUserids();
+        } elseif (!is_array($userid)) {
+            $array[0] = [$userid];
+        }
+        //
+        if (isset($data['owner'])) {
+            $owners = ProjectUser::whereProjectId($data['id'])->whereOwner(1)->pluck('userid')->toArray();
+            $array = [array_intersect($array[0], $owners), array_diff($array[0], $owners)];
+        }
+        //
+        foreach ($array as $index => $item) {
+            if ($index > 0) {
+                $data['owner'] = 0;
+            }
+            $params = [
+                'ignoreFd' => Request::header('fd'),
+                'userid' => array_values($item),
+                'msg' => [
+                    'type' => 'project',
+                    'action' => $action,
+                    'data' => $data,
+                ]
+            ];
+            $task = new PushTask($params, false);
+            Task::deliver($task);
         }
-        $params = [
-            'ignoreFd' => Request::header('fd'),
-            'userid' => $userid,
-            'msg' => [
-                'type' => 'project',
-                'action' => $action,
-                'data' => $data,
-            ]
-        ];
-        $task = new PushTask($params, false);
-        Task::deliver($task);
     }
 
     /**
-     * 根据用户获取项目信息（用于判断会员是否存在项目内）
+     * 添加工作流
+     * @param $flows
+     * @return mixed
+     */
+    public function addFlow($flows)
+    {
+        return AbstractModel::transaction(function() use ($flows) {
+            $projectFlow = ProjectFlow::whereProjectId($this->id)->first();
+            if (empty($projectFlow)) {
+                $projectFlow = ProjectFlow::createInstance([
+                    'project_id' => $this->id,
+                    'name' => 'Default'
+                ]);
+                if (!$projectFlow->save()) {
+                    throw new ApiException('工作流创建失败');
+                }
+            }
+            //
+            $ids = [];
+            $idc = [];
+            $hasStart = false;
+            $hasEnd = false;
+            $upTaskList = [];
+            foreach ($flows as $item) {
+                $id = intval($item['id']);
+                $turns = Base::arrayRetainInt($item['turns'] ?: [], true);
+                $userids = Base::arrayRetainInt($item['userids'] ?: [], true);
+                $usertype = trim($item['usertype']);
+                $userlimit = intval($item['userlimit']);
+                if ($usertype == 'replace' && empty($userids)) {
+                    throw new ApiException("状态[{$item['name']}]设置错误，设置流转模式时必须填写状态负责人");
+                }
+                if ($usertype == 'merge' && empty($userids)) {
+                    throw new ApiException("状态[{$item['name']}]设置错误，设置剔除模式时必须填写状态负责人");
+                }
+                if ($userlimit && empty($userids)) {
+                    throw new ApiException("状态[{$item['name']}]设置错误，设置限制负责人时必须填写状态负责人");
+                }
+                $flow = ProjectFlowItem::updateInsert([
+                    'id' => $id,
+                    'project_id' => $this->id,
+                    'flow_id' => $projectFlow->id,
+                ], [
+                    'name' => trim($item['name']),
+                    'status' => trim($item['status']),
+                    'sort' => intval($item['sort']),
+                    'turns' => $turns,
+                    'userids' => $userids,
+                    'usertype' => trim($item['usertype']),
+                    'userlimit' => $userlimit,
+                ], [], $isInsert);
+                if ($flow) {
+                    $ids[] = $flow->id;
+                    if ($flow->id != $id) {
+                        $idc[$id] = $flow->id;
+                    }
+                    if ($flow->status == 'start') {
+                        $hasStart = true;
+                    }
+                    if ($flow->status == 'end') {
+                        $hasEnd = true;
+                    }
+                    if (!$isInsert) {
+                        $upTaskList[$flow->id] = $flow->status . "|" . $flow->name;
+                    }
+                }
+            }
+            if (!$hasStart) {
+                throw new ApiException('至少需要1个开始状态');
+            }
+            if (!$hasEnd) {
+                throw new ApiException('至少需要1个结束状态');
+            }
+            ProjectFlowItem::whereFlowId($projectFlow->id)->whereNotIn('id', $ids)->chunk(100, function($list) {
+                foreach ($list as $item) {
+                    $item->deleteFlowItem();
+                }
+            });
+            //
+            foreach ($upTaskList as $id => $value) {
+                ProjectTask::whereFlowItemId($id)->update([
+                    'flow_item_name' => $value
+                ]);
+            }
+            //
+            $projectFlow = ProjectFlow::with(['projectFlowItem'])->whereProjectId($this->id)->find($projectFlow->id);
+            $itemIds = $projectFlow->projectFlowItem->pluck('id')->toArray();
+            foreach ($projectFlow->projectFlowItem as $item) {
+                $turns = $item->turns;
+                foreach ($idc as $oid => $nid) {
+                    if (in_array($oid, $turns)) {
+                        $turns = array_diff($turns, [$oid]);
+                        $turns[] = $nid;
+                    }
+                }
+                if (!in_array($item->id, $turns)) {
+                    $turns[] = $item->id;
+                }
+                $turns = array_values(array_filter(array_unique(array_intersect($turns, $itemIds))));
+                sort($turns);
+                $item->turns = $turns;
+                ProjectFlowItem::whereId($item->id)->update([ 'turns' => Base::array2json($turns) ]);
+            }
+            return $projectFlow;
+        });
+    }
+
+    /**
+     * 获取项目信息（用于判断会员是否存在项目内）
      * @param int $project_id
-     * @param bool $ignoreArchived 排除已归档
+     * @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制
+     * @param null|bool $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制
      * @return self
      */
-    public static function userProject($project_id, $ignoreArchived = true)
+    public static function userProject($project_id, $archived = true, $mustOwner = null)
     {
-        $builder = self::select(self::projectSelect)->authData()->where('projects.id', intval($project_id));
-        if ($ignoreArchived) {
-            $builder->whereNull('projects.archived_at');
-        }
-        $project = $builder->first();
+        $project = self::authData()->where('projects.id', intval($project_id))->first();
         if (empty($project)) {
-            throw new ApiException('项目不存在或不在成员列表内');
+            throw new ApiException('项目不存在或不在成员列表内', [ 'project_id' => $project_id ], -4001);
+        }
+        if ($archived === true && $project->archived_at != null) {
+            throw new ApiException('项目已归档', [ 'project_id' => $project_id ], -4001);
+        }
+        if ($archived === false && $project->archived_at == null) {
+            throw new ApiException('项目未归档', [ 'project_id' => $project_id ]);
+        }
+        if ($mustOwner === true && !$project->owner) {
+            throw new ApiException('仅限项目负责人操作', [ 'project_id' => $project_id ]);
+        }
+        if ($mustOwner === false && $project->owner) {
+            throw new ApiException('禁止项目负责人操作', [ 'project_id' => $project_id ]);
         }
         return $project;
     }

app/Models/ProjectColumn.php

@@ -9,9 +9,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Request;
 
 /**
- * Class ProjectColumn
+ * App\Models\ProjectColumn
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property string|null $name 列表名称

app/Models/ProjectFlow.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+
+/**
+ * App\Models\ProjectFlow
+ *
+ * @property int $id
+ * @property int|null $project_id 项目ID
+ * @property string|null $name 流程名称
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ProjectFlowItem[] $projectFlowItem
+ * @property-read int|null $project_flow_item_count
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlow whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class ProjectFlow extends AbstractModel
+{
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function projectFlowItem(): \Illuminate\Database\Eloquent\Relations\HasMany
+    {
+        return $this->hasMany(ProjectFlowItem::class, 'flow_id', 'id')->orderBy('sort');
+    }
+
+    /**
+     * @return mixed
+     */
+    public function deleteFlow()
+    {
+        return AbstractModel::transaction(function() {
+            ProjectFlowItem::whereProjectId($this->project_id)->chunk(100, function($list) {
+                foreach ($list as $item) {
+                    $item->deleteFlowItem();
+                }
+            });
+            return $this->delete();
+        });
+    }
+}

app/Models/ProjectFlowItem.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Models;
+
+use App\Module\Base;
+
+/**
+ * App\Models\ProjectFlowItem
+ *
+ * @property int $id
+ * @property int|null $project_id 项目ID
+ * @property int|null $flow_id 流程ID
+ * @property string|null $name 名称
+ * @property string|null $status 状态
+ * @property array $turns 可流转
+ * @property array $userids 状态负责人ID
+ * @property string|null $usertype 流转模式
+ * @property int|null $userlimit 限制负责人
+ * @property int|null $sort 排序
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectFlow|null $projectFlow
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereFlowId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereSort($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereTurns($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUserids($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUserlimit($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectFlowItem whereUsertype($value)
+ * @mixin \Eloquent
+ */
+class ProjectFlowItem extends AbstractModel
+{
+    protected $hidden = [
+        'created_at',
+        'updated_at',
+    ];
+
+    /**
+     * @param $value
+     * @return array
+     */
+    public function getTurnsAttribute($value)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+        return Base::json2array($value);
+    }
+
+    /**
+     * @param $value
+     * @return array
+     */
+    public function getUseridsAttribute($value)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+        return Base::json2array($value);
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectFlow(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectFlow::class, 'id', 'flow_id');
+    }
+
+    /**
+     * @return bool|null
+     */
+    public function deleteFlowItem()
+    {
+        ProjectTask::whereFlowItemId($this->id)->update([
+            'flow_item_id' => 0,
+            'flow_item_name' => "",
+        ]);
+        return $this->delete();
+    }
+}

app/Models/ProjectInvite.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectInvite
+ *
+ * @property int $id
+ * @property int|null $project_id 项目ID
+ * @property int|null $num 累计邀请
+ * @property string|null $code 链接码
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read bool $already
+ * @property-read \App\Models\Project|null $project
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereNum($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectInvite whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class ProjectInvite extends AbstractModel
+{
+    protected $appends = [
+        'already',
+    ];
+
+    /**
+     * 是否已加入
+     * @return bool
+     */
+    public function getAlreadyAttribute()
+    {
+        if (!isset($this->appendattrs['already'])) {
+            $this->appendattrs['already'] = false;
+            if (User::userid()) {
+                $this->appendattrs['already']  = (bool)$this->project?->projectUser?->where('userid', User::userid())->count();
+            }
+        }
+        return $this->appendattrs['already'];
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function project(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(Project::class, 'id', 'project_id');
+    }
+}

app/Models/ProjectLog.php

@@ -2,18 +2,21 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+
 /**
- * Class ProjectLog
+ * App\Models\ProjectLog
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $column_id 列表ID
- * @property int|null $task_id 项目ID
+ * @property int|null $task_id 任务ID
  * @property int|null $userid 会员ID
  * @property string|null $detail 详细信息
+ * @property array $record 记录数据
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $projectTask
  * @property-read \App\Models\User|null $user
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery()
@@ -23,6 +26,7 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereDetail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereRecord($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereTaskId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUserid($value)
@@ -31,6 +35,18 @@ namespace App\Models;
 class ProjectLog extends AbstractModel
 {
 
+    /**
+     * @param $value
+     * @return array
+     */
+    public function getRecordAttribute($value)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+        return Base::json2array($value);
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
@@ -39,4 +55,12 @@ class ProjectLog extends AbstractModel
         return $this->hasOne(User::class, 'userid', 'userid');
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
 }

app/Models/ProjectTaskContent.php

@@ -2,10 +2,11 @@
 
 namespace App\Models;
 
+use App\Module\Base;
+
 /**
- * Class ProjectTaskContent
+ * App\Models\ProjectTaskContent
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
@@ -29,4 +30,54 @@ class ProjectTaskContent extends AbstractModel
         'created_at',
         'updated_at',
     ];
+
+    /**
+     * 获取内容详情
+     * @return array
+     */
+    public function getContentInfo()
+    {
+        $content = Base::json2array($this->content);
+        if (isset($content['url'])) {
+            $filePath = public_path($content['url']);
+            $array = $this->toArray();
+            $array['content'] = file_get_contents($filePath) ?: '';
+            if ($array['content']) {
+                $replace = Base::fillUrl('uploads/task');
+                $array['content'] = str_replace('{{RemoteURL}}uploads/task', $replace, $array['content']);
+            }
+            return $array;
+        }
+        return $this->toArray();
+    }
+
+    /**
+     * 保存任务详情至文件并返回文件路径
+     * @param $task_id
+     * @param $content
+     * @return string
+     */
+    public static function saveContent($task_id, $content)
+    {
+        $path = 'uploads/task/content/' . date("Ym") . '/' . $task_id . '/';
+        //
+        preg_match_all("/<img\s*src=\"data:image\/(png|jpg|jpeg);base64,(.*?)\"/s", $content, $matchs);
+        foreach ($matchs[2] as $key => $text) {
+            $tmpPath = $path . 'attached/';
+            Base::makeDir(public_path($tmpPath));
+            $tmpPath .= md5($text) . "." . $matchs[1][$key];
+            if (file_put_contents(public_path($tmpPath), base64_decode($text))) {
+                $content = str_replace($matchs[0][$key], '<img src="{{RemoteURL}}' . $tmpPath . '"', $content);
+            }
+        }
+        $pattern = '/<img(.*?)src=("|\')https*:\/\/(.*?)\/(uploads\/task\/content\/(.*?))\2/is';
+        $content = preg_replace($pattern, '<img$1src=$2{{RemoteURL}}$4$2', $content);
+        //
+        $filePath = $path . md5($content);
+        $publicPath = public_path($filePath);
+        Base::makeDir(dirname($publicPath));
+        file_put_contents($publicPath, $content);
+        //
+        return $filePath;
+    }
 }

app/Models/ProjectTaskFile.php

@@ -5,17 +5,16 @@ namespace App\Models;
 use App\Module\Base;
 
 /**
- * Class ProjectTaskFile
+ * App\Models\ProjectTaskFile
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
  * @property string|null $name 文件名称
  * @property int|null $size 文件大小(B)
  * @property string|null $ext 文件格式
- * @property string|null $path 文件地址
- * @property string|null $thumb 缩略图
+ * @property string $path 文件地址
+ * @property string $thumb 缩略图
  * @property int|null $userid 上传用户ID
  * @property int|null $download 下载次数
  * @property \Illuminate\Support\Carbon|null $created_at

app/Models/ProjectTaskFlowChange.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+/**
+ * App\Models\ProjectTaskFlowChange
+ *
+ * @property int $id
+ * @property int|null $task_id 任务ID
+ * @property int|null $userid 会员ID
+ * @property int|null $before_flow_item_id （变化前）工作流状态ID
+ * @property string|null $before_flow_item_name （变化前）工作流状态名称
+ * @property int|null $after_flow_item_id （变化后）工作流状态ID
+ * @property string|null $after_flow_item_name （变化后）工作流状态名称
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereAfterFlowItemName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereBeforeFlowItemName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskFlowChange whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ProjectTaskFlowChange extends AbstractModel
+{
+
+}

app/Models/ProjectTaskMailLog.php

@@ -0,0 +1,45 @@
+<?php
+
+
+namespace App\Models;
+
+
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+/**
+ * App\Models\ProjectTaskMailLog
+ *
+ * @property int $id
+ * @property int|null $userid 用户id
+ * @property int|null $task_id 任务id
+ * @property string|null $email 电子邮箱
+ * @property int|null $type 提醒类型：1第一次任务提醒，2第二次任务超期提醒
+ * @property int|null $is_send 邮件发送是否成功：0否，1是
+ * @property string|null $send_error 邮件发送错误详情
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog newQuery()
+ * @method static \Illuminate\Database\Query\Builder|ProjectTaskMailLog onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereIsSend($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereSendError($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereTaskId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskMailLog whereUserid($value)
+ * @method static \Illuminate\Database\Query\Builder|ProjectTaskMailLog withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|ProjectTaskMailLog withoutTrashed()
+ * @mixin \Eloquent
+ */
+class ProjectTaskMailLog extends AbstractModel
+{
+    use SoftDeletes;
+
+}

app/Models/ProjectTaskTag.php

@@ -3,9 +3,8 @@
 namespace App\Models;
 
 /**
- * Class ProjectTaskTag
+ * App\Models\ProjectTaskTag
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID

app/Models/ProjectTaskUser.php

@@ -3,9 +3,8 @@
 namespace App\Models;
 
 /**
- * Class ProjectTaskUser
+ * App\Models\ProjectTaskUser
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $task_id 任务ID
@@ -14,6 +13,7 @@ namespace App\Models;
  * @property int|null $owner 是否任务负责人
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\ProjectTask|null $projectTask
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskUser query()
@@ -30,4 +30,45 @@ namespace App\Models;
 class ProjectTaskUser extends AbstractModel
 {
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function projectTask(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(ProjectTask::class, 'id', 'task_id');
+    }
+
+    /**
+     * 移交任务身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereUserid($originalUserid)->chunk(100, function ($list) use ($newUserid) {
+            $tastIds = [];
+            /** @var self $item */
+            foreach ($list as $item) {
+                $row = self::whereTaskId($item->task_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->owner = max($row->owner, $item->owner);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+                if ($item->projectTask) {
+                    $item->projectTask->addLog("移交{任务}身份给", ['userid' => [$newUserid]]);
+                    if (!in_array($item->task_pid, $tastIds)) {
+                        $tastIds[] = $item->task_pid;
+                        $item->projectTask->syncDialogUser();
+                    }
+                }
+            }
+        });
+    }
 }

app/Models/ProjectUser.php

@@ -5,13 +5,13 @@ namespace App\Models;
 use App\Module\Base;
 
 /**
- * Class ProjectUser
+ * App\Models\ProjectUser
  *
- * @package App\Models
  * @property int $id
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
+ * @property string|null $top_at 置顶时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project|null $project
@@ -22,6 +22,7 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereOwner($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereProjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereTopAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectUser whereUserid($value)
  * @mixin \Eloquent
@@ -37,17 +38,54 @@ class ProjectUser extends AbstractModel
         return $this->hasOne(Project::class, 'id', 'project_id');
     }
 
+    /**
+     * 移交项目身份
+     * @param $originalUserid
+     * @param $newUserid
+     * @return void
+     */
+    public static function transfer($originalUserid, $newUserid)
+    {
+        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($newUserid) {
+            /** @var self $item */
+            foreach ($list as $item) {
+                $row = self::whereProjectId($item->project_id)->whereUserid($newUserid)->first();
+                if ($row) {
+                    // 已存在则删除原数据，判断改变已存在的数据
+                    $row->owner = max($row->owner, $item->owner);
+                    $row->save();
+                    $item->delete();
+                } else {
+                    // 不存在则改变原数据
+                    $item->userid = $newUserid;
+                    $item->save();
+                }
+                if ($item->project) {
+                    $item->project->addLog("移交项目身份给", ['userid' => $newUserid]);
+                    $item->project->syncDialogUser();
+                }
+            }
+        });
+    }
+
     /**
      * 退出项目
      */
     public function exitProject()
     {
-        $tasks = ProjectTask::whereProjectId($this->project_id)->authData($this->userid)->get();
-        foreach ($tasks as $task) {
-            if (ProjectTaskUser::whereTaskId($task->id)->whereUserid($this->userid)->delete()) {
-                $task->syncDialogUser();
-            }
-        }
+        ProjectTaskUser::whereProjectId($this->project_id)
+            ->whereUserid($this->userid)
+            ->chunk(100, function ($list) {
+                $tastIds = [];
+                /** @var ProjectTaskUser $item */
+                foreach ($list as $item) {
+                    $item->delete();
+                    if (!in_array($item->task_pid, $tastIds)) {
+                        $tastIds[] = $item->task_pid;
+                        $item->projectTask?->syncDialogUser();
+                    }
+                }
+            });
         $this->delete();
     }
 }

app/Models/Report.php

@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use Carbon\Carbon;
+use Carbon\Traits\Creator;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use JetBrains\PhpStorm\Pure;
+
+/**
+ * App\Models\Report
+ *
+ * @property int $id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string $title 标题
+ * @property string $type 汇报类型
+ * @property int $userid
+ * @property string $content
+ * @property string $sign 汇报唯一标识
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ReportReceive[] $Receives
+ * @property-read int|null $receives_count
+ * @property-read mixed $receives
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\User[] $receivesUser
+ * @property-read int|null $receives_user_count
+ * @property-read \App\Models\User|null $sendUser
+ * @method static Builder|Report newModelQuery()
+ * @method static Builder|Report newQuery()
+ * @method static Builder|Report query()
+ * @method static Builder|Report whereContent($value)
+ * @method static Builder|Report whereCreatedAt($value)
+ * @method static Builder|Report whereId($value)
+ * @method static Builder|Report whereSign($value)
+ * @method static Builder|Report whereTitle($value)
+ * @method static Builder|Report whereType($value)
+ * @method static Builder|Report whereUpdatedAt($value)
+ * @method static Builder|Report whereUserid($value)
+ * @mixin \Eloquent
+ */
+class Report extends AbstractModel
+{
+    use HasFactory;
+
+    const WEEKLY = "weekly";
+    const DAILY = "daily";
+
+    protected $fillable = [
+        "title",
+        "type",
+        "userid",
+        "content",
+    ];
+
+    protected $appends = [
+        'receives',
+    ];
+
+    public function Receives(): HasMany
+    {
+        return $this->hasMany(ReportReceive::class, "rid");
+    }
+
+    public function receivesUser(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, ReportReceive::class, "rid", "userid")
+            ->withPivot("receive_time", "read");
+    }
+
+    public function sendUser()
+    {
+        return $this->hasOne(User::class, "userid", "userid");
+    }
+
+    public function getTypeAttribute($value): string
+    {
+        return match ($value) {
+            Report::WEEKLY => "周报",
+            Report::DAILY => "日报",
+            default => "",
+        };
+    }
+
+    public function getContentAttribute($value): string
+    {
+        return htmlspecialchars_decode($value);
+    }
+
+    public function getReceivesAttribute()
+    {
+        if (!isset($this->appendattrs['receives'])) {
+            $this->appendattrs['receives'] = empty( $this->receivesUser ) ? [] : array_column($this->receivesUser->toArray(), "userid");
+        }
+        return $this->appendattrs['receives'];
+    }
+
+    /**
+     * 获取单条记录
+     * @param $id
+     * @return Report|Builder|Model|object|null
+     * @throw ApiException
+     */
+    public static function getOne($id)
+    {
+        $one = self::whereId($id)->first();
+        if (empty($one))
+            throw new ApiException("记录不存在");
+        return $one;
+    }
+
+    /**
+     * 获取最后一条提交记录
+     * @param User|null $user
+     * @return Builder|Model|\Illuminate\Database\Query\Builder|object
+     */
+    public static function getLastOne(User $user = null)
+    {
+        $user === null && $user = User::auth();
+        $one = self::whereUserid($user->userid)->orderByDesc("created_at")->first();
+        if ( empty($one) )
+            throw new ApiException("记录不存在");
+        return $one;
+    }
+
+    /**
+     * 生成唯一标识
+     * @param $type
+     * @param $offset
+     * @param Carbon|null $time
+     * @return string
+     */
+    public static function generateSign($type, $offset, Carbon $time = null): string
+    {
+        $user = User::auth();
+        $now_dt = $time === null ? Carbon::now() : $time;
+        $time_s = match ($type) {
+            Report::WEEKLY => function() use ($now_dt, $offset) {
+                // 如果设置了周期偏移量
+                empty( $offset ) || $now_dt->subWeeks( abs( $offset ) );
+                $now_dt->startOfWeek(); // 设置为当周第一天
+                return $now_dt->year . $now_dt->weekOfYear;
+            },
+            Report::DAILY => function() use ($now_dt, $offset) {
+                // 如果设置了周期偏移量
+                empty( $offset ) || $now_dt->subDays( abs( $offset ) );
+                return $now_dt->format("Ymd");
+            },
+            default => "",
+        };
+        return $user->userid . ( is_callable($time_s) ? $time_s() : "" );
+    }
+}

app/Models/ReportReceive.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\Models\ReportReceive
+ *
+ * @property int $id
+ * @property int $rid
+ * @property string|null $receive_time 接收时间
+ * @property int $userid 接收人
+ * @property int $read 是否已读
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRead($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereReceiveTime($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereRid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ReportReceive whereUserid($value)
+ * @mixin \Eloquent
+ */
+class ReportReceive extends AbstractModel
+{
+    use HasFactory;
+
+    // 关闭时间戳自动写入
+    public $timestamps = false;
+
+    protected $fillable = [
+        "rid",
+        "receive_time",
+        "userid",
+        "read",
+    ];
+}

app/Models/Setting.php

@@ -3,9 +3,8 @@
 namespace App\Models;
 
 /**
- * Class Setting
+ * App\Models\Setting
  *
- * @package App\Models
  * @property int $id
  * @property string|null $name
  * @property string|null $desc 参数描述、备注

app/Models/Tmp.php

@@ -3,9 +3,8 @@
 namespace App\Models;
 
 /**
- * Class Tmp
+ * App\Models\Tmp
  *
- * @package App\Models
  * @property int $id
  * @property string|null $name
  * @property string|null $value

app/Models/User.php

@@ -9,9 +9,8 @@ use Cache;
 use Carbon\Carbon;
 
 /**
- * Class User
+ * App\Models\User
  *
- * @package App\Models
  * @property int $userid
  * @property array $identity 身份
  * @property string|null $az A-Z
@@ -29,8 +28,11 @@ use Carbon\Carbon;
  * @property string|null $line_at 最后在线时间（接口）
  * @property int|null $task_dialog_id 最后打开的任务会话ID
  * @property string|null $created_ip 注册IP
+ * @property string|null $disable_at 禁用时间（离职时间）
+ * @property int|null $email_verity 邮箱是否已验证
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Database\Factories\UserFactory factory(...$parameters)
  * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User query()
@@ -38,7 +40,9 @@ use Carbon\Carbon;
  * @method static \Illuminate\Database\Eloquent\Builder|User whereChangepass($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedIp($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereDisableAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerity($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereEncrypt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereIdentity($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereLastAt($value)
@@ -145,6 +149,34 @@ class User extends AbstractModel
         }
     }
 
+    /**
+     * 检查环境是否允许
+     * @param null $onlyUserid  仅指定会员
+     */
+    public function checkSystem($onlyUserid = null)
+    {
+        if ($onlyUserid && $onlyUserid != $this->userid) {
+            return;
+        }
+        if (env("PASSWORD_ADMIN") == 'disabled') {
+            if ($this->userid == 1) {
+                throw new ApiException('当前环境禁止此操作');
+            }
+        }
+        if (env("PASSWORD_OWNER") == 'disabled') {
+            throw new ApiException('当前环境禁止此操作');
+        }
+    }
+
+    /**
+     * 删除会员
+     * @return bool|null
+     */
+    public function deleteUser()
+    {
+        UserEmailVerification::whereEmail($this->email)->delete();
+        return $this->delete();
+    }
 
     /** ***************************************************************************************** */
     /** ***************************************************************************************** */
@@ -160,18 +192,20 @@ class User extends AbstractModel
     public static function reg($email, $password, $other = [])
     {
         //邮箱
-        if (!Base::isMail($email)) {
+        if (!Base::isEmail($email)) {
             throw new ApiException('请输入正确的邮箱地址');
         }
         if (User::email2userid($email) > 0) {
+            $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
+            $user = self::whereUserid(User::email2userid($email))->first();
+            if ($isRegVerify && $user->email_verity === 0) {
+                UserEmailVerification::userEmailSend($user);
+                throw new ApiException('您的帐号已注册过，请验证邮箱', ['code' => 'email']);
+            }
             throw new ApiException('邮箱地址已存在');
         }
         //密码
-        if (strlen($password) < 6) {
-            throw new ApiException('密码设置不能小于6位数');
-        } elseif (strlen($password) > 32) {
-            throw new ApiException('密码最多只能设置32位数');
-        }
+        self::passwordPolicy($password);
         //开始注册
         $encrypt = Base::generatePassword(6);
         $inArray = [
@@ -441,4 +475,35 @@ class User extends AbstractModel
                 }
         }
     }
+
+    /**
+     * 检测密码策略是否符合
+     * @param $password
+     * @return void
+     */
+    public static function passwordPolicy($password)
+    {
+        if (strlen($password) < 6) {
+            throw new ApiException('密码设置不能小于6位数');
+        }
+        if (strlen($password) > 32) {
+            throw new ApiException('密码最多只能设置32位数');
+        }
+        // 复杂密码
+        $password_policy = Base::settingFind('system', 'password_policy');
+        if ($password_policy == 'complex') {
+            if (preg_match("/^[0-9]+$/", $password)) {
+                throw new ApiException('密码不能全是数字，请包含数字，字母大小写或者特殊字符');
+            }
+            if (preg_match("/^[a-zA-Z]+$/", $password)) {
+                throw new ApiException('密码不能全是字母，请包含数字，字母大小写或者特殊字符');
+            }
+            if (preg_match("/^[0-9A-Z]+$/", $password)) {
+                throw new ApiException('密码不能全是数字+大写字母，密码包含数字，字母大小写或者特殊字符');
+            }
+            if (preg_match("/^[0-9a-z]+$/", $password)) {
+                throw new ApiException('密码不能全是数字+小写字母，密码包含数字，字母大小写或者特殊字符');
+            }
+        }
+    }
 }

app/Models/UserEmailVerification.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+use Carbon\Carbon;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
+
+/**
+ * App\Models\UserEmailVerification
+ *
+ * @property int $id
+ * @property int|null $userid 用户id
+ * @property string|null $code 验证参数
+ * @property string|null $email 电子邮箱
+ * @property int|null $status 0-未验证，1-已验证
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification query()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUserid($value)
+ * @mixin \Eloquent
+ */
+class UserEmailVerification extends AbstractModel
+{
+
+    /**
+     * 发验证邮箱
+     * @param User $user
+     */
+    public static function userEmailSend(User $user)
+    {
+        $res = self::whereUserid($user->userid)->where('created_at', '>', Carbon::now()->subMinutes(30))->first();
+        if ($res) return;
+        //删除
+        self::whereUserid($user->userid)->delete();
+        $userEmailVerification = self::createInstance([
+            'userid' => $user->userid,
+            'email' => $user->email,
+            'code' => Base::generatePassword(64),
+            'status' => 0,
+        ]);
+        $userEmailVerification->save();
+
+        $setting = Base::setting('emailSetting');
+        $url = Base::fillUrl('single/valid/email') . '?code=' . $userEmailVerification->code;
+        try {
+            if (!Base::isEmail($user->email)) {
+                throw new \Exception("User email '{$user->email}' address error");
+            }
+            $subject = env('APP_NAME') . " 绑定邮箱验证";
+            $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
+            Factory::mailer()
+                ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
+                ->setMessage(EmailMessage::create()
+                    ->from(env('APP_NAME', 'Task') . " <{$setting['account']}>")
+                    ->to($user->email)
+                    ->subject($subject)
+                    ->html($content))
+                ->send();
+        } catch (\Exception $e) {
+            if (str_contains($e->getMessage(), "Timed Out")) {
+                throw new ApiException("language.TimedOut");
+            } elseif ($e->getCode() === 550) {
+                throw new ApiException('邮件内容被拒绝，请检查邮箱是否开启接收功能');
+            } else {
+                throw new ApiException($e->getMessage());
+            }
+        }
+    }
+}

app/Models/UserTransfer.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Models;
+
+use App\Exceptions\ApiException;
+use App\Module\Base;
+use Carbon\Carbon;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
+
+/**
+ * App\Models\UserTransfer
+ *
+ * @property int $id
+ * @property int|null $original_userid 原作者
+ * @property int|null $new_userid 交接人
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer query()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereNewUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereOriginalUserid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserTransfer whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class UserTransfer extends AbstractModel
+{
+
+    /**
+     * 开始移交
+     * @return void
+     */
+    public function start()
+    {
+        // 移交项目身份
+        ProjectUser::transfer($this->original_userid, $this->new_userid);
+        // 移交任务身份
+        ProjectTaskUser::transfer($this->original_userid, $this->new_userid);
+        // 移交文件
+        File::transfer($this->original_userid, $this->new_userid);
+    }
+}

app/Models/WebSocket.php

@@ -4,14 +4,13 @@ namespace App\Models;
 
 
 /**
- * Class WebSocket
+ * App\Models\WebSocket
  *
- * @package App\Models
  * @property int $id
  * @property string $key
  * @property string|null $fd
- * @property int|null $userid
  * @property string|null $path
+ * @property int|null $userid
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocket newModelQuery()

app/Models/WebSocketDialog.php

@@ -3,18 +3,20 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
+use App\Tasks\PushTask;
 use Carbon\Carbon;
+use Hhxsv5\LaravelS\Swoole\Task\Task;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class WebSocketDialog
+ * App\Models\WebSocketDialog
  *
- * @package App\Models
  * @property int $id
  * @property string|null $type 对话类型
  * @property string|null $group_type 聊天室类型
  * @property string|null $name 对话名称
  * @property string|null $last_at 最后消息时间
+ * @property int|null $owner_id 群主用户ID
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
@@ -30,6 +32,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereLastAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereOwnerId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereUpdatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|WebSocketDialog withTrashed()
@@ -48,6 +51,93 @@ class WebSocketDialog extends AbstractModel
         return $this->hasMany(WebSocketDialogUser::class, 'dialog_id', 'id');
     }
 
+    /**
+     * 格式化对话
+     * @param int $userid   会员ID
+     * @return $this
+     */
+    public function formatData($userid)
+    {
+        // 最后消息
+        $last_msg = WebSocketDialogMsg::whereDialogId($this->id)->orderByDesc('id')->first();
+        $this->last_msg = $last_msg;
+        // 未读信息
+        $unreadBuilder = WebSocketDialogMsgRead::whereDialogId($this->id)->whereUserid($userid)->whereReadAt(null);
+        $this->unread = $unreadBuilder->count();
+        $this->mention = $unreadBuilder->whereMention(1)->count();
+        $this->mark_unread = $this->mark_unread ?? WebSocketDialogUser::whereDialogId($this->id)->whereUserid($userid)->value('mark_unread');
+        // 对话人数
+        $builder = WebSocketDialogUser::whereDialogId($this->id);
+        $this->people = $builder->count();
+        // 对方信息
+        $this->dialog_user = null;
+        $this->group_info = null;
+        $this->top_at = $this->top_at ?? WebSocketDialogUser::whereDialogId($this->id)->whereUserid($userid)->value('top_at');
+        switch ($this->type) {
+            case "user":
+                $dialog_user = $builder->where('userid', '!=', $userid)->first();
+                $this->name = User::userid2nickname($dialog_user->userid);
+                $this->dialog_user = $dialog_user;
+                break;
+            case "group":
+                if ($this->group_type === 'project') {
+                    $this->group_info = Project::withTrashed()->select(['id', 'name', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
+                    $this->name = $this->group_info ? $this->group_info->name : '';
+                } elseif ($this->group_type === 'task') {
+                    $this->group_info = ProjectTask::withTrashed()->select(['id', 'name', 'complete_at', 'archived_at', 'deleted_at'])->whereDialogId($this->id)->first()?->cancelAppend()->cancelHidden();
+                    $this->name = $this->group_info ? $this->group_info->name : '';
+                }
+                break;
+        }
+        return $this;
+    }
+
+    /**
+     * 加入聊天室
+     * @param int|array $userid     加入的会员ID或会员ID组
+     * @return bool
+     */
+    public function joinGroup($userid)
+    {
+        AbstractModel::transaction(function () use ($userid) {
+            foreach (is_array($userid) ? $userid : [$userid] as $value) {
+                if ($value > 0) {
+                    WebSocketDialogUser::updateInsert([
+                        'dialog_id' => $this->id,
+                        'userid' => $value,
+                    ]);
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * 退出聊天室
+     * @param int|array $userid     加入的会员ID或会员ID组
+     * @return bool
+     */
+    public function exitGroup($userid)
+    {
+        $builder = WebSocketDialogUser::whereDialogId($this->id);
+        if (is_array($userid)) {
+            $builder->whereIn('userid', $userid);
+        } else {
+            $builder->whereUserid($userid);
+        }
+        $builder->chunkById(100, function($list) {
+            /** @var WebSocketDialogUser $item */
+            foreach ($list as $item) {
+                if ($item->userid == $this->owner_id) {
+                    // 群主不可退出
+                    continue;
+                }
+                $item->delete();
+            }
+        });
+        return true;
+    }
+
     /**
      * 删除会话
      * @return bool
@@ -55,27 +145,87 @@ class WebSocketDialog extends AbstractModel
     public function deleteDialog()
     {
         AbstractModel::transaction(function () {
-            WebSocketDialogMsgRead::whereDialogId($this->id)->whereNull('read_at')->update([
-                'read_at' => Carbon::now()
-            ]);
+            WebSocketDialogMsgRead::whereDialogId($this->id)
+                ->whereNull('read_at')
+                ->chunkById(100, function ($list) {
+                    WebSocketDialogMsgRead::onlyMarkRead($list);
+                });
             $this->delete();
         });
         return true;
     }
 
+    /**
+     * 还原会话
+     * @return bool
+     */
+    public function recoveryDialog()
+    {
+        $this->restore();
+        return true;
+    }
+
+    /**
+     * 检查群组类型
+     * @return void
+     */
+    public function checkGroup($groupType = 'user')
+    {
+        if ($this->type !== 'group') {
+            throw new ApiException('仅限群组操作');
+        }
+        if ($this->group_type !== $groupType) {
+            throw new ApiException('操作的群组类型错误');
+        }
+    }
+
+    /**
+     * 推送消息
+     * @param $action
+     * @param array $data           发送内容，默认为[id=>项目ID]
+     * @param array $userid         指定会员，默认为群组所有成员
+     * @return void
+     */
+    public function pushMsg($action, $data = null, $userid = null)
+    {
+        if ($data === null) {
+            $data = ['id' => $this->id];
+        }
+        //
+        if ($userid === null) {
+            $userid = $this->dialogUser->pluck('userid')->toArray();
+        }
+        //
+        $params = [
+            'userid' => $userid,
+            'msg' => [
+                'type' => 'dialog',
+                'mode' => $action,
+                'data' => $data,
+            ]
+        ];
+        $task = new PushTask($params, false);
+        Task::deliver($task);
+    }
+
     /**
      * 获取对话（同时检验对话身份）
-     * @param $id
+     * @param $dialog_id
+     * @param bool $checkOwner 是否校验群组身份
      * @return self
      */
-    public static function checkDialog($id)
+    public static function checkDialog($dialog_id, $checkOwner = false)
     {
-        $dialog = WebSocketDialog::whereId($id)->first();
+        $dialog = WebSocketDialog::find($dialog_id);
         if (empty($dialog)) {
-            throw new ApiException('对话不存在或已被删除');
+            throw new ApiException('对话不存在或已被删除', ['dialog_id' => $dialog_id], -4003);
         }
         //
         $userid = User::userid();
+        if ($checkOwner === true && $dialog->owner_id != $userid) {
+            throw new ApiException('仅限群主操作');
+        }
+        //
         if ($dialog->type === 'group' && $dialog->group_type === 'task') {
             // 任务群对话校验是否在项目内
             $project_id = intval(ProjectTask::whereDialogId($dialog->id)->value('project_id'));
@@ -86,48 +236,7 @@ class WebSocketDialog extends AbstractModel
             }
         }
         if (!WebSocketDialogUser::whereDialogId($dialog->id)->whereUserid($userid)->exists()) {
-            throw new ApiException('不在成员列表内');
-        }
-        return $dialog;
-    }
-
-    /**
-     * 格式化对话
-     * @param WebSocketDialog $dialog
-     * @param int $userid   会员ID
-     * @return self|null
-     */
-    public static function formatData(WebSocketDialog $dialog, $userid)
-    {
-        if (empty($dialog)) {
-            return null;
-        }
-        // 最后消息
-        $last_msg = WebSocketDialogMsg::whereDialogId($dialog->id)->orderByDesc('id')->first();
-        $dialog->last_msg = $last_msg;
-        // 未读信息
-        $dialog->unread = WebSocketDialogMsgRead::whereDialogId($dialog->id)->whereUserid($userid)->whereReadAt(null)->count();
-        // 对话人数
-        $builder = WebSocketDialogUser::whereDialogId($dialog->id);
-        $dialog->people = $builder->count();
-        // 对方信息
-        $dialog->dialog_user = null;
-        $dialog->group_info = null;
-        switch ($dialog->type) {
-            case "user":
-                $dialog_user = $builder->where('userid', '!=', $userid)->first();
-                $dialog->name = User::userid2nickname($dialog_user->userid);
-                $dialog->dialog_user = $dialog_user;
-                break;
-            case "group":
-                if ($dialog->group_type === 'project') {
-                    $dialog->group_info = Project::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
-                    $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
-                } elseif ($dialog->group_type === 'task') {
-                    $dialog->group_info = ProjectTask::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
-                    $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
-                }
-                break;
+            throw new ApiException('不在成员列表内', ['dialog_id' => $dialog_id], -4003);
         }
         return $dialog;
     }
@@ -135,17 +244,20 @@ class WebSocketDialog extends AbstractModel
     /**
      * 创建聊天室
      * @param string $name          聊天室名称
-     * @param int|array $userid     加入的会员ID或会员ID组
+     * @param int|array $userid     加入的会员ID(组)
      * @param string $group_type    聊天室类型
+     * @param int $owner_id         群主会员ID
      * @return self|null
      */
-    public static function createGroup($name, $userid, $group_type = '')
+    public static function createGroup($name, $userid, $group_type = '', $owner_id = 0)
     {
-        return AbstractModel::transaction(function () use ($userid, $group_type, $name) {
+        return AbstractModel::transaction(function () use ($owner_id, $userid, $group_type, $name) {
             $dialog = self::createInstance([
                 'type' => 'group',
                 'name' => $name ?: '',
                 'group_type' => $group_type,
+                'owner_id' => $owner_id,
+                'last_at' => $group_type === 'user' ? Carbon::now() : null,
             ]);
             $dialog->save();
             foreach (is_array($userid) ? $userid : [$userid] as $value) {
@@ -160,47 +272,6 @@ class WebSocketDialog extends AbstractModel
         });
     }
 
-    /**
-     * 加入聊天室
-     * @param int $dialog_id        会话ID（即 聊天室ID）
-     * @param int|array $userid     加入的会员ID或会员ID组
-     * @return bool
-     */
-    public static function joinGroup($dialog_id, $userid)
-    {
-        $dialog = self::whereId($dialog_id)->whereType('group')->first();
-        if (empty($dialog)) {
-            return false;
-        }
-        AbstractModel::transaction(function () use ($dialog, $userid) {
-            foreach (is_array($userid) ? $userid : [$userid] as $value) {
-                if ($value > 0) {
-                    WebSocketDialogUser::createInstance([
-                        'dialog_id' => $dialog->id,
-                        'userid' => $value,
-                    ])->save();
-                }
-            }
-        });
-        return true;
-    }
-
-    /**
-     * 退出聊天室
-     * @param int $dialog_id        会话ID（即 聊天室ID）
-     * @param int|array $userid     加入的会员ID或会员ID组
-     * @return bool
-     */
-    public static function exitGroup($dialog_id, $userid)
-    {
-        if (is_array($userid)) {
-            WebSocketDialogUser::whereDialogId($dialog_id)->whereIn('userid', $userid)->delete();
-        } else {
-            WebSocketDialogUser::whereDialogId($dialog_id)->whereUserid($userid)->delete();
-        }
-        return true;
-    }
-
     /**
      * 获取会员对话（没有自动创建）
      * @param int $userid   会员ID
@@ -210,12 +281,14 @@ class WebSocketDialog extends AbstractModel
     public static function checkUserDialog($userid, $userid2)
     {
         $dialogUser = self::select(['web_socket_dialogs.*'])
-            ->join('web_socket_dialog_users', 'web_socket_dialog_users.dialog_id', '=', 'web_socket_dialogs.id')
+            ->join('web_socket_dialog_users as u1', 'web_socket_dialogs.id', '=', 'u1.dialog_id')
+            ->join('web_socket_dialog_users as u2', 'web_socket_dialogs.id', '=', 'u2.dialog_id')
+            ->where('u1.userid', $userid)
+            ->where('u2.userid', $userid2)
             ->where('web_socket_dialogs.type', 'user')
-            ->whereIn('web_socket_dialog_users.userid', [$userid, $userid2])
-            ->get();
-        if ($dialogUser->count() >= 2) {
-            return $dialogUser[0];
+            ->first();
+        if ($dialogUser) {
+            return $dialogUser;
         }
         return AbstractModel::transaction(function () use ($userid2, $userid) {
             $dialog = self::createInstance([

app/Models/WebSocketDialogMsg.php

@@ -8,11 +8,11 @@ use App\Tasks\PushTask;
 use App\Tasks\WebSocketDialogMsgTask;
 use Carbon\Carbon;
 use Hhxsv5\LaravelS\Swoole\Task\Task;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class WebSocketDialogMsg
+ * App\Models\WebSocketDialogMsg
  *
- * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 发送会员ID
@@ -22,11 +22,15 @@ use Hhxsv5\LaravelS\Swoole\Task\Task;
  * @property int|null $send 发送数量
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int|mixed $percentage
+ * @property-read \App\Models\WebSocketDialog|null $webSocketDialog
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg newQuery()
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialogMsg onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg query()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereMsg($value)
@@ -35,10 +39,14 @@ use Hhxsv5\LaravelS\Swoole\Task\Task;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsg whereUserid($value)
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialogMsg withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialogMsg withoutTrashed()
  * @mixin \Eloquent
  */
 class WebSocketDialogMsg extends AbstractModel
 {
+    use SoftDeletes;
+
     protected $appends = [
         'percentage',
     ];
@@ -47,6 +55,14 @@ class WebSocketDialogMsg extends AbstractModel
         'updated_at',
     ];
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialog(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(WebSocketDialog::class, 'id', 'dialog_id');
+    }
+
     /**
      * 阅读占比
      * @return int|mixed
@@ -54,11 +70,7 @@ class WebSocketDialogMsg extends AbstractModel
     public function getPercentageAttribute()
     {
         if (!isset($this->appendattrs['percentage'])) {
-            if ($this->read > $this->send || empty($this->send)) {
-                $this->appendattrs['percentage'] = 100;
-            } else {
-                $this->appendattrs['percentage'] = intval($this->read / $this->send * 100);
-            }
+            $this->generatePercentage();
         }
         return $this->appendattrs['percentage'];
     }
@@ -82,6 +94,22 @@ class WebSocketDialogMsg extends AbstractModel
         return $value;
     }
 
+    /**
+     * 获取占比
+     * @param bool|int $increment 是否新增阅读数
+     * @return int
+     */
+    public function generatePercentage($increment = false) {
+        if ($increment) {
+            $this->increment('read', is_bool($increment) ? 1 : $increment);
+        }
+        if ($this->read > $this->send || empty($this->send)) {
+            return $this->appendattrs['percentage'] = 100;
+        } else {
+            return $this->appendattrs['percentage'] = intval($this->read / $this->send * 100);
+        }
+    }
+
     /**
      * 标记已送达 同时 告诉发送人已送达
      * @param $userid
@@ -111,13 +139,17 @@ class WebSocketDialogMsg extends AbstractModel
             if (!$msgRead->read_at) {
                 $msgRead->read_at = Carbon::now();
                 $msgRead->save();
-                $this->increment('read');
+                $this->generatePercentage(true);
                 PushTask::push([
                     'userid' => $this->userid,
                     'msg' => [
                         'type' => 'dialog',
-                        'mode' => 'update',
-                        'data' => $this->toArray(),
+                        'mode' => 'readed',
+                        'data' => [
+                            'id' => $this->id,
+                            'read' => $this->read,
+                            'percentage' => $this->percentage,
+                        ],
                     ]
                 ]);
             }
@@ -125,6 +157,93 @@ class WebSocketDialogMsg extends AbstractModel
         return true;
     }
 
+    /**
+     * 删除消息
+     * @return void
+     */
+    public function deleteMsg()
+    {
+        $send_dt = Carbon::parse($this->created_at)->addDay();
+        if ($send_dt->lt(Carbon::now())) {
+            throw new ApiException('已超过24小时，此消息不能撤回');
+        }
+        AbstractModel::transaction(function() {
+            $deleteRead = WebSocketDialogMsgRead::whereMsgId($this->id)->whereNull('read_at')->delete();    // 未阅读记录不需要软删除，直接删除即可
+            $this->delete();
+            //
+            $last_msg = null;
+            if ($this->webSocketDialog) {
+                $last_msg = WebSocketDialogMsg::whereDialogId($this->dialog_id)->orderByDesc('id')->first();
+                $this->webSocketDialog->last_at = $last_msg->created_at;
+                $this->webSocketDialog->save();
+            }
+            //
+            $dialog = WebSocketDialog::find($this->dialog_id);
+            if ($dialog) {
+                $userids = $dialog->dialogUser->pluck('userid')->toArray();
+                PushTask::push([
+                    'userid' => $userids,
+                    'msg' => [
+                        'type' => 'dialog',
+                        'mode' => 'delete',
+                        'data' => [
+                            'id' => $this->id,
+                            'dialog_id' => $this->dialog_id,
+                            'last_msg' => $last_msg,
+                            'update_read' => $deleteRead ? 1 : 0
+                        ],
+                    ]
+                ]);
+            }
+        });
+    }
+
+    /**
+     * 处理文本消息内容，用于发送前
+     * @param $text
+     * @param $dialog_id
+     * @return mixed|string|string[]
+     */
+    public static function formatMsg($text, $dialog_id)
+    {
+        // 图片 [:IMAGE:className:width:height:src:alt:]
+        preg_match_all("/<img\s*src=\"data:image\/(png|jpg|jpeg);base64,(.*?)\"(.*?)>(<\/img>)*/s", $text, $matchs);
+        foreach ($matchs[2] as $key => $base64) {
+            $tmpPath = "uploads/chat/" . date("Ym") . "/" . $dialog_id . "/";
+            Base::makeDir(public_path($tmpPath));
+            $tmpPath .= md5s($base64) . "." . $matchs[1][$key];
+            if (file_put_contents(public_path($tmpPath), base64_decode($base64))) {
+                $imagesize = getimagesize(public_path($tmpPath));
+                $text = str_replace($matchs[0][$key], "[:IMAGE:browse:{$imagesize[0]}:{$imagesize[1]}:{$tmpPath}::]", $text);
+            }
+        }
+        // 表情图片
+        preg_match_all("/<img class=\"emoticon\"(.*?)>/s", $text, $matchs);
+        foreach ($matchs[1] as $key => $str) {
+            preg_match("/data-asset=\"(.*?)\"/", $str, $matchAsset);
+            preg_match("/data-name=\"(.*?)\"/", $str, $matchName);
+            if (file_exists(public_path($matchAsset[1]))) {
+                $imagesize = getimagesize(public_path($matchAsset[1]));
+                $text = str_replace($matchs[0][$key], "[:IMAGE:emoticon:{$imagesize[0]}:{$imagesize[1]}:{$matchAsset[1]}:{$matchName[1]}:]", $text);
+            }
+        }
+        // @成员、#任务
+        preg_match_all("/<span class=\"mention\"(.*?)>.*?<\/span>.*?<\/span>.*?<\/span>/s", $text, $matchs);
+        foreach ($matchs[1] as $key => $str) {
+            preg_match("/data-denotation-char=\"(.*?)\"/", $str, $matchChar);
+            preg_match("/data-id=\"(.*?)\"/", $str, $matchId);
+            preg_match("/data-value=\"(.*?)\"/", $str, $matchValye);
+            $text = str_replace($matchs[0][$key], "[:{$matchChar[1]}:{$matchId[1]}:{$matchValye[1]}:]", $text);
+        }
+        // 过滤标签
+        $text = strip_tags($text, '<blockquote> <strong> <pre> <ol> <ul> <li> <em> <p> <s> <u>');
+        $text = preg_replace("/\<(blockquote|strong|pre|ol|ul|li|em|p|s|u).*?\>/i", "<$1>", $text);
+        $text = preg_replace("/\[:IMAGE:(.*?):(.*?):(.*?):(.*?):(.*?):\]/i", "<img class=\"$1\" width=\"$2\" height=\"$3\" src=\"{{RemoteURL}}$4\" alt=\"$5\"/>", $text);
+        $text = preg_replace("/\[:@:(.*?):(.*?):\]/i", "<span class=\"mention user\" data-id=\"$1\">@$2</span>", $text);
+        $text = preg_replace("/\[:#:(.*?):(.*?):\]/i", "<span class=\"mention task\" data-id=\"$1\">#$2</span>", $text);
+        return preg_replace("/^(<p><\/p>)+|(<p><\/p>)+$/i", "", $text);
+    }
+
     /**
      * 发送消息
      * @param int $dialog_id    会话ID（即 聊天室ID）

app/Models/WebSocketDialogMsgRead.php

@@ -2,22 +2,26 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
+
 /**
- * Class WebSocketDialogMsgRead
+ * App\Models\WebSocketDialogMsgRead
  *
- * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
  * @property int|null $userid 发送会员ID
+ * @property int|null $mention 是否提及（被@）
  * @property int|null $after 在阅读之后才添加的记录
  * @property string|null $read_at 阅读时间
+ * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead query()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereAfter($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMention($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereMsgId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereReadAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogMsgRead whereUserid($value)
@@ -30,4 +34,38 @@ class WebSocketDialogMsgRead extends AbstractModel
         parent::__construct($attributes);
         $this->timestamps = false;
     }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function webSocketDialogMsg(): \Illuminate\Database\Eloquent\Relations\HasOne
+    {
+        return $this->hasOne(WebSocketDialogMsg::class, 'id', 'msg_id');
+    }
+
+    /**
+     * 仅标记成阅读
+     * @param $list
+     * @return void
+     */
+    public static function onlyMarkRead($list)
+    {
+        $dialogMsg = [];
+        /** @var WebSocketDialogMsgRead $item */
+        foreach ($list as $item) {
+            $item->read_at = Carbon::now();
+            $item->save();
+            if (isset($dialogMsg[$item->msg_id])) {
+                $dialogMsg[$item->msg_id]['readNum']++;
+            } else {
+                $dialogMsg[$item->msg_id] = [
+                    'dialogMsg' => $item->webSocketDialogMsg,
+                    'readNum' => 1
+                ];
+            }
+        }
+        foreach ($dialogMsg as $item) {
+            $item['dialogMsg']?->generatePercentage($item['readNum']);
+        }
+    }
 }

app/Models/WebSocketDialogUser.php

@@ -3,12 +3,13 @@
 namespace App\Models;
 
 /**
- * Class WebSocketDialogUser
+ * App\Models\WebSocketDialogUser
  *
- * @package App\Models
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
+ * @property string|null $top_at 置顶时间
+ * @property int|null $mark_unread 是否标记为未读：0否，1是
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser newModelQuery()
@@ -17,6 +18,8 @@ namespace App\Models;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereDialogId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereMarkUnread($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereTopAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialogUser whereUserid($value)
  * @mixin \Eloquent

app/Models/WebSocketTmpMsg.php

@@ -3,9 +3,8 @@
 namespace App\Models;
 
 /**
- * Class WebSocketTmpMsg
+ * App\Models\WebSocketTmpMsg
  *
- * @package App\Models
  * @property int $id
  * @property string|null $md5 MD5(会员ID-消息)
  * @property string|null $msg 详细消息

app/Module/Base.php

@@ -2,6 +2,7 @@
 
 namespace App\Module;
 
+use App\Exceptions\ApiException;
 use App\Models\Setting;
 use App\Models\Tmp;
 use Cache;
@@ -11,6 +12,7 @@ use Illuminate\Support\Facades\Config;
 use Redirect;
 use Request;
 use Storage;
+use Validator;
 
 class Base
 {
@@ -58,20 +60,55 @@ class Base
         ])->save();
     }
 
+    /**
+     * 获取package配置文件
+     * @return array
+     */
+    public static function getPackage()
+    {
+        return Cache::remember("Base::package", now()->addSeconds(10), function () {
+            $file = base_path('package.json');
+            if (file_exists($file)) {
+                $package = json_decode(file_get_contents($file), true);
+                return is_array($package) ? $package : [];
+            }
+            return [];
+        });
+    }
+
     /**
      * 获取版本号
      * @return string
      */
     public static function getVersion()
     {
-        return Cache::remember("Base::version", now()->addSeconds(10), function () {
-            $file = base_path('package.json');
-            if (file_exists($file)) {
-                $packageArray = json_decode(file_get_contents($file), true);
-                return $packageArray['version'] ?? '1.0.0';
-            }
-            return '1.0.0';
-        });
+        $package = self::getPackage();
+        return $package['version'] ?? '1.0.0';
+    }
+
+    /**
+     * 获取客户端版本号
+     * @return string
+     */
+    public static function getClientVersion()
+    {
+        global $_A;
+        if (!isset($_A["__static_client_version"])) {
+            $_A["__static_client_version"] = Request::header('version') ?: '0.0.1';
+        }
+        return $_A["__static_client_version"];
+    }
+
+    /**
+     * 检查客户端版本
+     * @param string $min 最小版本
+     * @return void
+     */
+    public static function checkClientVersion($min)
+    {
+        if (version_compare(Base::getClientVersion(), $min, '<')) {
+            throw new ApiException('当前版本 (v' . Base::getClientVersion() . ') 过低');
+        }
     }
 
     /**
@@ -316,19 +353,15 @@ class Base
     {
         if (strtolower($charset) == 'utf-8') {
             if (Base::getStrlen($string) <= $length) return $string;
-            $strcut = str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $string);
-            $strcut = Base::utf8Substr($strcut, $length, $start);
-            $strcut = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $strcut);
+            $strcut = Base::utf8Substr($string, $length, $start);
             return $strcut . $dot;
         } else {
             $length = $length * 2;
             if (strlen($string) <= $length) return $string;
-            $string = str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $string);
             $strcut = '';
             for ($i = 0; $i < $length; $i++) {
                 $strcut .= ord($string[$i]) > 127 ? $string[$i] . $string[++$i] : $string[$i];
             }
-            $strcut = str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $strcut);
         }
         return $strcut . $dot;
     }
@@ -684,24 +717,20 @@ class Base
     /**
      * 判断两个地址域名是否相同
      * @param string $var1
-     * @param string $var2
+     * @param string|array $var2
      * @return bool
      */
     public static function hostContrast($var1, $var2)
     {
         $arr1 = parse_url($var1);
-        $arr2 = parse_url($var2);
+        $host1 = $arr1['host'] ?? $var1;
         //
-        $host1 = $var1;
-        if (isset($arr1['host'])) {
-            $host1 = $arr1['host'];
+        $host2 = [];
+        foreach (is_array($var2) ? $var2 : [$var2] as $url) {
+            $arr2 = parse_url($url);
+            $host2[] = $arr2['host'] ?? $url;
         }
-        //
-        $host2 = $var2;
-        if (isset($arr2['host'])) {
-            $host2 = $arr2['host'];
-        }
-        return $host1 == $host2;
+        return in_array($host1, $host2);
     }
 
     /**
@@ -725,6 +754,7 @@ class Base
      */
     public static function fillUrl($str = '')
     {
+        global $_A;
         if (is_array($str)) {
             foreach ($str as $key => $item) {
                 $str[$key] = Base::fillUrl($item);
@@ -743,9 +773,12 @@ class Base
         ) {
             return $str;
         } else {
+            if ($_A['__fill_url_remote_url'] === true) {
+                return "{{RemoteURL}}" . $str;
+            }
             try {
                 return url($str);
-            } catch (\Throwable $e) {
+            } catch (\Throwable) {
                 return self::getSchemeAndHost() . "/" . $str;
             }
         }
@@ -766,7 +799,7 @@ class Base
         }
         try {
             $find = url('');
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             $find = self::getSchemeAndHost();
         }
         return Base::leftDelete($str, $find . '/');
@@ -782,6 +815,31 @@ class Base
         return $scheme.($_SERVER['HTTP_HOST'] ?? '');
     }
 
+    /**
+     * 地址后拼接参数
+     * @param $url
+     * @param $parames
+     * @return mixed|string
+     */
+    public static function urlAddparameter($url, $parames)
+    {
+        if ($parames && is_array($parames)) {
+            $array = [];
+            foreach ($parames as $key => $val) {
+                $array[] = $key . "=" . $val;
+            }
+            if ($array) {
+                $query = implode("&", $array);
+                if (str_contains($url, "?")) {
+                    $url .= "&" . $query;
+                } else {
+                    $url .= "?" . $query;
+                }
+            }
+        }
+        return $url;
+    }
+
     /**
      * 格式化内容图片地址
      * @param $content
@@ -830,13 +888,16 @@ class Base
     /**
      * 数组只保留数字的
      * @param $array
+     * @param bool $int 是否格式化值
      * @return array
      */
-    public static function arrayRetainInt($array)
+    public static function arrayRetainInt($array, $int = false)
     {
         foreach ($array as $k => $v) {
             if (!is_numeric($v)) {
                 unset($array[$k]);
+            } elseif ($int === true) {
+                $array[$k] = intval($v);
             }
         }
         return array_values($array);
@@ -931,13 +992,16 @@ class Base
 
     /**
      * 检测邮箱格式
-     * @param string $str 需要检测的字符串
-     * @return int
+     * @param $str
+     * @return bool
      */
-    public static function isMail($str)
+    public static function isEmail($str)
     {
-        $RegExp = '/^[a-z0-9][a-z\.0-9-_]+@[a-z0-9_-]+(?:\.[a-z]{0,3}\.[a-z]{0,2}|\.[a-z]{0,3}|\.[a-z]{0,2})$/i';
-        return preg_match($RegExp, $str);
+        if (filter_var($str, FILTER_VALIDATE_EMAIL)) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -1153,11 +1217,12 @@ class Base
 
     /**
      * 获取或设置
-     * @param $setname //配置名称
-     * @param bool $array //保存内容
+     * @param $setname          // 配置名称
+     * @param bool $array       // 保存内容
+     * @param false $isUpdate   // 保存内容为更新模式，默认否
      * @return array
      */
-    public static function setting($setname, $array = false)
+    public static function setting($setname, $array = false, $isUpdate = false)
     {
         global $_A;
         if (empty($setname)) {
@@ -1168,15 +1233,19 @@ class Base
         }
         $setting = [];
         $row = Setting::whereName($setname)->first();
-        if (!empty($row)) {
+        if ($row) {
             $setting = Base::string2array($row->setting);
         } else {
             $row = Setting::createInstance(['name' => $setname]);
             $row->save();
         }
         if ($array !== false) {
-            $setting = $array;
-            $row->updateInstance(['setting' => $array]);
+            if ($isUpdate && is_array($array)) {
+                $setting = array_merge($setting, $array);
+            } else {
+                $setting = $array;
+            }
+            $row->updateInstance(['setting' => $setting]);
             $row->save();
         }
         $_A["__static_setting_" . $setname] = $setting;
@@ -1559,7 +1628,7 @@ class Base
     }
 
     /**
-     * 用户名、邮箱、手机账号、银行卡号中间字符串以*隐藏
+     * 用户名、邮箱、手机帐号、银行卡号中间字符串以*隐藏
      * @param $str
      * @return string
      */
@@ -1658,24 +1727,46 @@ class Base
      */
     public static function timeDiff($s, $e)
     {
-        $d = $e - $s;
-        if ($d > 86400) {
-            $day = floor($d / 86400);
-            $hour = ceil(($d - ($day * 86400)) / 3600);
-            if ($hour > 0) {
-                return $day . '天' . $hour . '小时';
-            } else {
-                return $day . '天';
-            }
-        } elseif ($d > 3600) {
-            return ceil($d / 3600) . '小时';
-        } elseif ($d > 60) {
-            return ceil($d / 60) . '分钟';
-        } elseif ($d > 1) {
-            return '1分钟内';
-        } else {
-            return '0秒';
+        $time = $e - $s;
+        $days = 0;
+        if ($time >= 86400) { // 如果大于1天
+            $days = (int)($time / 86400);
+            $time = $time % 86400; // 计算天后剩余的毫秒数
         }
+        $hours = 0;
+        if ($time >= 3600) { // 如果大于1小时
+            $hours = (int)($time / 3600);
+            $time = $time % 3600; // 计算小时后剩余的毫秒数
+        }
+        $minutes = ceil($time / 60); // 剩下的毫秒数都算作分
+        $daysStr = $days > 0 ? $days . '天' : '';
+        $hoursStr = ($hours > 0 || ($days > 0 && $minutes > 0)) ? $hours . '时' : '';
+        $minuteStr = ($minutes > 0) ? $minutes . '分' : '';
+        return $daysStr . $hoursStr . $minuteStr;
+    }
+
+    /**
+     * 时间秒数格式化
+     * @param int $time 时间秒数
+     * @return string
+     */
+    public static function timeFormat($time)
+    {
+        $days = 0;
+        if ($time >= 86400) { // 如果大于1天
+            $days = (int)($time / 86400);
+            $time = $time % 86400; // 计算天后剩余的毫秒数
+        }
+        $hours = 0;
+        if ($time >= 3600) { // 如果大于1小时
+            $hours = (int)($time / 3600);
+            $time = $time % 3600; // 计算小时后剩余的毫秒数
+        }
+        $minutes = ceil($time / 60); // 剩下的毫秒数都算作分
+        $daysStr = $days > 0 ? $days . '天' : '';
+        $hoursStr = ($hours > 0 || ($days > 0 && $minutes > 0)) ? $hours . '时' : '';
+        $minuteStr = ($minutes > 0) ? $minutes . '分' : '';
+        return $daysStr . $hoursStr . $minuteStr;
     }
 
     /**
@@ -2105,7 +2196,7 @@ class Base
                     if ($width > 0 || $height > 0) {
                         $scaleName = "_{WIDTH}x{HEIGHT}";
                         if (isset($param['scale'][2])) {
-                            $scaleName .= $param['scale'][2];
+                            $scaleName .= "_c{$param['scale'][2]}";
                         }
                     }
                 }
@@ -2216,10 +2307,7 @@ class Base
                     $type = ['zip'];
                     break;
                 case 'file':
-                    $type = ['jpg', 'jpeg', 'png', 'gif', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'esp', 'pdf', 'rar', 'zip', 'gz'];
-                    break;
-                case 'office':
-                    $type = ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'];
+                    $type = ['jpg', 'jpeg', 'png', 'gif', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'esp', 'pdf', 'rar', 'zip', 'gz', 'ai', 'avi', 'bmp', 'cdr', 'eps', 'mov', 'mp3', 'mp4', 'pr', 'psd', 'svg', 'tif'];
                     break;
                 case 'firmware':
                     $type = ['img', 'tar', 'bin'];
@@ -2227,8 +2315,34 @@ class Base
                 case 'md':
                     $type = ['md'];
                     break;
-                case 'node_template':
-                    $type = ['csv'];
+                case 'desktop':
+                    $type = ['yml', 'yaml', 'dmg', 'pkg', 'blockmap', 'zip', 'exe', 'msi'];
+                    break;
+                case 'more':
+                    $type = [
+                        'text', 'md', 'markdown',
+                        'drawio',
+                        'mind',
+                        'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx',
+                        'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw',
+                        'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z',
+                        'tif', 'tiff',
+                        'dwg', 'dxf',
+                        'ofd',
+                        'pdf',
+                        'txt',
+                        'htaccess', 'htgroups', 'htpasswd', 'conf', 'bat', 'cmd', 'cpp', 'c', 'cc', 'cxx', 'h', 'hh', 'hpp', 'ino', 'cs', 'css',
+                        'dockerfile', 'go', 'golang', 'html', 'htm', 'xhtml', 'vue', 'we', 'wpy', 'java', 'js', 'jsm', 'jsx', 'json', 'jsp', 'less', 'lua', 'makefile', 'gnumakefile',
+                        'ocamlmakefile', 'make', 'mysql', 'nginx', 'ini', 'cfg', 'prefs', 'm', 'mm', 'pl', 'pm', 'p6', 'pl6', 'pm6', 'pgsql', 'php',
+                        'inc', 'phtml', 'shtml', 'php3', 'php4', 'php5', 'phps', 'phpt', 'aw', 'ctp', 'module', 'ps1', 'py', 'r', 'rb', 'ru', 'gemspec', 'rake', 'guardfile', 'rakefile',
+                        'gemfile', 'rs', 'sass', 'scss', 'sh', 'bash', 'bashrc', 'sql', 'sqlserver', 'swift', 'ts', 'typescript', 'str', 'vbs', 'vb', 'v', 'vh', 'sv', 'svh', 'xml',
+                        'rdf', 'rss', 'wsdl', 'xslt', 'atom', 'mathml', 'mml', 'xul', 'xbl', 'xaml', 'yaml', 'yml',
+                        'asp', 'properties', 'gitignore', 'log', 'bas', 'prg', 'python', 'ftl', 'aspx',
+                        'mp3', 'wav', 'mp4', 'flv',
+                        'avi', 'mov', 'wmv', 'mkv', '3gp', 'rm',
+                        'xmind',
+                        'rp',
+                    ];
                     break;
                 default:
                     return Base::retError('错误的类型参数');
@@ -2246,7 +2360,9 @@ class Base
                 $fileSize = 0;
             }
             $scaleName = "";
-            if ($param['fileName']) {
+            if ($param['fileName'] === true) {
+                $fileName = $file->getClientOriginalName();
+            } elseif ($param['fileName']) {
                 $fileName = $param['fileName'];
             } else {
                 if ($param['scale'] && is_array($param['scale'])) {
@@ -2254,7 +2370,7 @@ class Base
                     if ($width > 0 || $height > 0) {
                         $scaleName = "_{WIDTH}x{HEIGHT}";
                         if (isset($param['scale'][2])) {
-                            $scaleName .= $param['scale'][2];
+                            $scaleName .= "_c{$param['scale'][2]}";
                         }
                     }
                 }
@@ -2349,6 +2465,37 @@ class Base
         }
     }
 
+    /**
+     * 上传文件移动
+     * @param array $uploadResult
+     * @param string $newPath "/" 结尾
+     * @return array
+     */
+    public static function uploadMove($uploadResult, $newPath)
+    {
+        if (str_ends_with($newPath, "/") && file_exists($uploadResult['file'])) {
+            Base::makeDir(public_path($newPath));
+            $oldPath = dirname($uploadResult['path']) . "/";
+            $newFile = str_replace($oldPath, $newPath, $uploadResult['file']);
+            if (rename($uploadResult['file'], $newFile)) {
+                $oldUrl = $uploadResult['url'];
+                $uploadResult['file'] = $newFile;
+                $uploadResult['path'] = str_replace($oldPath, $newPath, $uploadResult['path']);
+                $uploadResult['url'] = str_replace($oldPath, $newPath, $uploadResult['url']);
+                if ($uploadResult['thumb'] == $oldUrl) {
+                    $uploadResult['thumb'] = $uploadResult['url'];
+                } elseif ($uploadResult['thumb']) {
+                    $oldThumb = substr($uploadResult['thumb'], strpos($uploadResult['thumb'], $newPath));
+                    $newThumb = str_replace($oldPath, $newPath, $oldThumb);
+                    if (file_exists(public_path($oldThumb)) && rename(public_path($oldThumb), public_path($newThumb))) {
+                        $uploadResult['thumb'] = str_replace($oldPath, $newPath, $uploadResult['thumb']);
+                    }
+                }
+            }
+        }
+        return $uploadResult;
+    }
+
     /**
      * 生成缩略图
      * @param string $src_img 源图绝对完整地址{带文件名及后缀名}
@@ -2620,16 +2767,19 @@ class Base
     /**
      * 遍历获取文件
      * @param $dir
+     * @param bool $subdirectory    是否遍历子目录
      * @return array
      */
-    public static function readDir($dir)
+    public static function readDir($dir, $subdirectory = true)
     {
         $files = array();
         $dir_list = scandir($dir);
         foreach ($dir_list as $file) {
             if ($file != '..' && $file != '.') {
                 if (is_dir($dir . '/' . $file)) {
-                    $files = array_merge($files, self::readDir($dir . '/' . $file));
+                    if ($subdirectory) {
+                        $files = array_merge($files, self::readDir($dir . '/' . $file, $subdirectory));
+                    }
                 } else {
                     $files[] = $dir . "/" . $file;
                 }
@@ -2858,4 +3008,54 @@ class Base
         $matrix = array_unique($matrix, SORT_REGULAR);
         return array_merge($matrix);
     }
+
+    /**
+     * 字节转格式
+     * @param $bytes
+     * @return string
+     */
+    public static function readableBytes($bytes)
+    {
+        $i = floor(log($bytes) / log(1024));
+        $sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+        return sprintf('%.02F', $bytes / pow(1024, $i)) * 1 . ' ' . $sizes[$i];
+    }
+
+    /**
+     * 去除emoji表情
+     * @param $str
+     * @return string|string[]|null
+     */
+    public static function filterEmoji($str)
+    {
+        return preg_replace_callback(
+            '/./u',
+            function (array $match) {
+                return strlen($match[0]) >= 4 ? '' : $match[0];
+            },
+            $str);
+    }
+
+    /**
+     * 统一验证器
+     * @param $data
+     * @param $messages
+     */
+    public static function validator($data, $messages) {
+        $rules = [];
+        foreach ($messages as $key => $item) {
+            $keys = explode(".", $key);
+            if (isset($keys[1])) {
+                if (isset($rules[$keys[0]])) {
+                    $rules[$keys[0]] = $rules[$keys[0]] . '|' . $keys[1];
+                } else {
+                    $rules[$keys[0]] = $keys[1];
+                }
+            }
+        }
+        $validator = Validator::make($data, $rules, $messages);
+        if ($validator->fails()) {
+            throw new ApiException($validator->errors()->first());
+        }
+    }
 }

app/Module/BillExport.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Module;
+
+use Excel;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithStrictNullComparison;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
+use PhpOffice\PhpSpreadsheet\Writer\Exception;
+
+class BillExport implements WithHeadings, WithEvents, FromCollection, WithTitle, WithStrictNullComparison
+{
+    public $title;
+    public $headings = [];
+    public $data = [];
+    public $typeLists = [];
+    public $typeNumber = 0;
+
+    public function __construct($title, array $data)
+    {
+        $this->title = $title;
+        $this->data = $data;
+    }
+
+    public static function create($data = [], $title = "Sheet1") {
+        if (is_string($data)) {
+            list($title, $data) = [$data, $title];
+        }
+        if (!is_array($data)) {
+            $data = [];
+        }
+        return new BillExport($title, $data);
+    }
+
+    public function setTitle($title) {
+        $this->title = $title;
+        return $this;
+    }
+
+    public function setHeadings(array $headings) {
+        $this->headings = $headings;
+        return $this;
+    }
+
+    public function setData(array $data) {
+        $this->data = $data;
+        return $this;
+    }
+
+    public function setTypeList(array $typeList, $number = 0) {
+        $this->typeLists = $typeList;
+        $this->typeNumber = $number;
+        return $this;
+    }
+
+    public function store($fileName = '') {
+        if (empty($fileName)) {
+            $fileName = date("YmdHis") . '.xls';
+        }
+        try {
+            return Excel::store($this, $fileName);
+        } catch (Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        } catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        }
+    }
+
+    public function download($fileName = '') {
+        if (empty($fileName)) {
+            $fileName = date("YmdHis") . '.xls';
+        }
+        try {
+            return Excel::download($this, $fileName);
+        } catch (Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        } catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
+            return "导出错误：" . $e->getMessage();
+        }
+    }
+
+    /**
+     * 导出的文件标题
+     * @return string
+     */
+    public function title(): string
+    {
+        return $this->title;
+    }
+
+    /**
+     * 标题行
+     * @return array
+     */
+    public function headings(): array
+    {
+        return $this->headings;
+    }
+
+    /**
+     * 导出的内容
+     * @return \Illuminate\Support\Collection
+     */
+    public function collection()
+    {
+        return collect($this->data);
+    }
+
+    /**
+     * 设置单元格事件
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::Class => function (AfterSheet $event) {
+                $count = count($this->data);
+                foreach ($this->typeLists AS $cell => $typeList) {
+                    if ($cell && $typeList) {
+                        $p = $this->headings ? 1 : 0;
+                        for ($i = 1 + $p; $i <= max($count, $this->typeNumber) + $p; $i++) {
+                            $validation = $event->sheet->getDelegate()->getCell($cell . $i)->getDataValidation();
+                            $validation->setType(DataValidation::TYPE_LIST);
+                            $validation->setErrorStyle(DataValidation::STYLE_WARNING);
+                            $validation->setAllowBlank(false);
+                            $validation->setShowDropDown(true);
+                            $validation->setShowInputMessage(true);
+                            $validation->setShowErrorMessage(true);
+                            $validation->setErrorTitle('输入的值不合法');
+                            $validation->setError('选择的值不在列表中，请选择列表中的值');
+                            $validation->setPromptTitle('从列表中选择');
+                            $validation->setPrompt('请选择下拉列表中的值');
+                            $validation->setFormula1('"' . implode(',', $typeList) . '"');
+                        }
+                    }
+                }
+            }
+        ];
+    }
+}

app/Module/BillImport.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Module;
+
+
+use Maatwebsite\Excel\Concerns\ToArray;
+
+class BillImport implements ToArray
+{
+    public function Array(Array $tables)
+    {
+        return $tables;
+    }
+
+}

app/Providers/AppServiceProvider.php

@@ -23,6 +23,14 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        \Illuminate\Database\Query\Builder::macro('rawSql', function(){
+            return array_reduce($this->getBindings(), function($sql, $binding){
+                return preg_replace('/\?/', is_numeric($binding) ? $binding : "'".$binding."'" , $sql, 1);
+            }, $this->toSql());
+        });
+
+        \Illuminate\Database\Eloquent\Builder::macro('rawSql', function(){
+            return ($this->getQuery()->rawSql());
+        });
     }
 }

app/Services/WebSocketService.php

@@ -127,9 +127,11 @@ class WebSocketService implements WebSocketHandlerInterface
             case 'readMsg':
                 $ids = is_array($data['id']) ? $data['id'] : [$data['id']];
                 $userid = $this->getUserid($frame->fd);
-                $list = WebSocketDialogMsg::whereIn('id', $ids)->get();
-                $list->transform(function(WebSocketDialogMsg $item) use ($userid) {
-                    $item->readSuccess($userid);
+                WebSocketDialogMsg::whereIn('id', $ids)->chunkById(20, function($list) use ($userid) {
+                    /** @var WebSocketDialogMsg $item */
+                    foreach ($list as $item) {
+                        $item->readSuccess($userid);
+                    }
                 });
                 return;
 
@@ -143,10 +145,10 @@ class WebSocketService implements WebSocketHandlerInterface
                     $pathOld = $row->path;
                     $row->path = $pathNew;
                     $row->save();
-                    if (preg_match("/^file\/content\/\d+$/", $pathOld)) {
+                    if (preg_match("/^\/single\/file\/\d+$/", $pathOld)) {
                         $this->pushPath($pathOld);
                     }
-                    if (preg_match("/^file\/content\/\d+$/", $pathNew)) {
+                    if (preg_match("/^\/single\/file\/\d+$/", $pathNew)) {
                         $this->pushPath($pathNew);
                     }
                 }
@@ -204,7 +206,19 @@ class WebSocketService implements WebSocketHandlerInterface
      */
     private function deleteUser($fd)
     {
-        WebSocket::whereFd($fd)->delete();
+        $array = [];
+        WebSocket::whereFd($fd)->chunk(10, function($list) use (&$array) {
+            /** @var WebSocket $item */
+            foreach ($list as $item) {
+                $item->delete();
+                if ($item->path && str_starts_with($item->path, "/single/file/")) {
+                    $array[$item->path] = $item->path;
+                }
+            }
+        });
+        foreach ($array as $path) {
+            $this->pushPath($path);
+        }
     }
 
     /**

app/Tasks/AutoArchivedTask.php

@@ -0,0 +1,45 @@
+<?php
+namespace App\Tasks;
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+use App\Models\AbstractModel;
+use App\Models\ProjectTask;
+use App\Module\Base;
+use Carbon\Carbon;
+
+/**
+ * 完成的任务自动归档
+ * Class AutoArchivedTask
+ * @package App\Tasks
+ */
+class AutoArchivedTask extends AbstractTask
+{
+
+    public function __construct()
+    {
+        //
+    }
+
+    public function start()
+    {
+        $setting = Base::setting('system');
+        if ($setting['auto_archived'] === 'open') {
+            $archivedDay = floatval($setting['archived_day']);
+            if ($archivedDay > 0) {
+                $archivedDay = min(100, $archivedDay);
+                $archivedTime = Carbon::now()->subDays($archivedDay);
+                //获取已完成未归档的任务
+                $taskLists = ProjectTask::whereNotNull('complete_at')
+                    ->where('complete_at', '<=', $archivedTime)
+                    ->where('archived_userid', 0)
+                    ->whereNull('archived_at')
+                    ->take(100)
+                    ->get();
+                foreach ($taskLists AS $task) {
+                    $task->archivedTask(Carbon::now(), true);
+                }
+            }
+        }
+    }
+}

app/Tasks/OverdueRemindEmailTask.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Tasks;
+
+use App\Models\ProjectTask;
+use App\Models\ProjectTaskMailLog;
+use App\Models\User;
+use App\Module\Base;
+use Carbon\Carbon;
+use Guanguans\Notify\Factory;
+use Guanguans\Notify\Messages\EmailMessage;
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+class OverdueRemindEmailTask extends AbstractTask
+{
+    public function __construct()
+    {
+        //
+    }
+
+    public function start()
+    {
+        $setting = Base::setting('emailSetting');
+        if ($setting['notice'] === 'open') {
+            $hours = floatval($setting['task_remind_hours']);
+            $hours2 = floatval($setting['task_remind_hours2']);
+            if ($hours > 0) {
+                ProjectTask::whereNull('complete_at')
+                    ->whereNull('archived_at')
+                    ->whereBetween("end_at", [
+                        Carbon::now()->addMinutes($hours * 60),
+                        Carbon::now()->addMinutes($hours * 60 + 10)
+                    ])->chunkById(100, function ($tasks) {
+                        /** @var ProjectTask $task */
+                        foreach ($tasks as $task) {
+                            $this->overdueBeforeAfterEmail($task, true);
+                        }
+                    });
+            }
+            if ($hours2 > 0) {
+                ProjectTask::whereNull('complete_at')
+                    ->whereNull('archived_at')
+                    ->whereBetween("end_at", [
+                        Carbon::now()->subMinutes($hours2 * 60 + 10),
+                        Carbon::now()->subMinutes($hours2 * 60)
+                    ])->chunkById(100, function ($tasks) {
+                        /** @var ProjectTask $task */
+                        foreach ($tasks as $task) {
+                            $this->overdueBeforeAfterEmail($task, false);
+                        }
+                    });
+            }
+        }
+    }
+
+    /**
+     * 过期前、超期后提醒
+     * @param ProjectTask $task
+     * @param $isBefore
+     * @return void
+     */
+    private function overdueBeforeAfterEmail(ProjectTask $task, $isBefore)
+    {
+        $userids = $task->taskUser->where('owner', 1)->pluck('userid')->toArray();
+        if (empty($userids)) {
+            return;
+        }
+        $users = User::whereIn('userid', $userids)->get();
+        if (empty($users)) {
+            return;
+        }
+
+        $setting = Base::setting('emailSetting');
+        $hours = floatval($setting['task_remind_hours']);
+        $hours2 = floatval($setting['task_remind_hours2']);
+
+        /** @var User $user */
+        foreach ($users as $user) {
+            $data = [
+                'type' => $isBefore ? 1 : 2,
+                'userid' => $user->userid,
+                'task_id' => $task->id,
+            ];
+            $emailLog = ProjectTaskMailLog::where($data)->first();
+            if ($emailLog) {
+                continue;
+            }
+            try {
+                if (!Base::isEmail($user->email)) {
+                    throw new \Exception("User email '{$user->email}' address error");
+                }
+                if ($isBefore) {
+                    $subject = env('APP_NAME') . " 任务提醒";
+                    $content = "<p>{$user->nickname} 您好：</p><p>您有一个任务【{$task->name}】还有{$hours}小时即将超时，请及时处理。</p>";
+                } else {
+                    $subject = env('APP_NAME') . " 任务过期提醒";
+                    $content = "<p>{$user->nickname} 您好：</p><p>您的任务【{$task->name}】已经超时{$hours2}小时，请及时处理。</p>";
+                }
+                Factory::mailer()
+                    ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
+                    ->setMessage(EmailMessage::create()
+                        ->from(env('APP_NAME', 'Task') . " <{$setting['account']}>")
+                        ->to($user->email)
+                        ->subject($subject)
+                        ->html($content))
+                    ->send();
+                $data['is_send'] = 1;
+            } catch (\Exception $e) {
+                $data['send_error'] = $e->getMessage();
+            }
+            $data['email'] = $user->email;
+            ProjectTaskMailLog::createInstance($data)->save();
+        }
+    }
+}

app/Tasks/WebSocketDialogMsgTask.php

@@ -33,6 +33,11 @@ class WebSocketDialogMsgTask extends AbstractTask
 
     public function start()
     {
+        global $_A;
+        $_A = [
+            '__fill_url_remote_url' => true,
+        ];
+        //
         $msg = WebSocketDialogMsg::find($this->id);
         if (empty($msg)) {
             return;
@@ -43,30 +48,38 @@ class WebSocketDialogMsgTask extends AbstractTask
         }
 
         // 推送目标①：群成员
+        $array = [];
         $userids = $dialog->dialogUser->pluck('userid')->toArray();
         foreach ($userids AS $userid) {
             if ($userid == $msg->userid) {
                 continue;
             }
+            $mention = preg_match("/<span class=\"mention user\" data-id=\"[0|{$userid}]\">/", $msg->type === 'text' ? $msg->msg['text'] : '');
             WebSocketDialogMsgRead::createInstance([
                 'dialog_id' => $msg->dialog_id,
                 'msg_id' => $msg->id,
                 'userid' => $userid,
+                'mention' => $mention,
             ])->saveOrIgnore();
+            $array[$userid] = $mention;
         }
         // 更新已发送数量
         $msg->send = WebSocketDialogMsgRead::whereMsgId($msg->id)->count();
         $msg->save();
         // 开始推送消息
-        PushTask::push([
-            'userid' => $userids,
-            'ignoreFd' => $this->ignoreFd,
-            'msg' => [
-                'type' => 'dialog',
-                'mode' => 'add',
-                'data' => $msg->toArray(),
-            ]
-        ]);
+        foreach ($array as $userid => $mention) {
+            PushTask::push([
+                'userid' => $userid,
+                'ignoreFd' => $this->ignoreFd,
+                'msg' => [
+                    'type' => 'dialog',
+                    'mode' => 'add',
+                    'data' => array_merge($msg->toArray(), [
+                        'mention' => $mention,
+                    ]),
+                ]
+            ]);
+        }
 
         // 推送目标②：正在打开这个任务会话的会员
         if ($dialog->type == 'group' && $dialog->group_type == 'task') {

bin/run

@@ -73,7 +73,7 @@ class runLoader
     }
 }
 
-$array = getopt('', ['port:', 'ssl:', 'mode:']);
+$array = getopt('', ['port:', 'mode:']);
 $loader = new runLoader();
 
 if (isset($array['mode'])) {
@@ -84,9 +84,6 @@ $data = [];
 if (isset($array['port'])) {
     $data['APP_PORT'] = $array['port'];
 }
-if (isset($array['ssl'])) {
-    $data['APP_PORT_SSL'] = $array['ssl'];
-}
 if ($data) {
     $loader->modifyEnv($data);
 }

cliff.toml

@@ -0,0 +1,60 @@
+# configuration file for git-cliff (0.1.0)
+
+[changelog]
+# changelog header
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}]
+{% else %}\
+    ## [Unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespace from the template
+trim = true
+# changelog footer
+footer = """
+"""
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = true
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features"},
+    { message = "^fix", group = "Bug Fixes"},
+    { message = "^doc", group = "Documentation"},
+    { message = "^perf", group = "Performance"},
+    { message = "^pref", group = "Performance"},
+    { message = "^refactor", group = "Refactor"},
+    { message = "^style", group = "Styling"},
+    { message = "^test", group = "Testing"},
+    { message = "^chore\\(release\\): prepare for", skip = true},
+    { message = "^chore", group = "Miscellaneous Tasks"},
+    { body = ".*security", group = "Security"},
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = true
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"
+# regex for ignoring tags
+ignore_tags = ""
+# sort the tags chronologically
+date_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"

cmd

@@ -12,6 +12,8 @@ OK="${Green}[OK]${Font}"
 Error="${Red}[错误]${Font}"
 
 cur_path="$(pwd)"
+cur_arg=$@
+COMPOSE="docker-compose"
 
 judge() {
     if [[ 0 -eq $? ]]; then
@@ -23,10 +25,26 @@ judge() {
     fi
 }
 
+rand() {
+    local min=$1
+    local max=$(($2-$min+1))
+    local num=$(($RANDOM+1000000000))
+    echo $(($num%$max+$min))
+}
+
+rand_string() {
+    local lan=$1
+    if [[ `uname` == 'Linux' ]]; then
+        echo "$(date +%s%N | md5sum | cut -c 1-${lan})"
+    else
+        echo "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-${lan}")"
+    fi
+}
+
 supervisorctl_restart() {
-    RES=`docker-compose exec php /bin/bash -c "supervisorctl update $1"`
-    if [ -z "$RES" ];then
-        docker-compose exec php /bin/bash -c "supervisorctl restart $1"
+    local RES=`run_exec php "supervisorctl update $1"`
+    if [ -z "$RES" ]; then
+        run_exec php "supervisorctl restart $1"
     else
         echo -e "$RES"
     fi
@@ -38,48 +56,199 @@ check_docker() {
         echo -e "${Error} ${RedBG} 未安装 Docker！${Font}"
         exit 1
     fi
-    docker-compose --version &> /dev/null
+    docker-compose version &> /dev/null
     if [ $? -ne  0 ]; then
-        echo -e "${Error} ${RedBG} 未安装 Docker-compose！${Font}"
+        docker compose version &> /dev/null
+        if [ $? -ne  0 ]; then
+            echo -e "${Error} ${RedBG} 未安装 Docker-compose！${Font}"
+            exit 1
+        fi
+        COMPOSE="docker compose"
+    fi
+    if [[ -n `$COMPOSE version | grep -E "\sv*1"` ]]; then
+        $COMPOSE version
+        echo -e "${Error} ${RedBG} Docker-compose 版本过低，请升级至v2+！${Font}"
         exit 1
     fi
 }
 
 check_node() {
-    npm --version > /dev/null
+    npm --version &> /dev/null
     if [ $? -ne  0 ]; then
         echo -e "${Error} ${RedBG} 未安装nodejs！${Font}"
         exit 1
     fi
 }
 
+docker_name() {
+    echo `$COMPOSE ps | awk '{print $1}' | grep "\-$1\-"`
+}
+
+run_compile() {
+    local type=$1
+    check_node
+    if [ ! -d "./node_modules" ]; then
+        npm install
+    fi
+    run_exec php "php bin/run --mode=$type"
+    supervisorctl_restart php
+    #
+    if [ "$type" = "prod" ]; then
+        rm -rf "./public/js/build"
+        npx mix --production
+        echo "$(rand_string 16)" > ./public/js/hash
+    else
+        npx mix watch --hot
+    fi
+}
+
+run_electron() {
+    local argv=$@
+    check_node
+    if [ ! -d "./node_modules" ]; then
+        npm install
+    fi
+    if [ ! -d "./electron/node_modules" ]; then
+        pushd electron
+        npm install
+        popd
+    fi
+    #
+    if [ -d "./electron/dist" ]; then
+        rm -rf "./electron/dist"
+    fi
+    if [ -d "./electron/public" ] && [ "$argv" != "--nobuild" ]; then
+        rm -rf "./electron/public"
+    fi
+    mkdir -p ./electron/public
+    cp ./electron/index.html ./electron/public/index.html
+    #
+    if [ "$argv" != "dev" ] && [ "$argv" != "--nobuild" ]; then
+        npx mix --production -- --env --electron
+    fi
+    if [ "$argv" == "dev" ]; then
+        run_exec php "php bin/run --mode=$argv"
+        supervisorctl_restart php
+    fi
+    node ./electron/build.js $argv
+}
+
+run_exec() {
+    local container=$1
+    local cmd=$2
+    local name=`docker_name $container`
+    if [ -z "$name" ]; then
+        echo -e "${Error} ${RedBG} 没有找到 $container 容器! ${Font}"
+        exit 1
+    fi
+    docker exec -it "$name" /bin/sh -c "$cmd"
+}
+
+run_mysql() {
+    if [ "$1" = "backup" ]; then
+        # 备份数据库
+        database=$(env_get DB_DATABASE)
+        username=$(env_get DB_USERNAME)
+        password=$(env_get DB_PASSWORD)
+        mkdir -p ${cur_path}/docker/mysql/backup
+        filename="${cur_path}/docker/mysql/backup/${database}_$(date "+%Y%m%d%H%M%S").sql.gz"
+        run_exec mariadb "exec mysqldump --databases $database -u$username -p$password" | gzip > $filename
+        judge "备份数据库"
+        [ -f "$filename" ] && echo -e "备份文件：$filename"
+    elif [ "$1" = "recovery" ]; then
+        # 还原数据库
+        database=$(env_get DB_DATABASE)
+        username=$(env_get DB_USERNAME)
+        password=$(env_get DB_PASSWORD)
+        mkdir -p ${cur_path}/docker/mysql/backup
+        list=`ls -1 "${cur_path}/docker/mysql/backup" | grep ".sql.gz"`
+        if [ -z "$list" ]; then
+            echo -e "${Error} ${RedBG} 没有备份文件！${Font}"
+            exit 1
+        fi
+        echo "$list"
+        read -rp "请输入备份文件名称还原：" inputname
+        filename="${cur_path}/docker/mysql/backup/${inputname}"
+        if [ ! -f "$filename" ]; then
+            echo -e "${Error} ${RedBG} 备份文件：${inputname} 不存在！ ${Font}"
+            exit 1
+        fi
+        container_name=`docker_name mariadb`
+        if [ -z "$container_name" ]; then
+            echo -e "${Error} ${RedBG} 没有找到 mariadb 容器! ${Font}"
+            exit 1
+        fi
+        docker cp $filename $container_name:/
+        run_exec mariadb "gunzip < /$inputname | mysql -u$username -p$password $database"
+        run_exec php "php artisan migrate"
+        judge "还原数据库"
+    fi
+}
+
 env_get() {
-    key=$1
-    value=`cat ${cur_path}/.env | grep "^$key=" | awk -F '=' '{print $2}'`
+    local key=$1
+    local value=`cat ${cur_path}/.env | grep "^$key=" | awk -F '=' '{print $2}'`
     echo "$value"
 }
 
 env_set() {
-    key=$1
-    val=$2
-    exist=`cat ${cur_path}/.env | grep "^$key="`
-    if [ -z "$exist" ];then
+    local key=$1
+    local val=$2
+    local exist=`cat ${cur_path}/.env | grep "^$key="`
+    if [ -z "$exist" ]; then
         echo "$key=$val" >> $cur_path/.env
     else
-        command="sed -i '/^$key=/c\\$key=$val' /www/.env"
-        docker run -it --rm -v ${cur_path}:/www alpine sh -c "$command"
+        if [[ `uname` == 'Linux' ]]; then
+            sed -i "/^${key}=/c\\${key}=${val}" ${cur_path}/.env
+        else
+            docker run -it --rm -v ${cur_path}:/www alpine sh -c "sed -i "/^${key}=/c\\${key}=${val}" /www/.env"
+        fi
+        if [ $? -ne  0 ]; then
+            echo -e "${Error} ${RedBG} 设置env参数失败！${Font}"
+            exit 1
+        fi
     fi
 }
 
 env_init() {
-    if [ ! -f ".env" ];then
+    if [ ! -f ".env" ]; then
         cp .env.docker .env
     fi
-    if [ -z "$(env_get DB_ROOT_PASSWORD)" ];then
-        env_set DB_ROOT_PASSWORD "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-16")"
+    if [ -z "$(env_get DB_ROOT_PASSWORD)" ]; then
+        env_set DB_ROOT_PASSWORD "$(rand_string 16)"
     fi
-    if [ -z "$(env_get DOCKER_ID)" ];then
-        env_set DOCKER_ID "$(docker run -it --rm alpine sh -c "date +%s%N | md5sum | cut -c 1-6")"
+    if [ -z "$(env_get APP_ID)" ]; then
+        env_set APP_ID "$(rand_string 6)"
+    fi
+    if [ -z "$(env_get APP_IPPR)" ]; then
+        env_set APP_IPPR "10.$(rand 50 100).$(rand 100 200)"
+    fi
+}
+
+arg_get() {
+    local find="n"
+    local value=""
+    for var in $cur_arg; do
+        if [[ "$find" == "y" ]]; then
+            if [[ ! $var =~ "--" ]]; then
+                value=$var
+            fi
+            break
+        fi
+        if [[ "--$1" == "$var" ]] || [[ "-$1" == "$var" ]]; then
+            find="y"
+            value="yes"
+        fi
+    done
+    echo $value
+}
+
+is_arm() {
+    local get_arch=`arch`
+    if [[ $get_arch =~ "aarch" ]] || [[ $get_arch =~ "arm" ]]; then
+        echo "yes"
+    else
+        echo "no"
     fi
 }
 
@@ -87,38 +256,79 @@ env_init() {
 ####################################################################################
 ####################################################################################
 
-COMPOSE="docker-compose"
-env_init
-check_docker
+if [[ "$1" != "electron" ]]; then
+    check_docker
+    env_init
+fi
 
-if [ $# -gt 0 ];then
+if [ $# -gt 0 ]; then
     if [[ "$1" == "init" ]] || [[ "$1" == "install" ]]; then
         shift 1
-        networkid=`docker network ls | grep "dooteak-networks-" | awk '{print $1}'`
-        if [ -n "$networkid" ]; then
-            docker network rm "$networkid" > /dev/null
+        # 判断架构
+        if [[ "$(is_arm)" == "yes" ]] && [[ -z "$(arg_get force)" ]]; then
+            echo -e "${Error} ${RedBG}暂不支持arm架构，强制安装请使用：./cmd install --force${Font}"
+            exit 1
         fi
-        rm -rf composer.lock
-        rm -rf package-lock.json
-        mkdir -p ${cur_path}/docker/mysql/data
-        chmod -R 777 ${cur_path}/docker/mysql/data
+        # 初始化文件
+        if [[ -n "$(arg_get relock)" ]]; then
+            rm -rf node_modules
+            rm -rf package-lock.json
+            rm -rf vendor
+            rm -rf composer.lock
+        fi
+        mkdir -p "${cur_path}/docker/log/supervisor"
+        mkdir -p "${cur_path}/docker/mysql/data"
+        chmod -R 775 "${cur_path}/docker/log/supervisor"
+        chmod -R 775 "${cur_path}/docker/mysql/data"
+        # 启动容器
+        [[ "$(arg_get port)" -gt 0 ]] && env_set APP_PORT "$(arg_get port)"
+        $COMPOSE up php -d
+        # 安装composer依赖
+        run_exec php "composer install"
+        if [ ! -f "${cur_path}/vendor/autoload.php" ]; then
+            run_exec php "composer config repo.packagist composer https://packagist.phpcomposer.com"
+            run_exec php "composer install"
+            run_exec php "composer config --unset repos.packagist"
+        fi
+        if [ ! -f "${cur_path}/vendor/autoload.php" ]; then
+            echo -e "${Error} ${RedBG}composer install 失败，请重试！ ${Font}"
+            exit 1
+        fi
+        [[ -z "$(env_get APP_KEY)" ]] && run_exec php "php artisan key:generate"
+        run_exec php "php bin/run --mode=prod"
+        # 检查数据库
+        remaining=20
+        while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/db.opt" ]; do
+            ((remaining=$remaining-1))
+            if [ $remaining -lt 0 ]; then
+                echo -e "${Error} ${RedBG} 数据库初始化失败! ${Font}"
+                exit 1
+            fi
+            chmod -R 775 "${cur_path}/docker/mysql/data"
+            sleep 3
+        done
+        run_exec php "php artisan migrate --seed"
+        if [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/$(env_get DB_PREFIX)migrations.ibd" ]; then
+            echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}"
+            exit 1
+        fi
+        # 设置初始化密码
+        res=`run_exec mariadb "sh /etc/mysql/repassword.sh"`
         $COMPOSE up -d
-        $COMPOSE restart php
-        $COMPOSE exec php /bin/bash -c "composer install"
-        [ -z "$(env_get APP_KEY)" ] && $COMPOSE exec php /bin/bash -c "php artisan key:generate"
-        $COMPOSE exec php /bin/bash -c "php artisan migrate --seed"
-        $COMPOSE exec php /bin/bash -c "php bin/run --port=2222 --ssl=2223"
-        $COMPOSE exec php /bin/bash -c "php bin/run --mode=prod"
-        $COMPOSE stop
-        $COMPOSE start
+        supervisorctl_restart php
+        echo -e "${OK} ${GreenBG} 安装完成 ${Font}"
+        echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
+        echo -e "$res"
     elif [[ "$1" == "update" ]]; then
         shift 1
+        run_mysql backup
         git fetch --all
         git reset --hard origin/$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
         git pull
-        $COMPOSE exec php /bin/bash -c "composer update"
-        $COMPOSE exec php /bin/bash -c "php artisan migrate"
+        run_exec php "composer update"
+        run_exec php "php artisan migrate"
         supervisorctl_restart php
+        $COMPOSE up -d
     elif [[ "$1" == "uninstall" ]]; then
         shift 1
         read -rp "确定要卸载（含：删除容器、数据库、日志）吗？(y/n): " uninstall
@@ -132,30 +342,41 @@ if [ $# -gt 0 ];then
             exit 2
             ;;
         esac
-        docker-compose rm -fs
+        $COMPOSE down
         rm -rf "./docker/mysql/data"
         rm -rf "./docker/log/supervisor"
         find "./storage/logs" -name "*.log" | xargs rm -rf
         echo -e "${OK} ${GreenBG} 卸载完成 ${Font}"
-    elif [[ "$1" == "dev" ]]; then
+    elif [[ "$1" == "reinstall" ]]; then
         shift 1
-        check_node
-        $COMPOSE exec php /bin/bash -c "php bin/run --mode=dev"
-        supervisorctl_restart php
-        mix watch --hot
-    elif [[ "$1" == "prod" ]]; then
+        ./cmd uninstall $@
+        sleep 3
+        ./cmd install $@
+    elif [[ "$1" == "port" ]]; then
         shift 1
-        check_node
-        $COMPOSE exec php /bin/bash -c "php bin/run --mode=prod"
-        supervisorctl_restart php
-        rm -rf "./public/js/build"
-        mix --production
-    elif [[ "$1" == "super" ]]; then
+        env_set APP_PORT "$1"
+        $COMPOSE up -d
+        echo -e "${OK} ${GreenBG} 修改成功 ${Font}"
+        echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
+    elif [[ "$1" == "repassword" ]]; then
         shift 1
-        supervisorctl_restart "$@"
+        run_exec mariadb "sh /etc/mysql/repassword.sh \"$@\""
+    elif [[ "$1" == "dev" ]] || [[ "$1" == "development" ]]; then
+        shift 1
+        run_compile dev
+    elif [[ "$1" == "prod" ]] || [[ "$1" == "production" ]]; then
+        shift 1
+        run_compile prod
+    elif [[ "$1" == "electron" ]]; then
+        shift 1
+        run_electron $@
+    elif [[ "$1" == "doc" ]]; then
+        shift 1
+        run_exec php "php app/Http/Controllers/Api/apidoc.php"
+        docker run -it --rm -v ${cur_path}:/home/node/apidoc kuaifan/apidoc -i app/Http/Controllers/Api -o public/docs
     elif [[ "$1" == "debug" ]]; then
         shift 1
-        if [[ "$@" == "close" ]];then
+        if [[ "$@" == "close" ]]; then
             env_set APP_DEBUG "false"
         else
             env_set APP_DEBUG "true"
@@ -163,45 +384,48 @@ if [ $# -gt 0 ];then
         supervisorctl_restart php
     elif [[ "$1" == "https" ]]; then
         shift 1
-        if [[ "$@" == "auto" ]];then
-            env_set APP_FORCE_URL_SCHEME "auto"
+        if [[ "$@" == "auto" ]]; then
+            env_set APP_SCHEME "auto"
         else
-            env_set APP_FORCE_URL_SCHEME "true"
+            env_set APP_SCHEME "true"
         fi
         supervisorctl_restart php
     elif [[ "$1" == "artisan" ]]; then
         shift 1
-        e="php artisan $@" && $COMPOSE exec php /bin/bash -c "$e"
+        e="php artisan $@" && run_exec php "$e"
     elif [[ "$1" == "php" ]]; then
         shift 1
-        e="php $@" && $COMPOSE exec php /bin/bash -c "$e"
+        e="php $@" && run_exec php "$e"
+    elif [[ "$1" == "nginx" ]]; then
+        shift 1
+        e="nginx $@" && run_exec nginx "$e"
+    elif [[ "$1" == "redis" ]]; then
+        shift 1
+        e="redis $@" && run_exec redis "$e"
     elif [[ "$1" == "mysql" ]]; then
         shift 1
-        if [[ "$@" == "bak" ]];then
-            database=$(env_get DB_DATABASE)
-            password=$(env_get DB_ROOT_PASSWORD)
-            filename="${cur_path}/docker/mysql/bak/${database}_$(date "+%Y%m%d%H%M%S").sql.gz"
-            $COMPOSE exec mariadb /bin/sh -c "exec mysqldump --databases $database -uroot -p\"$password\"" | gzip > $filename
-            judge "备份数据库"
-            [ -f "$filename" ] && echo -e "备份文件：$filename"
+        if [ "$1" = "backup" ]; then
+            run_mysql backup
+        elif [ "$1" = "recovery" ]; then
+            run_mysql recovery
         else
-            e="mysql $@" && $COMPOSE exec mariadb /bin/sh -c "$e"
+            e="mysql $@" && run_exec mariadb "$e"
         fi
     elif [[ "$1" == "composer" ]]; then
         shift 1
-        e="composer $@" && $COMPOSE exec php /bin/bash -c "$e"
-    elif [[ "$1" == "supervisorctl" ]]; then
+        e="composer $@" && run_exec php "$e"
+    elif [[ "$1" == "service" ]]; then
         shift 1
-        e="supervisorctl $@" && $COMPOSE exec php /bin/bash -c "$e"
+        e="service $@" && run_exec php "$e"
+    elif [[ "$1" == "super" ]] || [[ "$1" == "supervisorctl" ]]; then
+        shift 1
+        e="supervisorctl $@" && run_exec php "$e"
+    elif [[ "$1" == "models" ]]; then
+        shift 1
+        run_exec php "php artisan ide-helper:models -W"
     elif [[ "$1" == "test" ]]; then
         shift 1
-        e="./vendor/bin/phpunit $@" && $COMPOSE exec php /bin/bash -c "$e"
-    elif [[ "$1" == "npm" ]]; then
-        shift 1
-        e="npm $@" && $COMPOSE exec php /bin/bash -c "$e"
-    elif [[ "$1" == "yarn" ]]; then
-        shift 1
-        e="yarn $@" && $COMPOSE exec php /bin/bash -c "$e"
+        e="./vendor/bin/phpunit $@" && run_exec php "$e"
     elif [[ "$1" == "restart" ]]; then
         shift 1
         $COMPOSE stop "$@"

composer.json

@@ -16,6 +16,7 @@
         "ext-simplexml": "*",
         "fideloper/proxy": "^4.4.1",
         "fruitcake/laravel-cors": "^2.0.4",
+        "guanguans/notify": "^1.20",
         "guzzlehttp/guzzle": "^7.3.0",
         "laravel/framework": "^v8.48.1",
         "laravel/tinker": "^v2.6.1",

config/laravels.php

@@ -300,9 +300,9 @@ return [
         'log_level'          => 4,
         'log_file'           => storage_path(sprintf('logs/swoole-%s.log', date('Y-m'))),
         'document_root'      => base_path('public'),
-        'buffer_output_size' => 200 * 1024 * 1024,
-        'socket_buffer_size' => 256 * 1024 * 1024,
-        'package_max_length' => 200 * 1024 * 1024,
+        'buffer_output_size' => 512 * 1024 * 1024,
+        'socket_buffer_size' => 512 * 1024 * 1024,
+        'package_max_length' => 512 * 1024 * 1024,
         'reload_async'       => true,
         'max_wait_time'      => 60,
         'enable_reuse_port'  => true,

database/migrations/2021_06_25_182631_create_project_logs_table.php

@@ -17,7 +17,7 @@ class CreateProjectLogsTable extends Migration
             $table->bigIncrements('id');
             $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
             $table->bigInteger('column_id')->nullable()->default(0)->comment('列表ID');
-            $table->bigInteger('task_id')->nullable()->default(0)->comment('项目ID');
+            $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID');
             $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID');
             $table->string('detail', 500)->nullable()->default('')->comment('详细信息');
             $table->timestamps();

database/migrations/2021_12_10_170751_files_add_ext.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FilesAddExt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('files', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('files', 'ext')) {
+                $isAdd = true;
+                $table->string('ext', 20)->nullable()->default('')->after('type')->comment('后缀名');
+            }
+        });
+        if ($isAdd) {
+            // 更新数据
+            \App\Models\File::chunkById(100, function ($lists) {
+                foreach ($lists as $item) {
+                    if (in_array($item->type, ['word', 'excel', 'ppt'])) {
+                        $item->ext = str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $item->type);
+                        $item->save();
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('files', function (Blueprint $table) {
+            $table->dropColumn("ext");
+        });
+    }
+}

database/migrations/2021_12_13_002344_project_tasks_add_archived_follow.php

@@ -0,0 +1,50 @@
+<?php
+
+use App\Models\Project;
+use App\Models\ProjectTask;
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectTasksAddArchivedFollow extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('project_tasks', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('project_tasks', 'archived_follow')) {
+                $isAdd = true;
+                $table->tinyInteger('archived_follow')->nullable()->default(0)->after('archived_userid')->comment('跟随项目归档（项目取消归档时任务也取消归档）');
+            }
+        });
+        if ($isAdd) {
+            // 更新数据
+            Project::whereNotNull('archived_at')->chunkById(100, function ($lists) {
+                foreach ($lists as $item) {
+                    ProjectTask::whereProjectId($item->id)->whereArchivedAt(null)->update([
+                        'archived_at' => $item->archived_at,
+                        'archived_follow' => 1
+                    ]);
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_tasks', function (Blueprint $table) {
+            $table->dropColumn("archived_follow");
+        });
+    }
+}

database/migrations/2021_12_27_121827_create_project_invites_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectInvitesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_invites', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
+            $table->integer('num')->nullable()->default(0)->comment('累计邀请');
+            $table->string('code')->nullable()->default('')->comment('链接码');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_invites');
+    }
+}

database/migrations/2021_12_29_170103_create_file_links_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateFileLinksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('file_links', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('file_id')->nullable()->default(0)->comment('文件ID');
+            $table->integer('num')->nullable()->default(0)->comment('累计访问');
+            $table->string('code')->nullable()->default('')->comment('链接码');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('file_links');
+    }
+}

database/migrations/2021_12_29_170409_file_users_add_permission.php

@@ -0,0 +1,55 @@
+<?php
+
+use App\Models\File;
+use App\Models\FileUser;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FileUsersAddPermission extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('file_users', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('file_users', 'permission')) {
+                $isAdd = true;
+                $table->tinyInteger('permission')->nullable()->default(0)->after('userid')->comment('权限：0只读，1读写');
+            }
+        });
+        if ($isAdd) {
+            // 更新数据
+            File::whereShare(1)->chunkById(100, function ($lists) {
+                foreach ($lists as $file) {
+                    FileUser::updateInsert([
+                        'file_id' => $file->id,
+                        'userid' => 0,
+                    ]);
+                }
+            });
+            File::whereShare(2)->update([
+                'share' => 1,
+            ]);
+            FileUser::wherePermission(0)->update([
+                'permission' => 1,
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('file_users', function (Blueprint $table) {
+            $table->dropColumn("permission");
+        });
+    }
+}

database/migrations/2021_12_30_155338_create_reports_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if ( Schema::hasTable('reports') )
+            return;
+
+        Schema::create('reports', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->string("title")->default("")->comment("标题");
+            $table->enum("type", ["weekly", "daily"])->default("daily")->comment("汇报类型");
+            $table->unsignedBigInteger("userid")->default(0);
+            $table->longText("content")->nullable();
+            $table->index(["userid", "created_at"], "default");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('reports');
+    }
+}

database/migrations/2021_12_30_162019_create_report_receives_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportReceivesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if ( Schema::hasTable('report_receives') )
+            return;
+
+        Schema::create('report_receives', function (Blueprint $table) {
+            $table->bigIncrements("id");
+            $table->unsignedInteger("rid")->default(0);
+            $table->timestamp("receive_time")->nullable()->comment("接收时间");
+            $table->unsignedBigInteger("userid")->default(0)->comment("接收人");
+            $table->unsignedTinyInteger("read")->default(0)->comment("是否已读");
+            $table->index(["userid", "receive_time"], "default");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('report_receives');
+    }
+}

database/migrations/2022_01_04_111739_add_report_sign.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddReportSign extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('reports', function (Blueprint $table) {
+            $table->string("sign")->default("")->comment("汇报唯一标识");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('reports', function (Blueprint $table) {
+            $table->dropColumn("sign");
+        });
+    }
+}

database/migrations/2022_01_06_131020_users_add_disable_at.php

@@ -0,0 +1,43 @@
+<?php
+
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UsersAddDisableAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('users', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('users', 'disable_at')) {
+                $isAdd = true;
+                $table->timestamp('disable_at')->nullable()->after('created_ip')->comment('禁用时间');
+            }
+        });
+        if ($isAdd) {
+            User::where("identity", "like", "%,disable,%")->update([
+                'disable_at' => Carbon::now(),
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn("disable_at");
+        });
+    }
+}

database/migrations/2022_01_06_132023_project_tasks_update_subtask_time.php

@@ -0,0 +1,39 @@
+<?php
+
+use App\Models\ProjectTask;
+use Illuminate\Database\Migrations\Migration;
+
+class ProjectTasksUpdateSubtaskTime extends Migration
+{
+    /**
+     * 子任务同步主任务（任务时间）
+     *
+     * @return void
+     */
+    public function up()
+    {
+        ProjectTask::where('parent_id', '>', 0)
+            ->whereNull('end_at')
+            ->chunkById(100, function ($lists) {
+                /** @var ProjectTask $task */
+                foreach ($lists as $task) {
+                    $parent = ProjectTask::whereNotNull('end_at')->find($task->parent_id);
+                    if ($parent) {
+                        $task->start_at = $parent->start_at;
+                        $task->end_at = $parent->end_at;
+                        $task->save();
+                    }
+                }
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2022_01_06_164034_project_tasks_update_subtask_archived_delete.php

@@ -0,0 +1,51 @@
+<?php
+
+use App\Models\ProjectTask;
+use Illuminate\Database\Migrations\Migration;
+
+class ProjectTasksUpdateSubtaskArchivedDelete extends Migration
+{
+    /**
+     * 子任务同步主任务（归档、删除）
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // 归档
+        ProjectTask::whereParentId(0)
+            ->whereNotNull('archived_at')
+            ->chunkById(100, function ($lists) {
+                /** @var ProjectTask $task */
+                foreach ($lists as $task) {
+                    ProjectTask::whereParentId($task->id)->update([
+                        'archived_at' => $task->archived_at,
+                        'archived_userid' => $task->archived_userid,
+                        'archived_follow' => $task->archived_follow,
+                    ]);
+                }
+            });
+
+        // 删除
+        ProjectTask::onlyTrashed()
+            ->whereParentId(0)
+            ->chunkById(100, function ($lists) {
+                /** @var ProjectTask $task */
+                foreach ($lists as $task) {
+                    ProjectTask::whereParentId($task->id)->update([
+                        'deleted_at' => $task->deleted_at,
+                    ]);
+                }
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2022_01_08_171816_create_project_flow_items_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectFlowItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_flow_items', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
+            $table->bigInteger('flow_id')->nullable()->default(0)->comment('流程ID');
+            $table->string('name', 50)->nullable()->default('')->comment('名称');
+            $table->string('status', 20)->nullable()->default('')->comment('状态');
+            $table->string('turns')->nullable()->default('')->comment('可流转');
+            $table->string('userids')->nullable()->default('')->comment('状态负责人ID');
+            $table->integer('sort')->nullable()->comment('排序');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_flow_items');
+    }
+}

database/migrations/2022_01_08_171816_create_project_flows_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectFlowsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_flows', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID');
+            $table->string('name', 50)->nullable()->default('')->comment('流程名称');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_flows');
+    }
+}

database/migrations/2022_01_08_172053_project_tasks_add_flow_item_id_flow_item_name.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectTasksAddFlowItemIdFlowItemName extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_tasks', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_tasks', 'flow_item_id')) {
+                $table->bigInteger('flow_item_id')->nullable()->default(0)->after('dialog_id')->comment('工作流状态ID');
+                $table->string('flow_item_name', 50)->nullable()->default('')->after('flow_item_id')->comment('工作流状态名称');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_tasks', function (Blueprint $table) {
+            $table->dropColumn("flow_item_id");
+            $table->dropColumn("flow_item_name");
+        });
+    }
+}

database/migrations/2022_01_11_182830_project_flow_items_add_usertype.php

@@ -0,0 +1,42 @@
+<?php
+
+use App\Models\ProjectFlowItem;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectFlowItemsAddUsertype extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $isAdd = false;
+        Schema::table('project_flow_items', function (Blueprint $table) use (&$isAdd) {
+            if (!Schema::hasColumn('project_flow_items', 'usertype')) {
+                $isAdd = true;
+                $table->string('usertype', 10)->nullable()->default('')->after('userids')->comment('流转模式');
+            }
+        });
+        if ($isAdd) {
+            ProjectFlowItem::where("usertype", "")->update([
+                'usertype' => 'add',
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            $table->dropColumn("usertype");
+        });
+    }
+}

database/migrations/2022_01_11_191703_project_logs_add_record.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectLogsAddRecord extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_logs', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_logs', 'record')) {
+                $table->text('record')->nullable()->after('detail')->comment('记录数据');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_logs', function (Blueprint $table) {
+            $table->dropColumn("record");
+        });
+    }
+}

database/migrations/2022_01_12_153411_project_flow_items_add_userlimit.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectFlowItemsAddUserlimit extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_flow_items', 'userlimit')) {
+                $table->tinyInteger('userlimit')->nullable()->default(0)->after('usertype')->comment('限制负责人');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_flow_items', function (Blueprint $table) {
+            $table->dropColumn("userlimit");
+        });
+    }
+}

database/migrations/2022_01_29_125829_web_socket_dialog_msgs_add_deletes.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WebSocketDialogMsgsAddDeletes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_msgs', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_msgs', 'deleted_at')) {
+                $table->softDeletes();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_msgs', function (Blueprint $table) {
+            $table->dropSoftDeletes();
+        });
+    }
+}

database/migrations/2022_02_08_211051_insert_setting_column_template.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class InsertSettingColumnTemplate extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $array = \App\Module\Base::setting('columnTemplate');
+        if (empty($array)) {
+            \App\Module\Base::setting('columnTemplate', [
+                [
+                    'name' => '软件开发',
+                    'columns' => ['产品规划', '前端开发', '后端开发', '测试', '发布', '其他'],
+                ],
+                [
+                    'name' => '产品开发',
+                    'columns' => ['产品计划', '正在设计', '正在研发', '测试', '准备发布', '发布成功'],
+                ],
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}

database/migrations/2022_02_18_095253_web_socket_dialog_users_add_top_at.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class WebSocketDialogUsersAddTopAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_users', 'top_at')) {
+                $table->timestamp('top_at')->nullable()->after('userid')->comment('置顶时间');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            $table->dropColumn("top_at");
+        });
+    }
+}

database/migrations/2022_02_20_171030_files_update_type.php

@@ -0,0 +1,30 @@
+<?php
+
+use App\Models\File;
+use Illuminate\Database\Migrations\Migration;
+
+class FilesUpdateType extends Migration
+{
+    /**
+     * 更改流程图文件类型
+     * @return void
+     */
+    public function up()
+    {
+        File::whereType('flow')->update([
+            'type' => 'drawio'
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        File::whereType('drawio')->update([
+            'type' => 'flow'
+        ]);
+    }
+}

database/migrations/2022_02_21_203230_files_update_ext.php

@@ -0,0 +1,75 @@
+<?php
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+use App\Models\File;
+use App\Models\FileContent;
+use App\Module\Base;
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+
+class FilesUpdateExt extends Migration
+{
+    /**
+     * 更新后缀
+     * @return void
+     */
+    public function up()
+    {
+        File::whereIn('type', ['mind', 'drawio', 'document'])->where('ext', '')->orderBy('id')->chunk(100, function($files) {
+            /** @var File $file */
+            foreach ($files as $file) {
+                $fileContent = FileContent::whereFid($file->id)->orderByDesc('id')->first();
+                $contentArray = Base::json2array($fileContent?->content);
+                $contentString = '';
+                //
+                switch ($file->type) {
+                    case 'document':
+                        $file->ext = $contentArray['type'] ?: 'md';
+                        $contentString = $contentArray['content'];
+                        break;
+                    case 'drawio':
+                        $file->ext = 'drawio';
+                        $contentString = $contentArray['xml'];
+                        break;
+                    case 'mind':
+                        $file->ext = 'mind';
+                        $contentString = $fileContent?->content;
+                        break;
+                }
+                $file->save();
+                //
+                $path = 'uploads/file/' . $file->type . '/' . date("Ym", Carbon::parse($file->created_at)->timestamp) . '/' . $file->id . '/' . md5($contentString);
+                $save = public_path($path);
+                Base::makeDir(dirname($save));
+                file_put_contents($save, $contentString);
+                $content = [
+                    'type' => $file->ext,
+                    'url' => $path
+                ];
+                //
+                $content = FileContent::createInstance([
+                    'fid' => $file->id,
+                    'content' => $content,
+                    'text' => $fileContent?->text,
+                    'size' => $file->size,
+                    'userid' => $file->userid,
+                ]);
+                $content->save();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        File::whereIn('ext', ['mind', 'drawio', 'md'])->update([
+            'ext' => ''
+        ]);
+        // ... 退回去意义不大，文件内容不做回滚操作
+    }
+}

database/migrations/2022_02_22_142148_project_users_add_top_at.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectUsersAddTopAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_users', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_users', 'top_at')) {
+                $table->timestamp('top_at')->nullable()->after('owner')->comment('置顶时间');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_users', function (Blueprint $table) {
+            $table->dropColumn("top_at");
+        });
+    }
+}

database/migrations/2022_02_27_112217_create_project_task_flow_changes_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectTaskFlowChangesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_task_flow_changes', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('task_id')->nullable()->default(0)->comment('任务ID');
+            $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID');
+            $table->bigInteger('before_item_id')->nullable()->default(0)->comment('（变化前）工作流状态ID');
+            $table->string('before_item_name', 50)->nullable()->default('')->comment('（变化前）工作流状态名称');
+            $table->bigInteger('after_item_id')->nullable()->default(0)->comment('（变化后）工作流状态ID');
+            $table->string('after_item_name', 50)->nullable()->default('')->comment('（变化后）工作流状态名称');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_task_flow_changes');
+    }
+}

database/migrations/2022_02_27_210444_rename_pre_project_task_flow_changes_item.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RenamePreProjectTaskFlowChangesItem extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('project_task_flow_changes', function (Blueprint $table) {
+            if (Schema::hasColumn('project_task_flow_changes', 'before_item_id')) {
+                $table->renameColumn('before_item_id', 'before_flow_item_id');
+                $table->renameColumn('before_item_name', 'before_flow_item_name');
+                $table->renameColumn('after_item_id', 'after_flow_item_id');
+                $table->renameColumn('after_item_name', 'after_flow_item_name');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('project_task_flow_changes', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2022_03_02_161123_add_is_email_verity_to_users.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsEmailVerityToUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (!Schema::hasColumn('users', 'is_email_verity')) {
+                $table->boolean('is_email_verity')->default(0)->nullable()->after('disable_at')->comment('邮箱是否已验证');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn("is_email_verity");
+        });
+    }
+}

database/migrations/2022_03_02_172504_create_user_email_verifications_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserEmailVerificationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_email_verifications', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('userid')->nullable()->default(0)->comment('用户id');
+            $table->string('code')->nullable()->default('')->comment('验证参数');
+            $table->string('email')->nullable()->default('')->comment('电子邮箱');
+            $table->integer('status')->nullable()->default(0)->comment('0-未验证，1-已验证');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_email_verifications');
+    }
+}

database/migrations/2022_03_03_154459_create_project_task_mail_logs_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateProjectTaskMailLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('project_task_mail_logs', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('userid')->nullable()->default(0)->comment('用户id');
+            $table->integer('task_id')->nullable()->default(0)->comment('任务id');
+            $table->string('email')->nullable()->default('')->comment('电子邮箱');
+            $table->tinyInteger('type')->nullable()->default(0)->comment('提醒类型：1第一次任务提醒，2第二次任务超期提醒');
+            $table->tinyInteger('is_send')->nullable()->default(0)->comment('邮件发送是否成功：0否，1是');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('project_task_mail_logs');
+    }
+}

database/migrations/2022_03_04_154630_project_task_contents_update_content.php

@@ -0,0 +1,40 @@
+<?php
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+use App\Models\ProjectTaskContent;
+use App\Module\Base;
+use Illuminate\Database\Migrations\Migration;
+
+class ProjectTaskContentsUpdateContent extends Migration
+{
+    /**
+     * 任务详细描述保存至文件
+     * @return void
+     */
+    public function up()
+    {
+        ProjectTaskContent::orderBy('id')->chunk(100, function($items) {
+            /** @var ProjectTaskContent $item */
+            foreach ($items as $item) {
+                $content = Base::json2array($item->content);
+                if (!isset($content['url'])) {
+                    $item->content = Base::array2json([
+                        'url' => ProjectTaskContent::saveContent($item->task_id, $item->content)
+                    ]);
+                    $item->save();
+                }
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // ... 退回去意义不大，文件内容不做回滚操作
+    }
+}

database/migrations/2022_03_08_124155_add_web_socket_dialog_users_add_is_mark_unread.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWebSocketDialogUsersAddIsMarkUnread extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            if (!Schema::hasColumn('web_socket_dialog_users', 'is_mark_unread')) {
+                $table->boolean('is_mark_unread')->default(0)->nullable()->after('top_at')->comment('是否标记为未读：0否，1是');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('web_socket_dialog_users', function (Blueprint $table) {
+            $table->dropColumn("is_mark_unread");
+        });
+    }
+}