consumer模块完成90%,前端完成supabase对接

This commit is contained in:
2026-02-04 17:21:15 +08:00
parent 8a535e3f38
commit 39aa1b6bec
1335 changed files with 191376 additions and 4 deletions

View File

@@ -3,7 +3,7 @@
// IP: 192.168.1.62
// Kong HTTP Port: 8000
//export const SUPA_URL: string = 'http://localhost:18000'
//export const SUPA_URL: string = 'http://192.168.1.61:18000'
//export const SUPA_KEY: string = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlzcyI6InN1cGFiYXNlLTEiLCJpYXQiOjE3Njk2NzY0OTgsImV4cCI6MTkyNzM1NjQ5OH0.ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
export const SUPA_URL: string = 'http://192.168.1.61:18000'
export const SUPA_KEY: string = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlzcyI6InN1cGFiYXNlLTEiLCJpYXQiOjE3Njk2NzY0OTgsImV4cCI6MTkyNzM1NjQ5OH0.ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'

View File

@@ -0,0 +1,55 @@
# 商城优惠券与红包系统设计文档 v1.1
## 1. 系统概述
本系统旨在为消费者提供多种形式的优惠激励,包括店铺优惠券、商品专属券、平台通用券以及现金红包。
核心流程包含:优惠配置(后台) -> 用户领取(前台) -> 下单核销(结算) -> 状态流转。
## 2. 优惠券分类 (Coupon Types)
### 2.1 优惠形式 (`coupon_type`)
1. **满减券 (Full Reduction)**: `coupon_type=1`, `discount_type=1`. 例如:满 100 减 10。
2. **折扣券 (Discount)**: `coupon_type=2`, `discount_type=2`. 例如:满 100 打 9 折。
3. **红包 (Red Packet)**: `coupon_type=1` (或3), `discount_type=1`, `min_order_amount=0`.
### 2.2 适用范围 (Derived from Data)
1. **店铺券**: `merchant_id` 不为空, `applicable_products` 为空。
2. **商品券**: `merchant_id` 不为空, `applicable_products` 包含特定商品ID。
3. **平台券**: `merchant_id` 为空。
## 3. 数据库设计 (Database Schema)
### 3.1 优惠券模板表 (`ml_coupon_templates`)
定义优惠券的规则。
- `id`: UUID (Primary Key)
- `merchant_id`: 商户ID (空则为平台券)
- `name`: 优惠券名称
- `coupon_type`: INTEGER (1:满减, 2:折扣, 3:免运费)
- `discount_type`: INTEGER (1:固定金额, 2:百分比)
- `discount_value`: DECIMAL (减免金额 或 折扣率如0.9)
- `min_order_amount`: DECIMAL (最低消费门槛, 0为无门槛)
- `total_quantity`: INTEGER (发行总量)
- `per_user_limit`: INTEGER (每人限领)
- `applicable_products`: JSONB (适用商品列表)
- `start_time` / `end_time`: 领取有效期
- `status`: INTEGER (1:正常)
### 3.2 用户优惠券表 (`ml_user_coupons`)
记录用户领取的优惠券实例。
- `id`: UUID
- `user_id`: 用户ID
- `template_id`: 关联模板
- `coupon_code`: 唯一码
- `status`: 1-未使用, 2-已使用, 3-已过期
- `received_at`: 领取时间
- `expire_at`: 过期时间
- `order_id`: 关联订单ID
## 4. 业务流程与开发指南
### 4.1 数据展示适配
前端 `getUserCoupons` 方法获取数据后,需根据 `coupon_type``discount_type` 做展示处理:
-`discount_type == 1`: 展示 `¥{discount_value}`
-`discount_type == 2`: 展示 `{discount_value * 10}折` (若存0.9) 或根据实际存储值适配。
### 4.2 SQL 初始化
已提供修正后的 `doc_mall/consumer/sql/06_setup_coupons.sql`,适配真实表结构字段。请重新执行以生成测试数据。

View File

@@ -0,0 +1,36 @@
# 消费者端 (Consumer) 项目文档
## 1. 项目概况
本项目是基于 UniApp X (UTS) 开发的医疗商城消费者前端应用。后端接入 Supabase (PostgreSQL) 数据库。
主要功能涵盖商品浏览、智能分类、品牌甄选、购物车、订单管理、钱包支付及充值提现等功能。
## 2. 技术栈
- **框架**: UniApp X (Vue 3 + UTS)
- **语言**: TypeScript (UTS Dialect)
- **数据库**: Supabase (PostgreSQL)
- **UI布局**: Flexbox + CSS (支持移动端和桌面端响应式适配)
## 3. 目录结构
```
pages/mall/consumer/
├── index.uvue # 首页 (智能分类/品牌甄选/热销)
├── search.uvue # 搜索页 (支持关键词、扫码、品牌筛选)
├── category.uvue # 分类详情页
├── product-detail.uvue # 商品详情页
├── cart.uvue # 购物车
├── checkout.uvue # 结算页
├── orders.uvue # 订单列表
├── order-detail.uvue # 订单详情
├── wallet.uvue # 我的钱包 (余额/充值/提现入口)
├── withdraw.uvue # 提现页面
└── profile.uvue # 个人中心
```
## 4. 快速开始
1. 确保 Supabase 数据库已初始化(运行 `doc_mall/consumer/sql/` 下的 SQL 脚本)。
2. 在 HBuilderX 中打开 `package.json``manifest.json` 配置 AppID。
3. 运行项目至 Android/iOS 模拟器或 Chrome 浏览器。
## 5. 文档索引
- [功能说明书](./功能说明书.md) - 详细的用户侧功能描述
- [技术开发文档](./技术开发文档.md) - 开发架构、核心逻辑与数据库交互说明

View File

@@ -0,0 +1,41 @@
# 消费者端功能说明书
## 1. 首页 (Home)
首页集成了智能分类导航、品牌甄选、热销商品展示等模块,支持完全响应式布局。
### 1.1 智能分类与品牌甄选
用户可以通过顶部的胶囊状切换按钮在"智能分类"和"品牌甄选"视图之间切换。
- **智能分类**: 展示药品/商品的常规分类(如感冒咳嗽、维生素等),每次刷新页面顺序随机打乱。
- **品牌甄选**: 展示入驻品牌列表,每次刷新页面顺序随机打乱。点击品牌图标将直接跳转至搜索页并展示该品牌下的所有商品。
### 1.2 热销推荐
下方瀑布流展示热销、特价及推荐商品,支持下拉刷新和上拉加载更多。
---
## 2. 搜索 (Search)
支持关键词搜索、历史搜索记录、热门搜索推荐及"猜你需要"(随机推荐)。
- **来源识别**: 可通过首页的"品牌甄选"或"家庭常备药"入口自动触发搜索。
- **直接展示**: 若从品牌入口进入,系统自动执行搜索并展示结果,无需手动点击。
---
## 3. 购物车与结算 (Cart & Checkout)
- **购物车**: 支持单选/全选、数量增减、左滑删除。实时计算总价。
- **结算**: 确认收货地址、选择优惠券、查看运费,支持余额支付。
---
## 4. 订单系统 (Orders)
- **订单状态**: 待付款、待发货、待收货、已完成、已取消。
- **导航优化**: 在订单列表页点击物理返回键Android若上一页为登录页将自动重定向至个人中心防止意外退出登录。
---
## 5. 钱包系统 (Wallet)
- **资产概览**: 展示当前余额、累计充值、累计消费。
- **充值**: 支持模拟充值流程。
- **提现**:
- 用户可输入提现金额。
- 选择提现银行卡(需绑定)。
- 系统校验余额是否充足。

View File

@@ -0,0 +1,53 @@
# 技术开发文档
## 1. 架构设计
项目采用 MVVM 架构View 层为 `.uvue` 文件Model/Service 层主要由 `utils/supabaseService.uts` 承担,负责与 Supabase 进行数据交互。
## 2. 核心模块实现
### 2.1 首页 (index.uvue)
- **UI 组件**: 使用 `.category-tabs-pills` 实现胶囊式选项卡切换。解决在移动端 flex 布局默认方向问题,显式设置 `flex-direction: row`
- **动态布局**: 监听 `statusBarHeight`,动态调整内容区域的 `marginTop`,防止被自定义导航栏遮挡。
- **数据加载**:
- `loadCategories()``loadBrands()` 获取数据后调用 `.sort(() => Math.random() - 0.5)` 实现随机排序。
- 品牌点击事件 `switchBrand` 使用 `uni.navigateTo` 跳转至搜索页,携带参数 `type=brand`
### 2.2 搜索页 (search.uvue)
- **自动搜索逻辑**: 在 `onLoad``initPage` 中检查页面参数 `options`
-`options.type === 'brand'`,则直接调用 `performSearch()`,并设置 `showResults = true`,跳过手动输入步骤。
- **数据源**: `supabaseService.searchProducts` 支持按销量、价格排序。
### 2.3 订单导航拦截 (orders.uvue)
- **问题**: 登录后跳转至订单页,点击返回键可能回到登录页。
- **方案**: 实现 `onBackPress` 生命周期钩子。
```typescript
onBackPress((options) => {
if (options.from === 'navigateBack') {
// 检查路由栈,若需拦截则跳转至 Profile
uni.switchTab({ url: '/pages/mall/consumer/profile' })
return true
}
return false
})
```
### 2.4 钱包与提现 (wallet.uvue / withdraw.uvue)
- **数据交互**:
- `getWalletBalance()`: 获取 `ak_wallet` 表余额。
- `withdraw()`: 调用 Supabase RPC `withdraw_balance` (需在数据库定义该函数) 或直接操作余额表(视后端实现而定,建议使用 RPC 保证事务原子性)。
## 3. 数据库交互 (Supabase)
主要涉及的表结构:
- `ml_products`: 商品主表
- `ml_brands`: 品牌表
- `ml_categories`: 分类表
- `ak_wallet`: 用户钱包表
- `ml_orders`: 订单表
### 3.1 数据脚本
请参考 `doc_mall/consumer/sql/` 目录下的 SQL 脚本进行数据初始化:
- `05_insert_brand_products.sql`: 自动为每个品牌生成 12 个测试商品。
## 4. UI 适配指南
- **状态栏适配**: 所有自定义导航栏页面均需获取 `uni.getSystemInfoSync().statusBarHeight` 并设置顶部内边距。
- **响应式**: 使用媒体查询 (`@media`) 适配手机、平板及桌面端网格列数 (2列 -> 6列)。

27
mall/.eslintrc.js Normal file
View File

@@ -0,0 +1,27 @@
module.exports = {
root: true,
env: {
node: true,
es2021: true,
},
extends: ["plugin:vue/vue3-essential"],
parserOptions: {
ecmaVersion: 12,
sourceType: "module",
},
plugins: ["vue"],
rules: {
"vue/no-parsing-error": "error",
"vue/html-end-tags": "error",
},
overrides: [
{
files: ["*.uvue"],
parser: "vue-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
extraFileExtensions: [".uvue"],
},
},
],
};

View File

@@ -0,0 +1,12 @@
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch cyh666666/consumer
# Your branch is up to date with 'origin/cyh666666/consumer'.
#
# Changes to be committed:
# modified: ak/config.uts
# modified: pages.json
# modified: utils/supabaseService.uts
#

View File

@@ -0,0 +1,5 @@
8a535e3f387f58d736ca44a544e45ac1fe784cc8 branch 'cyh666666/consumer' of http://192.168.1.111:3000/mall/mall
859372ca5b2d6c86107d3b19d5d7482a02eaac41 not-for-merge branch 'comclib-analytics' of http://192.168.1.111:3000/mall/mall
93b42a277ac0d0ebc6e93cac902ac779604b64e0 not-for-merge branch 'huangzhenbao-admin' of http://192.168.1.111:3000/mall/mall
859372ca5b2d6c86107d3b19d5d7482a02eaac41 not-for-merge branch 'main' of http://192.168.1.111:3000/mall/mall
8efe6d5e89193e991453d882b0fa3b353e903bf2 not-for-merge branch 'ysj-delivery' of http://192.168.1.111:3000/mall/mall

1
mall/.git_disabled/HEAD Normal file
View File

@@ -0,0 +1 @@
ref: refs/heads/cyh666666/consumer

View File

@@ -0,0 +1 @@
8a535e3f387f58d736ca44a544e45ac1fe784cc8

18
mall/.git_disabled/config Normal file
View File

@@ -0,0 +1,18 @@
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote "origin"]
url = http://192.168.1.111:3000/mall/mall.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "main"]
remote = origin
merge = refs/heads/main
vscode-merge-base = origin/main
[branch "cyh666666/consumer"]
remote = origin
vscode-merge-base = origin/main
merge = refs/heads/cyh666666/consumer

View File

@@ -0,0 +1 @@
Unnamed repository; edit this file 'description' to name the repository.

View File

@@ -0,0 +1,15 @@
#!/bin/sh
#
# An example hook script to check the commit log message taken by
# applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit. The hook is
# allowed to edit the commit message file.
#
# To enable this hook, rename this file to "applypatch-msg".
. git-sh-setup
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
:

View File

@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".
# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
# This example catches duplicate Signed-off-by lines.
test "" = "$(grep '^Signed-off-by: ' "$1" |
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
echo >&2 Duplicate Signed-off-by lines.
exit 1
}

View File

@@ -0,0 +1,174 @@
#!/usr/bin/perl
use strict;
use warnings;
use IPC::Open2;
# An example hook script to integrate Watchman
# (https://facebook.github.io/watchman/) with git to speed up detecting
# new and modified files.
#
# The hook is passed a version (currently 2) and last update token
# formatted as a string and outputs to stdout a new update token and
# all files that have been modified since the update token. Paths must
# be relative to the root of the working tree and separated by a single NUL.
#
# To enable this hook, rename this file to "query-watchman" and set
# 'git config core.fsmonitor .git/hooks/query-watchman'
#
my ($version, $last_update_token) = @ARGV;
# Uncomment for debugging
# print STDERR "$0 $version $last_update_token\n";
# Check the hook interface version
if ($version ne 2) {
die "Unsupported query-fsmonitor hook version '$version'.\n" .
"Falling back to scanning...\n";
}
my $git_work_tree = get_working_dir();
my $retry = 1;
my $json_pkg;
eval {
require JSON::XS;
$json_pkg = "JSON::XS";
1;
} or do {
require JSON::PP;
$json_pkg = "JSON::PP";
};
launch_watchman();
sub launch_watchman {
my $o = watchman_query();
if (is_work_tree_watched($o)) {
output_result($o->{clock}, @{$o->{files}});
}
}
sub output_result {
my ($clockid, @files) = @_;
# Uncomment for debugging watchman output
# open (my $fh, ">", ".git/watchman-output.out");
# binmode $fh, ":utf8";
# print $fh "$clockid\n@files\n";
# close $fh;
binmode STDOUT, ":utf8";
print $clockid;
print "\0";
local $, = "\0";
print @files;
}
sub watchman_clock {
my $response = qx/watchman clock "$git_work_tree"/;
die "Failed to get clock id on '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
return $json_pkg->new->utf8->decode($response);
}
sub watchman_query {
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
or die "open2() failed: $!\n" .
"Falling back to scanning...\n";
# In the query expression below we're asking for names of files that
# changed since $last_update_token but not from the .git folder.
#
# To accomplish this, we're using the "since" generator to use the
# recency index to select candidate nodes and "fields" to limit the
# output to file names only. Then we're using the "expression" term to
# further constrain the results.
my $last_update_line = "";
if (substr($last_update_token, 0, 1) eq "c") {
$last_update_token = "\"$last_update_token\"";
$last_update_line = qq[\n"since": $last_update_token,];
}
my $query = <<" END";
["query", "$git_work_tree", {$last_update_line
"fields": ["name"],
"expression": ["not", ["dirname", ".git"]]
}]
END
# Uncomment for debugging the watchman query
# open (my $fh, ">", ".git/watchman-query.json");
# print $fh $query;
# close $fh;
print CHLD_IN $query;
close CHLD_IN;
my $response = do {local $/; <CHLD_OUT>};
# Uncomment for debugging the watch response
# open ($fh, ">", ".git/watchman-response.json");
# print $fh $response;
# close $fh;
die "Watchman: command returned no output.\n" .
"Falling back to scanning...\n" if $response eq "";
die "Watchman: command returned invalid output: $response\n" .
"Falling back to scanning...\n" unless $response =~ /^\{/;
return $json_pkg->new->utf8->decode($response);
}
sub is_work_tree_watched {
my ($output) = @_;
my $error = $output->{error};
if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
$retry--;
my $response = qx/watchman watch "$git_work_tree"/;
die "Failed to make watchman watch '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
$output = $json_pkg->new->utf8->decode($response);
$error = $output->{error};
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
# Uncomment for debugging watchman output
# open (my $fh, ">", ".git/watchman-output.out");
# close $fh;
# Watchman will always return all files on the first query so
# return the fast "everything is dirty" flag to git and do the
# Watchman query just to get it over with now so we won't pay
# the cost in git to look up each individual file.
my $o = watchman_clock();
$error = $output->{error};
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
output_result($o->{clock}, ("/"));
$last_update_token = $o->{clock};
eval { launch_watchman() };
return 0;
}
die "Watchman: $error.\n" .
"Falling back to scanning...\n" if $error;
return 1;
}
sub get_working_dir {
my $working_dir;
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
$working_dir = Win32::GetCwd();
$working_dir =~ tr/\\/\//;
} else {
require Cwd;
$working_dir = Cwd::cwd();
}
return $working_dir;
}

View File

@@ -0,0 +1,8 @@
#!/bin/sh
#
# An example hook script to prepare a packed repository for use over
# dumb transports.
#
# To enable this hook, rename this file to "post-update".
exec git update-server-info

View File

@@ -0,0 +1,14 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed
# by applypatch from an e-mail message.
#
# The hook should exit with non-zero status after issuing an
# appropriate message if it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-applypatch".
. git-sh-setup
precommit="$(git rev-parse --git-path hooks/pre-commit)"
test -x "$precommit" && exec "$precommit" ${1+"$@"}
:

View File

@@ -0,0 +1,49 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message if
# it wants to stop the commit.
#
# To enable this hook, rename this file to "pre-commit".
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --type=bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
# Cross platform projects tend to avoid non-ASCII filenames; prevent
# them from being added to the repository. We exploit the fact that the
# printable range starts at the space character and ends with tilde.
if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff-index --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
This can cause problems if you want to work with people on other platforms.
To be portable it is advisable to rename the file.
If you know what you are doing you can disable this check using:
git config hooks.allownonascii true
EOF
exit 1
fi
# If there are whitespace errors, print the offending file names and fail.
exec git diff-index --check --cached $against --

View File

@@ -0,0 +1,13 @@
#!/bin/sh
#
# An example hook script to verify what is about to be committed.
# Called by "git merge" with no arguments. The hook should
# exit with non-zero status after issuing an appropriate message to
# stderr if it wants to stop the merge commit.
#
# To enable this hook, rename this file to "pre-merge-commit".
. git-sh-setup
test -x "$GIT_DIR/hooks/pre-commit" &&
exec "$GIT_DIR/hooks/pre-commit"
:

View File

@@ -0,0 +1,53 @@
#!/bin/sh
# An example hook script to verify what is about to be pushed. Called by "git
# push" after it has checked the remote status, but before anything has been
# pushed. If this script exits with a non-zero status nothing will be pushed.
#
# This hook is called with the following parameters:
#
# $1 -- Name of the remote to which the push is being done
# $2 -- URL to which the push is being done
#
# If pushing without using a named remote those arguments will be equal.
#
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
# <local ref> <local oid> <remote ref> <remote oid>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
remote="$1"
url="$2"
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
while read local_ref local_oid remote_ref remote_oid
do
if test "$local_oid" = "$zero"
then
# Handle delete
:
else
if test "$remote_oid" = "$zero"
then
# New branch, examine all commits
range="$local_oid"
else
# Update to existing branch, examine new commits
range="$remote_oid..$local_oid"
fi
# Check for WIP commit
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
if test -n "$commit"
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
fi
fi
done
exit 0

View File

@@ -0,0 +1,169 @@
#!/bin/sh
#
# Copyright (c) 2006, 2008 Junio C Hamano
#
# The "pre-rebase" hook is run just before "git rebase" starts doing
# its job, and can prevent the command from running by exiting with
# non-zero status.
#
# The hook is called with the following parameters:
#
# $1 -- the upstream the series was forked from.
# $2 -- the branch being rebased (or empty when rebasing the current branch).
#
# This sample shows how to prevent topic branches that are already
# merged to 'next' branch from getting rebased, because allowing it
# would result in rebasing already published history.
publish=next
basebranch="$1"
if test "$#" = 2
then
topic="refs/heads/$2"
else
topic=`git symbolic-ref HEAD` ||
exit 0 ;# we do not interrupt rebasing detached HEAD
fi
case "$topic" in
refs/heads/??/*)
;;
*)
exit 0 ;# we do not interrupt others.
;;
esac
# Now we are dealing with a topic branch being rebased
# on top of master. Is it OK to rebase it?
# Does the topic really exist?
git show-ref -q "$topic" || {
echo >&2 "No such branch $topic"
exit 1
}
# Is topic fully merged to master?
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
if test -z "$not_in_master"
then
echo >&2 "$topic is fully merged to master; better remove it."
exit 1 ;# we could allow it, but there is no point.
fi
# Is topic ever merged to next? If so you should not be rebasing it.
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
only_next_2=`git rev-list ^master ${publish} | sort`
if test "$only_next_1" = "$only_next_2"
then
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
echo >&2 "$topic is already up to date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
fi
else
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
/usr/bin/perl -e '
my $topic = $ARGV[0];
my $msg = "* $topic has commits already merged to public branch:\n";
my (%not_in_next) = map {
/^([0-9a-f]+) /;
($1 => 1);
} split(/\n/, $ARGV[1]);
for my $elem (map {
/^([0-9a-f]+) (.*)$/;
[$1 => $2];
} split(/\n/, $ARGV[2])) {
if (!exists $not_in_next{$elem->[0]}) {
if ($msg) {
print STDERR $msg;
undef $msg;
}
print STDERR " $elem->[1]\n";
}
}
' "$topic" "$not_in_next" "$not_in_master"
exit 1
fi
<<\DOC_END
This sample hook safeguards topic branches that have been
published from being rewound.
The workflow assumed here is:
* Once a topic branch forks from "master", "master" is never
merged into it again (either directly or indirectly).
* Once a topic branch is fully cooked and merged into "master",
it is deleted. If you need to build on top of it to correct
earlier mistakes, a new topic branch is created by forking at
the tip of the "master". This is not strictly necessary, but
it makes it easier to keep your history simple.
* Whenever you need to test or publish your changes to topic
branches, merge them into "next" branch.
The script, being an example, hardcodes the publish branch name
to be "next", but it is trivial to make it configurable via
$GIT_DIR/config mechanism.
With this workflow, you would want to know:
(1) ... if a topic branch has ever been merged to "next". Young
topic branches can have stupid mistakes you would rather
clean up before publishing, and things that have not been
merged into other branches can be easily rebased without
affecting other people. But once it is published, you would
not want to rewind it.
(2) ... if a topic branch has been fully merged to "master".
Then you can delete it. More importantly, you should not
build on top of it -- other people may already want to
change things related to the topic as patches against your
"master", so if you need further changes, it is better to
fork the topic (perhaps with the same name) afresh from the
tip of "master".
Let's look at this example:
o---o---o---o---o---o---o---o---o---o "next"
/ / / /
/ a---a---b A / /
/ / / /
/ / c---c---c---c B /
/ / / \ /
/ / / b---b C \ /
/ / / / \ /
---o---o---o---o---o---o---o---o---o---o---o "master"
A, B and C are topic branches.
* A has one fix since it was merged up to "next".
* B has finished. It has been fully merged up to "master" and "next",
and is ready to be deleted.
* C has not merged to "next" at all.
We would want to allow C to be rebased, refuse A, and encourage
B to be deleted.
To compute (1):
git rev-list ^master ^topic next
git rev-list ^master next
if these match, topic has not merged in next at all.
To compute (2):
git rev-list master..topic
if this is empty, it is fully merged to "master".
DOC_END

View File

@@ -0,0 +1,24 @@
#!/bin/sh
#
# An example hook script to make use of push options.
# The example simply echoes all push options that start with 'echoback='
# and rejects all pushes when the "reject" push option is used.
#
# To enable this hook, rename this file to "pre-receive".
if test -n "$GIT_PUSH_OPTION_COUNT"
then
i=0
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
do
eval "value=\$GIT_PUSH_OPTION_$i"
case "$value" in
echoback=*)
echo "echo from the pre-receive-hook: ${value#*=}" >&2
;;
reject)
exit 1
esac
i=$((i + 1))
done
fi

View File

@@ -0,0 +1,42 @@
#!/bin/sh
#
# An example hook script to prepare the commit log message.
# Called by "git commit" with the name of the file that has the
# commit message, followed by the description of the commit
# message's source. The hook's purpose is to edit the commit
# message file. If the hook fails with a non-zero status,
# the commit is aborted.
#
# To enable this hook, rename this file to "prepare-commit-msg".
# This hook includes three examples. The first one removes the
# "# Please enter the commit message..." help message.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
# commented because it doesn't cope with --amend or with squashed
# commits.
#
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
COMMIT_MSG_FILE=$1
COMMIT_SOURCE=$2
SHA1=$3
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
# case "$COMMIT_SOURCE,$SHA1" in
# ,|template,)
# /usr/bin/perl -i.bak -pe '
# print "\n" . `git diff --cached --name-status -r`
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
# *) ;;
# esac
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
# if test -z "$COMMIT_SOURCE"
# then
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
# fi

View File

@@ -0,0 +1,78 @@
#!/bin/sh
# An example hook script to update a checked-out tree on a git push.
#
# This hook is invoked by git-receive-pack(1) when it reacts to git
# push and updates reference(s) in its repository, and when the push
# tries to update the branch that is currently checked out and the
# receive.denyCurrentBranch configuration variable is set to
# updateInstead.
#
# By default, such a push is refused if the working tree and the index
# of the remote repository has any difference from the currently
# checked out commit; when both the working tree and the index match
# the current commit, they are updated to match the newly pushed tip
# of the branch. This hook is to be used to override the default
# behaviour; however the code below reimplements the default behaviour
# as a starting point for convenient modification.
#
# The hook receives the commit with which the tip of the current
# branch is going to be updated:
commit=$1
# It can exit with a non-zero status to refuse the push (when it does
# so, it must not modify the index or the working tree).
die () {
echo >&2 "$*"
exit 1
}
# Or it can make any necessary changes to the working tree and to the
# index to bring them to the desired state when the tip of the current
# branch is updated to the new commit, and exit with a zero status.
#
# For example, the hook can simply run git read-tree -u -m HEAD "$1"
# in order to emulate git fetch that is run in the reverse direction
# with git push, as the two-tree form of git read-tree -u -m is
# essentially the same as git switch or git checkout that switches
# branches while keeping the local changes in the working tree that do
# not interfere with the difference between the branches.
# The below is a more-or-less exact translation to shell of the C code
# for the default behaviour for git's push-to-checkout hook defined in
# the push_to_deploy() function in builtin/receive-pack.c.
#
# Note that the hook will be executed from the repository directory,
# not from the working tree, so if you want to perform operations on
# the working tree, you will have to adapt your code accordingly, e.g.
# by adding "cd .." or using relative paths.
if ! git update-index -q --ignore-submodules --refresh
then
die "Up-to-date check failed"
fi
if ! git diff-files --quiet --ignore-submodules --
then
die "Working directory has unstaged changes"
fi
# This is a rough translation of:
#
# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
if git cat-file -e HEAD 2>/dev/null
then
head=HEAD
else
head=$(git hash-object -t tree --stdin </dev/null)
fi
if ! git diff-index --quiet --cached --ignore-submodules $head --
then
die "Working directory has staged changes"
fi
if ! git read-tree -u -m "$commit"
then
die "Could not update working tree to new HEAD"
fi

View File

@@ -0,0 +1,77 @@
#!/bin/sh
# An example hook script to validate a patch (and/or patch series) before
# sending it via email.
#
# The hook should exit with non-zero status after issuing an appropriate
# message if it wants to prevent the email(s) from being sent.
#
# To enable this hook, rename this file to "sendemail-validate".
#
# By default, it will only check that the patch(es) can be applied on top of
# the default upstream branch without conflicts in a secondary worktree. After
# validation (successful or not) of the last patch of a series, the worktree
# will be deleted.
#
# The following config variables can be set to change the default remote and
# remote ref that are used to apply the patches against:
#
# sendemail.validateRemote (default: origin)
# sendemail.validateRemoteRef (default: HEAD)
#
# Replace the TODO placeholders with appropriate checks according to your
# needs.
validate_cover_letter () {
file="$1"
# TODO: Replace with appropriate checks (e.g. spell checking).
true
}
validate_patch () {
file="$1"
# Ensure that the patch applies without conflicts.
git am -3 "$file" || return
# TODO: Replace with appropriate checks for this patch
# (e.g. checkpatch.pl).
true
}
validate_series () {
# TODO: Replace with appropriate checks for the whole series
# (e.g. quick build, coding style checks, etc.).
true
}
# main -------------------------------------------------------------------------
if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
then
remote=$(git config --default origin --get sendemail.validateRemote) &&
ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" &&
git config --replace-all sendemail.validateWorktree "$worktree"
else
worktree=$(git config --get sendemail.validateWorktree)
fi || {
echo "sendemail-validate: error: failed to prepare worktree" >&2
exit 1
}
unset GIT_DIR GIT_WORK_TREE
cd "$worktree" &&
if grep -q "^diff --git " "$1"
then
validate_patch "$1"
else
validate_cover_letter "$1"
fi &&
if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
then
git config --unset-all sendemail.validateWorktree &&
trap 'git worktree remove -ff "$worktree"' EXIT &&
validate_series
fi

View File

@@ -0,0 +1,128 @@
#!/bin/sh
#
# An example hook script to block unannotated tags from entering.
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
#
# To enable this hook, rename this file to "update".
#
# Config
# ------
# hooks.allowunannotated
# This boolean sets whether unannotated tags will be allowed into the
# repository. By default they won't be.
# hooks.allowdeletetag
# This boolean sets whether deleting tags will be allowed in the
# repository. By default they won't be.
# hooks.allowmodifytag
# This boolean sets whether a tag may be modified after creation. By default
# it won't be.
# hooks.allowdeletebranch
# This boolean sets whether deleting branches will be allowed in the
# repository. By default they won't be.
# hooks.denycreatebranch
# This boolean sets whether remotely creating branches will be denied
# in the repository. By default this is allowed.
#
# --- Command line
refname="$1"
oldrev="$2"
newrev="$3"
# --- Safety check
if [ -z "$GIT_DIR" ]; then
echo "Don't run this script from the command line." >&2
echo " (if you want, you could supply GIT_DIR then run" >&2
echo " $0 <ref> <oldrev> <newrev>)" >&2
exit 1
fi
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
exit 1
fi
# --- Config
allowunannotated=$(git config --type=bool hooks.allowunannotated)
allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
case "$projectdesc" in
"Unnamed repository"* | "")
echo "*** Project description file hasn't been set" >&2
exit 1
;;
esac
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
newrev_type=$(git cat-file -t $newrev)
fi
case "$refname","$newrev_type" in
refs/tags/*,commit)
# un-annotated tag
short_refname=${refname##refs/tags/}
if [ "$allowunannotated" != "true" ]; then
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
exit 1
fi
;;
refs/tags/*,delete)
# delete tag
if [ "$allowdeletetag" != "true" ]; then
echo "*** Deleting a tag is not allowed in this repository" >&2
exit 1
fi
;;
refs/tags/*,tag)
# annotated tag
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
then
echo "*** Tag '$refname' already exists." >&2
echo "*** Modifying a tag is not allowed in this repository." >&2
exit 1
fi
;;
refs/heads/*,commit)
# branch
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
echo "*** Creating a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/heads/*,delete)
# delete branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a branch is not allowed in this repository" >&2
exit 1
fi
;;
refs/remotes/*,commit)
# tracking branch
;;
refs/remotes/*,delete)
# delete tracking branch
if [ "$allowdeletebranch" != "true" ]; then
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
exit 1
fi
;;
*)
# Anything else (is there anything else?)
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
exit 1
;;
esac
# --- Finished
exit 0

BIN
mall/.git_disabled/index Normal file

Binary file not shown.

View File

@@ -0,0 +1,6 @@
# git ls-files --others --exclude-from=.git/info/exclude
# Lines that start with '#' are comments.
# For a project mostly in C, the following would be a good set of
# exclude patterns (uncomment them if you want to use them):
# *.[oa]
# *~

View File

@@ -0,0 +1,18 @@
0000000000000000000000000000000000000000 d7f95f7fa5490d252e58a717ba2d8e059d6de4e5 cyh666666 <2398882793@qq.com> 1768978997 +0800 clone: from http://192.168.1.111:3000/mall/mall.git
d7f95f7fa5490d252e58a717ba2d8e059d6de4e5 75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 cyh666666 <2398882793@qq.com> 1769044253 +0800 pull origin main: Fast-forward
75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 cyh666666 <2398882793@qq.com> 1769067536 +0800 checkout: moving from main to cyh666666/consumer
75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 73498128dde533e8984c8bc2ebcca43253e46fb6 cyh666666 <2398882793@qq.com> 1769072859 +0800 commit: feat: 初次提交我的项目代码
73498128dde533e8984c8bc2ebcca43253e46fb6 b634c762b30e72de14209ca03c40039c9b0e0ae4 cyh666666 <2398882793@qq.com> 1769158025 +0800 commit: 20260123
b634c762b30e72de14209ca03c40039c9b0e0ae4 0ed62a82583382449a860a0d5bd7517a93c88dc9 cyh666666 <2398882793@qq.com> 1769160667 +0800 commit: 20260123new
0ed62a82583382449a860a0d5bd7517a93c88dc9 be90f1213bf8ef5948faf6a77e18f4eb533a556a cyh666666 <2398882793@qq.com> 1769386601 +0800 commit: 继续补充功能页面consumer模块完成度70%
be90f1213bf8ef5948faf6a77e18f4eb533a556a f2f208f258a1a6e6247ec138c1a16eb63138d4db cyh666666 <2398882793@qq.com> 1769418951 +0800 commit: 继续完善购物逻辑闭环consumer模块完成度75%
f2f208f258a1a6e6247ec138c1a16eb63138d4db 4ab722a118d41f1999c2203d12742ace922b176d cyh666666 <2398882793@qq.com> 1769506419 +0800 commit: 继续完善购物逻辑闭环consumer模块完成度80%
4ab722a118d41f1999c2203d12742ace922b176d 4ab722a118d41f1999c2203d12742ace922b176d cyh666666 <2398882793@qq.com> 1769567394 +0800 checkout: moving from cyh666666/consumer to cyh666666/consumer
4ab722a118d41f1999c2203d12742ace922b176d af316e6d94c477505554b040f022f3e40457146c cyh666666 <2398882793@qq.com> 1769568414 +0800 commit: 提交昨晚至今早的修改
af316e6d94c477505554b040f022f3e40457146c 66aa909193b008842948589adf6f302840aa6efc cyh666666 <2398882793@qq.com> 1769569003 +0800 commit (merge): 提交昨晚至今早的修改2
66aa909193b008842948589adf6f302840aa6efc a4fa00c93501c27c16b745b7d262d0bd5a838dcd cyh666666 <2398882793@qq.com> 1769592530 +0800 commit: consumer模块完成度85%测试连接supabase
a4fa00c93501c27c16b745b7d262d0bd5a838dcd ab038ec029662aaa9dcd7c624be85d5e35dc6e96 cyh666666 <2398882793@qq.com> 1769678927 +0800 commit: consumer模块完成度85%连接服务器supabase新建相关表
ab038ec029662aaa9dcd7c624be85d5e35dc6e96 d57592ca7d17ce3d209458375b3de10683099cca cyh666666 <2398882793@qq.com> 1769765342 +0800 commit: 继续完善
d57592ca7d17ce3d209458375b3de10683099cca b6200cda285b50c855c9b7b5c9ddf5e1aec8f74e cyh666666 <2398882793@qq.com> 1770024871 +0800 commit: 前端各页面对接数据
b6200cda285b50c855c9b7b5c9ddf5e1aec8f74e 8a535e3f387f58d736ca44a544e45ac1fe784cc8 cyh666666 <2398882793@qq.com> 1770109910 +0800 commit: consumer模块完成90%前端完成supabase对接
8a535e3f387f58d736ca44a544e45ac1fe784cc8 1b83b5e0b358b18c0d830d2b597aaab40d040297 cyh666666 <2398882793@qq.com> 1770110783 +0800 commit (merge): 20260203

View File

@@ -0,0 +1,15 @@
0000000000000000000000000000000000000000 75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 cyh666666 <2398882793@qq.com> 1769067536 +0800 branch: Created from HEAD
75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 73498128dde533e8984c8bc2ebcca43253e46fb6 cyh666666 <2398882793@qq.com> 1769072859 +0800 commit: feat: 初次提交我的项目代码
73498128dde533e8984c8bc2ebcca43253e46fb6 b634c762b30e72de14209ca03c40039c9b0e0ae4 cyh666666 <2398882793@qq.com> 1769158025 +0800 commit: 20260123
b634c762b30e72de14209ca03c40039c9b0e0ae4 0ed62a82583382449a860a0d5bd7517a93c88dc9 cyh666666 <2398882793@qq.com> 1769160667 +0800 commit: 20260123new
0ed62a82583382449a860a0d5bd7517a93c88dc9 be90f1213bf8ef5948faf6a77e18f4eb533a556a cyh666666 <2398882793@qq.com> 1769386601 +0800 commit: 继续补充功能页面consumer模块完成度70%
be90f1213bf8ef5948faf6a77e18f4eb533a556a f2f208f258a1a6e6247ec138c1a16eb63138d4db cyh666666 <2398882793@qq.com> 1769418951 +0800 commit: 继续完善购物逻辑闭环consumer模块完成度75%
f2f208f258a1a6e6247ec138c1a16eb63138d4db 4ab722a118d41f1999c2203d12742ace922b176d cyh666666 <2398882793@qq.com> 1769506419 +0800 commit: 继续完善购物逻辑闭环consumer模块完成度80%
4ab722a118d41f1999c2203d12742ace922b176d af316e6d94c477505554b040f022f3e40457146c cyh666666 <2398882793@qq.com> 1769568414 +0800 commit: 提交昨晚至今早的修改
af316e6d94c477505554b040f022f3e40457146c 66aa909193b008842948589adf6f302840aa6efc cyh666666 <2398882793@qq.com> 1769569003 +0800 commit (merge): 提交昨晚至今早的修改2
66aa909193b008842948589adf6f302840aa6efc a4fa00c93501c27c16b745b7d262d0bd5a838dcd cyh666666 <2398882793@qq.com> 1769592530 +0800 commit: consumer模块完成度85%测试连接supabase
a4fa00c93501c27c16b745b7d262d0bd5a838dcd ab038ec029662aaa9dcd7c624be85d5e35dc6e96 cyh666666 <2398882793@qq.com> 1769678927 +0800 commit: consumer模块完成度85%连接服务器supabase新建相关表
ab038ec029662aaa9dcd7c624be85d5e35dc6e96 d57592ca7d17ce3d209458375b3de10683099cca cyh666666 <2398882793@qq.com> 1769765342 +0800 commit: 继续完善
d57592ca7d17ce3d209458375b3de10683099cca b6200cda285b50c855c9b7b5c9ddf5e1aec8f74e cyh666666 <2398882793@qq.com> 1770024871 +0800 commit: 前端各页面对接数据
b6200cda285b50c855c9b7b5c9ddf5e1aec8f74e 8a535e3f387f58d736ca44a544e45ac1fe784cc8 cyh666666 <2398882793@qq.com> 1770109910 +0800 commit: consumer模块完成90%前端完成supabase对接
8a535e3f387f58d736ca44a544e45ac1fe784cc8 1b83b5e0b358b18c0d830d2b597aaab40d040297 cyh666666 <2398882793@qq.com> 1770110783 +0800 commit (merge): 20260203

View File

@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 d7f95f7fa5490d252e58a717ba2d8e059d6de4e5 cyh666666 <2398882793@qq.com> 1768978997 +0800 clone: from http://192.168.1.111:3000/mall/mall.git
d7f95f7fa5490d252e58a717ba2d8e059d6de4e5 75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 cyh666666 <2398882793@qq.com> 1769044253 +0800 pull origin main: Fast-forward

View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000 d7f95f7fa5490d252e58a717ba2d8e059d6de4e5 cyh666666 <2398882793@qq.com> 1768978997 +0800 clone: from http://192.168.1.111:3000/mall/mall.git

View File

@@ -0,0 +1,3 @@
0000000000000000000000000000000000000000 932b19919696299677cedede1db60e5a55594d88 cyh666666 <2398882793@qq.com> 1769567722 +0800 fetch origin: storing head
932b19919696299677cedede1db60e5a55594d88 3e89513e8b937a6ea6b9a531bea583e055b612dd cyh666666 <2398882793@qq.com> 1769568501 +0800 fetch origin: fast-forward
3e89513e8b937a6ea6b9a531bea583e055b612dd 859372ca5b2d6c86107d3b19d5d7482a02eaac41 cyh666666 <2398882793@qq.com> 1770110166 +0800 fetch origin: fast-forward

View File

@@ -0,0 +1,15 @@
0000000000000000000000000000000000000000 75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 cyh666666 <2398882793@qq.com> 1769067793 +0800 update by push
75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 73498128dde533e8984c8bc2ebcca43253e46fb6 cyh666666 <2398882793@qq.com> 1769072868 +0800 update by push
73498128dde533e8984c8bc2ebcca43253e46fb6 b634c762b30e72de14209ca03c40039c9b0e0ae4 cyh666666 <2398882793@qq.com> 1769158117 +0800 update by push
b634c762b30e72de14209ca03c40039c9b0e0ae4 0ed62a82583382449a860a0d5bd7517a93c88dc9 cyh666666 <2398882793@qq.com> 1769160677 +0800 update by push
0ed62a82583382449a860a0d5bd7517a93c88dc9 be90f1213bf8ef5948faf6a77e18f4eb533a556a cyh666666 <2398882793@qq.com> 1769386684 +0800 update by push
be90f1213bf8ef5948faf6a77e18f4eb533a556a f2f208f258a1a6e6247ec138c1a16eb63138d4db cyh666666 <2398882793@qq.com> 1769418971 +0800 update by push
f2f208f258a1a6e6247ec138c1a16eb63138d4db 4ab722a118d41f1999c2203d12742ace922b176d cyh666666 <2398882793@qq.com> 1769506450 +0800 update by push
4ab722a118d41f1999c2203d12742ace922b176d af316e6d94c477505554b040f022f3e40457146c cyh666666 <2398882793@qq.com> 1769568451 +0800 update by push
af316e6d94c477505554b040f022f3e40457146c 66aa909193b008842948589adf6f302840aa6efc cyh666666 <2398882793@qq.com> 1769569015 +0800 update by push
66aa909193b008842948589adf6f302840aa6efc a4fa00c93501c27c16b745b7d262d0bd5a838dcd cyh666666 <2398882793@qq.com> 1769592543 +0800 update by push
a4fa00c93501c27c16b745b7d262d0bd5a838dcd ab038ec029662aaa9dcd7c624be85d5e35dc6e96 cyh666666 <2398882793@qq.com> 1769678973 +0800 update by push
ab038ec029662aaa9dcd7c624be85d5e35dc6e96 d57592ca7d17ce3d209458375b3de10683099cca cyh666666 <2398882793@qq.com> 1769765355 +0800 update by push
d57592ca7d17ce3d209458375b3de10683099cca b6200cda285b50c855c9b7b5c9ddf5e1aec8f74e cyh666666 <2398882793@qq.com> 1770024892 +0800 update by push
b6200cda285b50c855c9b7b5c9ddf5e1aec8f74e 8a535e3f387f58d736ca44a544e45ac1fe784cc8 cyh666666 <2398882793@qq.com> 1770109945 +0800 update by push
8a535e3f387f58d736ca44a544e45ac1fe784cc8 1b83b5e0b358b18c0d830d2b597aaab40d040297 cyh666666 <2398882793@qq.com> 1770110827 +0800 update by push

View File

@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 3e89513e8b937a6ea6b9a531bea583e055b612dd cyh666666 <2398882793@qq.com> 1769567722 +0800 fetch origin: storing head
3e89513e8b937a6ea6b9a531bea583e055b612dd 93b42a277ac0d0ebc6e93cac902ac779604b64e0 cyh666666 <2398882793@qq.com> 1770110166 +0800 fetch origin: fast-forward

View File

@@ -0,0 +1,3 @@
d7f95f7fa5490d252e58a717ba2d8e059d6de4e5 75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 cyh666666 <2398882793@qq.com> 1769044252 +0800 pull origin main: fast-forward
75fad97d5dbee5a32ac586cbfee2d8e1d73dd1f2 3e89513e8b937a6ea6b9a531bea583e055b612dd cyh666666 <2398882793@qq.com> 1769567722 +0800 fetch origin: fast-forward
3e89513e8b937a6ea6b9a531bea583e055b612dd 859372ca5b2d6c86107d3b19d5d7482a02eaac41 cyh666666 <2398882793@qq.com> 1770110166 +0800 fetch origin: fast-forward

View File

@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 1cca27096a4b78611871f803077c33cc5b4b4d3a cyh666666 <2398882793@qq.com> 1769567722 +0800 fetch origin: storing head
1cca27096a4b78611871f803077c33cc5b4b4d3a 8efe6d5e89193e991453d882b0fa3b353e903bf2 cyh666666 <2398882793@qq.com> 1770110166 +0800 fetch origin: fast-forward

View File

@@ -0,0 +1,3 @@
x∙▌A
B1 ]Вщ Р т4рФGtЯЩЗ╘┬╥W╪│Ё[ФЫ:"%щ▄у=2ГЁ6gг■;!┴╔╒у╨gjЙ⌠i7ЛоВЗmд.°╜u├ <eB╣ p╣зАh·C{▌к╡F{_ДG<WU╔RЫТxЛl≥▐1╘I RБ
└╞ЩН

View File

@@ -0,0 +1,3 @@
x<>;N1D‰}
çHÈîŸÛÒ
q•v»­%

Some files were not shown because too many files have changed in this diff Show More