修复整数没有补位0导致无法匹配交易

.github/workflows/docker-alpine.yml

@@ -1,46 +0,0 @@
-name: docker-alpine-epusdt
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-
-env:
-  IMAGE_NAME: epusdt
-
-jobs:
-  push-docker-hub:
-    runs-on: ubuntu-latest
-    env:
-      TZ: Asia/Shanghai
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Compute Build Metadata
-        id: meta
-        shell: bash
-        run: |
-          echo "version=main-${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
-          echo "commit=${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
-          echo "date=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$GITHUB_OUTPUT"
-
-      - name: Login
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build And Push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          build-args: |
-            VERSION=${{ steps.meta.outputs.version }}
-            COMMIT=${{ steps.meta.outputs.commit }}
-            DATE=${{ steps.meta.outputs.date }}
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:alpine

.github/workflows/release.yml

@@ -1,79 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  contents: write
-  id-token: write
-  attestations: write
-  artifact-metadata: write
-
-concurrency:
-  group: release-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  goreleaser:
-    name: Build And Publish Binaries
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Ensure Tag Commit Is On Default Branch
-        env:
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-        run: |
-          git fetch origin "$DEFAULT_BRANCH" --depth=1
-          if ! git merge-base --is-ancestor "$GITHUB_SHA" "origin/$DEFAULT_BRANCH"; then
-            echo "tag ${GITHUB_REF_NAME} must reference a commit reachable from ${DEFAULT_BRANCH}"
-            exit 1
-          fi
-
-      - name: Set Up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: src/go.mod
-
-      - name: Select Previous Stable Tag For Final Releases
-        run: |
-          current_tag="${GITHUB_REF_NAME}"
-          if [[ "$current_tag" == *-* ]]; then
-            echo "prerelease tag detected: $current_tag"
-            exit 0
-          fi
-
-          previous_stable_tag="$(
-            git tag --list 'v*' --sort=-version:refname |
-              grep -Fxv "$current_tag" |
-              grep -Ev -- '-' |
-              head -n 1
-          )"
-
-          if [[ -n "$previous_stable_tag" ]]; then
-            echo "using previous stable tag: $previous_stable_tag"
-            echo "GORELEASER_PREVIOUS_TAG=$previous_stable_tag" >> "$GITHUB_ENV"
-          else
-            echo "no previous stable tag found"
-          fi
-
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v7
-        with:
-          distribution: goreleaser
-          version: "~> v2"
-          workdir: src
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Attest Release Artifacts
-        uses: actions/attest@v4
-        with:
-          subject-checksums: src/dist/SHA256SUMS

.gitignore

@@ -1,8 +1,4 @@
 .idea/
 src/runtime/
 src/.env
-src/*.db
+.DS_Store
-src/*.db-shm
-src/*.db-wal
-.DS_Store
-.env

DEVELOPMENT_STANDARD.md

@@ -1,157 +0,0 @@
-# Development Standard
-
-## Purpose
-
-This document defines the default development goals, review criteria, and testing constraints for changes in this repository.
-
-Before starting any implementation, use this document as a checklist.
-
-## Development Goals
-
-Every change should be judged against all of the following goals:
-
-1. Functional completeness
-   The target feature must actually work end to end, not just compile.
-
-2. No accidental teammate regression
-   Do not accidentally remove or override teammate capabilities that already exist on the base branch.
-
-3. Robustness
-   The code should handle normal failure cases, retries, state conflicts, and restart scenarios as reasonably as possible.
-
-4. Elegance
-   Prefer clear responsibilities, minimal coupling, and a small number of well-named moving parts.
-
-5. Maintainability
-   Avoid hidden behavior, confusing configuration, or implementation details that make future debugging harder.
-
-6. No dirty output
-   Never commit local runtime artifacts, local databases, caches, logs, or other development byproducts.
-
-7. No mojibake
-   Source files, messages, and docs should not contain broken encoding text.
-
-## Multi-Dimensional Self Review
-
-Each meaningful change should be evaluated across these dimensions:
-
-- functional completeness
-- engineering implementation quality
-- robustness
-- elegance
-- maintainability
-- regression risk
-- commit readiness
-- test coverage quality
-
-Scoring should be honest. High scores require both working behavior and clean delivery quality.
-
-## Code Quality Rules
-
-### Redundancy
-
-Avoid redundant code unless duplication is clearly cheaper and safer than abstraction.
-
-The following are considered bad redundancy:
-
-- duplicate business logic with only tiny naming differences
-- duplicate retry or state logic in multiple places
-- helper functions that exist only to wrap one line without improving clarity
-
-The following are acceptable:
-
-- small data shapes for read optimization
-- isolated helpers that remove repeated infrastructure setup
-- compatibility shims with clear removal intent
-
-### Elegance
-
-Code is considered elegant when:
-
-- responsibilities are split cleanly
-- names explain intent
-- state transitions are explicit
-- configuration is understandable
-- behavior is observable through useful logs
-- failure handling does not hide important problems
-
-### Robustness
-
-Code is considered robust when:
-
-- state changes are guarded by conditions where needed
-- retries are controlled, not infinite
-- restart recovery is possible where it matters
-- local concurrency does not easily corrupt behavior
-- failure in one side task does not silently break the main flow
-
-## Bug Standard
-
-Ask these questions before treating a change as finished:
-
-- Is there any blocking functional bug?
-- Is there any likely edge-case bug?
-- Is there any operational bug under realistic local concurrency?
-- Is there any user-visible regression?
-
-If a bug is known, it must be called out explicitly in review notes.
-
-## Testing Rules
-
-### Required Principle
-
-Tests must validate behavior, not re-implement the code under test.
-
-### Forbidden Test Types
-
-Do not write:
-
-- invalid tests
-- mirror tests
-- tests that only repeat implementation branches line by line
-- tests that only verify mocks interacted in the same order as the code was written
-- tests that lock onto incidental internals instead of real behavior
-
-### Preferred Test Types
-
-Prefer:
-
-- end-to-end behavior tests
-- state transition tests
-- concurrency conflict tests
-- retry and recovery tests
-- expiration and timing behavior tests
-- persistence and restart-oriented tests where relevant
-
-### Test Coverage Expectations
-
-Coverage quality matters more than raw coverage count.
-
-For core flows, tests should cover:
-
-- normal success path
-- important failure path
-- state conflict or idempotency path
-- retry or delayed processing path where relevant
-
-## Review Checklist
-
-Before considering a change ready, confirm:
-
-- functionality is complete
-- teammate capability was not accidentally lost
-- no local artifact will be committed
-- no mojibake exists
-- no obvious redundant code exists
-- no known blocking bug remains
-- robustness is acceptable for the target deployment model
-- tests are behavior-based and not mirror tests
-- review notes clearly explain intentional semantic changes
-
-## Current Project Direction
-
-For this repository specifically, current review should assume:
-
-- single-instance deployment is the primary target unless stated otherwise
-- runtime semantics may intentionally differ from older Redis and asynq behavior when the new SQLite design is deliberate
-- any such semantic difference must be explained in merge or review notes

Dockerfile

@@ -1,26 +0,0 @@
-FROM golang:alpine AS builder
-
-RUN apk add --no-cache --update git build-base
-ENV CGO_ENABLED=1
-ARG VERSION=0.0.0-dev
-ARG COMMIT=none
-ARG DATE=unknown
-WORKDIR /app
-COPY ./src/go.mod ./src/go.sum ./
-RUN go mod download
-
-COPY ./src .
-RUN go build -ldflags "-s -w -X github.com/assimon/luuu/config.BuildVersion=${VERSION} -X github.com/assimon/luuu/config.BuildCommit=${COMMIT} -X github.com/assimon/luuu/config.BuildDate=${DATE}"  \
-	-o epusdt .
-
-FROM alpine:latest AS runner
-ENV TZ=Asia/Shanghai
-RUN apk --no-cache add ca-certificates tzdata
-
-WORKDIR /app
-COPY --from=builder /app/static /app/static
-COPY --from=builder /app/static /static
-COPY --from=builder /app/epusdt .
-VOLUME /app/conf
-
-ENTRYPOINT ["./epusdt" ,"http","start"]

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is 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.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  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.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  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 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. Use with the GNU Affero General Public License.
-
-  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 Affero 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 special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 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 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 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 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  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 GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -39,16 +39,11 @@ Epusdt
 
 ## 教程：
 - 宝塔运行`epusdt`教程👉🏻[宝塔运行epusdt](wiki/BT_RUN.md)
-- 不好意思我有洁癖，手动运行`epusdt`教程👉🏻[手动运行epusdt](wiki/manual_RUN.md)
 - 开发者接入`epusdt`文档👉🏻[开发者接入epusdt](wiki/API.md)
-- HTML+PHP极速运行`epusdt`教程👉🏻[使用PHPAPI-for-epusdt极速接入epusdt](https://github.com/BlueSkyXN/PHPAPI-for-epusdt)
 
 ## 已适配系统插件
 - 独角数卡[插件地址](plugins/dujiaoka)
 
-## 加入交流/意见反馈
-- `Epusdt`频道[https://t.me/epusdt](https://t.me/epusdt)
-- `Epusdt`交流群组[https://t.me/epusdt_group](https://t.me/epusdt_group)
 
 ## 设计实现
 `Epusdt`的实现方式与其他项目原理类似，都是通过监听`trc20`网络的api或节点，      
@@ -65,7 +60,14 @@ Epusdt
 ### 流程图：
 ![Implementation principle](wiki/img/implementation_principle.jpg)
 
-
 ## 声明
-本项目仅供学习与技术交流使用，用户在使用过程中需自行遵守所在地法律法规。由于涉及加密资产及资金安全，用户应自行审查相关代码与风险。加密资产属于高风险新兴资产（包括稳定币），其价值可能波动甚至归零，GMwallet不对任何资产或使用结果作出保证。本内容不构成任何投资、税务、法律或金融建议，仅供教育用途，相关决策请咨询专业人士。
+`Epusdt`为开源的产品，仅用于学习交流使用！       
-
+不可用于任何违反中华人民共和国(含台湾省)或使用者所在地区法律法规的用途。           
+因为作者即本人仅完成代码的开发和开源活动(开源即任何人都可以下载使用或修改分发)，从未参与用户的任何运营和盈利活动。       
+且不知晓用户后续将程序源代码用于何种用途，故用户使用过程中所带来的任何法律责任即由用户自己承担。            
+```
+！！！Warning！！！
+项目中所涉及区块链代币均为学习用途，作者并不赞成区块链所繁衍出代币的金融属性
+亦不鼓励和支持任何"挖矿"，"炒币"，"虚拟币ICO"等非法行为
+虚拟币市场行为不受监管要求和控制，投资交易需谨慎，仅供学习区块链知识
+```

RELEASING.md

@@ -1,70 +0,0 @@
-# Releasing
-
-This repository publishes versioned binaries to GitHub Releases when a tag is pushed.
-
-## What gets published
-
-For each tag like `v1.2.3`, GitHub Actions builds release archives for:
-
-- `linux/amd64`
-- `linux/arm64`
-- `darwin/amd64`
-- `darwin/arm64`
-- `windows/amd64`
-- `windows/arm64`
-
-Each archive includes:
-
-- the `epusdt` binary
-- `src/.env.example`
-- `src/static/`
-
-Windows artifacts are published as `.zip`. Other platforms are published as `.tar.gz`.
-
-Each release also publishes:
-
-- a `SHA256SUMS` checksum file
-- a GitHub build provenance attestation for the checksum file
-
-## How to cut a release
-
-1. Make sure the release commit has already landed on the default branch.
-2. Create an annotated tag:
-
-```bash
-git tag -a v1.0.0 -m "release v1.0.0"
-```
-
-3. Push the tag:
-
-```bash
-git push origin v1.0.0
-```
-
-4. Wait for the `release` workflow to finish on GitHub.
-5. Download the generated binaries from the GitHub Release page.
-
-## Verify a release
-
-Verify the GitHub build provenance attestation:
-
-```bash
-gh attestation verify SHA256SUMS -R GMwalletApp/epusdt
-```
-
-## Local validation
-
-Run a snapshot build locally before pushing a tag:
-
-```bash
-cd src
-go run github.com/goreleaser/goreleaser/v2@latest release --snapshot --clean
-```
-
-The resulting artifacts will be generated under `src/dist/`.
-
-## Release candidates
-
-If you use tags like `v1.2.3-rc1`, GoReleaser will mark the GitHub release as a prerelease.
-
-For a final tag like `v1.2.3`, the release workflow forces GoReleaser to compare against the previous stable tag instead of the latest `rc` tag. This keeps the final changelog focused on stable-to-stable changes.

REVIEW.md

@@ -1,208 +0,0 @@
-# Review
-
-## Scope
-
-This review checks `dev-runtime` against `dev` with the following standards:
-
-- Do not accidentally remove or override teammate payment capabilities already merged into `dev`.
-- Do not submit local test artifacts or dirty files.
-- Confirm Redis -> SQLite replacement is functionally complete for the intended single-instance target.
-- Judge code quality, elegance, robustness, and maintainability.
-- Check for real bugs, mojibake, and redundant code.
-- Compare current quality with the previous `dev` implementation.
-
-These standards are also the default development constraints for future work:
-
-- no invalid tests
-- no mirror tests
-- prefer behavior-based tests over implementation-shaped tests
-- explain intentional semantic changes in review notes
-- verify dirty local artifacts are excluded before commit
-- think about teammate-regression risk before coding, not only after coding
-
-## Files That Must Not Be Committed
-
-These local SQLite artifacts must never be committed:
-
-- `src/epusdt.db`
-- `src/epusdt.db-shm`
-- `src/epusdt.db-wal`
-
-They are now excluded by `.gitignore`.
-
-## Teammate Capabilities Still Preserved
-
-The following teammate payment capabilities are still present:
-
-- multi-currency order model: `src/model/mdb/orders_mdb.go`
-- wallet address model: `src/model/mdb/wallet_address_mdb.go`
-- native `TRX` transfer detection: `src/model/service/task_service.go`
-- `TRC20 USDT` detection: `src/model/service/task_service.go`
-- dynamic exchange-rate path: `src/model/service/order_service.go`, `src/config/config.go`
-- `TRON_GRID_API_KEY` support: `src/config/config.go`
-
-Conclusion: teammate core payment capabilities were not accidentally removed.
-
-## Intentional Architecture Changes
-
-These are intentional refactors, not accidental overrides:
-
-- Redis runtime removed: `src/model/dao/rdb.go`
-- asynq handlers removed: `src/mq/handle/callback_queue.go`, `src/mq/handle/order_expiration_queue.go`
-- SQLite runtime lock introduced: `src/model/mdb/transaction_lock_mdb.go`
-- SQLite scheduler introduced: `src/mq/queue.go`, `src/mq/worker.go`
-- reservation moved from Redis key to SQLite unique constraint: `src/model/data/order_data.go`
-
-Conclusion: this branch keeps payment capability but changes the runtime implementation.
-
-## Previously Regressed Parts That Are Now Restored
-
-The following regressions have been restored in the current working tree:
-
-- rich Telegram payment notification template: `src/model/service/task_service.go`
-- key chain-scan observability logs: `src/model/service/task_service.go`
-- Chinese checkout error message: `src/model/service/pay_service.go`
-- more reliable Telegram add-wallet flow: `src/telegram/handle.go`
-
-## Functional Completion
-
-For the single-instance target, the Redis -> SQLite replacement is complete across:
-
-- order creation
-- amount reservation
-- chain scan matching
-- payment success processing
-- order expiration
-- callback scheduling
-- Telegram notification
-
-Conclusion: feature work is complete for the intended single-instance model.
-
-## Mojibake Check
-
-No real mojibake was found in the source files checked during review.
-
-Files spot-checked:
-
-- `src/telegram/handle.go`
-- `src/model/service/task_service.go`
-- `src/model/service/pay_service.go`
-
-Note: some terminals may render UTF-8 Chinese poorly, but the source content itself is fine.
-
-## Redundant Code Check
-
-No obvious redundant business code was found.
-
-Recent helper additions are justified:
-
-- `PendingCallbackOrder`
-- `expirableOrder`
-- `configureSQLite`
-
-Conclusion: no clear "fix by duplication" smell was found.
-
-## Bug Assessment
-
-No confirmed blocking business bug is currently visible in the reviewed code path.
-
-Important risk that still needs attention:
-
-- SQLite main DB can still hit `SQLITE_BUSY` under concurrent polling and writes.
-
-This risk is now being mitigated by:
-
-- `src/model/dao/sqlite_config.go`
-- `src/model/dao/mdb_sqlite.go`
-- `src/model/dao/runtime_sqlite.go`
-- lightweight busy retry in `src/mq/worker.go`
-
-Conclusion: no confirmed blocking functional bug, but SQLite concurrency remains a real operational boundary that should still be watched in runtime.
-
-## Robustness Assessment
-
-Strengths:
-
-- conditional state transitions prevent reviving expired orders
-- reservation is now a persistent unique constraint instead of a temporary Redis key
-- callback state is durable across process restarts
-- behavior tests exist for key paths:
-  - `src/model/service/order_service_test.go`
-  - `src/mq/worker_test.go`
-- callback polling now has a small targeted retry for transient SQLite busy errors
-
-Remaining limits:
-
-- robust for single-instance deployment
-- not a final design for multi-instance deployment
-- SQLite contention should still be watched in real runtime
-
-Conclusion: robust enough for single-instance use, not a direct multi-instance design.
-
-## Elegance Assessment
-
-Strengths:
-
-- runtime responsibility is cleaner with SQLite reservation + scheduler
-- logging responsibility is split more clearly:
-  - `log_level`
-  - `http_access_log`
-  - `sql_debug`
-- Telegram input flow is more practical for real clients
-- SQLite tuning is extracted into one helper
-
-Tradeoffs:
-
-- callback semantics are no longer the same as the old immediate-asynq enqueue path
-- current branch still has local uncommitted fixes that must be organized into a clean commit set
-
-Conclusion: elegant for the chosen single-instance direction, but must be explained clearly when merging.
-
-## Quality Compared With Previous Code
-
-Overall judgment: quality did not go down; it improved in the single-instance direction.
-
-Improvements:
-
-- stronger state-machine constraints
-- better log control
-- more durable runtime reservation
-- better Telegram interaction resilience
-- added behavior tests
-- added restart-oriented callback recovery coverage
-- reduced scheduler fragility under transient SQLite busy errors
-
-Changed semantics rather than degradation:
-
-- merchant callback is now polled by SQLite scheduler instead of immediate asynq enqueue
-
-Conclusion: quality is not lower, but runtime semantics changed and must be stated explicitly.
-
-## Self Score
-
-- functional completeness: 9.1/10
-- engineering implementation: 8.9/10
-- robustness: 8.7/10
-- elegance: 9.0/10
-- commit readiness: 8.8/10
-
-Overall self score: 8.9/10
-
-Main deductions:
-
-- current uncommitted fixes still need to be organized into a clean commit
-- SQLite single-file concurrency boundary still exists
-- callback semantics differ from `dev-payment` and require clear communication
-
-## Final Conclusion
-
-This code can be submitted, but only if all of the following are done:
-
-1. Do not commit local SQLite artifacts.
-2. Include the current uncommitted fixes in a clean, intentional commit set.
-3. Explain clearly in merge notes:
-   - what teammate capabilities were preserved
-   - what runtime behavior was intentionally refactored
-   - what semantics changed and why
-
-If those three conditions are met, this is not a hidden override of teammate code. It is a reviewed and documented refactor.

docker-compose.yaml

@@ -1,12 +0,0 @@
-version: "3"
-services:
-  epusdt:
-    image:  annona/epusdt:alpine
-    restart: always
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ./env:/app/.env
-    ports:
-      - "8088:8000"

src/.env.example

@@ -1,63 +1,60 @@
 app_name=epusdt
+#下面配置你的域名，收银台会需要
 app_uri=https://dujiaoka.com
-log_level=info
+#是否开启debug，默认false
-http_access_log=false
+app_debug=false
-sql_debug=false
+#http服务监听端口
 http_listen=:8000
 
+#静态资源文件目录
 static_path=/static
+#缓存路径
 runtime_root_path=/runtime
 
+#日志配置
 log_save_path=/logs
 log_max_size=32
 log_max_age=7
 max_backups=3
 
-# supported values: postgres,mysql,sqlite
+# mysql配置
-db_type=sqlite
-
-# sqlite primary database config
-sqlite_database_filename=
-sqlite_table_prefix=
-
-# postgres config
-postgres_host=127.0.0.1
-postgres_port=3306
-postgres_user=mysql_user
-postgres_passwd=mysql_password
-postgres_database=database_name
-postgres_table_prefix=
-postgres_max_idle_conns=10
-postgres_max_open_conns=100
-postgres_max_life_time=6
-
-# mysql config
 mysql_host=127.0.0.1
 mysql_port=3306
-mysql_user=mysql_user
+mysql_user=mysql账号
-mysql_passwd=mysql_password
+mysql_passwd=mysql密码
-mysql_database=database_name
+mysql_database=数据库
 mysql_table_prefix=
 mysql_max_idle_conns=10
 mysql_max_open_conns=100
 mysql_max_life_time=6
 
-# sqlite runtime store config
+# redis配置
-runtime_sqlite_filename=epusdt-runtime.db
+redis_host=127.0.0.1
+redis_port=6379
+redis_passwd=
+redis_db=5
+redis_pool_size=5
+redis_max_retries=3
+redis_idle_timeout=1000
 
-# background scheduler config
+# 消息队列配置
 queue_concurrency=10
-queue_poll_interval_ms=1000
+queue_level_critical=6
-callback_retry_base_seconds=5
+queue_level_default=3
+queue_level_low=1
 
+#机器人Apitoken
 tg_bot_token=
+#telegram代理url(大陆地区服务器可使用一台国外服务器做反代tg的url)，如果运行的本来就是境外服务器，则无需填写
 tg_proxy=
+#管理员userid
 tg_manage=
 
+#api接口认证token
 api_auth_token=
 
+#订单过期时间(单位分钟)
 order_expiration_time=10
-order_notice_max_retry=0
+
-forced_usdt_rate=
+#强制汇率(设置此参数后每笔交易将按照此汇率计算，例如:6.4)
-api_rate_url=
+forced_usdt_rate=
-tron_grid_api_key=

src/.goreleaser.yaml

@@ -1,62 +1,43 @@
-version: 2
+# This is an example .goreleaser.yml file with some sensible defaults.
-
+# Make sure to check the documentation at https://goreleaser.com
-project_name: epusdt
-
 before:
   hooks:
-    - go test ./...
+    # You may remove this if you don't use go modules.
-
+    #- go mod tidy
+    # you may remove this if you don't need go generate
+    #- go generate ./...
 builds:
-  - id: epusdt
+  - env:
-    main: .
-    binary: epusdt
-    env:
       - CGO_ENABLED=0
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w -X github.com/assimon/luuu/config.BuildVersion={{ .Version }} -X github.com/assimon/luuu/config.BuildCommit={{ .Commit }} -X github.com/assimon/luuu/config.BuildDate={{ .Date }}
     goos:
-      - linux
       - darwin
+      - linux
       - windows
     goarch:
       - amd64
-      - arm64
+      #- arm
-
+      #- 386
 archives:
-  - id: epusdt
+  - replacements:
-    ids:
+      darwin: Darwin
-      - epusdt
+      linux: Linux
-    name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
+      windows: Windows
+      386: i386
+      amd64: x86_64
+    id: epusdt
+    name_template: "{{ .ProjectName }}_v0.0.1_{{ .Os }}_{{ .Arch }}"
+    format: tar.gz
     files:
       - .env.example
-      - static/**
+      - static/*
-    format_overrides:
+      - runtime/*
-      - goos: windows
-        formats:
-          - zip
-
 checksum:
-  name_template: "SHA256SUMS"
+  name_template: 'checksums.txt'
-
 snapshot:
   name_template: "{{ incpatch .Version }}-next"
-
-release:
-  github:
-    owner: GMwalletApp
-    name: epusdt
-  prerelease: auto
-
 changelog:
   sort: asc
   filters:
     exclude:
-      - "^docs:"
+      - '^docs:'
-      - "^test:"
+      - '^test:'
-      - "^chore:"
-      - "^ci:"
-      - "^fix\\(ci\\):"
-      - "^build\\(release\\):"
-      - "^Merge pull request"

src/bootstrap/bootstrap.go

@@ -1,8 +1,7 @@
 package bootstrap
 
 import (
-	"sync"
+	"github.com/assimon/luuu/command"
-
 	"github.com/assimon/luuu/config"
 	"github.com/assimon/luuu/model/dao"
 	"github.com/assimon/luuu/mq"
@@ -11,15 +10,24 @@ import (
 	"github.com/assimon/luuu/util/log"
 )
 
-var initOnce sync.Once
+//Start 服务启动
-
+func Start() {
-func InitApp() {
+	// 配置加载
-	initOnce.Do(func() {
+	config.Init()
-		config.Init()
+	// 日志加载
-		log.Init()
+	log.Init()
-		dao.Init()
+	// Mysql启动
-		mq.Start()
+	dao.MysqlInit()
-		go telegram.BotStart()
+	// redis启动
-		go task.Start()
+	dao.RedisInit()
-	})
+	// 队列启动
+	mq.Start()
+	// telegram机器人启动
+	go telegram.BotStart()
+	// 定时任务
+	go task.Start()
+	err := command.Execute()
+	if err != nil {
+		panic(err)
+	}
 }

src/command/banner.go

@@ -1,18 +0,0 @@
-package command
-
-import (
-	"github.com/assimon/luuu/config"
-	"github.com/gookit/color"
-)
-
-func printBanner() {
-	color.Green.Printf("%s\n", "  _____                     _ _   \n | ____|_ __  _   _ ___  __| | |_ \n |  _| | '_ \\| | | / __|/ _` | __|\n | |___| |_) | |_| \\__ \\ (_| | |_ \n |_____| .__/ \\__,_|___/\\__,_|\\__|\n       |_|                        ")
-	color.Infof(
-		"Epusdt version(%s) commit(%s) built(%s) Powered by %s %s \n",
-		config.GetAppVersion(),
-		config.GetBuildCommit(),
-		config.GetBuildDate(),
-		"GMwalletApp",
-		"https://github.com/GMwalletApp/epusdt",
-	)
-}

src/command/http_server.go

@@ -2,12 +2,6 @@ package command
 
 import (
 	"context"
-	"net/http"
-	"os"
-	"os/signal"
-	"time"
-
-	"github.com/assimon/luuu/bootstrap"
 	"github.com/assimon/luuu/config"
 	"github.com/assimon/luuu/middleware"
 	"github.com/assimon/luuu/route"
@@ -18,12 +12,16 @@ import (
 	echoMiddleware "github.com/labstack/echo/v4/middleware"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"net/http"
+	"os"
+	"os/signal"
+	"time"
 )
 
 var httpCmd = &cobra.Command{
 	Use:   "http",
-	Short: "http service",
+	Short: "http服务",
-	Long:  "http service commands",
+	Long:  "http服务相关命令",
 	Run: func(cmd *cobra.Command, args []string) {
 	},
 }
@@ -34,11 +32,9 @@ func init() {
 
 var startCmd = &cobra.Command{
 	Use:   "start",
-	Short: "start",
+	Short: "启动",
-	Long:  "start http service",
+	Long:  "启动http服务",
 	Run: func(cmd *cobra.Command, args []string) {
-		bootstrap.InitApp()
-		printBanner()
 		HttpServerStart()
 	},
 }
@@ -48,22 +44,23 @@ func HttpServerStart() {
 	e := echo.New()
 	e.HideBanner = true
 	e.HTTPErrorHandler = customHTTPErrorHandler
-
+	// 中间件注册
 	MiddlewareRegister(e)
+	// 路由注册
 	route.RegisterRoute(e)
-	e.Static(config.StaticPath, config.StaticFilePath)
+	// 静态目录注册
-
+	e.Static(config.StaticPath, "static")
 	httpListen := viper.GetString("http_listen")
 	go func() {
 		if err = e.Start(httpListen); err != http.ErrServerClosed {
 			log.Sugar.Error(err)
 		}
 	}()
-
+	// Wait for interrupt signal to gracefully shutdown the server with a timeout of 10 seconds.
+	// Use a buffered channel to avoid missing signals as recommended for signal.Notify
 	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt, os.Kill)
 	<-quit
-
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	if err = e.Shutdown(ctx); err != nil {
@@ -71,13 +68,16 @@ func HttpServerStart() {
 	}
 }
 
+// MiddlewareRegister 中间件注册
 func MiddlewareRegister(e *echo.Echo) {
-	if config.HTTPAccessLog {
+	if config.AppDebug {
+		e.Debug = true
 		e.Use(echoMiddleware.Logger())
 	}
 	e.Use(middleware.RequestUUID())
 }
 
+// customHTTPErrorHandler 默认消息提示
 func customHTTPErrorHandler(err error, e echo.Context) {
 	code := http.StatusInternalServerError
 	msg := "server error"
@@ -95,4 +95,5 @@ func customHTTPErrorHandler(err error, e echo.Context) {
 		resp.Message = he.Msg
 	}
 	_ = e.JSON(http.StatusOK, resp)
+	return
 }

src/command/root.go

@@ -1,11 +1,6 @@
 package command
 
-import (
+import "github.com/spf13/cobra"
-	"github.com/assimon/luuu/config"
-	"github.com/spf13/cobra"
-)
-
-var configPath string
 
 var rootCmd = &cobra.Command{}
 
@@ -14,9 +9,5 @@ func Execute() error {
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&configPath, "config", "", "path to .env or directory containing .env")
-	rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
-		config.SetConfigPath(configPath)
-	}
 	rootCmd.AddCommand(httpCmd)
 }

src/command/version.go

@@ -1,26 +0,0 @@
-package command
-
-import (
-	"fmt"
-
-	"github.com/assimon/luuu/config"
-	"github.com/spf13/cobra"
-)
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print build version information",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		_, err := fmt.Fprintf(cmd.OutOrStdout(),
-			"version: %s\ncommit: %s\nbuilt: %s\n",
-			config.GetAppVersion(),
-			config.GetBuildCommit(),
-			config.GetBuildDate(),
-		)
-		return err
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(versionCmd)
-}

src/config/config.go

@@ -1,169 +1,59 @@
 package config
 
 import (
-	"errors"
 	"fmt"
-	"log"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/assimon/luuu/util/http_client"
 	"github.com/spf13/viper"
-	"github.com/tidwall/gjson"
+	"os"
 )
 
 var (
-	HTTPAccessLog      bool
+	AppDebug    bool
-	SQLDebug           bool
+	MysqlDns    string
-	LogLevel           string
+	RuntimePath string
-	MysqlDns           string
+	LogSavePath string
-	RuntimePath        string
+	StaticPath  string
-	LogSavePath        string
+	TgBotToken  string
-	StaticPath         string
+	TgProxy     string
-	StaticFilePath     string
+	TgManage    int64
-	TgBotToken         string
+	UsdtRate    float64
-	TgProxy            string
-	TgManage           int64
-	UsdtRate           float64
-	RateApiUrl         string
-	TRON_GRID_API_KEY  string
-	BuildVersion       = "0.0.0-dev"
-	BuildCommit        = "none"
-	BuildDate          = "unknown"
-	configRootPath     string
-	explicitConfigPath string
 )
 
-func SetConfigPath(path string) {
-	explicitConfigPath = strings.TrimSpace(path)
-}
-
 func Init() {
-	configPath, err := resolveConfigFilePath()
+	viper.AddConfigPath("./")
+	viper.SetConfigFile(".env")
+	err := viper.ReadInConfig()
 	if err != nil {
 		panic(err)
 	}
-	configRootPath = filepath.Dir(configPath)
+	gwd, err := os.Getwd()
-
-	viper.SetConfigFile(configPath)
-	err = viper.ReadInConfig()
 	if err != nil {
 		panic(err)
 	}
-	HTTPAccessLog = viper.GetBool("http_access_log")
+	AppDebug = viper.GetBool("app_debug")
-	SQLDebug = viper.GetBool("sql_debug")
+	StaticPath = viper.GetString("static_path")
-	LogLevel = normalizeLogLevel(viper.GetString("log_level"))
+	RuntimePath = fmt.Sprintf(
-	StaticPath = normalizeStaticURLPath(viper.GetString("static_path"))
+		"%s%s",
-	StaticFilePath = filepath.Join(configRootPath, strings.TrimPrefix(StaticPath, "/"))
+		gwd,
-	RuntimePath = resolvePathFromBase(configRootPath, viper.GetString("runtime_root_path"), filepath.Join(configRootPath, "runtime"))
+		viper.GetString("runtime_root_path"))
-	LogSavePath = resolvePathFromBase(RuntimePath, viper.GetString("log_save_path"), filepath.Join(RuntimePath, "logs"))
+	LogSavePath = fmt.Sprintf(
-	mustMkdir(RuntimePath)
+		"%s%s",
-	mustMkdir(LogSavePath)
+		RuntimePath,
+		viper.GetString("log_save_path"))
 	MysqlDns = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
-		url.QueryEscape(viper.GetString("mysql_user")),
+		viper.GetString("mysql_user"),
-		url.QueryEscape(viper.GetString("mysql_passwd")),
+		viper.GetString("mysql_passwd"),
-		fmt.Sprintf("%s:%s", viper.GetString("mysql_host"), viper.GetString("mysql_port")),
+		fmt.Sprintf(
+			"%s:%s",
+			viper.GetString("mysql_host"),
+			viper.GetString("mysql_port")),
 		viper.GetString("mysql_database"))
 	TgBotToken = viper.GetString("tg_bot_token")
 	TgProxy = viper.GetString("tg_proxy")
 	TgManage = viper.GetInt64("tg_manage")
-
-	RateApiUrl = GetRateApiUrl()
-	TRON_GRID_API_KEY = viper.GetString("tron_grid_api_key")
-}
-
-func mustMkdir(path string) {
-	if err := os.MkdirAll(path, 0o755); err != nil {
-		panic(err)
-	}
-}
-
-func normalizeLogLevel(level string) string {
-	switch strings.ToLower(strings.TrimSpace(level)) {
-	case "debug", "info", "warn", "error":
-		return strings.ToLower(strings.TrimSpace(level))
-	default:
-		return "info"
-	}
-}
-
-func normalizeStaticURLPath(path string) string {
-	path = strings.TrimSpace(path)
-	if path == "" || path == "/" {
-		return "/static"
-	}
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-	return path
-}
-
-func resolvePathFromBase(basePath string, path string, fallback string) string {
-	path = strings.TrimSpace(path)
-	if path == "" {
-		return fallback
-	}
-	if filepath.IsAbs(path) {
-		return path
-	}
-	path = strings.TrimPrefix(path, "/")
-	path = strings.TrimPrefix(path, "\\")
-	return filepath.Join(basePath, filepath.FromSlash(path))
-}
-
-func resolveConfigFilePath() (string, error) {
-	if explicitConfigPath != "" {
-		return normalizeConfiguredPath(explicitConfigPath)
-	}
-	if envPath := strings.TrimSpace(os.Getenv("EPUSDT_CONFIG")); envPath != "" {
-		return normalizeConfiguredPath(envPath)
-	}
-	return normalizeConfiguredPath(".env")
-}
-
-func normalizeConfiguredPath(input string) (string, error) {
-	path := strings.TrimSpace(input)
-	if path == "" {
-		path = ".env"
-	}
-	if !filepath.IsAbs(path) {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return "", err
-		}
-		path = filepath.Join(cwd, path)
-	}
-
-	info, err := os.Stat(path)
-	if err == nil && info.IsDir() {
-		path = filepath.Join(path, ".env")
-		info, err = os.Stat(path)
-	}
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return "", fmt.Errorf("config file not found: %s", path)
-		}
-		return "", err
-	}
-	if info.IsDir() {
-		return "", fmt.Errorf("config path must point to a file, got directory: %s", path)
-	}
-	return path, nil
 }
 
 func GetAppVersion() string {
-	return BuildVersion
+	return "0.0.1"
-}
-
-func GetBuildCommit() string {
-	return BuildCommit
-}
-
-func GetBuildDate() string {
-	return BuildDate
 }
 
 func GetAppName() string {
@@ -182,73 +72,6 @@ func GetApiAuthToken() string {
 	return viper.GetString("api_auth_token")
 }
 
-func GetRateApiUrl() string {
-	rateURL := viper.GetString("api_rate_url")
-	if rateURL == "" {
-		rateURL = os.Getenv("API_RATE_URL")
-	}
-	if rateURL == "" {
-		log.Println("api_rate_url is empty")
-	}
-	RateApiUrl = rateURL
-	return rateURL
-}
-
-func GetRateForCoin(coin string, base string) float64 {
-	coin = strings.ToLower(strings.TrimSpace(coin))
-	base = strings.ToLower(strings.TrimSpace(base))
-	if coin == "" || base == "" {
-		return 0
-	}
-	if coin == base {
-		return 1
-	}
-	if coin == "usdt" {
-		switch base {
-		case "usd":
-			return 1
-		case "cny":
-			usdtRate := GetUsdtRate()
-			if usdtRate > 0 {
-				return 1 / usdtRate
-			}
-		}
-	}
-
-	baseURL := RateApiUrl
-	if baseURL == "" {
-		baseURL = GetRateApiUrl()
-	}
-	if baseURL == "" {
-		log.Printf("rate api url is empty")
-		return 0.0
-	}
-	if baseURL[len(baseURL)-1] != '/' {
-		baseURL += "/"
-	}
-
-	client := http_client.GetHttpClient()
-	resp, err := client.R().Get(baseURL + fmt.Sprintf("%s.json", base))
-	if err != nil {
-		log.Printf("call rate api error: %s", err.Error())
-		return 0.0
-	}
-	if resp.StatusCode() < 200 || resp.StatusCode() >= 300 {
-		log.Printf("call rate api unexpected status: %s", resp.Status())
-		return 0.0
-	}
-
-	targetRate := 0.0
-	gjson.GetBytes(resp.Body(), base).ForEach(func(key, value gjson.Result) bool {
-		if key.String() == coin {
-			targetRate = value.Float()
-			return false
-		}
-		return true
-	})
-	return targetRate
-}
-
 func GetUsdtRate() float64 {
 	forcedUsdtRate := viper.GetFloat64("forced_usdt_rate")
 	if forcedUsdtRate > 0 {
@@ -267,64 +90,3 @@ func GetOrderExpirationTime() int {
 	}
 	return timer
 }
-
-func GetOrderExpirationTimeDuration() time.Duration {
-	timer := GetOrderExpirationTime()
-	return time.Minute * time.Duration(timer)
-}
-
-func GetRuntimeSqlitePath() string {
-	filename := viper.GetString("runtime_sqlite_filename")
-	if filename == "" {
-		filename = "epusdt-runtime.db"
-	}
-	if filepath.IsAbs(filename) {
-		return filename
-	}
-	filename = strings.TrimPrefix(strings.TrimPrefix(filename, "/"), "\\")
-	return filepath.Join(RuntimePath, filepath.FromSlash(filename))
-}
-
-func GetPrimarySqlitePath() string {
-	filename := strings.TrimSpace(viper.GetString("sqlite_database_filename"))
-	if filename == "" {
-		return filepath.Join(configRootPath, "epusdt.db")
-	}
-	if filepath.IsAbs(filename) {
-		return filename
-	}
-	filename = strings.TrimPrefix(strings.TrimPrefix(filename, "/"), "\\")
-	return filepath.Join(configRootPath, filepath.FromSlash(filename))
-}
-
-func GetQueueConcurrency() int {
-	concurrency := viper.GetInt("queue_concurrency")
-	if concurrency <= 0 {
-		return 10
-	}
-	return concurrency
-}
-
-func GetQueuePollInterval() time.Duration {
-	interval := viper.GetInt("queue_poll_interval_ms")
-	if interval <= 0 {
-		interval = 1000
-	}
-	return time.Duration(interval) * time.Millisecond
-}
-
-func GetOrderNoticeMaxRetry() int {
-	retry := viper.GetInt("order_notice_max_retry")
-	if retry < 0 {
-		return 0
-	}
-	return retry
-}
-
-func GetCallbackRetryBaseDuration() time.Duration {
-	seconds := viper.GetInt("callback_retry_base_seconds")
-	if seconds <= 0 {
-		seconds = 5
-	}
-	return time.Duration(seconds) * time.Second
-}

src/config/config_test.go

@@ -1,118 +0,0 @@
-package config
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestNormalizeConfiguredPathUsesExplicitFile(t *testing.T) {
-	t.Helper()
-
-	root := t.TempDir()
-	configPath := filepath.Join(root, "custom.env")
-	if err := os.WriteFile(configPath, []byte("app_name=test\n"), 0o644); err != nil {
-		t.Fatalf("write config: %v", err)
-	}
-
-	got, err := normalizeConfiguredPath(configPath)
-	if err != nil {
-		t.Fatalf("normalize explicit file: %v", err)
-	}
-	if got != configPath {
-		t.Fatalf("config path = %s, want %s", got, configPath)
-	}
-}
-
-func TestNormalizeConfiguredPathUsesExplicitDirectory(t *testing.T) {
-	t.Helper()
-
-	root := t.TempDir()
-	configPath := filepath.Join(root, ".env")
-	if err := os.WriteFile(configPath, []byte("app_name=test\n"), 0o644); err != nil {
-		t.Fatalf("write config: %v", err)
-	}
-
-	got, err := normalizeConfiguredPath(root)
-	if err != nil {
-		t.Fatalf("normalize explicit directory: %v", err)
-	}
-	if got != configPath {
-		t.Fatalf("config path = %s, want %s", got, configPath)
-	}
-}
-
-func TestResolveConfigFilePathUsesCurrentDirectoryByDefault(t *testing.T) {
-	t.Helper()
-
-	oldCwd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("get cwd: %v", err)
-	}
-	defer func() { _ = os.Chdir(oldCwd) }()
-
-	root := t.TempDir()
-	configPath := filepath.Join(root, ".env")
-	if err := os.WriteFile(configPath, []byte("app_name=test\n"), 0o644); err != nil {
-		t.Fatalf("write config: %v", err)
-	}
-	if err := os.Chdir(root); err != nil {
-		t.Fatalf("chdir: %v", err)
-	}
-
-	t.Setenv("EPUSDT_CONFIG", "")
-	SetConfigPath("")
-
-	got, err := resolveConfigFilePath()
-	if err != nil {
-		t.Fatalf("resolve config path: %v", err)
-	}
-	if got != configPath {
-		t.Fatalf("config path = %s, want %s", got, configPath)
-	}
-}
-
-func TestResolveConfigFilePathPrefersExplicitOverEnv(t *testing.T) {
-	t.Helper()
-
-	oldCwd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("get cwd: %v", err)
-	}
-	defer func() { _ = os.Chdir(oldCwd) }()
-
-	root := t.TempDir()
-	if err := os.Chdir(root); err != nil {
-		t.Fatalf("chdir: %v", err)
-	}
-
-	envDir := filepath.Join(root, "from-env")
-	if err := os.MkdirAll(envDir, 0o755); err != nil {
-		t.Fatalf("mkdir env dir: %v", err)
-	}
-	envPath := filepath.Join(envDir, ".env")
-	if err := os.WriteFile(envPath, []byte("app_name=env\n"), 0o644); err != nil {
-		t.Fatalf("write env config: %v", err)
-	}
-
-	flagDir := filepath.Join(root, "from-flag")
-	if err := os.MkdirAll(flagDir, 0o755); err != nil {
-		t.Fatalf("mkdir flag dir: %v", err)
-	}
-	flagPath := filepath.Join(flagDir, ".env")
-	if err := os.WriteFile(flagPath, []byte("app_name=flag\n"), 0o644); err != nil {
-		t.Fatalf("write flag config: %v", err)
-	}
-
-	t.Setenv("EPUSDT_CONFIG", envDir)
-	SetConfigPath(flagDir)
-	defer SetConfigPath("")
-
-	got, err := resolveConfigFilePath()
-	if err != nil {
-		t.Fatalf("resolve config path: %v", err)
-	}
-	if got != flagPath {
-		t.Fatalf("config path = %s, want %s", got, flagPath)
-	}
-}

src/controller/comm/pay_controller.go

@@ -1,13 +1,13 @@
 package comm
 
 import (
+	"fmt"
 	"github.com/assimon/luuu/config"
 	"github.com/assimon/luuu/model/response"
 	"github.com/assimon/luuu/model/service"
 	"github.com/labstack/echo/v4"
 	"html/template"
 	"net/http"
-	"path/filepath"
 )
 
 // CheckoutCounter 收银台
@@ -17,7 +17,7 @@ func (c *BaseCommController) CheckoutCounter(ctx echo.Context) (err error) {
 	if err != nil {
 		return ctx.String(http.StatusOK, err.Error())
 	}
-	tmpl, err := template.ParseFiles(filepath.Join(config.StaticFilePath, "index.html"))
+	tmpl, err := template.ParseFiles(fmt.Sprintf(".%s/%s", config.StaticPath, "index.html"))
 	if err != nil {
 		return ctx.String(http.StatusOK, err.Error())
 	}

src/crypto/tron.go

@@ -1,30 +0,0 @@
-package crypto
-
-import (
-	"crypto/sha256"
-
-	"github.com/shengdoushi/base58"
-)
-
-const AddressLength = 20
-const PrefixMainnet = 0x41
-
-// Encode returns the Base58 encoding of input using the Bitcoin alphabet.
-func Encode(input []byte) string {
-	return base58.Encode(input, base58.BitcoinAlphabet)
-}
-
-// EncodeCheck returns the Base58Check encoding of input (Base58 with a 4-byte SHA-256d checksum).
-func EncodeCheck(input []byte) string {
-	h256h0 := sha256.New()
-	h256h0.Write(input)
-	h0 := h256h0.Sum(nil)
-
-	h256h1 := sha256.New()
-	h256h1.Write(h0)
-	h1 := h256h1.Sum(nil)
-
-	inputCheck := append(append([]byte(nil), input...), h1[:4]...)
-
-	return Encode(inputCheck)
-}

src/go.mod

@@ -1,82 +1,26 @@
 module github.com/assimon/luuu
 
-go 1.25.0
+go 1.16
 
 require (
-	github.com/btcsuite/btcutil v1.0.2
+	github.com/go-redis/redis/v8 v8.11.5
-	github.com/dromara/carbon/v2 v2.6.15
+	github.com/go-resty/resty/v2 v2.7.0
-	github.com/go-resty/resty/v2 v2.11.0
+	github.com/golang-module/carbon/v2 v2.0.1
 	github.com/gookit/color v1.5.0
-	github.com/gookit/goutil v0.4.6
+	github.com/gookit/goutil v0.4.4
-	github.com/gookit/validate v1.3.1
+	github.com/gookit/validate v1.2.11
+	github.com/hibiken/asynq v0.22.1
 	github.com/json-iterator/go v1.1.12
 	github.com/labstack/echo/v4 v4.6.0
-	github.com/libtnb/sqlite v1.0.1
 	github.com/natefinch/lumberjack v2.0.0+incompatible
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shengdoushi/base58 v1.0.0
 	github.com/shopspring/decimal v1.3.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.9.0
-	github.com/tidwall/gjson v1.18.0
 	go.uber.org/zap v1.17.0
-	gopkg.in/telebot.v3 v3.0.0
-	gorm.io/driver/mysql v1.5.1
-	gorm.io/driver/postgres v1.5.2
-	gorm.io/driver/sqlite v1.6.0
-	gorm.io/gorm v1.31.1
-)
-
-require (
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/gookit/filter v1.1.2 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.3.1 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/labstack/gommon v0.3.0 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.22 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/ncruces/go-strftime v1.0.0 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/tidwall/match v1.2.0 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasttemplate v1.2.1 // indirect
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	gopkg.in/ini.v1 v1.63.2 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/telebot.v3 v3.0.0
-	modernc.org/libc v1.70.0 // indirect
+	gorm.io/driver/mysql v1.1.2
-	modernc.org/mathutil v1.7.1 // indirect
+	gorm.io/gorm v1.21.15
-	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.47.0 // indirect
 )

src/go.sum

@@ -47,7 +47,6 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -55,18 +54,12 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
-github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts=
-github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
-github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
-github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
-github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
-github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -78,14 +71,11 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dromara/carbon/v2 v2.6.15 h1:3HuC3XcWczIHUTbg/f0CSVydtKEdM+P0GM1sdsbwXmI=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dromara/carbon/v2 v2.6.15/go.mod h1:NGo3reeV5vhWCYWcSqbJRZm46MEwyfYI5EJRdVFoLJo=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -98,8 +88,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
@@ -112,15 +100,21 @@ github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvSc
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
+github.com/go-redis/redis/v8 v8.11.2/go.mod h1:DLomh7y2e3ggQXQLd1YgmvIfecPJoFl7WU5SOQ/r06M=
-github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
+github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
+github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-module/carbon/v2 v2.0.1 h1:lck7WgSNVvUIRbwE+MJG3qyrT+Vrcz1tp6TkZ91gFgE=
+github.com/golang-module/carbon/v2 v2.0.1/go.mod h1:NF5unWf838+pyRY0o+qZdIwBMkFf7w0hmLIguLiEpzU=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -150,6 +144,7 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -165,9 +160,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -184,15 +178,14 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
-github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -202,11 +195,10 @@ github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl
 github.com/gookit/filter v1.1.2 h1:mp6zSRaRhGuoGZNUlZR4W0/1OTwKRUI5qCXEtD02BR0=
 github.com/gookit/filter v1.1.2/go.mod h1:pVXLLDD+A8yH9GRztq2Cp7zwZocnuTUpbZs9Q+awAKM=
 github.com/gookit/goutil v0.3.12/go.mod h1:ITj7Lw0muhJNOX+QRa+j+HH0+RNoQVuTmZx5d5LE1vE=
+github.com/gookit/goutil v0.4.4 h1:18xr8NKbs4LteyOHZfQ8g7JqTqZal801mAT6LERGdpE=
 github.com/gookit/goutil v0.4.4/go.mod h1:qlGVh0PI+WnWSjYnIocfz/7tkeogxL6+EDNP1mRe+7o=
-github.com/gookit/goutil v0.4.6 h1:LSATnmIyR0rV4BMj3XyaKFYtX/HbRURnPVHt6Zb5ABs=
+github.com/gookit/validate v1.2.11 h1:zUMsezhMrW3Cy8St3cQJgCKB1ZIbKOWK8e7WMSuVIRc=
-github.com/gookit/goutil v0.4.6/go.mod h1:pq1eTibwb2wN96jrci0xy7xogWzzo9CihOQJEAvz4yQ=
+github.com/gookit/validate v1.2.11/go.mod h1:wXo0Vr+AzFUCEUCbTFXgKlPfT+V/V0wPK3zLp49jQq0=
-github.com/gookit/validate v1.3.1 h1:YoxBxG5H+WucKjfEo8X+QvYOzED7ue3Mfpq6jtpIbYs=
-github.com/gookit/validate v1.3.1/go.mod h1:mzcr3U5XtAlQVAgbW0wbmDGiuefU/MNuDkXFMBNb1ko=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
@@ -228,10 +220,7 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
@@ -241,23 +230,17 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
+github.com/hibiken/asynq v0.22.1 h1:t7bbiz2O4MC69qKeKp5UON7ToxynBNXT/kTP/XYq9M8=
+github.com/hibiken/asynq v0.22.1/go.mod h1:K70jPVx+CAmmQrXot7Dru0D52EO7ob4BIun3ri5z1Qw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU=
-github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
-github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI=
-github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -267,23 +250,18 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.6.0 h1:vsYEeeYy077cB5yMpgI+ubA7iVRZEtrzHhcvRhd27gA=
 github.com/labstack/echo/v4 v4.6.0/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k=
 github.com/labstack/gommon v0.3.0 h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/libtnb/sqlite v1.0.1 h1:H4kdU3LBOjdxfQy8s02/wG1rNmp8GMiqzgel0axewtI=
-github.com/libtnb/sqlite v1.0.1/go.mod h1:zuagCP0nvIJwr4e0kdzq9Yc2Pw5HlVOoLT6ZmzmjOes=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -300,11 +278,8 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -329,11 +304,22 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=
 github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
-github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
@@ -346,22 +332,16 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/shengdoushi/base58 v1.0.0 h1:tGe4o6TmdXFJWoI31VoSWvuaKxf0Px3gqa3sUWhAxBs=
-github.com/shengdoushi/base58 v1.0.0/go.mod h1:m5uIILfzcKMw6238iWAhP4l3s5+uXyF3+bJKUNhAL9I=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -371,9 +351,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
-github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw=
 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
@@ -389,20 +368,10 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
-github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
-github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
@@ -415,7 +384,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
@@ -429,11 +397,12 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v0.10.0 h1:G3eWbSNIskeRqtsN/1uI5B+eP73y3JUuBsv9AZjehb4=
+go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -441,13 +410,10 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -483,10 +449,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -513,6 +475,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -520,18 +483,17 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20211029224645-99673261e6eb h1:pirldcYWx7rx7kE5r+9WsOXPXK0+WH5+uZ7uPmJ44uM=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -559,10 +521,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -577,12 +535,14 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -605,6 +565,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -623,21 +584,11 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -646,19 +597,13 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -707,6 +652,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
@@ -715,13 +661,10 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -848,12 +791,12 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -863,26 +806,23 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXL
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/telebot.v3 v3.0.0 h1:UgHIiE/RdjoDi6nf4xACM7PU3TqiPVV9vvTydCEnrTo=
 gopkg.in/telebot.v3 v3.0.0/go.mod h1:7rExV8/0mDDNu9epSrDm/8j22KLaActH1Tbee6YjzWg=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gorm.io/driver/mysql v1.1.2 h1:OofcyE2lga734MxwcCW9uB4mWNXMr50uaGRVwQL2B0M=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.1.2/go.mod h1:4P/X9vSc3WTrhTLZ259cpFd6xKNYiSSdSZngkSBGIMM=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
+gorm.io/gorm v1.21.12/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
+gorm.io/gorm v1.21.15 h1:gAyaDoPw0lCyrSFWhBlahbUA1U4P5RViC1uIqoB+1Rk=
-gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0=
+gorm.io/gorm v1.21.15/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
-gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8=
-gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
-gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
-gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -890,34 +830,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
-modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.32.0 h1:hjG66bI/kqIPX1b2yT6fr/jt+QedtP2fqojG2VrFuVw=
-modernc.org/ccgo/v4 v4.32.0/go.mod h1:6F08EBCx5uQc38kMGl+0Nm0oWczoo1c7cgpzEry7Uc0=
-modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=
-modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=
-modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
-modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo=
-modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
-modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
-modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
-modernc.org/libc v1.70.0 h1:U58NawXqXbgpZ/dcdS9kMshu08aiA6b7gusEusqzNkw=
-modernc.org/libc v1.70.0/go.mod h1:OVmxFGP1CI/Z4L3E0Q3Mf1PDE0BucwMkcXjjLntvHJo=
-modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
-modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
-modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
-modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
-modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.47.0 h1:R1XyaNpoW4Et9yly+I2EeX7pBza/w+pmYee/0HJDyKk=
-modernc.org/sqlite v1.47.0/go.mod h1:hWjRO6Tj/5Ik8ieqxQybiEOUXy0NJFNp2tpvVpKlvig=
-modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
-modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

src/internal/testutil/testdb.go

@@ -1,96 +0,0 @@
-package testutil
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/assimon/luuu/config"
-	"github.com/assimon/luuu/model/dao"
-	"github.com/assimon/luuu/model/mdb"
-	appLog "github.com/assimon/luuu/util/log"
-	"github.com/libtnb/sqlite"
-	"github.com/spf13/viper"
-	"go.uber.org/zap"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-)
-
-func SetupTestDatabases(t testing.TB) func() {
-	t.Helper()
-
-	viper.Reset()
-	viper.Set("forced_usdt_rate", 1.0)
-	viper.Set("app_uri", "https://example.com")
-	viper.Set("order_expiration_time", 10)
-	viper.Set("order_notice_max_retry", 2)
-	viper.Set("callback_retry_base_seconds", 1)
-	viper.Set("queue_concurrency", 4)
-	viper.Set("queue_poll_interval_ms", 50)
-	viper.Set("api_auth_token", "test-token")
-
-	config.HTTPAccessLog = false
-	config.SQLDebug = false
-	config.LogLevel = "error"
-	config.UsdtRate = 0
-	appLog.Sugar = zap.NewNop().Sugar()
-
-	mainDB := mustOpenSQLite(t, filepath.Join(t.TempDir(), "main.db"))
-	runtimeDB := mustOpenSQLite(t, filepath.Join(t.TempDir(), "runtime.db"))
-
-	mustMigrate(t, mainDB, &mdb.Orders{}, &mdb.WalletAddress{})
-	mustMigrate(t, runtimeDB, &mdb.TransactionLock{})
-
-	dao.Mdb = mainDB
-	dao.RuntimeDB = runtimeDB
-
-	return func() {
-		closeDB(t, runtimeDB)
-		closeDB(t, mainDB)
-		dao.Mdb = nil
-		dao.RuntimeDB = nil
-		viper.Reset()
-	}
-}
-
-func mustOpenSQLite(t testing.TB, path string) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open(path), &gorm.Config{
-		NamingStrategy: schema.NamingStrategy{SingularTable: true},
-		Logger:         logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		t.Fatalf("open sqlite %s: %v", path, err)
-	}
-
-	sqlDB, err := db.DB()
-	if err != nil {
-		t.Fatalf("db handle for %s: %v", path, err)
-	}
-	sqlDB.SetMaxOpenConns(1)
-	sqlDB.SetMaxIdleConns(1)
-
-	return db
-}
-
-func mustMigrate(t testing.TB, db *gorm.DB, models ...interface{}) {
-	t.Helper()
-	if err := db.AutoMigrate(models...); err != nil {
-		t.Fatalf("automigrate: %v", err)
-	}
-}
-
-func closeDB(t testing.TB, db *gorm.DB) {
-	t.Helper()
-	if db == nil {
-		return
-	}
-	sqlDB, err := db.DB()
-	if err != nil {
-		t.Fatalf("db handle close: %v", err)
-	}
-	if err = sqlDB.Close(); err != nil {
-		t.Fatalf("close db: %v", err)
-	}
-}

src/main.go

@@ -1,7 +1,8 @@
 package main
 
 import (
-	"github.com/assimon/luuu/command"
+	"github.com/assimon/luuu/bootstrap"
+	"github.com/assimon/luuu/config"
 	"github.com/gookit/color"
 )
 
@@ -11,7 +12,7 @@ func main() {
 			color.Error.Println("[Start Server Err!!!] ", err)
 		}
 	}()
-	if err := command.Execute(); err != nil {
+	color.Green.Printf("%s\n", "  _____                     _ _   \n | ____|_ __  _   _ ___  __| | |_ \n |  _| | '_ \\| | | / __|/ _` | __|\n | |___| |_) | |_| \\__ \\ (_| | |_ \n |_____| .__/ \\__,_|___/\\__,_|\\__|\n       |_|                        ")
-		panic(err)
+	color.Infof("Epusdt version(%s) Powered by %s %s \n", config.GetAppVersion(), "assimon", "https://github.com/assimon/epusdt")
-	}
+	bootstrap.Start()
 }

src/model/dao/init.go

@@ -1,15 +0,0 @@
-package dao
-
-import (
-	"log"
-)
-
-func Init() {
-	if err := DBInit(); err != nil {
-		log.Fatalf("DBInit err: %v", err)
-	}
-
-	if err := RuntimeInit(); err != nil {
-		log.Fatalf("RuntimeInit err: %v", err)
-	}
-}

src/model/dao/mdb.go

@@ -1,30 +1,47 @@
 package dao
 
 import (
-	"strings"
+	"github.com/assimon/luuu/config"
-
+	"github.com/assimon/luuu/util/log"
+	"github.com/gookit/color"
 	"github.com/spf13/viper"
+	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"gorm.io/gorm/schema"
+	"time"
 )
 
 var Mdb *gorm.DB
 
-func DBInit() error {
+// MysqlInit 数据库初始化
-	dbType := viper.GetString("db_type")
+func MysqlInit() {
-	if strings.EqualFold(dbType, "postgres") {
+	var err error
-		if err := PostgreSQLInit(); err != nil {
+	Mdb, err = gorm.Open(mysql.Open(config.MysqlDns), &gorm.Config{
-			return err
+		NamingStrategy: schema.NamingStrategy{
-		}
+			TablePrefix:   viper.GetString("mysql_table_prefix"),
-	} else if strings.EqualFold(dbType, "sqlite") {
+			SingularTable: true,
-		if err := SqliteInit(); err != nil {
+		},
-			return err
+		Logger: logger.Default.LogMode(logger.Error),
-		}
+	})
-	} else {
+	if err != nil {
-		if err := MysqlInit(); err != nil {
+		panic(err)
-			return err
-		}
 	}
-
+	if config.AppDebug {
-	MdbTableInit()
+		Mdb = Mdb.Debug()
-	return nil
+	}
+	sqlDB, err := Mdb.DB()
+	if err != nil {
+		color.Red.Printf("[store_db] mysql get DB,err=%s\n", err)
+		panic(err)
+	}
+	sqlDB.SetMaxIdleConns(viper.GetInt("mysql_max_idle_conns"))
+	sqlDB.SetMaxOpenConns(viper.GetInt("mysql_max_open_conns"))
+	sqlDB.SetConnMaxLifetime(time.Hour * time.Duration(viper.GetInt("mysql_max_life_time")))
+	err = sqlDB.Ping()
+	if err != nil {
+		color.Red.Printf("[store_db] mysql connDB err:%s", err.Error())
+		panic(err)
+	}
+	log.Sugar.Debug("[store_db] mysql connDB success")
 }

src/model/dao/mdb_mysql.go

@@ -1,56 +0,0 @@
-package dao
-
-import (
-	"time"
-
-	"github.com/assimon/luuu/config"
-	"github.com/assimon/luuu/util/log"
-	"github.com/gookit/color"
-	"github.com/spf13/viper"
-	"gorm.io/driver/mysql"
-
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-)
-
-// MysqlInit 数据库初始化
-func MysqlInit() error {
-	var err error
-	Mdb, err = gorm.Open(mysql.Open(config.MysqlDns), &gorm.Config{
-		NamingStrategy: schema.NamingStrategy{
-			TablePrefix:   viper.GetString("mysql_table_prefix"),
-			SingularTable: true,
-		},
-		Logger: logger.Default.LogMode(logger.Error),
-	})
-	if err != nil {
-		color.Red.Printf("[store_db] mysql open DB,err=%s\n", err)
-		// panic(err)
-		return err
-	}
-	if config.SQLDebug {
-		Mdb = Mdb.Debug()
-	}
-	sqlDB, err := Mdb.DB()
-	if err != nil {
-		color.Red.Printf("[store_db] mysql get DB,err=%s\n", err)
-		// panic(err)
-		time.Sleep(10 * time.Second)
-		MysqlInit()
-		return err
-	}
-	sqlDB.SetMaxIdleConns(viper.GetInt("mysql_max_idle_conns"))
-	sqlDB.SetMaxOpenConns(viper.GetInt("mysql_max_open_conns"))
-	sqlDB.SetConnMaxLifetime(time.Hour * time.Duration(viper.GetInt("mysql_max_life_time")))
-	err = sqlDB.Ping()
-	if err != nil {
-		color.Red.Printf("[store_db] mysql connDB err:%s", err.Error())
-		// panic(err)
-		time.Sleep(10 * time.Second)
-		MysqlInit()
-		return err
-	}
-	log.Sugar.Debug("[store_db] mysql connDB success")
-	return nil
-}

src/model/dao/mdb_postgres.go

@@ -1,63 +0,0 @@
-package dao
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/assimon/luuu/config"
-	"github.com/assimon/luuu/util/log"
-	"github.com/gookit/color"
-	"github.com/spf13/viper"
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-)
-
-// PostgreSQLInit 数据库初始化
-func PostgreSQLInit() error {
-	var err error
-	user := viper.GetString("postgres_user")
-	pass := viper.GetString("postgres_passwd")
-	host := viper.GetString("postgres_host")
-	port := viper.GetString("postgres_port")
-	dbname := viper.GetString("postgres_database")
-	dsn := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=disable TimeZone=Asia/Shanghai",
-		user, pass, host, port, dbname,
-	)
-	Mdb, err = gorm.Open(postgres.Open(dsn),
-		&gorm.Config{
-			NamingStrategy: schema.NamingStrategy{
-				TablePrefix:   viper.GetString("postgres_table_prefix"),
-				SingularTable: true,
-			},
-			Logger: logger.Default.LogMode(logger.Error),
-		},
-	)
-	if err != nil {
-		color.Red.Printf("[store_db] postgres open DB,err=%s\n", err)
-		// panic(err)
-		return err
-	}
-
-	if config.SQLDebug {
-		Mdb = Mdb.Debug()
-	}
-	sqlDB, err := Mdb.DB()
-	if err != nil {
-		color.Red.Printf("[store_db] postgres get DB,err=%s\n", err)
-		// panic(err)
-		return err
-	}
-	sqlDB.SetMaxIdleConns(viper.GetInt("postgres_max_idle_conns"))
-	sqlDB.SetMaxOpenConns(viper.GetInt("postgres_max_open_conns"))
-	sqlDB.SetConnMaxLifetime(time.Hour * time.Duration(viper.GetInt("postgres_max_life_time")))
-	err = sqlDB.Ping()
-	if err != nil {
-		color.Red.Printf("[store_db] postgres connDB err:%s", err.Error())
-		// panic(err)
-		return err
-	}
-	log.Sugar.Debug("[store_db] postgres connDB success")
-	return nil
-}

src/model/dao/mdb_sqlite.go

@@ -1,47 +0,0 @@
-package dao
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/assimon/luuu/config"
-	"github.com/assimon/luuu/util/log"
-	"github.com/gookit/color"
-	"github.com/spf13/viper"
-
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-)
-
-// SqliteInit 数据库初始化
-func SqliteInit() error {
-	var err error
-	dbFilename := config.GetPrimarySqlitePath()
-	if err = os.MkdirAll(filepath.Dir(dbFilename), 0o755); err != nil {
-		color.Red.Printf("[store_db] sqlite mkdir err=%s\n", err)
-		return err
-	}
-	color.Green.Printf("[store_db] sqlite filename: %s\n", dbFilename)
-	Mdb, err = openDB(dbFilename, &gorm.Config{
-		NamingStrategy: schema.NamingStrategy{
-			TablePrefix:   viper.GetString("sqlite_table_prefix"),
-			SingularTable: true,
-		},
-		Logger: logger.Default.LogMode(logger.Error),
-	})
-	if err != nil {
-		color.Red.Printf("[store_db] sqlite open DB,err=%s\n", err)
-		// panic(err)
-		return err
-	}
-	if config.SQLDebug {
-		Mdb = Mdb.Debug()
-	}
-	if _, err = configureSQLite(Mdb, 1); err != nil {
-		color.Red.Printf("[store_db] sqlite connDB err:%s", err.Error())
-		return err
-	}
-	log.Sugar.Debug("[store_db] sqlite connDB success")
-	return nil
-}

src/model/dao/mdb_sqlite_cgo.go

@@ -1,16 +0,0 @@
-//go:build sqlite_cgo
-
-package dao
-
-import (
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-)
-
-func openDB(dsn string, cfg *gorm.Config) (*gorm.DB, error) {
-	db, err := gorm.Open(sqlite.Open(dsn+"?_journal_mode=WAL&_busy_timeout=5000"), cfg)
-	if err != nil {
-		return nil, err
-	}
-	return db, nil
-}

src/model/dao/mdb_sqlite_pure.go

@@ -1,16 +0,0 @@
-//go:build !sqlite_cgo
-
-package dao
-
-import (
-	"github.com/libtnb/sqlite"
-	"gorm.io/gorm"
-)
-
-func openDB(dsn string, cfg *gorm.Config) (*gorm.DB, error) {
-	db, err := gorm.Open(sqlite.Open(dsn+"?_journal_mode=WAL&_busy_timeout=5000"), cfg)
-	if err != nil {
-		return nil, err
-	}
-	return db, nil
-}

src/model/dao/mdb_table_init.go

@@ -1,26 +0,0 @@
-package dao
-
-import (
-	"sync"
-
-	"github.com/assimon/luuu/model/mdb"
-	"github.com/gookit/color"
-)
-
-var once sync.Once
-
-// 自动建表
-func MdbTableInit() {
-	once.Do(func() {
-		if err := Mdb.AutoMigrate(&mdb.Orders{}); err != nil {
-			color.Red.Printf("[store_db] AutoMigrate DB(Orders),err=%s\n", err)
-			// panic(err)
-			return
-		}
-		if err := Mdb.AutoMigrate(&mdb.WalletAddress{}); err != nil {
-			color.Red.Printf("[store_db] AutoMigrate DB(Orders),err=%s\n", err)
-			// panic(err)
-			return
-		}
-	})
-}

src/model/dao/rdb.go

@@ -0,0 +1,41 @@
+package dao
+
+import (
+	"context"
+	"fmt"
+	"github.com/assimon/luuu/util/log"
+	"github.com/go-redis/redis/v8"
+	"github.com/gookit/color"
+	"github.com/spf13/viper"
+	"time"
+)
+
+var Rdb *redis.Client
+
+func RedisInit() {
+	options := redis.Options{
+		Addr: fmt.Sprintf(
+			"%s:%s",
+			viper.GetString("redis_host"),
+			viper.GetString("redis_port")), // Redis地址
+		DB:          viper.GetInt("redis_db"),                                        // Redis库
+		PoolSize:    viper.GetInt("redis_pool_size"),                                 // Redis连接池大小
+		MaxRetries:  viper.GetInt("redis_max_retries"),                               // 最大重试次数
+		IdleTimeout: time.Second * time.Duration(viper.GetInt("redis_idle_timeout")), // 空闲链接超时时间
+	}
+	if viper.GetString("redis_passwd") != "" {
+		options.Password = viper.GetString("redis_passwd")
+	}
+	Rdb = redis.NewClient(&options)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	pong, err := Rdb.Ping(ctx).Result()
+	if err == redis.Nil {
+		log.Sugar.Debug("[store_redis] Nil reply returned by Rdb when key does not exist.")
+	} else if err != nil {
+		color.Red.Printf("[store_redis] redis connRdb err,err=%s", err)
+		panic(err)
+	} else {
+		log.Sugar.Debug("[store_redis] redis connRdb success,suc=%s", pong)
+	}
+}

src/model/dao/runtime_sqlite.go

@@ -1,51 +0,0 @@
-package dao
-
-import (
-	"github.com/assimon/luuu/config"
-	"github.com/assimon/luuu/model/mdb"
-	"github.com/assimon/luuu/util/log"
-	"github.com/gookit/color"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/schema"
-)
-
-var RuntimeDB *gorm.DB
-
-func RuntimeInit() error {
-	var err error
-	runtimePath := config.GetRuntimeSqlitePath()
-	color.Green.Printf("[runtime_db] sqlite filename: %s\n", runtimePath)
-	RuntimeDB, err = openDB(runtimePath, &gorm.Config{
-		NamingStrategy: schema.NamingStrategy{
-			SingularTable: true,
-		},
-		Logger: logger.Default.LogMode(logger.Error),
-	})
-	if err != nil {
-		color.Red.Printf("[runtime_db] sqlite open DB,err=%s\n", err)
-		return err
-	}
-
-	concurrency := config.GetQueueConcurrency()
-	if concurrency < 2 {
-		concurrency = 2
-	}
-	if concurrency > 16 {
-		concurrency = 16
-	}
-	if _, err = configureSQLite(RuntimeDB, concurrency); err != nil {
-		color.Red.Printf("[runtime_db] sqlite connDB err:%s", err.Error())
-		return err
-	}
-	if err = RuntimeDB.Exec("DROP INDEX IF EXISTS transaction_lock_token_amount_uindex").Error; err != nil {
-		return err
-	}
-	if err = RuntimeDB.AutoMigrate(&mdb.TransactionLock{}); err != nil {
-		color.Red.Printf("[runtime_db] sqlite migrate DB(TransactionLock),err=%s\n", err)
-		return err
-	}
-
-	log.Sugar.Debug("[runtime_db] sqlite connDB success")
-	return nil
-}

src/model/dao/sqlite_config.go

@@ -1,35 +0,0 @@
-package dao
-
-import (
-	"database/sql"
-
-	"gorm.io/gorm"
-)
-
-func configureSQLite(db *gorm.DB, maxOpenConns int) (*sql.DB, error) {
-	sqlDB, err := db.DB()
-	if err != nil {
-		return nil, err
-	}
-
-	if maxOpenConns <= 0 {
-		maxOpenConns = 1
-	}
-	sqlDB.SetMaxOpenConns(maxOpenConns)
-	sqlDB.SetMaxIdleConns(1)
-
-	if err := db.Exec("PRAGMA journal_mode=WAL;").Error; err != nil {
-		return nil, err
-	}
-	if err := db.Exec("PRAGMA synchronous=NORMAL;").Error; err != nil {
-		return nil, err
-	}
-	if err := db.Exec("PRAGMA busy_timeout=5000;").Error; err != nil {
-		return nil, err
-	}
-	if err := sqlDB.Ping(); err != nil {
-		return nil, err
-	}
-
-	return sqlDB, nil
-}

src/model/data/order_data.go

@@ -1,184 +1,130 @@
 package data
 
 import (
-	"errors"
+	"context"
-	"strings"
+	"fmt"
-	"time"
-
 	"github.com/assimon/luuu/model/dao"
 	"github.com/assimon/luuu/model/mdb"
 	"github.com/assimon/luuu/model/request"
-	"github.com/dromara/carbon/v2"
+	"github.com/go-redis/redis/v8"
-	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
-var ErrTransactionLocked = errors.New("transaction amount is already locked")
+var (
+	CacheWalletAddressToAvailableAmountKey = "WalletAddressToAvailableAmountKey:" // 钱包 - 可用金额 - 过期时间
+	CacheWalletAddressToOrdersKey          = "WalletAddressToOrdersKey:"          // 钱包 - 待支付金额 - 订单号
+)
 
-type PendingCallbackOrder struct {
+// GetOrderInfoByOrderId 通过客户订单号查询订单
-	TradeId         string      `gorm:"column:trade_id"`
-	CallbackNum     int         `gorm:"column:callback_num"`
-	CallBackConfirm int         `gorm:"column:callback_confirm"`
-	UpdatedAt       carbon.Time `gorm:"column:updated_at"`
-}
-
-func normalizeLockAmount(amount float64) (int64, string) {
-	value := decimal.NewFromFloat(amount).Round(2)
-	return value.Shift(2).IntPart(), value.StringFixed(2)
-}
-
-func normalizeLockToken(token string) string {
-	return strings.ToUpper(strings.TrimSpace(token))
-}
-
-// GetOrderInfoByOrderId fetches an order by merchant order id.
 func GetOrderInfoByOrderId(orderId string) (*mdb.Orders, error) {
 	order := new(mdb.Orders)
 	err := dao.Mdb.Model(order).Limit(1).Find(order, "order_id = ?", orderId).Error
 	return order, err
 }
 
-// GetOrderInfoByTradeId fetches an order by epusdt trade id.
+// GetOrderInfoByTradeId 通过交易号查询订单
 func GetOrderInfoByTradeId(tradeId string) (*mdb.Orders, error) {
 	order := new(mdb.Orders)
 	err := dao.Mdb.Model(order).Limit(1).Find(order, "trade_id = ?", tradeId).Error
 	return order, err
 }
 
-// CreateOrderWithTransaction creates an order in the active database transaction.
+// CreateOrderWithTransaction 事务创建订单
 func CreateOrderWithTransaction(tx *gorm.DB, order *mdb.Orders) error {
-	return tx.Model(order).Create(order).Error
+	err := tx.Model(order).Create(order).Error
+	return err
 }
 
-// GetOrderByBlockIdWithTransaction fetches an order by blockchain tx id.
+// GetOrderByBlockIdWithTransaction 通过区块获取订单
-func GetOrderByBlockIdWithTransaction(tx *gorm.DB, blockID string) (*mdb.Orders, error) {
+func GetOrderByBlockIdWithTransaction(tx *gorm.DB, blockId string) (*mdb.Orders, error) {
 	order := new(mdb.Orders)
-	err := tx.Model(order).Limit(1).Find(order, "block_transaction_id = ?", blockID).Error
+	err := tx.Model(order).Limit(1).Find(order, "block_transaction_id = ?", blockId).Error
 	return order, err
 }
 
-// OrderSuccessWithTransaction marks an order as paid only if it is still waiting for payment.
+// OrderSuccessWithTransaction 事务支付成功
-func OrderSuccessWithTransaction(tx *gorm.DB, req *request.OrderProcessingRequest) (bool, error) {
+func OrderSuccessWithTransaction(tx *gorm.DB, req *request.OrderProcessingRequest) error {
-	result := tx.Model(&mdb.Orders{}).
+	err := tx.Model(&mdb.Orders{}).Where("trade_id = ?", req.TradeId).Updates(map[string]interface{}{
-		Where("trade_id = ?", req.TradeId).
+		"block_transaction_id": req.BlockTransactionId,
-		Where("status = ?", mdb.StatusWaitPay).
+		"status":               mdb.StatusPaySuccess,
-		Updates(map[string]interface{}{
+		"callback_confirm":     mdb.CallBackConfirmNo,
-			"block_transaction_id": req.BlockTransactionId,
+	}).Error
-			"status":               mdb.StatusPaySuccess,
+	return err
-			"callback_confirm":     mdb.CallBackConfirmNo,
-		})
-	return result.RowsAffected > 0, result.Error
 }
 
-// GetPendingCallbackOrders returns the minimal callback scheduling state.
+// GetPendingCallbackOrders 查询出等待回调的订单
-func GetPendingCallbackOrders(maxRetry int, limit int) ([]PendingCallbackOrder, error) {
+func GetPendingCallbackOrders() ([]mdb.Orders, error) {
-	var orders []PendingCallbackOrder
+	var orders []mdb.Orders
-	query := dao.Mdb.Model(&mdb.Orders{}).
+	err := dao.Mdb.Model(orders).
-		Select("trade_id", "callback_num", "callback_confirm", "updated_at").
+		Where("callback_num < ?", 5).
-		Where("callback_num <= ?", maxRetry).
 		Where("callback_confirm = ?", mdb.CallBackConfirmNo).
 		Where("status = ?", mdb.StatusPaySuccess).
-		Order("updated_at asc")
+		Find(&orders).Error
-	if limit > 0 {
-		query = query.Limit(limit)
-	}
-	err := query.Find(&orders).Error
 	return orders, err
 }
 
-// SaveCallBackOrdersResp persists a callback attempt result.
+// SaveCallBackOrdersResp 保存订单回调结果
 func SaveCallBackOrdersResp(order *mdb.Orders) error {
-	return dao.Mdb.Model(order).
+	err := dao.Mdb.Model(order).Where("id = ?", order.ID).Updates(map[string]interface{}{
-		Where("id = ?", order.ID).
+		"callback_num":     gorm.Expr("callback_num + ?", 1),
-		Where("callback_confirm = ?", mdb.CallBackConfirmNo).
+		"callback_confirm": order.CallBackConfirm,
-		Updates(map[string]interface{}{
+	}).Error
-			"callback_num":     gorm.Expr("callback_num + ?", 1),
+	return err
-			"callback_confirm": order.CallBackConfirm,
-		}).Error
 }
 
-// UpdateOrderIsExpirationById expires an order only if it is still pending and already timed out.
+// UpdateOrderIsExpirationById 通过id设置订单过期
-func UpdateOrderIsExpirationById(id uint64, expirationCutoff time.Time) (bool, error) {
+func UpdateOrderIsExpirationById(id uint64) error {
-	result := dao.Mdb.Model(mdb.Orders{}).
+	err := dao.Mdb.Model(mdb.Orders{}).Where("id = ?", id).Update("status", mdb.StatusExpired).Error
-		Where("id = ?", id).
+	return err
-		Where("status = ?", mdb.StatusWaitPay).
-		Where("created_at <= ?", expirationCutoff).
-		Update("status", mdb.StatusExpired)
-	return result.RowsAffected > 0, result.Error
 }
 
-// GetTradeIdByWalletAddressAndAmountAndToken resolves the reserved trade id by address, token and amount.
+// LockPayCache 锁定支付池
-func GetTradeIdByWalletAddressAndAmountAndToken(address string, token string, amount float64) (string, error) {
+func LockPayCache(token, tradeId, amount string, expirationTime int64) error {
-	scaledAmount, _ := normalizeLockAmount(amount)
+	// 载入Redis
-	var lock mdb.TransactionLock
+	ctx := context.Background()
-	err := dao.RuntimeDB.Model(&mdb.TransactionLock{}).
+	pipe := dao.Rdb.TxPipeline()
-		Where("address = ?", address).
+	lockAvailableAmountKey := fmt.Sprintf("%s%s", CacheWalletAddressToAvailableAmountKey, token)
-		Where("token = ?", normalizeLockToken(token)).
+	// 占用金额
-		Where("amount_scaled = ?", scaledAmount).
+	pipe.HSet(ctx, lockAvailableAmountKey, amount, expirationTime)
-		Where("expires_at > ?", time.Now()).
+	// 标记金额对应订单号
-		Limit(1).
+	lockWalletOrdersKey := fmt.Sprintf("%s%s", CacheWalletAddressToOrdersKey, token)
-		Find(&lock).Error
+	pipe.HSet(ctx, lockWalletOrdersKey, amount, tradeId)
+	_, err := pipe.Exec(ctx)
+	return err
+}
+
+// ClearPayCache 清理支付池
+func ClearPayCache(token, amount string) error {
+	ctx := context.Background()
+	lockAvailableAmountKey := fmt.Sprintf("%s%s", CacheWalletAddressToAvailableAmountKey, token)
+	lockWalletOrdersKey := fmt.Sprintf("%s%s", CacheWalletAddressToOrdersKey, token)
+	pipe := dao.Rdb.TxPipeline()
+	pipe.HDel(ctx, lockAvailableAmountKey, amount)
+	pipe.HDel(ctx, lockWalletOrdersKey, amount)
+	_, err := pipe.Exec(ctx)
+	return err
+}
+
+func GetTradeIdByAmount(ctx context.Context, token, amount string) (string, error) {
+	cacheKey := fmt.Sprintf("%s%s", CacheWalletAddressToOrdersKey, token)
+	result, err := dao.Rdb.HGet(ctx, cacheKey, amount).Result()
+	if err == redis.Nil {
+		return "", nil
+	}
 	if err != nil {
 		return "", err
 	}
-	if lock.ID <= 0 {
+	return result, nil
+}
+
+func GetExpirationTimeByAmount(ctx context.Context, token, amount string) (string, error) {
+	cacheKey := fmt.Sprintf("%s%s", CacheWalletAddressToAvailableAmountKey, token)
+	result, err := dao.Rdb.HGet(ctx, cacheKey, amount).Result()
+	if err == redis.Nil {
 		return "", nil
 	}
-	return lock.TradeId, nil
+	if err != nil {
-}
+		return "", err
-
-// LockTransaction reserves an address+token+amount pair in sqlite until expiration.
-func LockTransaction(address, token, tradeID string, amount float64, expirationTime time.Duration) error {
-	scaledAmount, amountText := normalizeLockAmount(amount)
-	normalizedToken := normalizeLockToken(token)
-	now := time.Now()
-	lock := &mdb.TransactionLock{
-		Address:      address,
-		Token:        normalizedToken,
-		AmountScaled: scaledAmount,
-		AmountText:   amountText,
-		TradeId:      tradeID,
-		ExpiresAt:    now.Add(expirationTime),
 	}
-
+	return result, nil
-	return dao.RuntimeDB.Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("address = ?", address).
-			Where("token = ?", normalizedToken).
-			Where("amount_scaled = ?", scaledAmount).
-			Where("expires_at <= ?", now).
-			Delete(&mdb.TransactionLock{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("trade_id = ?", tradeID).Delete(&mdb.TransactionLock{}).Error; err != nil {
-			return err
-		}
-
-		result := tx.Clauses(clause.OnConflict{DoNothing: true}).Create(lock)
-		if result.Error != nil {
-			return result.Error
-		}
-		if result.RowsAffected == 0 {
-			return ErrTransactionLocked
-		}
-		return nil
-	})
-}
-
-// UnLockTransaction releases the reservation for address+token+amount.
-func UnLockTransaction(address string, token string, amount float64) error {
-	scaledAmount, _ := normalizeLockAmount(amount)
-	return dao.RuntimeDB.
-		Where("address = ?", address).
-		Where("token = ?", normalizeLockToken(token)).
-		Where("amount_scaled = ?", scaledAmount).
-		Delete(&mdb.TransactionLock{}).Error
-}
-
-func UnLockTransactionByTradeId(tradeID string) error {
-	return dao.RuntimeDB.Where("trade_id = ?", tradeID).Delete(&mdb.TransactionLock{}).Error
-}
-
-func CleanupExpiredTransactionLocks() error {
-	return dao.RuntimeDB.Where("expires_at <= ?", time.Now()).Delete(&mdb.TransactionLock{}).Error
 }

src/model/data/wallet_address_data.go

@@ -7,8 +7,8 @@ import (
 )
 
 // AddWalletAddress 创建钱包
-func AddWalletAddress(address string) (*mdb.WalletAddress, error) {
+func AddWalletAddress(token string) (*mdb.WalletAddress, error) {
-	exist, err := GetWalletAddressByToken(address)
+	exist, err := GetWalletAddressByToken(token)
 	if err != nil {
 		return nil, err
 	}
@@ -16,17 +16,17 @@ func AddWalletAddress(address string) (*mdb.WalletAddress, error) {
 		return nil, constant.WalletAddressAlreadyExists
 	}
 	walletAddress := &mdb.WalletAddress{
-		Address: address,
+		Token:  token,
-		Status:  mdb.TokenStatusEnable,
+		Status: mdb.TokenStatusEnable,
 	}
 	err = dao.Mdb.Create(walletAddress).Error
 	return walletAddress, err
 }
 
-// GetWalletAddressByToken 通过钱包地址获取address
+// GetWalletAddressByToken 通过钱包地址获取token
-func GetWalletAddressByToken(address string) (*mdb.WalletAddress, error) {
+func GetWalletAddressByToken(token string) (*mdb.WalletAddress, error) {
 	walletAddress := new(mdb.WalletAddress)
-	err := dao.Mdb.Model(walletAddress).Limit(1).Find(walletAddress, "address = ?", address).Error
+	err := dao.Mdb.Model(walletAddress).Limit(1).Find(walletAddress, "token = ?", token).Error
 	return walletAddress, err
 }
 

src/model/mdb/base.go

@@ -1,12 +1,12 @@
 package mdb
 
 import (
-	"github.com/dromara/carbon/v2"
+	"github.com/golang-module/carbon/v2"
 	"gorm.io/gorm"
 )
 
 type BaseModel struct {
-	ID        uint64         `gorm:"column:id;primary_key;autoIncrement" json:"id"`
+	ID        uint64         `gorm:"column:id;primary_key" json:"id"`
 	CreatedAt carbon.Time    `gorm:"column:created_at" json:"created_at"`
 	UpdatedAt carbon.Time    `gorm:"column:updated_at" json:"updated_at"`
 	DeletedAt gorm.DeletedAt `gorm:"index" json:"deleted_at"`

src/model/mdb/orders_mdb.go

@@ -9,22 +9,21 @@ const (
 )
 
 type Orders struct {
-	TradeId            string  `gorm:"column:trade_id;uniqueIndex:orders_trade_id_uindex" json:"trade_id"`
+	TradeId            string  `gorm:"column:trade_id" json:"trade_id"`                         //  epusdt订单号
-	OrderId            string  `gorm:"column:order_id;uniqueIndex:orders_order_id_uindex" json:"order_id"`
+	OrderId            string  `gorm:"column:order_id" json:"order_id"`                         //  客户交易id
-	BlockTransactionId string  `gorm:"index:orders_block_transaction_id_index;column:block_transaction_id" json:"block_transaction_id"`
+	BlockTransactionId string  `gorm:"column:block_transaction_id" json:"block_transaction_id"` // 区块id
-	Amount             float64 `gorm:"column:amount" json:"amount"`
+	Amount             float64 `gorm:"column:amount" json:"amount"`                             //  订单金额，保留4位小数
-	Currency           string  `gorm:"column:currency" json:"currency"`
+	ActualAmount       float64 `gorm:"column:actual_amount" json:"actual_amount"`               //  订单实际需要支付的金额，保留4位小数
-	ActualAmount       float64 `gorm:"column:actual_amount" json:"actual_amount"`
+	Token              string  `gorm:"column:token" json:"token"`                               //  所属钱包地址
-	ReceiveAddress     string  `gorm:"column:receive_address" json:"receive_address"`
+	Status             int     `gorm:"column:status" json:"status"`                             //  1：等待支付，2：支付成功，3：已过期
-	Token              string  `gorm:"column:token" json:"token"`
+	NotifyUrl          string  `gorm:"column:notify_url" json:"notify_url"`                     //  异步回调地址
-	Status             int     `gorm:"column:status;default:1" json:"status"`
+	RedirectUrl        string  `gorm:"column:redirect_url" json:"redirect_url"`                 //  同步回调地址
-	NotifyUrl          string  `gorm:"column:notify_url" json:"notify_url"`
+	CallbackNum        int     `gorm:"column:callback_num" json:"callback_num"`                 // 回调次数
-	RedirectUrl        string  `gorm:"column:redirect_url" json:"redirect_url"`
+	CallBackConfirm    int     `gorm:"column:callback_confirm" json:"callback_confirm"`         // 回调是否已确认 1是 2否
-	CallbackNum        int     `gorm:"column:callback_num;default:0" json:"callback_num"`
-	CallBackConfirm    int     `gorm:"column:callback_confirm;default:2" json:"callback_confirm"`
 	BaseModel
 }
 
+// TableName sets the insert table name for this struct type
 func (o *Orders) TableName() string {
 	return "orders"
 }

src/model/mdb/transaction_lock_mdb.go

@@ -1,19 +0,0 @@
-package mdb
-
-import "time"
-
-type TransactionLock struct {
-	ID           uint64    `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
-	Address      string    `gorm:"column:address;uniqueIndex:transaction_lock_address_token_amount_uindex,priority:1" json:"address"`
-	Token        string    `gorm:"column:token;uniqueIndex:transaction_lock_address_token_amount_uindex,priority:2" json:"token"`
-	AmountScaled int64     `gorm:"column:amount_scaled;uniqueIndex:transaction_lock_address_token_amount_uindex,priority:3" json:"amount_scaled"`
-	AmountText   string    `gorm:"column:amount_text" json:"amount_text"`
-	TradeId      string    `gorm:"column:trade_id;index:transaction_lock_trade_id_index" json:"trade_id"`
-	ExpiresAt    time.Time `gorm:"column:expires_at;index:transaction_lock_expires_at_index" json:"expires_at"`
-	CreatedAt    time.Time `gorm:"column:created_at" json:"created_at"`
-	UpdatedAt    time.Time `gorm:"column:updated_at" json:"updated_at"`
-}
-
-func (t *TransactionLock) TableName() string {
-	return "transaction_lock"
-}

src/model/mdb/wallet_address_mdb.go

@@ -5,12 +5,14 @@ const (
 	TokenStatusDisable = 2
 )
 
+// WalletAddress  钱包表
 type WalletAddress struct {
-	Address string `gorm:"column:address;uniqueIndex:wallet_address_address_uindex" json:"address"`
+	Token  string `gorm:"column:token" json:"token"`   //  钱包token
-	Status  int64  `gorm:"column:status;default:1" json:"status"`
+	Status int64  `gorm:"column:status" json:"status"` //  1:启用 2:禁用
 	BaseModel
 }
 
+// TableName sets the insert table name for this struct type
 func (w *WalletAddress) TableName() string {
 	return "wallet_address"
 }

src/model/request/order_request.go

@@ -5,10 +5,8 @@ import "github.com/gookit/validate"
 // CreateTransactionRequest 创建交易请求
 type CreateTransactionRequest struct {
 	OrderId     string  `json:"order_id" validate:"required|maxLen:32"`
-	Currency    string  `json:"currency" validate:"required"`
-	Token       string  `json:"token" validate:"required"`
 	Amount      float64 `json:"amount" validate:"required|isFloat|gt:0.01"`
-	NotifyUrl   string  `json:"notify_url" validate:"required"`
+	NotifyUrl   string  `json:"notify_url" validate:"required|isFullURL"`
 	Signature   string  `json:"signature"  validate:"required"`
 	RedirectUrl string  `json:"redirect_url"`
 }
@@ -16,8 +14,6 @@ type CreateTransactionRequest struct {
 func (r CreateTransactionRequest) Translates() map[string]string {
 	return validate.MS{
 		"OrderId":   "订单号",
-		"Currency":  "货币",
-		"Token":     "币种",
 		"Amount":    "支付金额",
 		"NotifyUrl": "异步回调网址",
 		"Signature": "签名",
@@ -26,10 +22,8 @@ func (r CreateTransactionRequest) Translates() map[string]string {
 
 // OrderProcessingRequest 订单处理
 type OrderProcessingRequest struct {
-	ReceiveAddress     string
-	Currency           string
 	Token              string
-	Amount             float64
+	Amount             string
 	TradeId            string
 	BlockTransactionId string
 }

src/model/response/order_response.go

@@ -5,10 +5,8 @@ type CreateTransactionResponse struct {
 	TradeId        string  `json:"trade_id"`        //  epusdt订单号
 	OrderId        string  `json:"order_id"`        //  客户交易id
 	Amount         float64 `json:"amount"`          //  订单金额，保留4位小数
-	Currency       string  `json:"currency"`        //  订单货币类型 CNY USD......
 	ActualAmount   float64 `json:"actual_amount"`   //  订单实际需要支付的金额，保留4位小数
-	ReceiveAddress string  `json:"receive_address"` //  收款钱包地址
+	Token          string  `json:"token"`           //  收款钱包地址
-	Token          string  `json:"token"`           // 所属币种 TRX USDT......
 	ExpirationTime int64   `json:"expiration_time"` // 过期时间 时间戳
 	PaymentUrl     string  `json:"payment_url"`     // 收银台地址
 }
@@ -19,8 +17,7 @@ type OrderNotifyResponse struct {
 	OrderId            string  `json:"order_id"`             //  客户交易id
 	Amount             float64 `json:"amount"`               //  订单金额，保留4位小数
 	ActualAmount       float64 `json:"actual_amount"`        //  订单实际需要支付的金额，保留4位小数
-	ReceiveAddress     string  `json:"receive_address"`      //  收款钱包地址
+	Token              string  `json:"token"`                //  收款钱包地址
-	Token              string  `json:"token"`                // 所属币种 TRX USDT......
 	BlockTransactionId string  `json:"block_transaction_id"` // 区块id
 	Signature          string  `json:"signature"`            // 签名
 	Status             int     `json:"status"`               //  1：等待支付，2：支付成功，3：已过期

src/model/response/pay_response.go

@@ -3,8 +3,7 @@ package response
 type CheckoutCounterResponse struct {
 	TradeId        string  `json:"trade_id"`        //  epusdt订单号
 	ActualAmount   float64 `json:"actual_amount"`   //  订单实际需要支付的金额，保留4位小数
-	ReceiveAddress string  `json:"receive_address"` //  收款钱包地址
+	Token          string  `json:"token"`           //  收款钱包地址
-	Token          string  `json:"token"`           //  所属币种 TRX USDT......
 	ExpirationTime int64   `json:"expiration_time"` // 过期时间 时间戳
 	RedirectUrl    string  `json:"redirect_url"`
 }

src/model/service/order_service.go

@@ -1,58 +1,48 @@
 package service
 
 import (
-	"errors"
+	"context"
 	"fmt"
-	"math/rand"
-	"strings"
-	"sync"
-	"time"
-
 	"github.com/assimon/luuu/config"
 	"github.com/assimon/luuu/model/dao"
 	"github.com/assimon/luuu/model/data"
 	"github.com/assimon/luuu/model/mdb"
 	"github.com/assimon/luuu/model/request"
 	"github.com/assimon/luuu/model/response"
+	"github.com/assimon/luuu/mq"
+	"github.com/assimon/luuu/mq/handle"
+	"github.com/assimon/luuu/telegram"
 	"github.com/assimon/luuu/util/constant"
-	"github.com/assimon/luuu/util/log"
+	"github.com/golang-module/carbon/v2"
-	"github.com/assimon/luuu/util/math"
+	"github.com/gookit/goutil/mathutil"
-	"github.com/dromara/carbon/v2"
+	"github.com/hibiken/asynq"
 	"github.com/shopspring/decimal"
-)
+	"math/rand"
-
+	"strconv"
-const (
+	"sync"
-	CnyMinimumPaymentAmount  = 0.01
+	"time"
-	UsdtMinimumPaymentAmount = 0.01
-	UsdtAmountPerIncrement   = 0.01
-	IncrementalMaximumNumber = 100
 )
 
 var gCreateTransactionLock sync.Mutex
-var gOrderProcessingLock sync.Mutex
 
-// CreateTransaction creates a new payment order.
+// CreateTransaction 创建订单
 func CreateTransaction(req *request.CreateTransactionRequest) (*response.CreateTransactionResponse, error) {
 	gCreateTransactionLock.Lock()
 	defer gCreateTransactionLock.Unlock()
-
+	// 汇率计算金额
-	token := strings.ToUpper(strings.TrimSpace(req.Token))
+	rmb := decimal.NewFromFloat(req.Amount)
-	currency := strings.ToUpper(strings.TrimSpace(req.Currency))
+	rate := decimal.NewFromFloat(config.GetUsdtRate())
-	payAmount := math.MustParsePrecFloat64(req.Amount, 2)
+	amount := rmb.Div(rate).InexactFloat64()
-	rate := config.GetRateForCoin(strings.ToLower(token), strings.ToLower(currency))
+	actualAmountStr := fmt.Sprintf("%.4f", amount)
-	if rate <= 0 {
+	actualAmountFloat, err := strconv.ParseFloat(actualAmountStr, 64)
-		return nil, constant.RateAmountErr
+	if err != nil {
+		return nil, err
 	}
-
+	// 是否可以满足最低支付金额
-	decimalPayAmount := decimal.NewFromFloat(payAmount)
+	if actualAmountFloat <= 0 {
-	decimalTokenAmount := decimalPayAmount.Mul(decimal.NewFromFloat(rate))
-	if decimalPayAmount.Cmp(decimal.NewFromFloat(CnyMinimumPaymentAmount)) == -1 {
 		return nil, constant.PayAmountErr
 	}
-	if decimalTokenAmount.Cmp(decimal.NewFromFloat(UsdtMinimumPaymentAmount)) == -1 {
+	// 已经存在了的交易
-		return nil, constant.PayAmountErr
-	}
-
 	exist, err := data.GetOrderInfoByOrderId(req.OrderId)
 	if err != nil {
 		return nil, err
@@ -60,7 +50,7 @@ func CreateTransaction(req *request.CreateTransactionRequest) (*response.CreateT
 	if exist.ID > 0 {
 		return nil, constant.OrderAlreadyExists
 	}
-
+	// 有无可用钱包
 	walletAddress, err := data.GetAvailableWalletAddress()
 	if err != nil {
 		return nil, err
@@ -68,136 +58,166 @@ func CreateTransaction(req *request.CreateTransactionRequest) (*response.CreateT
 	if len(walletAddress) <= 0 {
 		return nil, constant.NotAvailableWalletAddress
 	}
-
+	availableToken, availableAmountStr, err := CalculateAvailableWalletTokenAndAmount(actualAmountStr, walletAddress)
-	tradeID := GenerateCode()
-	amount := math.MustParsePrecFloat64(decimalTokenAmount.InexactFloat64(), 2)
-	availableAddress, availableAmount, err := ReserveAvailableWalletAndAmount(tradeID, token, amount, walletAddress)
 	if err != nil {
 		return nil, err
 	}
-	if availableAddress == "" {
+	if availableToken == "" || availableAmountStr == "" {
 		return nil, constant.NotAvailableAmountErr
 	}
-
+	availableAmountFloat, err := strconv.ParseFloat(availableAmountStr, 64)
+	if err != nil {
+		return nil, err
+	}
 	tx := dao.Mdb.Begin()
 	order := &mdb.Orders{
-		TradeId:        tradeID,
+		TradeId:      GenerateCode(),
-		OrderId:        req.OrderId,
+		OrderId:      req.OrderId,
-		Amount:         req.Amount,
+		Amount:       req.Amount,
-		Currency:       currency,
+		ActualAmount: availableAmountFloat,
-		ActualAmount:   availableAmount,
+		Token:        availableToken,
-		ReceiveAddress: availableAddress,
+		Status:       mdb.StatusWaitPay,
-		Token:          token,
+		NotifyUrl:    req.NotifyUrl,
-		Status:         mdb.StatusWaitPay,
+		RedirectUrl:  req.RedirectUrl,
-		NotifyUrl:      req.NotifyUrl,
-		RedirectUrl:    req.RedirectUrl,
 	}
-	if err = data.CreateOrderWithTransaction(tx, order); err != nil {
+	err = data.CreateOrderWithTransaction(tx, order)
+	if err != nil {
 		tx.Rollback()
-		_ = data.UnLockTransactionByTradeId(tradeID)
 		return nil, err
 	}
-	if err = tx.Commit().Error; err != nil {
+	ExpirationTime := carbon.Now().AddMinutes(config.GetOrderExpirationTime()).Timestamp()
+	// 锁定支付池
+	err = data.LockPayCache(availableToken, order.TradeId, availableAmountStr, ExpirationTime)
+	if err != nil {
 		tx.Rollback()
-		_ = data.UnLockTransactionByTradeId(tradeID)
 		return nil, err
 	}
-
+	tx.Commit()
-	expirationTime := carbon.Now().AddMinutes(config.GetOrderExpirationTime()).Timestamp()
+	// 超时过期消息队列
+	orderExpirationQueue, _ := handle.NewOrderExpirationQueue(order.TradeId)
+	mq.MClient.Enqueue(orderExpirationQueue, asynq.ProcessIn(time.Minute*time.Duration(config.GetOrderExpirationTime())))
 	resp := &response.CreateTransactionResponse{
 		TradeId:        order.TradeId,
 		OrderId:        order.OrderId,
 		Amount:         order.Amount,
-		Currency:       order.Currency,
 		ActualAmount:   order.ActualAmount,
-		ReceiveAddress: order.ReceiveAddress,
 		Token:          order.Token,
-		ExpirationTime: expirationTime,
+		ExpirationTime: ExpirationTime,
 		PaymentUrl:     fmt.Sprintf("%s/pay/checkout-counter/%s", config.GetAppUri(), order.TradeId),
 	}
 	return resp, nil
 }
 
-// OrderProcessing marks an order as paid and releases its sqlite reservation.
+// OrderProcessing 成功处理订单
 func OrderProcessing(req *request.OrderProcessingRequest) error {
-	gOrderProcessingLock.Lock()
-	defer gOrderProcessingLock.Unlock()
-
 	tx := dao.Mdb.Begin()
 	exist, err := data.GetOrderByBlockIdWithTransaction(tx, req.BlockTransactionId)
 	if err != nil {
-		tx.Rollback()
 		return err
 	}
 	if exist.ID > 0 {
 		tx.Rollback()
 		return constant.OrderBlockAlreadyProcess
 	}
-
+	// 标记订单成功
-	updated, err := data.OrderSuccessWithTransaction(tx, req)
+	err = data.OrderSuccessWithTransaction(tx, req)
 	if err != nil {
 		tx.Rollback()
 		return err
 	}
-	if !updated {
+	err = data.ClearPayCache(req.Token, req.Amount)
-		tx.Rollback()
+	tx.Commit()
-		return constant.OrderStatusConflict
+	order, err := data.GetOrderInfoByTradeId(req.TradeId)
-	}
+	if err != nil {
-	if err = tx.Commit().Error; err != nil {
-		tx.Rollback()
 		return err
 	}
-
+	// 回调队列
-	if err = data.UnLockTransaction(req.ReceiveAddress, req.Token, req.Amount); err != nil {
+	orderCallbackQueue, _ := handle.NewOrderCallbackQueue(order)
-		log.Sugar.Warnf("[order] unlock transaction after pay success failed, trade_id=%s, err=%v", req.TradeId, err)
+	mq.MClient.Enqueue(orderCallbackQueue, asynq.MaxRetry(5))
-	}
+	// 发送机器人消息
+	msgTpl := `
+<b>📢📢有新的交易支付成功！</b>
+<pre>交易号：%s</pre>
+<pre>订单号：%s</pre>
+<pre>请求支付金额：%.4f cny</pre>
+<pre>实际支付金额：%.4f usdt</pre>
+<pre>钱包地址：%s</pre>
+<pre>订单创建时间：%s</pre>
+<pre>支付成功时间：%s</pre>
+`
+	msg := fmt.Sprintf(msgTpl, order.TradeId, order.OrderId, order.Amount, order.ActualAmount, order.Token, order.CreatedAt.ToDateTimeString(), carbon.Now().ToDateTimeString())
+	telegram.SendToBot(msg)
 	return nil
 }
 
-// ReserveAvailableWalletAndAmount finds and locks an address+token+amount pair.
+func CalculateAvailableWalletTokenAndAmount(amount string, walletAddress []mdb.WalletAddress) (string, string, error) {
-func ReserveAvailableWalletAndAmount(tradeID string, token string, amount float64, walletAddress []mdb.WalletAddress) (string, float64, error) {
+	calculateAmountStr := amount
-	availableAddress := ""
+	availableAmountStr := ""
-	availableAmount := amount
+	availableToken := ""
-
+	for i := 0; i < 100; i++ {
-	tryLockWalletFunc := func(targetAmount float64) (string, error) {
+		token, err := CalculateAvailableWalletToken(calculateAmountStr, walletAddress)
-		for _, address := range walletAddress {
-			err := data.LockTransaction(address.Address, token, tradeID, targetAmount, config.GetOrderExpirationTimeDuration())
-			if err == nil {
-				return address.Address, nil
-			}
-			if errors.Is(err, data.ErrTransactionLocked) {
-				continue
-			}
-			return "", err
-		}
-		return "", nil
-	}
-
-	for i := 0; i < IncrementalMaximumNumber; i++ {
-		address, err := tryLockWalletFunc(availableAmount)
 		if err != nil {
-			return "", 0, err
+			return "", "", err
 		}
-		if address == "" {
+		// 这个金额没有拿到可用的钱包，重试，金额+0.0001
-			decimalOldAmount := decimal.NewFromFloat(availableAmount)
+		if token == "" {
-			decimalIncr := decimal.NewFromFloat(UsdtAmountPerIncrement)
+			x, err := decimal.NewFromString(calculateAmountStr)
-			availableAmount = decimalOldAmount.Add(decimalIncr).InexactFloat64()
+			if err != nil {
+				return "", "", err
+			}
+			y, err := decimal.NewFromString("0.0001")
+			if err != nil {
+				return "", "", err
+			}
+			calculateAmountStr = x.Add(y).String()
 			continue
 		}
-		availableAddress = address
+		availableAmountStr = calculateAmountStr
+		availableToken = token
 		break
 	}
-	return availableAddress, availableAmount, nil
+	return availableToken, availableAmountStr, nil
 }
 
-// GenerateCode creates a unique trade id.
+// CalculateAvailableWalletToken 计算可用钱包token
+func CalculateAvailableWalletToken(payAmount string, walletAddress []mdb.WalletAddress) (string, error) {
+	nowTime := time.Now().Unix()
+	ctx := context.Background()
+	walletToken := ""
+	for _, address := range walletAddress {
+		result, err := data.GetExpirationTimeByAmount(ctx, address.Token, payAmount)
+		if err != nil {
+			return "", err
+		}
+		// 这个钱包金额被占用了
+		if result != "" {
+			endTime := mathutil.MustInt64(result)
+			// 但是过期了
+			if endTime < nowTime {
+				// 删掉过期，还能继续用这个地址
+				err = data.ClearPayCache(address.Token, payAmount)
+				if err != nil {
+					return "", err
+				}
+			} else {
+				continue
+			}
+		}
+		walletToken = address.Token
+		break
+	}
+	return walletToken, nil
+}
+
+// GenerateCode 订单号生成
 func GenerateCode() string {
 	date := time.Now().Format("20060102")
 	r := rand.Intn(1000)
-	return fmt.Sprintf("%s%d%03d", date, time.Now().UnixNano()/1e6, r)
+	code := fmt.Sprintf("%s%d%03d", date, time.Now().UnixNano()/1e6, r)
+	return code
 }
 
-// GetOrderInfoByTradeId returns a validated order.
+// GetOrderInfoByTradeId 通过交易号获取订单
 func GetOrderInfoByTradeId(tradeId string) (*mdb.Orders, error) {
 	order, err := data.GetOrderInfoByTradeId(tradeId)
 	if err != nil {

src/model/service/order_service_test.go

@@ -1,300 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"sync"
-	"testing"
-
-	"github.com/assimon/luuu/internal/testutil"
-	"github.com/assimon/luuu/model/dao"
-	"github.com/assimon/luuu/model/data"
-	"github.com/assimon/luuu/model/mdb"
-	"github.com/assimon/luuu/model/request"
-	"github.com/assimon/luuu/util/constant"
-)
-
-func newCreateTransactionRequest(orderID string, amount float64) *request.CreateTransactionRequest {
-	return &request.CreateTransactionRequest{
-		OrderId:   orderID,
-		Currency:  "CNY",
-		Token:     "USDT",
-		Amount:    amount,
-		NotifyUrl: "https://merchant.example/callback",
-	}
-}
-
-func TestCreateTransactionAssignsIncrementedAmountsAndLocks(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	if _, err := data.AddWalletAddress("wallet_1"); err != nil {
-		t.Fatalf("add wallet: %v", err)
-	}
-
-	resp1, err := CreateTransaction(newCreateTransactionRequest("order_1", 1))
-	if err != nil {
-		t.Fatalf("create first transaction: %v", err)
-	}
-	resp2, err := CreateTransaction(newCreateTransactionRequest("order_2", 1))
-	if err != nil {
-		t.Fatalf("create second transaction: %v", err)
-	}
-
-	if got := fmt.Sprintf("%.2f", resp1.ActualAmount); got != "1.00" {
-		t.Fatalf("first actual amount = %s, want 1.00", got)
-	}
-	if got := fmt.Sprintf("%.2f", resp2.ActualAmount); got != "1.01" {
-		t.Fatalf("second actual amount = %s, want 1.01", got)
-	}
-	if resp1.ReceiveAddress != "wallet_1" || resp2.ReceiveAddress != "wallet_1" {
-		t.Fatalf("unexpected receive addresses: %s, %s", resp1.ReceiveAddress, resp2.ReceiveAddress)
-	}
-	if resp1.Token != "USDT" || resp2.Token != "USDT" {
-		t.Fatalf("unexpected tokens: %s, %s", resp1.Token, resp2.Token)
-	}
-
-	tradeID1, err := data.GetTradeIdByWalletAddressAndAmountAndToken(resp1.ReceiveAddress, resp1.Token, resp1.ActualAmount)
-	if err != nil {
-		t.Fatalf("get first runtime lock: %v", err)
-	}
-	if tradeID1 != resp1.TradeId {
-		t.Fatalf("first runtime lock = %s, want %s", tradeID1, resp1.TradeId)
-	}
-
-	tradeID2, err := data.GetTradeIdByWalletAddressAndAmountAndToken(resp2.ReceiveAddress, resp2.Token, resp2.ActualAmount)
-	if err != nil {
-		t.Fatalf("get second runtime lock: %v", err)
-	}
-	if tradeID2 != resp2.TradeId {
-		t.Fatalf("second runtime lock = %s, want %s", tradeID2, resp2.TradeId)
-	}
-}
-
-func TestOrderProcessingMarksPaidAndReleasesLock(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	if _, err := data.AddWalletAddress("wallet_1"); err != nil {
-		t.Fatalf("add wallet: %v", err)
-	}
-
-	resp, err := CreateTransaction(newCreateTransactionRequest("order_1", 1))
-	if err != nil {
-		t.Fatalf("create transaction: %v", err)
-	}
-
-	err = OrderProcessing(&request.OrderProcessingRequest{
-		ReceiveAddress:     resp.ReceiveAddress,
-		Token:              resp.Token,
-		TradeId:            resp.TradeId,
-		Amount:             resp.ActualAmount,
-		BlockTransactionId: "block_1",
-	})
-	if err != nil {
-		t.Fatalf("order processing: %v", err)
-	}
-
-	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
-	if err != nil {
-		t.Fatalf("get order by trade id: %v", err)
-	}
-	if order.Status != mdb.StatusPaySuccess {
-		t.Fatalf("order status = %d, want %d", order.Status, mdb.StatusPaySuccess)
-	}
-	if order.CallBackConfirm != mdb.CallBackConfirmNo {
-		t.Fatalf("callback confirm = %d, want %d", order.CallBackConfirm, mdb.CallBackConfirmNo)
-	}
-	if order.BlockTransactionId != "block_1" {
-		t.Fatalf("block transaction id = %s, want block_1", order.BlockTransactionId)
-	}
-
-	tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(resp.ReceiveAddress, resp.Token, resp.ActualAmount)
-	if err != nil {
-		t.Fatalf("get runtime lock after processing: %v", err)
-	}
-	if tradeID != "" {
-		t.Fatalf("runtime lock still exists: %s", tradeID)
-	}
-}
-
-func TestOrderProcessingRejectsDuplicateBlockForSameOrder(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	if _, err := data.AddWalletAddress("wallet_1"); err != nil {
-		t.Fatalf("add wallet: %v", err)
-	}
-
-	resp, err := CreateTransaction(newCreateTransactionRequest("order_1", 1))
-	if err != nil {
-		t.Fatalf("create transaction: %v", err)
-	}
-
-	req := &request.OrderProcessingRequest{
-		ReceiveAddress:     resp.ReceiveAddress,
-		Token:              resp.Token,
-		TradeId:            resp.TradeId,
-		Amount:             resp.ActualAmount,
-		BlockTransactionId: "block_1",
-	}
-	if err = OrderProcessing(req); err != nil {
-		t.Fatalf("first order processing: %v", err)
-	}
-
-	err = OrderProcessing(req)
-	if err != constant.OrderBlockAlreadyProcess {
-		t.Fatalf("second order processing error = %v, want %v", err, constant.OrderBlockAlreadyProcess)
-	}
-
-	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
-	if err != nil {
-		t.Fatalf("reload order after duplicate block: %v", err)
-	}
-	if order.Status != mdb.StatusPaySuccess {
-		t.Fatalf("order status after duplicate block = %d, want %d", order.Status, mdb.StatusPaySuccess)
-	}
-	if order.BlockTransactionId != "block_1" {
-		t.Fatalf("order block transaction id after duplicate block = %s, want block_1", order.BlockTransactionId)
-	}
-}
-
-func TestOrderProcessingDoesNotReviveExpiredOrder(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	if _, err := data.AddWalletAddress("wallet_1"); err != nil {
-		t.Fatalf("add wallet: %v", err)
-	}
-
-	resp, err := CreateTransaction(newCreateTransactionRequest("order_1", 1))
-	if err != nil {
-		t.Fatalf("create transaction: %v", err)
-	}
-
-	if err = dao.Mdb.Model(&mdb.Orders{}).
-		Where("trade_id = ?", resp.TradeId).
-		Update("status", mdb.StatusExpired).Error; err != nil {
-		t.Fatalf("force order expired: %v", err)
-	}
-
-	err = OrderProcessing(&request.OrderProcessingRequest{
-		ReceiveAddress:     resp.ReceiveAddress,
-		Token:              resp.Token,
-		TradeId:            resp.TradeId,
-		Amount:             resp.ActualAmount,
-		BlockTransactionId: "block_expired",
-	})
-	if err != constant.OrderStatusConflict {
-		t.Fatalf("order processing error = %v, want %v", err, constant.OrderStatusConflict)
-	}
-
-	order, err := data.GetOrderInfoByTradeId(resp.TradeId)
-	if err != nil {
-		t.Fatalf("reload expired order: %v", err)
-	}
-	if order.Status != mdb.StatusExpired {
-		t.Fatalf("expired order status = %d, want %d", order.Status, mdb.StatusExpired)
-	}
-	if order.BlockTransactionId != "" {
-		t.Fatalf("expired order block transaction id = %s, want empty", order.BlockTransactionId)
-	}
-}
-
-func TestOrderProcessingOnlyOneOrderClaimsABlockTransaction(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	if _, err := data.AddWalletAddress("wallet_1"); err != nil {
-		t.Fatalf("add wallet: %v", err)
-	}
-	if _, err := data.AddWalletAddress("wallet_2"); err != nil {
-		t.Fatalf("add wallet: %v", err)
-	}
-
-	resp1, err := CreateTransaction(newCreateTransactionRequest("order_1", 1))
-	if err != nil {
-		t.Fatalf("create first transaction: %v", err)
-	}
-	resp2, err := CreateTransaction(newCreateTransactionRequest("order_2", 2))
-	if err != nil {
-		t.Fatalf("create second transaction: %v", err)
-	}
-
-	start := make(chan struct{})
-	errs := make(chan error, 2)
-	var wg sync.WaitGroup
-	for _, tc := range []struct {
-		address string
-		token   string
-		tradeID string
-		amount  float64
-	}{
-		{address: resp1.ReceiveAddress, token: resp1.Token, tradeID: resp1.TradeId, amount: resp1.ActualAmount},
-		{address: resp2.ReceiveAddress, token: resp2.Token, tradeID: resp2.TradeId, amount: resp2.ActualAmount},
-	} {
-		wg.Add(1)
-		go func(address, token, tradeID string, amount float64) {
-			defer wg.Done()
-			<-start
-			errs <- OrderProcessing(&request.OrderProcessingRequest{
-				ReceiveAddress:     address,
-				Token:              token,
-				TradeId:            tradeID,
-				Amount:             amount,
-				BlockTransactionId: "shared_block",
-			})
-		}(tc.address, tc.token, tc.tradeID, tc.amount)
-	}
-
-	close(start)
-	wg.Wait()
-	close(errs)
-
-	var successCount int
-	var duplicateCount int
-	for err := range errs {
-		switch err {
-		case nil:
-			successCount++
-		case constant.OrderBlockAlreadyProcess:
-			duplicateCount++
-		default:
-			t.Fatalf("unexpected order processing error: %v", err)
-		}
-	}
-	if successCount != 1 || duplicateCount != 1 {
-		t.Fatalf("success=%d duplicate=%d, want 1 and 1", successCount, duplicateCount)
-	}
-
-	orders := []struct {
-		tradeID string
-	}{
-		{tradeID: resp1.TradeId},
-		{tradeID: resp2.TradeId},
-	}
-	var paidCount int
-	var pendingCount int
-	for _, item := range orders {
-		order, err := data.GetOrderInfoByTradeId(item.tradeID)
-		if err != nil {
-			t.Fatalf("reload order %s: %v", item.tradeID, err)
-		}
-		switch order.Status {
-		case mdb.StatusPaySuccess:
-			paidCount++
-			if order.BlockTransactionId != "shared_block" {
-				t.Fatalf("paid order block transaction id = %s, want shared_block", order.BlockTransactionId)
-			}
-		case mdb.StatusWaitPay:
-			pendingCount++
-			if order.BlockTransactionId != "" {
-				t.Fatalf("pending order block transaction id = %s, want empty", order.BlockTransactionId)
-			}
-		default:
-			t.Fatalf("unexpected order status for %s: %d", item.tradeID, order.Status)
-		}
-	}
-	if paidCount != 1 || pendingCount != 1 {
-		t.Fatalf("paid=%d pending=%d, want 1 and 1", paidCount, pendingCount)
-	}
-}

src/model/service/pay_service.go

@@ -2,29 +2,26 @@ package service
 
 import (
 	"errors"
-
 	"github.com/assimon/luuu/config"
 	"github.com/assimon/luuu/model/data"
 	"github.com/assimon/luuu/model/mdb"
 	"github.com/assimon/luuu/model/response"
 )
 
-// GetCheckoutCounterByTradeId returns checkout info for a pending order.
+// GetCheckoutCounterByTradeId 获取收银台详情，通过订单
 func GetCheckoutCounterByTradeId(tradeId string) (*response.CheckoutCounterResponse, error) {
 	orderInfo, err := data.GetOrderInfoByTradeId(tradeId)
 	if err != nil {
 		return nil, err
 	}
 	if orderInfo.ID <= 0 || orderInfo.Status != mdb.StatusWaitPay {
-		return nil, errors.New("不存在待支付订单或已过期")
+		return nil, errors.New("不存在待支付订单或已过期！")
 	}
-
 	resp := &response.CheckoutCounterResponse{
 		TradeId:        orderInfo.TradeId,
 		ActualAmount:   orderInfo.ActualAmount,
-		ReceiveAddress: orderInfo.ReceiveAddress,
 		Token:          orderInfo.Token,
-		ExpirationTime: orderInfo.CreatedAt.AddMinutes(config.GetOrderExpirationTime()).TimestampMilli(),
+		ExpirationTime: orderInfo.CreatedAt.AddMinutes(config.GetOrderExpirationTime()).TimestampWithMillisecond(),
 		RedirectUrl:    orderInfo.RedirectUrl,
 	}
 	return resp, nil

src/model/service/task_service.go

@@ -1,281 +1,136 @@
 package service
 
 import (
-	"encoding/hex"
+	"context"
-	"errors"
 	"fmt"
-	"net/http"
-	"strings"
-	"sync"
-
-	"github.com/assimon/luuu/config"
-	tron "github.com/assimon/luuu/crypto"
 	"github.com/assimon/luuu/model/data"
-	"github.com/assimon/luuu/model/mdb"
 	"github.com/assimon/luuu/model/request"
-	"github.com/assimon/luuu/telegram"
-	"github.com/assimon/luuu/util/constant"
 	"github.com/assimon/luuu/util/http_client"
+	"github.com/assimon/luuu/util/json"
 	"github.com/assimon/luuu/util/log"
-	"github.com/assimon/luuu/util/math"
+	"github.com/golang-module/carbon/v2"
-	"github.com/dromara/carbon/v2"
+	"github.com/gookit/goutil/mathutil"
 	"github.com/gookit/goutil/stdutil"
 	"github.com/shopspring/decimal"
-	"github.com/tidwall/gjson"
+	"net/http"
+	"sync"
+	"time"
 )
 
-const TRC20_USDT_ID = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
+const UsdtTrc20ApiUri = "https://apilist.tronscan.org/api/token_trc20/transfers"
 
-func Trc20CallBack(address string, wg *sync.WaitGroup) {
+type UsdtTrc20Resp struct {
+	Total          int              `json:"total"`
+	RangeTotal     int              `json:"rangeTotal"`
+	TokenTransfers []TokenTransfers `json:"token_transfers"`
+}
+
+type TokenInfo struct {
+	TokenID      string `json:"tokenId"`
+	TokenAbbr    string `json:"tokenAbbr"`
+	TokenName    string `json:"tokenName"`
+	TokenDecimal int    `json:"tokenDecimal"`
+	TokenCanShow int    `json:"tokenCanShow"`
+	TokenType    string `json:"tokenType"`
+	TokenLogo    string `json:"tokenLogo"`
+	TokenLevel   string `json:"tokenLevel"`
+	Vip          bool   `json:"vip"`
+}
+type TokenTransfers struct {
+	TransactionID         string    `json:"transaction_id"`
+	BlockTs               int64     `json:"block_ts"`
+	FromAddress           string    `json:"from_address"`
+	ToAddress             string    `json:"to_address"`
+	Block                 int       `json:"block"`
+	ContractAddress       string    `json:"contract_address"`
+	Quant                 string    `json:"quant"`
+	ApprovalAmount        string    `json:"approval_amount"`
+	EventType             string    `json:"event_type"`
+	ContractType          string    `json:"contract_type"`
+	Confirmed             bool      `json:"confirmed"`
+	ContractRet           string    `json:"contractRet"`
+	FinalResult           string    `json:"finalResult"`
+	TokenInfo             TokenInfo `json:"tokenInfo"`
+	FromAddressIsContract bool      `json:"fromAddressIsContract"`
+	ToAddressIsContract   bool      `json:"toAddressIsContract"`
+	Revert                bool      `json:"revert"`
+}
+
+// Trc20CallBack trc20回调
+func Trc20CallBack(token string, wg *sync.WaitGroup) {
 	defer wg.Done()
 	defer func() {
 		if err := recover(); err != nil {
 			log.Sugar.Error(err)
 		}
 	}()
-
-	var innerWg sync.WaitGroup
-	innerWg.Add(2)
-	go checkTrxTransfers(address, &innerWg)
-	go checkTrc20Transfers(address, &innerWg)
-	innerWg.Wait()
-}
-
-func checkTrxTransfers(address string, wg *sync.WaitGroup) {
-	defer wg.Done()
-	defer func() {
-		if err := recover(); err != nil {
-			log.Sugar.Errorf("[TRX][%s] panic recovered: %v", address, err)
-		}
-	}()
-
 	client := http_client.GetHttpClient()
-	startTime := carbon.Now().AddHours(-24).TimestampMilli()
+	startTime := carbon.Now().AddHours(-24).TimestampWithMillisecond()
-	endTime := carbon.Now().TimestampMilli()
+	endTime := carbon.Now().TimestampWithMillisecond()
-	url := fmt.Sprintf("https://api.trongrid.io/v1/accounts/%s/transactions", address)
-
 	resp, err := client.R().SetQueryParams(map[string]string{
-		"order_by":      "block_timestamp,desc",
+		"limit":           "200",
-		"limit":         "100",
+		"start":           "0",
-		"only_to":       "true",
+		"direction":       "in",
-		"min_timestamp": stdutil.ToString(startTime),
+		"tokens":          "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
-		"max_timestamp": stdutil.ToString(endTime),
+		"relatedAddress":  token,
-	}).SetHeader("TRON-PRO-API-KEY", config.TRON_GRID_API_KEY).Get(url)
+		"start_timestamp": stdutil.ToString(startTime),
+		"end_timestamp":   stdutil.ToString(endTime),
+	}).Get(UsdtTrc20ApiUri)
 	if err != nil {
 		panic(err)
 	}
 	if resp.StatusCode() != http.StatusOK {
-		panic(fmt.Sprintf("TRX API returned status %d", resp.StatusCode()))
+		panic(err)
 	}
-
+	var trc20Resp UsdtTrc20Resp
-	success := gjson.GetBytes(resp.Body(), "success").Bool()
+	err = json.Cjson.Unmarshal(resp.Body(), &trc20Resp)
-	if !success {
-		panic("TRX API response indicates failure")
-	}
-
-	transfers := gjson.GetBytes(resp.Body(), "data").Array()
-	if len(transfers) == 0 {
-		log.Sugar.Debugf("[TRX][%s] no transfer records found", address)
-		return
-	}
-	log.Sugar.Debugf("[TRX][%s] fetched %d transfer records", address, len(transfers))
-
-	for i, transfer := range transfers {
-		if transfer.Get("raw_data.contract.0.type").String() != "TransferContract" {
-			continue
-		}
-		if transfer.Get("ret.0.contractRet").String() != "SUCCESS" {
-			continue
-		}
-
-		toAddressHex := transfer.Get("raw_data.contract.0.parameter.value.to_address").String()
-		toBytes, err := hex.DecodeString(toAddressHex)
-		if err != nil {
-			log.Sugar.Errorf("[TRX][%s] decode address failed on tx #%d: %v", address, i, err)
-			continue
-		}
-		if tron.EncodeCheck(toBytes) != address {
-			continue
-		}
-
-		rawAmount := transfer.Get("raw_data.contract.0.parameter.value.amount").String()
-		decimalQuant, err := decimal.NewFromString(rawAmount)
-		if err != nil {
-			log.Sugar.Errorf("[TRX][%s] parse amount failed on tx #%d: %v", address, i, err)
-			continue
-		}
-		amount := math.MustParsePrecFloat64(decimalQuant.Div(decimal.NewFromInt(1000000)).InexactFloat64(), 2)
-		if amount <= 0 {
-			continue
-		}
-
-		txID := transfer.Get("txID").String()
-		tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(address, "TRX", amount)
-		if err != nil {
-			panic(err)
-		}
-		if tradeID == "" {
-			log.Sugar.Debugf("[TRX][%s] skip unmatched tx hash=%s amount=%.2f", address, txID, amount)
-			continue
-		}
-		log.Sugar.Infof("[TRX][%s] matched trade_id=%s hash=%s amount=%.2f", address, tradeID, txID, amount)
-
-		order, err := data.GetOrderInfoByTradeId(tradeID)
-		if err != nil {
-			panic(err)
-		}
-		blockTimestamp := transfer.Get("block_timestamp").Int()
-		createTime := order.CreatedAt.TimestampMilli()
-		if blockTimestamp < createTime {
-			log.Sugar.Warnf("[TRX][%s] skip tx %s because block time %d is before order create time %d", address, txID, blockTimestamp, createTime)
-			continue
-		}
-
-		req := &request.OrderProcessingRequest{
-			ReceiveAddress:     address,
-			Token:              "TRX",
-			TradeId:            tradeID,
-			Amount:             amount,
-			BlockTransactionId: txID,
-		}
-		err = OrderProcessing(req)
-		if err != nil {
-			if errors.Is(err, constant.OrderBlockAlreadyProcess) || errors.Is(err, constant.OrderStatusConflict) {
-				log.Sugar.Infof("[TRX][%s] skip resolved transfer trade_id=%s hash=%s err=%v", address, tradeID, txID, err)
-				continue
-			}
-			panic(err)
-		}
-
-		sendPaymentNotification(order)
-		log.Sugar.Infof("[TRX][%s] payment processed trade_id=%s hash=%s", address, tradeID, txID)
-	}
-}
-
-func checkTrc20Transfers(address string, wg *sync.WaitGroup) {
-	defer wg.Done()
-	defer func() {
-		if err := recover(); err != nil {
-			log.Sugar.Errorf("[TRC20][%s] panic recovered: %v", address, err)
-		}
-	}()
-
-	client := http_client.GetHttpClient()
-	startTime := carbon.Now().AddHours(-24).TimestampMilli()
-	endTime := carbon.Now().TimestampMilli()
-	url := fmt.Sprintf("https://api.trongrid.io/v1/accounts/%s/transactions/trc20", address)
-
-	resp, err := client.R().SetQueryParams(map[string]string{
-		"order_by":      "block_timestamp,desc",
-		"limit":         "100",
-		"only_to":       "true",
-		"min_timestamp": stdutil.ToString(startTime),
-		"max_timestamp": stdutil.ToString(endTime),
-	}).SetHeader("TRON-PRO-API-KEY", config.TRON_GRID_API_KEY).Get(url)
 	if err != nil {
 		panic(err)
 	}
-	if resp.StatusCode() != http.StatusOK {
+	if trc20Resp.Total <= 0 {
-		panic(fmt.Sprintf("TRC20 API returned status %d", resp.StatusCode()))
-	}
-
-	success := gjson.GetBytes(resp.Body(), "success").Bool()
-	if !success {
-		panic("TRC20 API response indicates failure")
-	}
-
-	transfers := gjson.GetBytes(resp.Body(), "data").Array()
-	if len(transfers) == 0 {
-		log.Sugar.Debugf("[TRC20][%s] no transfer records found", address)
 		return
 	}
-	log.Sugar.Debugf("[TRC20][%s] fetched %d transfer records", address, len(transfers))
+	ctx := context.Background()
-
+	nowTime := time.Now().Unix()
-	for i, transfer := range transfers {
+	for _, transfer := range trc20Resp.TokenTransfers {
-		if transfer.Get("token_info.address").String() != TRC20_USDT_ID {
+		if transfer.ToAddress != token || transfer.FinalResult != "SUCCESS" {
 			continue
 		}
-		if transfer.Get("to").String() != address {
+		x, _ := decimal.NewFromString(transfer.Quant)
-			continue
+		y, _ := decimal.NewFromString("1000000")
-		}
+		quant := x.Div(y).InexactFloat64()
-
+		amount := fmt.Sprintf("%.4f", quant)
-		valueStr := transfer.Get("value").String()
+		result, err := data.GetExpirationTimeByAmount(ctx, token, amount)
-		decimalQuant, err := decimal.NewFromString(valueStr)
-		if err != nil {
-			log.Sugar.Errorf("[TRC20][%s] parse value failed on tx #%d: %v", address, i, err)
-			continue
-		}
-		tokenDecimals := transfer.Get("token_info.decimals").Int()
-		amount := math.MustParsePrecFloat64(decimalQuant.Div(decimal.New(1, int32(tokenDecimals))).InexactFloat64(), 2)
-		if amount <= 0 {
-			continue
-		}
-
-		txID := transfer.Get("transaction_id").String()
-		tradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(address, "USDT", amount)
 		if err != nil {
 			panic(err)
 		}
-		if tradeID == "" {
+		if result != "" {
-			log.Sugar.Debugf("[TRC20][%s] skip unmatched tx hash=%s amount=%.2f", address, txID, amount)
+			expTime := mathutil.MustInt64(result)
-			continue
+			// 但是过期了
+			if expTime < nowTime {
+				// 删掉过期
+				_ = data.ClearPayCache(token, amount)
+				continue
+			}
 		}
-		log.Sugar.Infof("[TRC20][%s] matched trade_id=%s hash=%s amount=%.2f", address, tradeID, txID, amount)
+		// 该钱包下有无匹配金额订单
-
+		tradeId, err := data.GetTradeIdByAmount(ctx, token, amount)
-		order, err := data.GetOrderInfoByTradeId(tradeID)
 		if err != nil {
 			panic(err)
 		}
-		blockTimestamp := transfer.Get("block_timestamp").Int()
+		if tradeId == "" {
-		createTime := order.CreatedAt.TimestampMilli()
-		if blockTimestamp < createTime {
-			log.Sugar.Warnf("[TRC20][%s] skip tx %s because block time %d is before order create time %d", address, txID, blockTimestamp, createTime)
 			continue
 		}
-
+		// 到这一步就匹配到金额了
 		req := &request.OrderProcessingRequest{
-			ReceiveAddress:     address,
+			Token:              token,
-			Token:              "USDT",
+			TradeId:            tradeId,
-			TradeId:            tradeID,
 			Amount:             amount,
-			BlockTransactionId: txID,
+			BlockTransactionId: transfer.TransactionID,
 		}
 		err = OrderProcessing(req)
 		if err != nil {
-			if errors.Is(err, constant.OrderBlockAlreadyProcess) || errors.Is(err, constant.OrderStatusConflict) {
-				log.Sugar.Infof("[TRC20][%s] skip resolved transfer trade_id=%s hash=%s err=%v", address, tradeID, txID, err)
-				continue
-			}
 			panic(err)
 		}
-
-		sendPaymentNotification(order)
-		log.Sugar.Infof("[TRC20][%s] payment processed trade_id=%s hash=%s", address, tradeID, txID)
 	}
 }
-
-func sendPaymentNotification(order *mdb.Orders) {
-	msg := fmt.Sprintf(
-		"🎉 <b>收款成功通知</b>\n\n"+
-			"💰 <b>金额信息</b>\n"+
-			"├ 订单金额：<code>%.2f %s</code>\n"+
-			"└ 实际到账：<code>%.2f %s</code>\n\n"+
-			"📋 <b>订单信息</b>\n"+
-			"├ 交易号：<code>%s</code>\n"+
-			"├ 订单号：<code>%s</code>\n"+
-			"└ 钱包地址：<code>%s</code>\n\n"+
-			"⏰ <b>时间信息</b>\n"+
-			"├ 创建时间：%s\n"+
-			"└ 支付时间：%s",
-		order.Amount,
-		strings.ToUpper(order.Currency),
-		order.ActualAmount,
-		strings.ToUpper(order.Token),
-		order.TradeId,
-		order.OrderId,
-		order.ReceiveAddress,
-		order.CreatedAt.ToDateTimeString(),
-		carbon.Now().ToDateTimeString(),
-	)
-	telegram.SendToBot(msg)
-}

src/mq/handle/callback_queue.go

@@ -0,0 +1,67 @@
+package handle
+
+import (
+	"context"
+	"errors"
+	"github.com/assimon/luuu/config"
+	"github.com/assimon/luuu/model/data"
+	"github.com/assimon/luuu/model/mdb"
+	"github.com/assimon/luuu/model/response"
+	"github.com/assimon/luuu/util/http_client"
+	"github.com/assimon/luuu/util/json"
+	"github.com/assimon/luuu/util/log"
+	"github.com/assimon/luuu/util/sign"
+	"github.com/hibiken/asynq"
+)
+
+const QueueOrderCallback = "order:callback"
+
+func NewOrderCallbackQueue(order *mdb.Orders) (*asynq.Task, error) {
+	payload, err := json.Cjson.Marshal(order)
+	if err != nil {
+		return nil, err
+	}
+	return asynq.NewTask(QueueOrderCallback, payload), nil
+}
+
+func OrderCallbackHandle(ctx context.Context, t *asynq.Task) error {
+	var order mdb.Orders
+	err := json.Cjson.Unmarshal(t.Payload(), &order)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err := recover(); err != nil {
+			log.Sugar.Error(err)
+		}
+	}()
+	defer func() {
+		data.SaveCallBackOrdersResp(&order)
+	}()
+	client := http_client.GetHttpClient()
+	orderResp := response.OrderNotifyResponse{
+		TradeId:            order.TradeId,
+		OrderId:            order.OrderId,
+		Amount:             order.Amount,
+		ActualAmount:       order.ActualAmount,
+		Token:              order.Token,
+		BlockTransactionId: order.BlockTransactionId,
+		Status:             mdb.StatusPaySuccess,
+	}
+	signature, err := sign.Get(orderResp, config.GetApiAuthToken())
+	if err != nil {
+		return err
+	}
+	orderResp.Signature = signature
+	resp, err := client.R().SetHeader("powered-by", "Epusdt(https://github.com/assimon/epusdt)").SetBody(orderResp).Post(order.NotifyUrl)
+	if err != nil {
+		return err
+	}
+	body := string(resp.Body())
+	if body != "ok" {
+		order.CallBackConfirm = mdb.CallBackConfirmNo
+		return errors.New("not ok")
+	}
+	order.CallBackConfirm = mdb.CallBackConfirmOk
+	return nil
+}

src/mq/handle/order_expiration_queue.go

@@ -0,0 +1,37 @@
+package handle
+
+import (
+	"context"
+	"fmt"
+	"github.com/assimon/luuu/model/data"
+	"github.com/assimon/luuu/model/mdb"
+	"github.com/hibiken/asynq"
+)
+
+const QueueOrderExpiration = "order:expiration"
+
+func NewOrderExpirationQueue(tradeId string) (*asynq.Task, error) {
+	return asynq.NewTask(QueueOrderExpiration, []byte(tradeId)), nil
+}
+
+// OrderExpirationHandle 设置订单过期
+func OrderExpirationHandle(ctx context.Context, t *asynq.Task) error {
+	tradeId := string(t.Payload())
+	orderInfo, err := data.GetOrderInfoByTradeId(tradeId)
+	if err != nil {
+		return err
+	}
+	if orderInfo.ID <= 0 || orderInfo.Status != mdb.StatusWaitPay {
+		return nil
+	}
+	err = data.UpdateOrderIsExpirationById(orderInfo.ID)
+	if err != nil {
+		return err
+	}
+	actualAmount := fmt.Sprintf("%.4f", orderInfo.ActualAmount)
+	err = data.ClearPayCache(orderInfo.Token, actualAmount)
+	if err != nil {
+		return err
+	}
+	return nil
+}

src/mq/queue.go

@@ -1,22 +1,51 @@
 package mq
 
 import (
-	"sync"
+	"fmt"
-
+	"github.com/assimon/luuu/mq/handle"
-	"github.com/assimon/luuu/config"
+	"github.com/assimon/luuu/util/log"
+	"github.com/hibiken/asynq"
+	"github.com/spf13/viper"
 )
 
-var (
+var MClient *asynq.Client
-	startOnce        sync.Once
-	callbackLimiter  chan struct{}
-	callbackInflight sync.Map
-)
 
 func Start() {
-	startOnce.Do(func() {
+	redis := asynq.RedisClientOpt{
-		callbackLimiter = make(chan struct{}, config.GetQueueConcurrency())
+		Addr: fmt.Sprintf(
-		go runOrderExpirationLoop()
+			"%s:%s",
-		go runOrderCallbackLoop()
+			viper.GetString("redis_host"),
-		go runTransactionLockCleanupLoop()
+			viper.GetString("redis_port")),
-	})
+		DB:       viper.GetInt("redis_db"),
+		Password: viper.GetString("redis_passwd"),
+	}
+	initClient(redis)
+	go initListen(redis)
+}
+
+func initClient(redis asynq.RedisClientOpt) {
+	MClient = asynq.NewClient(redis)
+}
+
+func initListen(redis asynq.RedisClientOpt) {
+	srv := asynq.NewServer(
+		redis,
+		asynq.Config{
+			// Specify how many concurrent workers to use
+			Concurrency: viper.GetInt("queue_concurrency"),
+			// Optionally specify multiple queues with different priority.
+			Queues: map[string]int{
+				"critical": viper.GetInt("queue_level_critical"),
+				"default":  viper.GetInt("queue_level_default"),
+				"low":      viper.GetInt("queue_level_low"),
+			},
+			Logger: log.Sugar,
+		},
+	)
+	mux := asynq.NewServeMux()
+	mux.HandleFunc(handle.QueueOrderExpiration, handle.OrderExpirationHandle)
+	mux.HandleFunc(handle.QueueOrderCallback, handle.OrderCallbackHandle)
+	if err := srv.Run(mux); err != nil {
+		log.Sugar.Fatalf("[queue] could not run server: %v", err)
+	}
 }

src/mq/worker.go

@@ -1,257 +0,0 @@
-package mq
-
-import (
-	"errors"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/assimon/luuu/config"
-	"github.com/assimon/luuu/model/dao"
-	"github.com/assimon/luuu/model/data"
-	"github.com/assimon/luuu/model/mdb"
-	"github.com/assimon/luuu/model/response"
-	"github.com/assimon/luuu/util/http_client"
-	"github.com/assimon/luuu/util/log"
-	"github.com/assimon/luuu/util/sign"
-)
-
-const batchSize = 100
-
-const sqliteBusyRetryAttempts = 3
-
-type expirableOrder struct {
-	ID             uint64  `gorm:"column:id"`
-	TradeId        string  `gorm:"column:trade_id"`
-	ReceiveAddress string  `gorm:"column:receive_address"`
-	Token          string  `gorm:"column:token"`
-	ActualAmount   float64 `gorm:"column:actual_amount"`
-}
-
-func runOrderExpirationLoop() {
-	runLoop("order_expiration", processExpiredOrders)
-}
-
-func runOrderCallbackLoop() {
-	runLoop("order_callback", dispatchPendingCallbacks)
-}
-
-func runTransactionLockCleanupLoop() {
-	runLoop("transaction_lock_cleanup", cleanupExpiredTransactionLocks)
-}
-
-func runLoop(name string, fn func()) {
-	safeRun(name, fn)
-	ticker := time.NewTicker(config.GetQueuePollInterval())
-	defer ticker.Stop()
-
-	for range ticker.C {
-		safeRun(name, fn)
-	}
-}
-
-func safeRun(name string, fn func()) {
-	defer func() {
-		if err := recover(); err != nil {
-			log.Sugar.Errorf("[mq] %s panic: %v", name, err)
-		}
-	}()
-	fn()
-}
-
-func processExpiredOrders() {
-	expirationCutoff := time.Now().Add(-config.GetOrderExpirationTimeDuration())
-	for {
-		var orders []expirableOrder
-		err := withSQLiteBusyRetry(func() error {
-			return dao.Mdb.Model(&mdb.Orders{}).
-				Select("id", "trade_id", "receive_address", "token", "actual_amount").
-				Where("status = ?", mdb.StatusWaitPay).
-				Where("created_at <= ?", expirationCutoff).
-				Order("id asc").
-				Limit(batchSize).
-				Find(&orders).Error
-		})
-		if err != nil {
-			log.Sugar.Errorf("[mq] query expired orders failed: %v", err)
-			return
-		}
-		if len(orders) == 0 {
-			return
-		}
-
-		for _, order := range orders {
-			expired, err := data.UpdateOrderIsExpirationById(order.ID, expirationCutoff)
-			if err != nil {
-				log.Sugar.Errorf("[mq] expire order failed, trade_id=%s, err=%v", order.TradeId, err)
-				continue
-			}
-			if !expired {
-				continue
-			}
-			if err = data.UnLockTransaction(order.ReceiveAddress, order.Token, order.ActualAmount); err != nil {
-				log.Sugar.Warnf("[mq] release expired transaction lock failed, trade_id=%s, err=%v", order.TradeId, err)
-			}
-		}
-
-		if len(orders) < batchSize {
-			return
-		}
-	}
-}
-
-func dispatchPendingCallbacks() {
-	maxRetry := config.GetOrderNoticeMaxRetry()
-	var orders []data.PendingCallbackOrder
-	err := withSQLiteBusyRetry(func() error {
-		var innerErr error
-		orders, innerErr = data.GetPendingCallbackOrders(maxRetry, batchSize)
-		return innerErr
-	})
-	if err != nil {
-		log.Sugar.Errorf("[mq] query callback orders failed: %v", err)
-		return
-	}
-
-	now := time.Now()
-	for _, order := range orders {
-		if !isCallbackDue(&order, now, maxRetry) {
-			continue
-		}
-		tradeID := order.TradeId
-		if _, loaded := callbackInflight.LoadOrStore(tradeID, struct{}{}); loaded {
-			continue
-		}
-
-		select {
-		case callbackLimiter <- struct{}{}:
-			go processCallback(tradeID)
-		default:
-			callbackInflight.Delete(tradeID)
-			return
-		}
-	}
-}
-
-func processCallback(tradeID string) {
-	defer func() {
-		<-callbackLimiter
-		callbackInflight.Delete(tradeID)
-	}()
-
-	freshOrder, err := data.GetOrderInfoByTradeId(tradeID)
-	if err != nil {
-		log.Sugar.Errorf("[mq] reload callback order failed, trade_id=%s, err=%v", tradeID, err)
-		return
-	}
-	if freshOrder.ID <= 0 || freshOrder.Status != mdb.StatusPaySuccess || freshOrder.CallBackConfirm != mdb.CallBackConfirmNo {
-		return
-	}
-
-	if err = sendOrderCallback(freshOrder); err != nil {
-		log.Sugar.Warnf("[mq] callback request failed, trade_id=%s, attempt=%d, err=%v", freshOrder.TradeId, freshOrder.CallbackNum+1, err)
-		freshOrder.CallBackConfirm = mdb.CallBackConfirmNo
-	} else {
-		freshOrder.CallBackConfirm = mdb.CallBackConfirmOk
-	}
-
-	if err = data.SaveCallBackOrdersResp(freshOrder); err != nil {
-		log.Sugar.Errorf("[mq] save callback result failed, trade_id=%s, err=%v", freshOrder.TradeId, err)
-	}
-}
-
-func sendOrderCallback(order *mdb.Orders) error {
-	client := http_client.GetHttpClient()
-	orderResp := response.OrderNotifyResponse{
-		TradeId:            order.TradeId,
-		OrderId:            order.OrderId,
-		Amount:             order.Amount,
-		ActualAmount:       order.ActualAmount,
-		ReceiveAddress:     order.ReceiveAddress,
-		Token:              order.Token,
-		BlockTransactionId: order.BlockTransactionId,
-		Status:             mdb.StatusPaySuccess,
-	}
-	signature, err := sign.Get(orderResp, config.GetApiAuthToken())
-	if err != nil {
-		return err
-	}
-	orderResp.Signature = signature
-
-	resp, err := client.R().
-		SetHeader("powered-by", "Epusdt(https://github.com/GMwalletApp/epusdt)").
-		SetBody(orderResp).
-		Post(order.NotifyUrl)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode() != http.StatusOK {
-		return errors.New(resp.Status())
-	}
-	if string(resp.Body()) != "ok" {
-		return errors.New("not ok")
-	}
-	return nil
-}
-
-func cleanupExpiredTransactionLocks() {
-	if err := data.CleanupExpiredTransactionLocks(); err != nil {
-		log.Sugar.Errorf("[mq] cleanup expired transaction locks failed: %v", err)
-	}
-}
-
-func withSQLiteBusyRetry(fn func() error) error {
-	var err error
-	for attempt := 1; attempt <= sqliteBusyRetryAttempts; attempt++ {
-		err = fn()
-		if err == nil {
-			return nil
-		}
-		if !isSQLiteBusyError(err) || attempt == sqliteBusyRetryAttempts {
-			return err
-		}
-		time.Sleep(time.Duration(attempt*25) * time.Millisecond)
-	}
-	return err
-}
-
-func isSQLiteBusyError(err error) bool {
-	if err == nil {
-		return false
-	}
-	msg := strings.ToLower(err.Error())
-	return strings.Contains(msg, "database is locked") || strings.Contains(msg, "sqlite_busy")
-}
-
-func isCallbackDue(order *data.PendingCallbackOrder, now time.Time, maxRetry int) bool {
-	if order.CallBackConfirm != mdb.CallBackConfirmNo {
-		return false
-	}
-	if order.CallbackNum > maxRetry {
-		return false
-	}
-	if order.CallbackNum == 0 {
-		return true
-	}
-	nextRunAt := order.UpdatedAt.StdTime().Add(callbackRetryDelay(order.CallbackNum))
-	return !nextRunAt.After(now)
-}
-
-func callbackRetryDelay(attempts int) time.Duration {
-	if attempts <= 0 {
-		return 0
-	}
-
-	delay := config.GetCallbackRetryBaseDuration()
-	maxDelay := 5 * time.Minute
-	for i := 1; i < attempts; i++ {
-		if delay >= maxDelay/2 {
-			return maxDelay
-		}
-		delay *= 2
-	}
-	if delay > maxDelay {
-		return maxDelay
-	}
-	return delay
-}

src/mq/worker_test.go

@@ -1,271 +0,0 @@
-package mq
-
-import (
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/assimon/luuu/internal/testutil"
-	"github.com/assimon/luuu/model/dao"
-	"github.com/assimon/luuu/model/data"
-	"github.com/assimon/luuu/model/mdb"
-)
-
-func TestProcessExpiredOrdersExpiresWaitingOrdersAndReleasesLocks(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	order := &mdb.Orders{
-		TradeId:        "trade_expired",
-		OrderId:        "order_expired",
-		Amount:         1,
-		Currency:       "CNY",
-		ActualAmount:   1,
-		ReceiveAddress: "wallet_1",
-		Token:          "USDT",
-		Status:         mdb.StatusWaitPay,
-		NotifyUrl:      "https://merchant.example/callback",
-	}
-	if err := dao.Mdb.Create(order).Error; err != nil {
-		t.Fatalf("create expired order: %v", err)
-	}
-	if err := dao.Mdb.Model(order).UpdateColumn("created_at", time.Now().Add(-20*time.Minute)).Error; err != nil {
-		t.Fatalf("age expired order: %v", err)
-	}
-	if err := data.LockTransaction(order.ReceiveAddress, order.Token, order.TradeId, order.ActualAmount, time.Hour); err != nil {
-		t.Fatalf("lock expired order: %v", err)
-	}
-
-	recentOrder := &mdb.Orders{
-		TradeId:        "trade_recent",
-		OrderId:        "order_recent",
-		Amount:         1,
-		Currency:       "CNY",
-		ActualAmount:   1.01,
-		ReceiveAddress: "wallet_1",
-		Token:          "USDT",
-		Status:         mdb.StatusWaitPay,
-		NotifyUrl:      "https://merchant.example/callback",
-	}
-	if err := dao.Mdb.Create(recentOrder).Error; err != nil {
-		t.Fatalf("create recent order: %v", err)
-	}
-	if err := data.LockTransaction(recentOrder.ReceiveAddress, recentOrder.Token, recentOrder.TradeId, recentOrder.ActualAmount, time.Hour); err != nil {
-		t.Fatalf("lock recent order: %v", err)
-	}
-
-	processExpiredOrders()
-
-	expired, err := data.GetOrderInfoByTradeId(order.TradeId)
-	if err != nil {
-		t.Fatalf("reload expired order: %v", err)
-	}
-	if expired.Status != mdb.StatusExpired {
-		t.Fatalf("expired order status = %d, want %d", expired.Status, mdb.StatusExpired)
-	}
-	lockTradeID, err := data.GetTradeIdByWalletAddressAndAmountAndToken(order.ReceiveAddress, order.Token, order.ActualAmount)
-	if err != nil {
-		t.Fatalf("expired order lock lookup: %v", err)
-	}
-	if lockTradeID != "" {
-		t.Fatalf("expired order lock still exists: %s", lockTradeID)
-	}
-
-	recent, err := data.GetOrderInfoByTradeId(recentOrder.TradeId)
-	if err != nil {
-		t.Fatalf("reload recent order: %v", err)
-	}
-	if recent.Status != mdb.StatusWaitPay {
-		t.Fatalf("recent order status = %d, want %d", recent.Status, mdb.StatusWaitPay)
-	}
-	lockTradeID, err = data.GetTradeIdByWalletAddressAndAmountAndToken(recentOrder.ReceiveAddress, recentOrder.Token, recentOrder.ActualAmount)
-	if err != nil {
-		t.Fatalf("recent order lock lookup: %v", err)
-	}
-	if lockTradeID != recentOrder.TradeId {
-		t.Fatalf("recent order lock = %s, want %s", lockTradeID, recentOrder.TradeId)
-	}
-}
-
-func TestProcessExpiredOrdersKeepsPaidOrdersPaid(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	order := &mdb.Orders{
-		TradeId:            "trade_paid",
-		OrderId:            "order_paid",
-		Amount:             1,
-		Currency:           "CNY",
-		ActualAmount:       1,
-		ReceiveAddress:     "wallet_1",
-		Token:              "USDT",
-		Status:             mdb.StatusPaySuccess,
-		NotifyUrl:          "https://merchant.example/callback",
-		BlockTransactionId: "block_paid",
-		CallBackConfirm:    mdb.CallBackConfirmNo,
-	}
-	if err := dao.Mdb.Create(order).Error; err != nil {
-		t.Fatalf("create paid order: %v", err)
-	}
-	if err := dao.Mdb.Model(order).UpdateColumn("created_at", time.Now().Add(-20*time.Minute)).Error; err != nil {
-		t.Fatalf("age paid order: %v", err)
-	}
-
-	processExpiredOrders()
-
-	current, err := data.GetOrderInfoByTradeId(order.TradeId)
-	if err != nil {
-		t.Fatalf("reload paid order: %v", err)
-	}
-	if current.Status != mdb.StatusPaySuccess {
-		t.Fatalf("paid order status = %d, want %d", current.Status, mdb.StatusPaySuccess)
-	}
-	if current.BlockTransactionId != "block_paid" {
-		t.Fatalf("paid order block transaction id = %s, want block_paid", current.BlockTransactionId)
-	}
-}
-
-func TestDispatchPendingCallbacksHonorsBackoffAndPersistsSuccess(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	callbackLimiter = make(chan struct{}, 1)
-	callbackInflight = sync.Map{}
-
-	var requestCount int32
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		atomic.AddInt32(&requestCount, 1)
-		_, _ = io.WriteString(w, "ok")
-	}))
-	defer server.Close()
-
-	order := &mdb.Orders{
-		TradeId:            "trade_callback",
-		OrderId:            "order_callback",
-		Amount:             1,
-		Currency:           "CNY",
-		ActualAmount:       1,
-		ReceiveAddress:     "wallet_1",
-		Token:              "USDT",
-		Status:             mdb.StatusPaySuccess,
-		NotifyUrl:          server.URL,
-		BlockTransactionId: "block_callback",
-		CallbackNum:        1,
-		CallBackConfirm:    mdb.CallBackConfirmNo,
-	}
-	if err := dao.Mdb.Create(order).Error; err != nil {
-		t.Fatalf("create callback order: %v", err)
-	}
-
-	dispatchPendingCallbacks()
-	time.Sleep(200 * time.Millisecond)
-	if got := atomic.LoadInt32(&requestCount); got != 0 {
-		t.Fatalf("unexpected callback count before backoff elapsed: %d", got)
-	}
-
-	if err := dao.Mdb.Model(order).UpdateColumn("updated_at", time.Now().Add(-2*time.Second)).Error; err != nil {
-		t.Fatalf("age callback order: %v", err)
-	}
-	dispatchPendingCallbacks()
-
-	waitFor(t, 3*time.Second, func() bool {
-		current, err := data.GetOrderInfoByTradeId(order.TradeId)
-		if err != nil || current.ID <= 0 {
-			return false
-		}
-		return current.CallBackConfirm == mdb.CallBackConfirmOk && current.CallbackNum == 2
-	})
-
-	if got := atomic.LoadInt32(&requestCount); got != 1 {
-		t.Fatalf("callback request count = %d, want 1", got)
-	}
-}
-
-func TestDispatchPendingCallbacksResumesRetryAfterRestart(t *testing.T) {
-	cleanup := testutil.SetupTestDatabases(t)
-	defer cleanup()
-
-	callbackLimiter = make(chan struct{}, 1)
-	callbackInflight = sync.Map{}
-
-	var requestCount int32
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		attempt := atomic.AddInt32(&requestCount, 1)
-		if attempt == 1 {
-			http.Error(w, "retry later", http.StatusInternalServerError)
-			return
-		}
-		_, _ = io.WriteString(w, "ok")
-	}))
-	defer server.Close()
-
-	order := &mdb.Orders{
-		TradeId:            "trade_callback_restart",
-		OrderId:            "order_callback_restart",
-		Amount:             1,
-		Currency:           "CNY",
-		ActualAmount:       1,
-		ReceiveAddress:     "wallet_restart",
-		Token:              "USDT",
-		Status:             mdb.StatusPaySuccess,
-		NotifyUrl:          server.URL,
-		BlockTransactionId: "block_callback_restart",
-		CallbackNum:        0,
-		CallBackConfirm:    mdb.CallBackConfirmNo,
-	}
-	if err := dao.Mdb.Create(order).Error; err != nil {
-		t.Fatalf("create callback order: %v", err)
-	}
-
-	dispatchPendingCallbacks()
-
-	waitFor(t, 3*time.Second, func() bool {
-		current, err := data.GetOrderInfoByTradeId(order.TradeId)
-		if err != nil || current.ID <= 0 {
-			return false
-		}
-		return current.CallBackConfirm == mdb.CallBackConfirmNo && current.CallbackNum == 1
-	})
-
-	if got := atomic.LoadInt32(&requestCount); got != 1 {
-		t.Fatalf("first callback request count = %d, want 1", got)
-	}
-
-	callbackLimiter = make(chan struct{}, 1)
-	callbackInflight = sync.Map{}
-
-	if err := dao.Mdb.Model(order).UpdateColumn("updated_at", time.Now().Add(-2*time.Second)).Error; err != nil {
-		t.Fatalf("age callback order for retry: %v", err)
-	}
-
-	dispatchPendingCallbacks()
-
-	waitFor(t, 3*time.Second, func() bool {
-		current, err := data.GetOrderInfoByTradeId(order.TradeId)
-		if err != nil || current.ID <= 0 {
-			return false
-		}
-		return current.CallBackConfirm == mdb.CallBackConfirmOk && current.CallbackNum == 2
-	})
-
-	if got := atomic.LoadInt32(&requestCount); got != 2 {
-		t.Fatalf("total callback request count = %d, want 2", got)
-	}
-}
-
-func waitFor(t *testing.T, timeout time.Duration, fn func() bool) {
-	t.Helper()
-
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		if fn() {
-			return
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-	t.Fatal("condition not satisfied before timeout")
-}

src/route/router.go

@@ -1,17 +1,16 @@
 package route
 
 import (
-	"net/http"
-
 	"github.com/assimon/luuu/controller/comm"
 	"github.com/assimon/luuu/middleware"
 	"github.com/labstack/echo/v4"
+	"net/http"
 )
 
 // RegisterRoute 路由注册
 func RegisterRoute(e *echo.Echo) {
 	e.Any("/", func(c echo.Context) error {
-		return c.String(http.StatusOK, "hello epusdt, https://github.com/GMwalletApp/epusdt")
+		return c.String(http.StatusOK, "hello epusdt, https://github.com/assimon/epusdt")
 	})
 	// ==== 支付相关=====
 	payRoute := e.Group("/pay")

src/static/index.html

@@ -181,7 +181,6 @@
     let second = Math.round(ms / 1000);
     let minute = Math.floor(second / 60);
     let hour = Math.floor(minute / 60);
-    if(minute > 60) minute %= 60
     if (ms <= 0) {
       layer.alert("支付超时，请重新发起支付！", {icon: 5});
       return;
@@ -241,4 +240,4 @@
     });
   }
   window.onload = checkOrderStatus();
-</script>
+</script>

src/task/listen.go

@@ -1,20 +1,12 @@
 package task
 
-import (
+import "github.com/robfig/cron/v3"
-	"github.com/assimon/luuu/util/log"
-	"github.com/robfig/cron/v3"
-)
 
 func Start() {
-	log.Sugar.Info("[task] Starting task scheduler...")
 	c := cron.New()
+	// 汇率监听
+	c.AddJob("@every 60s", UsdtRateJob{})
 	// trc20钱包监听
-	_, err := c.AddJob("@every 5s", ListenTrc20Job{})
+	c.AddJob("@every 10s", ListenTrc20Job{})
-	if err != nil {
-		log.Sugar.Errorf("[task] Failed to add ListenTrc20Job: %v", err)
-		return
-	}
-	log.Sugar.Info("[task] ListenTrc20Job scheduled successfully (@every 5s)")
 	c.Start()
-	log.Sugar.Info("[task] Task scheduler started")
 }

src/task/listen_trc20_job.go

@@ -1,11 +1,10 @@
 package task
 
 import (
-	"sync"
-
 	"github.com/assimon/luuu/model/data"
 	"github.com/assimon/luuu/model/service"
 	"github.com/assimon/luuu/util/log"
+	"sync"
 )
 
 type ListenTrc20Job struct {
@@ -16,24 +15,18 @@ var gListenTrc20JobLock sync.Mutex
 func (r ListenTrc20Job) Run() {
 	gListenTrc20JobLock.Lock()
 	defer gListenTrc20JobLock.Unlock()
-	log.Sugar.Debug("[ListenTrc20Job] Job triggered")
 	walletAddress, err := data.GetAvailableWalletAddress()
 	if err != nil {
-		log.Sugar.Errorf("[ListenTrc20Job] Failed to get wallet addresses: %v", err)
+		log.Sugar.Error(err)
 		return
 	}
 	if len(walletAddress) <= 0 {
-		log.Sugar.Debug("[ListenTrc20Job] No available wallet addresses")
 		return
 	}
-	log.Sugar.Infof("[ListenTrc20Job] Found %d wallet addresses to monitor", len(walletAddress))
 	var wg sync.WaitGroup
 	for _, address := range walletAddress {
-		log.Sugar.Infof("[ListenTrc20Job] Listening to address: %s", address.Address)
-
 		wg.Add(1)
-		go service.Trc20CallBack(address.Address, &wg)
+		go service.Trc20CallBack(address.Token, &wg)
 	}
 	wg.Wait()
-	log.Sugar.Debug("[ListenTrc20Job] Job completed")
 }

src/task/usdt_rate_job.go

@@ -0,0 +1,66 @@
+package task
+
+import (
+	"fmt"
+	"github.com/assimon/luuu/config"
+	"github.com/assimon/luuu/util/http_client"
+	"github.com/assimon/luuu/util/json"
+	"github.com/assimon/luuu/util/log"
+	"strconv"
+	"time"
+)
+
+const UsdtRateApiUri = "https://api.coinmarketcap.com/data-api/v3/cryptocurrency/detail/chart"
+
+type UsdtRateJob struct {
+}
+
+type UsdtRateResp struct {
+	Data   Data   `json:"data"`
+	Status Status `json:"status"`
+}
+
+type Status struct {
+	Timestamp    time.Time `json:"timestamp"`
+	ErrorCode    string    `json:"error_code"`
+	ErrorMessage string    `json:"error_message"`
+	Elapsed      string    `json:"elapsed"`
+	CreditCount  int       `json:"credit_count"`
+}
+
+type Data struct {
+	Points map[string]Points `json:"points"`
+}
+
+type Points struct {
+	V []float64 `json:"v"`
+	C []float64 `json:"c"`
+}
+
+func (r UsdtRateJob) Run() {
+	client := http_client.GetHttpClient()
+	resp, err := client.R().SetQueryString("id=825&range=1H&convertId=2787").SetHeader("Accept", "application/json").Get(UsdtRateApiUri)
+	if err != nil {
+		log.Sugar.Error("usdt rate get err:", err.Error())
+		return
+	}
+	var usdtResp UsdtRateResp
+	err = json.Cjson.Unmarshal(resp.Body(), &usdtResp)
+	if err != nil {
+		log.Sugar.Error("Unmarshal usdt resp err:", err.Error())
+		return
+	}
+	if usdtResp.Status.ErrorCode != "0" {
+		log.Sugar.Error("usdt resp err:", usdtResp.Status.ErrorMessage)
+		return
+	}
+	for _, points := range usdtResp.Data.Points {
+		if len(points.C) > 0 && points.C[0] > 0 {
+			config.UsdtRate, err = strconv.ParseFloat(fmt.Sprintf("%.2f", points.C[0]), 64)
+			if err != nil {
+				log.Sugar.Error("Calculate UsdtRate err:", err.Error())
+			}
+			return
+		}
+	}
+}

src/telegram/handle.go

@@ -2,9 +2,6 @@ package telegram
 
 import (
 	"fmt"
-	"sync"
-	"time"
-
 	"github.com/assimon/luuu/model/data"
 	"github.com/assimon/luuu/model/mdb"
 	"github.com/gookit/goutil/mathutil"
@@ -13,52 +10,20 @@ import (
 )
 
 const (
-	ReplayAddWallet         = "请发给我一个合法的钱包地址"
+	ReplayAddWallet = "请发给我一个合法的钱包地址"
-	pendingWalletAddressTTL = 5 * time.Minute
 )
 
-type pendingWalletAddressState struct {
-	RequestedAt time.Time
-}
-
-var pendingWalletAddressUsers sync.Map
-
 func OnTextMessageHandle(c tb.Context) error {
-	msg := c.Message()
+	if c.Message().ReplyTo.Text == ReplayAddWallet {
-	if msg == nil {
+		defer bots.Delete(c.Message().ReplyTo)
-		return nil
+		_, err := data.AddWalletAddress(c.Message().Text)
+		if err != nil {
+			return c.Send(err.Error())
+		}
+		c.Send(fmt.Sprintf("钱包[%s]添加成功！", c.Message().Text))
+		return WalletList(c)
 	}
-
+	return nil
-	sender := c.Sender()
-	senderID := int64(0)
-	if sender != nil {
-		senderID = sender.ID
-	}
-
-	isReplyFlow := msg.ReplyTo != nil && msg.ReplyTo.Text == ReplayAddWallet
-	isPendingFlow := isWalletAddressPending(senderID)
-	if !isReplyFlow && !isPendingFlow {
-		return nil
-	}
-
-	if isReplyFlow {
-		defer bots.Delete(msg.ReplyTo)
-	}
-
-	msgText := msg.Text
-	if !isValidTronAddress(msgText) {
-		_ = c.Send(fmt.Sprintf("钱包 [%s] 添加失败：不是合法的 TRON 地址", msgText))
-		return nil
-	}
-
-	_, err := data.AddWalletAddress(msgText)
-	if err != nil {
-		return c.Send(err.Error())
-	}
-	pendingWalletAddressUsers.Delete(senderID)
-
-	_ = c.Send(fmt.Sprintf("钱包 [%s] 添加成功", msgText))
-	return WalletList(c)
 }
 
 func WalletList(c tb.Context) error {
@@ -66,35 +31,29 @@ func WalletList(c tb.Context) error {
 	if err != nil {
 		return err
 	}
-
 	var btnList [][]tb.InlineButton
 	for _, wallet := range wallets {
 		status := "已启用✅"
 		if wallet.Status == mdb.TokenStatusDisable {
 			status = "已禁用🚫"
 		}
-
+		var temp []tb.InlineButton
 		btnInfo := tb.InlineButton{
-			Unique: wallet.Address,
+			Unique: wallet.Token,
-			Text:   fmt.Sprintf("%s [%s]", wallet.Address, status),
+			Text:   fmt.Sprintf("%s[%s]", wallet.Token, status),
 			Data:   strutil.MustString(wallet.ID),
 		}
 		bots.Handle(&btnInfo, WalletInfo)
-		btnList = append(btnList, []tb.InlineButton{btnInfo})
+		btnList = append(btnList, append(temp, btnInfo))
 	}
-
 	addBtn := tb.InlineButton{Text: "添加钱包地址", Unique: "AddWallet"}
 	bots.Handle(&addBtn, func(c tb.Context) error {
-		if sender := c.Sender(); sender != nil {
-			pendingWalletAddressUsers.Store(sender.ID, pendingWalletAddressState{RequestedAt: time.Now()})
-		}
 		return c.Send(ReplayAddWallet, &tb.ReplyMarkup{
 			ForceReply: true,
 		})
 	})
 	btnList = append(btnList, []tb.InlineButton{addBtn})
-
+	return c.EditOrSend("请点击钱包继续操作", &tb.ReplyMarkup{
-	return c.EditOrSend("请选择钱包继续操作", &tb.ReplyMarkup{
 		InlineKeyboard: btnList,
 	})
 }
@@ -105,7 +64,6 @@ func WalletInfo(c tb.Context) error {
 	if err != nil {
 		return c.Send(err.Error())
 	}
-
 	enableBtn := tb.InlineButton{
 		Text:   "启用",
 		Unique: "enableBtn",
@@ -125,13 +83,11 @@ func WalletInfo(c tb.Context) error {
 		Text:   "返回",
 		Unique: "WalletList",
 	}
-
 	bots.Handle(&enableBtn, EnableWallet)
 	bots.Handle(&disableBtn, DisableWallet)
 	bots.Handle(&delBtn, DelWallet)
 	bots.Handle(&backBtn, WalletList)
-
+	return c.EditOrReply(tokenInfo.Token, &tb.ReplyMarkup{InlineKeyboard: [][]tb.InlineButton{
-	return c.EditOrReply(tokenInfo.Address, &tb.ReplyMarkup{InlineKeyboard: [][]tb.InlineButton{
 		{
 			enableBtn,
 			disableBtn,
@@ -178,20 +134,3 @@ func DelWallet(c tb.Context) error {
 	}
 	return WalletList(c)
 }
-
-func isWalletAddressPending(userID int64) bool {
-	if userID <= 0 {
-		return false
-	}
-	value, ok := pendingWalletAddressUsers.Load(userID)
-	if !ok {
-		return false
-	}
-
-	state, ok := value.(pendingWalletAddressState)
-	if !ok || time.Since(state.RequestedAt) > pendingWalletAddressTTL {
-		pendingWalletAddressUsers.Delete(userID)
-		return false
-	}
-	return true
-}

src/telegram/telegram.go

@@ -14,9 +14,8 @@ var bots *tb.Bot
 func BotStart() {
 	var err error
 	botSetting := tb.Settings{
-		Token:       config.TgBotToken,
+		Token:  config.TgBotToken,
-		Poller:      &tb.LongPoller{Timeout: 50 * time.Second},
+		Poller: &tb.LongPoller{Timeout: 10 * time.Second},
-		Synchronous: true,
 	}
 	if config.TgProxy != "" {
 		botSetting.URL = config.TgProxy
@@ -46,21 +45,14 @@ func RegisterHandle() {
 // SendToBot 主动发送消息机器人消息
 func SendToBot(msg string) {
 	go func() {
-		if bots == nil {
-			log.Sugar.Error("[Telegram] bots实例为nil，无法发送消息")
-			return
-		}
 		user := tb.User{
 			ID: config.TgManage,
 		}
-		log.Sugar.Infof("[Telegram] 正在发送消息给用户ID=%d", config.TgManage)
 		_, err := bots.Send(&user, msg, &tb.SendOptions{
 			ParseMode: tb.ModeHTML,
 		})
 		if err != nil {
-			log.Sugar.Errorf("[Telegram] 发送消息失败: userID=%d, err=%v", config.TgManage, err)
+			log.Sugar.Error(err)
-		} else {
-			log.Sugar.Infof("[Telegram] 发送消息成功: userID=%d", config.TgManage)
 		}
 	}()
 }

src/telegram/utils.go

@@ -1,34 +0,0 @@
-package telegram
-
-import (
-	"crypto/sha256"
-
-	"github.com/btcsuite/btcutil/base58"
-)
-
-// isValidTronAddress 校验 Tron Base58Check 地址是否合法
-func isValidTronAddress(addr string) bool {
-	// 基本过滤
-	if len(addr) < 26 || len(addr) > 35 || addr[0] != 'T' {
-		return false
-	}
-
-	decoded := base58.Decode(addr)
-	if len(decoded) != 25 {
-		return false
-	}
-
-	// TRON 主网地址必须以 0x41 开头
-	if decoded[0] != 0x41 {
-		return false
-	}
-
-	// Base58Check 校验
-	payload := decoded[:21]  // 前 21 字节
-	checksum := decoded[21:] // 后 4 字节
-
-	hash := sha256.Sum256(payload)
-	hash2 := sha256.Sum256(hash[:])
-
-	return string(checksum) == string(hash2[:4])
-}

src/util/constant/errno.go

@@ -1,18 +1,17 @@
 package constant
 
 var Errno = map[int]string{
-	400:   "system error",
+	400:   "系统错误",
-	401:   "signature verification failed",
+	401:   "签名认证错误",
-	10001: "wallet address already exists",
+	10001: "钱包地址已存在，请勿重复添加",
-	10002: "order already exists",
+	10002: "支付交易已存在，请勿重复创建",
-	10003: "no available wallet address",
+	10003: "无可用钱包地址，无法发起支付",
-	10004: "invalid payment amount",
+	10004: "支付金额有误, 无法满足最小支付单位",
-	10005: "no available amount channel",
+	10005: "无可用金额通道",
-	10006: "rate calculation failed",
+	10006: "汇率计算错误",
-	10007: "block transaction already processed",
+	10007: "订单区块已处理",
-	10008: "order does not exist",
+	10008: "订单不存在",
-	10009: "failed to parse request params",
+	10009: "无法解析请求参数",
-	10010: "order status already changed",
 }
 
 var (
@@ -27,7 +26,6 @@ var (
 	OrderBlockAlreadyProcess   = Err(10007)
 	OrderNotExists             = Err(10008)
 	ParamsMarshalErr           = Err(10009)
-	OrderStatusConflict        = Err(10010)
 )
 
 type RspError struct {

src/util/http_client/client.go

@@ -1,9 +1,8 @@
 package http_client
 
 import (
-	"time"
-
 	"github.com/go-resty/resty/v2"
+	"time"
 )
 
 // GetHttpClient 获取请求客户端
@@ -14,6 +13,6 @@ func GetHttpClient(proxys ...string) *resty.Client {
 		proxy := proxys[0]
 		client.SetProxy(proxy)
 	}
-	client.SetTimeout(time.Second * 10)
+	client.SetTimeout(time.Second * 5)
 	return client
 }

src/util/log/log.go

@@ -7,37 +7,27 @@ import (
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"os"
 	"time"
 )
 
 var Sugar *zap.SugaredLogger
 
 func Init() {
-	level := getLogLevel()
+	writeSyncer := getLogWriter()
-	core := zapcore.NewTee(
+	encoder := getEncoder()
-		zapcore.NewCore(getConsoleEncoder(), getConsoleWriter(), level),
+	core := zapcore.NewCore(encoder, writeSyncer, zapcore.DebugLevel)
-		zapcore.NewCore(getFileEncoder(), getFileWriter(), level),
-	)
 	logger := zap.New(core, zap.AddCaller())
 	Sugar = logger.Sugar()
 }
 
-func getFileEncoder() zapcore.Encoder {
+func getEncoder() zapcore.Encoder {
 	encoderConfig := zap.NewProductionEncoderConfig()
 	encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 	encoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder
 	return zapcore.NewJSONEncoder(encoderConfig)
 }
 
-func getConsoleEncoder() zapcore.Encoder {
+func getLogWriter() zapcore.WriteSyncer {
-	encoderConfig := zap.NewDevelopmentEncoderConfig()
-	encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-	encoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	return zapcore.NewConsoleEncoder(encoderConfig)
-}
-
-func getFileWriter() zapcore.WriteSyncer {
 	file := fmt.Sprintf("%s/log_%s.log",
 		config.LogSavePath,
 		time.Now().Format("20060102"))
@@ -50,20 +40,3 @@ func getFileWriter() zapcore.WriteSyncer {
 	}
 	return zapcore.AddSync(lumberJackLogger)
 }
-
-func getConsoleWriter() zapcore.WriteSyncer {
-	return zapcore.Lock(os.Stdout)
-}
-
-func getLogLevel() zapcore.Level {
-	switch config.LogLevel {
-	case "debug":
-		return zapcore.DebugLevel
-	case "warn":
-		return zapcore.WarnLevel
-	case "error":
-		return zapcore.ErrorLevel
-	default:
-		return zapcore.InfoLevel
-	}
-}

src/util/math/math.go

@@ -1,16 +0,0 @@
-package math
-
-import (
-	"fmt"
-	"strconv"
-)
-
-// MustParsePrecFloat64 按小数位截取float
-func MustParsePrecFloat64(value float64, prec int) float64 {
-	format := fmt.Sprintf("%%.%df", prec)
-	v, err := strconv.ParseFloat(fmt.Sprintf(format, value), 64)
-	if err != nil {
-		return 0
-	}
-	return v
-}

src/util/sign/sign.go

@@ -51,6 +51,7 @@ func MapToParams(params map[string]interface{}) (string, error) {
 		if k == "signature" {
 			continue
 		}
+		// 去除冗余未赋值struct
 		if v == nil {
 			continue
 		}
@@ -99,10 +100,6 @@ func MapToParams(params map[string]interface{}) (string, error) {
 		default:
 			return "", errors.New("signature marshal error")
 		}
-		// 空值不参与签名
-		if fv == "" {
-			continue
-		}
 		tempArr = append(tempArr, k+"="+fv)
 	}
 	sort.Strings(tempArr)

wiki/BT_RUN.md

@@ -13,63 +13,7 @@
 ![新增网站](img/add_web.png)
 
 ### 二、导入Sql
-登录管理刚刚新增数据库，导入`Epusdt`所需的sql文件。 
+登录管理刚刚新增数据库，导入`Epusdt`所需的sql文件。     
-
-以下为示范0.01版本 最新数据库请以 https://github.com/assimon/epusdt/blob/master/sql/ 为准
-
-#### 1.手动下载导入
-
-数据库地址:https://github.com/assimon/epusdt/blob/master/sql/v0.0.1.sql
-![导入Sql](img/sql.png)
-
-#### 2.使用phpMyAdmin导入
-使用文本编辑器打开`.sql`文件，如下：      
-```sql
--- auto-generated definition
-create table orders
-(
-    id                   int auto_increment
-        primary key,
-    trade_id             varchar(32)    not null comment 'epusdt订单号',
-    order_id             varchar(32)    not null comment '客户交易id',
-    block_transaction_id varchar(128)   null comment '区块唯一编号',
-    actual_amount        decimal(19, 4) not null comment '订单实际需要支付的金额，保留4位小数',
-    amount               decimal(19, 4) not null comment '订单金额，保留4位小数',
-    token                varchar(50)    not null comment '所属钱包地址',
-    status               int default 1  not null comment '1：等待支付，2：支付成功，3：已过期',
-    notify_url           varchar(128)   not null comment '异步回调地址',
-    redirect_url         varchar(128)   null comment '同步回调地址',
-    callback_num         int default 0  null comment '回调次数',
-    callback_confirm     int default 2  null comment '回调是否已确认？ 1是 2否',
-    created_at           timestamp      null,
-    updated_at           timestamp      null,
-    deleted_at           timestamp      null,
-    constraint orders_order_id_uindex
-        unique (order_id),
-    constraint orders_trade_id_uindex
-        unique (trade_id)
-);
-
-create index orders_block_transaction_id_index
-    on orders (block_transaction_id);
-
--- auto-generated definition
-create table wallet_address
-(
-    id         int auto_increment
-        primary key,
-    token      varchar(50)   not null comment '钱包token',
-    status     int default 1 not null comment '1:启用 2:禁用',
-    created_at timestamp     null,
-    updated_at timestamp     null,
-    deleted_at timestamp     null
-)
-    comment '钱包表';
-
-create index wallet_address_token_index
-    on wallet_address (token);
-```
-复制-粘贴至`phpmyadmin`的SQL面板，然后执行       
 ![导入Sql](img/run_sql.png)
 
 ### 三、配置Epusdt
@@ -172,4 +116,4 @@ forced_usdt_rate=
 ## 其他注意事项
 - 1.所有`.env`配置文件有了修改后都需要重启supervisor进程
 - 2.教程所示的目录均为参考，请勿1:1照抄，根据自己实际情况来
-- 3.`windows`与`linux`不同，`windows`请直接运行`epusdt.exe`即可，无需赋予执行权限
+- 3.`windows`与`linux`不同，`windows`请直接运行`epusdt.exe`即可，无需赋予执行权限

wiki/manual_RUN.md

@@ -1,214 +0,0 @@
-## 写在前面
-
-- 此教程专为有洁癖的宝宝们准备。不使用任何一键安装脚本。面板党可以退散了！！
-- 本人测试环境是 Debian 11 其他的没测试。
-## 1.下载源代码
-```bash
-cd /var/www/
-mkdir epusdt
-chmod 777 -R /var/www/epusdt
-cd epusdt
-wget https://github.com/assimon/epusdt/releases/download/v0.0.3/epusdt_0.0.3_Linux_x86_64.tar.gz
-tar -xzf epusdt_0.0.3_Linux_x86_64.tar.gz
-rm epusdt_0.0.3_Linux_x86_64.tar.gz
-```
-## 2.导入Sql
-- 创建sql文件
-```bash
-nano epusdt.sql
-```
-然后复制下面的
-```sql
--- auto-generated definition
-use epusdt;
-create table orders
-(
-    id                   int auto_increment
-        primary key,
-    trade_id             varchar(32)    not null comment 'epusdt订单号',
-    order_id             varchar(32)    not null comment '客户交易id',
-    block_transaction_id varchar(128)   null comment '区块唯一编号',
-    actual_amount        decimal(19, 4) not null comment '订单实际需要支付的金额，保留4位小数',
-    amount               decimal(19, 4) not null comment '订单金额，保留4位小数',
-    token                varchar(50)    not null comment '所属钱包地址',
-    status               int default 1  not null comment '1：等待支付，2：支付成功，3：已过期',
-    notify_url           varchar(128)   not null comment '异步回调地址',
-    redirect_url         varchar(128)   null comment '同步回调地址',
-    callback_num         int default 0  null comment '回调次数',
-    callback_confirm     int default 2  null comment '回调是否已确认？ 1是 2否',
-    created_at           timestamp      null,
-    updated_at           timestamp      null,
-    deleted_at           timestamp      null,
-    constraint orders_order_id_uindex
-        unique (order_id),
-    constraint orders_trade_id_uindex
-        unique (trade_id)
-);
-
-create index orders_block_transaction_id_index
-    on orders (block_transaction_id);
-
--- auto-generated definition
-create table wallet_address
-(
-    id         int auto_increment
-        primary key,
-    token      varchar(50)   not null comment '钱包token',
-    status     int default 1 not null comment '1:启用 2:禁用',
-    created_at timestamp     null,
-    updated_at timestamp     null,
-    deleted_at timestamp     null
-)
-    comment '钱包表';
-
-create index wallet_address_token_index
-    on wallet_address (token);
-```
-`ctrl+x` 退出，按 `Y`保存 再按回车就好了
-- 创建数据库 
-```bash
-mysql
-```
-接下来输入命令 
-```sql
-CREATE DATABASE [这里替换为数据库名] ;
-GRANT ALL ON [这里替换为数据库名].* TO '[这里替换为用户名]'@'localhost' IDENTIFIED BY '[这里替换为密码]' WITH GRANT OPTION;
-FLUSH PRIVILEGES;
-EXIT
-```
-- 导入sql文件
-```bash
-mysql -u[用户名] -p[密码] < epusdt.sql 
-```
-## 3.配置反向代理
-```bash
-nano /etc/nginx/sites-enabled/epusdt
-```
-你可以参考以下我的配置文件，注意更改域名。
-```bash
-server {
-   listen 80;
-   server_name domain.com;
-   return 301 https://domain.com$request_uri;
- }
-
-server {
-   listen 443 ssl http2;
-   server_name domain.com;
-   ssl_certificate  /etc/nginx/sslcert/cert.crt;
-   ssl_certificate_key  /etc/nginx/sslcert/key.key; 
-   ssl_prefer_server_ciphers on;
-
-   location / {
-        proxy_pass http://127.0.0.1:8000;
-}
-}
-
-```
-## 4.赋予Epusdt执行权限
-`linux`服务器需要赋予`Epust`执行权限方可启动。            
-执行命令```chmod +x epusdt```赋予权限
-## 5、配置Epusdt
-执行命令
-```bash
-mv .env.example .env
-nano .env
-```
-
-```dotenv
-app_name=epusdt
-#下面配置你的域名，收银台会需要
-app_uri=https://upay.dujiaoka.com
-#是否开启debug，默认false
-app_debug=false
-#http服务监听端口
-http_listen=:8000
-#静态资源文件目录
-static_path=/static
-#缓存路径
-runtime_root_path=/runtime
-#日志配置
-log_save_path=/logs
-log_max_size=32
-log_max_age=7
-max_backups=3
-# mysql配置
-mysql_host=127.0.0.1
-mysql_port=3306
-mysql_user=mysql账号
-mysql_passwd=mysql密码
-mysql_database=数据库
-mysql_table_prefix=
-mysql_max_idle_conns=10
-mysql_max_open_conns=100
-mysql_max_life_time=6
-# redis配置
-redis_host=127.0.0.1
-redis_port=6379
-redis_passwd=
-redis_db=5
-redis_pool_size=5
-redis_max_retries=3
-redis_idle_timeout=1000
-# 消息队列配置
-queue_concurrency=10
-queue_level_critical=6
-queue_level_default=3
-queue_level_low=1
-#机器人Apitoken
-tg_bot_token=
-#telegram代理url(大陆地区服务器可使用一台国外服务器做反代tg的url)，如果运行的本来就是境外服务器，则无需填写
-tg_proxy=
-#管理员userid
-tg_manage=
-#api接口认证token(用于发起交易的签名认证，请勿外泄)
-api_auth_token=
-#订单过期时间(单位分钟)
-order_expiration_time=10
-#强制汇率(设置此参数后每笔交易将按照此汇率计算，例如:6.4)
-forced_usdt_rate=
-```
-⚠️注意：配置文件里面不认识的不要修改，留空即可，不会改又要瞎改，除非你对项目源代码很熟悉很有信心😁
-
-必填配置项：app_uri、mysql配置、redis配置、api_auth_token
-
-选填配置项：tg_bot_token、tg_manage
-## 6、配置supervisor
-为了保证`Epusdt`常驻后台运行，我们需要配置`supervisor`来实现进程监听  
-```bash
-nano /etc/supervisor/conf.d/epusdt.conf
-```
-你可以参考以下我的配置文件，注意更改路径。
-```conf
-[program:epusdt]
-process_name=epusdt
-directory=/var/www/epusdt
-command=/var/www/epusdt/epusdt http start
-autostart=true
-autorestart=true
-user=www-data
-numprocs=1
-redirect_stderr=true
-stdout_logfile=/var/log/supervisor/epusdt.log
-```
-接下来输入命令
-```bash
-supervisorctl reread
-supervisorctl update
-supervisorctl start epusdt
-supervisorctl tail epusdt
-```
-出现下图，即为配置成功
-```bash
-  _____                     _ _   
- | ____|_ __  _   _ ___  __| | |_ 
- |  _| | '_ \| | | / __|/ _` | __|
- | |___| |_) | |_| \__ \ (_| | |_ 
- |_____| .__/ \__,_|___/\__,_|\__|
-       |_|                        
-Epusdt version(0.0.2) Powered by assimon https://github.com/assimon/epusdt 
-⇨ http server started on [::]:8000
-```
-## 其他注意事项
-- 1.所有`.env`配置文件有了修改后都需要重启supervisor进程 `supervisorctl restart epusdt`
-- 2.教程所示的目录均为参考，请勿1:1照抄，根据自己实际情况来