Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 648d9bc0d5 | |||
| 15ef71734d | |||
| 36c7ad8b43 | |||
| 2b6178892f |
@@ -66,3 +66,6 @@ backend/gencode
|
||||
|
||||
# iOS 证书私钥(绝不入库)
|
||||
.ios-certs/
|
||||
|
||||
# brainstorming visual companion
|
||||
.superpowers/
|
||||
|
||||
@@ -5,6 +5,32 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [1.0.62] - 2026-06-20
|
||||
|
||||
### 改进
|
||||
- 入库单、出库单的仓库、供应商、客户下拉框改为可搜索:点击后弹出搜索框,支持按名称、拼音首字母或编码快速筛选,选项多时无需再逐条翻找
|
||||
|
||||
### 修复
|
||||
- 修复账号在别处登录或被管理员强制下线后、退回登录页却没有任何提示的问题,现在会弹窗明确告知「登录已失效」
|
||||
|
||||
## [1.0.61] - 2026-06-20
|
||||
|
||||
### 改进
|
||||
- 全平台应用名统一为「岩美酒库」:macOS 此前窗口标题与应用名显示为 jiu_client,现与各端一致
|
||||
- 应用图标更新为最新品牌图标,覆盖 Windows 桌面 / 任务栏 / 标题栏 / 快捷方式及 macOS、iOS、Android、网页各端
|
||||
|
||||
### 修复
|
||||
- 修复设备管理中 Windows 设备「平台」显示为「未知 桌面端」的问题,更新本版本并重新登录后正确显示为 Windows
|
||||
|
||||
## [1.0.60] - 2026-06-20
|
||||
|
||||
### 新功能
|
||||
- 入库/出库录单新增日期选择器,单据日期、生产日期等可直接点选,无需手动输入
|
||||
|
||||
### 改进
|
||||
- 录单表单的商品、往来单位等可搜索下拉支持边搜边选,找不到时可内联新建选项,录单更顺手
|
||||
- 从旧系统迁入的历史进销存单据,明细可正常展示商品编号、名称、系列、规格等信息
|
||||
|
||||
## [1.0.59] - 2026-06-19
|
||||
|
||||
### 新功能
|
||||
|
||||
@@ -5,6 +5,12 @@
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [1.0.64] - 2026-06-20
|
||||
|
||||
### 改进
|
||||
- 登录设备并发限制改为「按账号统计全部平台合计」:同一账号在桌面、移动、Web 各端加起来最多同时在线 5 台设备(原先各平台分别计数)
|
||||
- 达到设备上限时,新设备登录会被明确拒绝并提示「已达到登录设备上限,请提升额度或下线其他设备后重试」,不再静默把最早登录的设备顶下线——由用户自行决定下线哪台或提升额度
|
||||
|
||||
## [1.0.63] - 2026-06-20
|
||||
|
||||
### 新功能
|
||||
|
||||
@@ -36,9 +36,10 @@ type JWTConfig struct {
|
||||
|
||||
// SessionConfig 登录会话与并发限制(全局默认,可被每店 session_policy 覆盖)。
|
||||
type SessionConfig struct {
|
||||
LimitDesktop int `mapstructure:"limit_desktop"` // 桌面端(win/mac/linux)最大并发会话,0=禁止
|
||||
LimitMobile int `mapstructure:"limit_mobile"` // 移动端(android/ios)最大并发会话,0=禁止
|
||||
LimitWeb int `mapstructure:"limit_web"` // web 端最大并发会话,0=禁止
|
||||
LimitTotal int `mapstructure:"limit_total"` // 单用户跨全部平台的最大并发会话总数(超额踢最旧)
|
||||
LimitDesktop int `mapstructure:"limit_desktop"` // 桌面端(win/mac/linux)平台闸门,0=禁止该平台登录
|
||||
LimitMobile int `mapstructure:"limit_mobile"` // 移动端(android/ios)平台闸门,0=禁止该平台登录
|
||||
LimitWeb int `mapstructure:"limit_web"` // web 端平台闸门,0=禁止该平台登录
|
||||
MaxFailures int `mapstructure:"max_failures"` // 同一账号连续登录失败几次后锁定
|
||||
IPMaxFailures int `mapstructure:"ip_max_failures"` // 同一 IP 跨账号累计失败几次后锁定该 IP(防单 IP 撞多账号)
|
||||
LockMinutes int `mapstructure:"lock_minutes"` // 锁定时长(分钟)
|
||||
@@ -92,7 +93,8 @@ func Load() {
|
||||
viper.SetDefault("server.cors_origin", "*")
|
||||
viper.SetDefault("jwt.access_expire_min", 60)
|
||||
viper.SetDefault("jwt.refresh_expire_h", 168) // 7天
|
||||
viper.SetDefault("session.limit_desktop", 2)
|
||||
viper.SetDefault("session.limit_total", 5) // 单用户跨全部平台合计并发上限
|
||||
viper.SetDefault("session.limit_desktop", 2) // 平台闸门:>0=允许,0=禁止该平台(数值不再作分平台上限)
|
||||
viper.SetDefault("session.limit_mobile", 2)
|
||||
viper.SetDefault("session.limit_web", 2) // 默认不禁 web(官网挂着 Web 版 app);设 0 可禁
|
||||
viper.SetDefault("session.max_failures", 5)
|
||||
|
||||
@@ -48,6 +48,9 @@ func (h *AuthHandler) Login(c *gin.Context) {
|
||||
status = http.StatusTooManyRequests
|
||||
} else if errors.Is(err, service.ErrPlatformNotAllowed) {
|
||||
status = http.StatusForbidden
|
||||
} else if errors.Is(err, service.ErrDeviceLimitReached) {
|
||||
c.JSON(http.StatusConflict, gin.H{"error": err.Error(), "code": "DEVICE_LIMIT"})
|
||||
return
|
||||
}
|
||||
c.JSON(status, gin.H{"error": err.Error()})
|
||||
return
|
||||
|
||||
@@ -22,6 +22,7 @@ var (
|
||||
ErrUserInactive = errors.New("user is disabled")
|
||||
ErrLicenseLocked = errors.New("license locked, please renew or contact support")
|
||||
ErrPlatformNotAllowed = errors.New("该平台不允许登录")
|
||||
ErrDeviceLimitReached = errors.New("已达到登录设备上限,请提升额度或下线其他设备后重试")
|
||||
ErrTooManyAttempts = errors.New("登录失败次数过多,账号已临时锁定,请稍后再试")
|
||||
ErrSessionRevoked = errors.New("session revoked")
|
||||
|
||||
@@ -186,32 +187,31 @@ func (s *AuthService) Login(shopCode, username, password string, dev DeviceInfo)
|
||||
// 的 lic_exp 带上新试用到期日。
|
||||
s.ensureTrialOnFirstUse(shop.ID)
|
||||
|
||||
// 按平台类限并发:取有效配额,0=禁止该平台,超额则踢最旧会话腾位。
|
||||
// 平台闸门:配额 0=禁止该平台登录(如禁 web);数值不再作分平台上限,并发统一按总数限。
|
||||
pclass := model.PlatformClass(dev.Platform)
|
||||
quota := s.effectiveQuota(&shop, pclass)
|
||||
if quota <= 0 {
|
||||
if s.effectiveQuota(&shop, pclass) <= 0 {
|
||||
s.recordLoginAttempt(shopCode, username, dev, false, "platform_not_allowed")
|
||||
return nil, nil, ErrPlatformNotAllowed
|
||||
}
|
||||
// 总并发上限:同一用户跨全部平台合计不超过 totalQuota。已满时拒绝本次登录(不再
|
||||
// 静默踢最旧),让用户自行下线其他设备或提升额度。
|
||||
totalQuota := s.effectiveTotalQuota(&shop)
|
||||
|
||||
sid := uuid.New().String()
|
||||
jti := uuid.New().String() // 初始 refresh token jti,后续每次续期轮换
|
||||
now := time.Now()
|
||||
if err := s.db.Transaction(func(tx *gorm.DB) error {
|
||||
// 统计该 user 在该 class 的活跃会话;超额踢最旧
|
||||
var active []model.UserSession
|
||||
if err := tx.Set("gorm:query_option", "FOR UPDATE").
|
||||
Where("shop_id = ? AND user_id = ? AND platform_class = ? AND revoked_at IS NULL",
|
||||
shop.ID, user.ID, pclass).
|
||||
Order("last_seen_at ASC").Find(&active).Error; err != nil {
|
||||
// 统计该 user 全部平台的活跃会话(不分平台类);已达上限则拒绝
|
||||
var activeCount int64
|
||||
if err := tx.Model(&model.UserSession{}).
|
||||
Set("gorm:query_option", "FOR UPDATE").
|
||||
Where("shop_id = ? AND user_id = ? AND revoked_at IS NULL",
|
||||
shop.ID, user.ID).
|
||||
Count(&activeCount).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
// 需要腾出 (active+1) - quota 个位置
|
||||
for i := 0; i <= len(active)-quota; i++ {
|
||||
if err := tx.Model(&model.UserSession{}).Where("id = ?", active[i].ID).
|
||||
Updates(map[string]interface{}{"revoked_at": now, "revoked_reason": "kicked"}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if activeCount >= int64(totalQuota) {
|
||||
return ErrDeviceLimitReached
|
||||
}
|
||||
|
||||
sess := model.UserSession{
|
||||
@@ -233,6 +233,9 @@ func (s *AuthService) Login(shopCode, username, password string, dev DeviceInfo)
|
||||
}
|
||||
return tx.Model(&model.User{}).Where("id = ?", user.ID).Update("last_login_at", now).Error
|
||||
}); err != nil {
|
||||
if errors.Is(err, ErrDeviceLimitReached) {
|
||||
s.recordLoginAttempt(shopCode, username, dev, false, "device_limit")
|
||||
}
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
@@ -264,7 +267,35 @@ func (s *AuthService) recordLoginAttempt(shopCode, username string, dev DeviceIn
|
||||
}
|
||||
}
|
||||
|
||||
// effectiveQuota 返回某店某平台类的有效并发配额:优先每店 session_policy 覆盖,否则全局默认。
|
||||
// effectiveTotalQuota 返回某店「单用户跨全部平台」的有效并发总配额:优先每店
|
||||
// session_policy["total"] 覆盖,否则全局默认 config.C.Session.LimitTotal。至少为 1,
|
||||
// 避免误配 0 时把所有会话踢光。
|
||||
func (s *AuthService) effectiveTotalQuota(shop *model.Shop) int {
|
||||
q := config.C.Session.LimitTotal
|
||||
if shop.CustomFields != nil {
|
||||
if raw, ok := shop.CustomFields["session_policy"]; ok {
|
||||
if policy, ok := raw.(map[string]interface{}); ok {
|
||||
switch n := policy["total"].(type) {
|
||||
case float64:
|
||||
if int(n) > 0 {
|
||||
q = int(n)
|
||||
}
|
||||
case int:
|
||||
if n > 0 {
|
||||
q = n
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if q < 1 {
|
||||
q = 1
|
||||
}
|
||||
return q
|
||||
}
|
||||
|
||||
// effectiveQuota 返回某店某平台类的平台闸门值:>0=允许该平台,0=禁止。优先每店
|
||||
// session_policy 覆盖,否则全局默认。注意:数值大小不再作分平台并发上限(已统一为总数)。
|
||||
func (s *AuthService) effectiveQuota(shop *model.Shop, pclass string) int {
|
||||
def := map[string]int{
|
||||
"desktop": config.C.Session.LimitDesktop,
|
||||
|
||||
@@ -11,9 +11,13 @@ import (
|
||||
"github.com/wangjia/jiu/backend/testutil"
|
||||
)
|
||||
|
||||
// 同平台类超配额时踢掉最旧会话。
|
||||
func TestLogin_PerClassQuota_KicksOldest(t *testing.T) {
|
||||
// 达到总配额时拒绝新登录(不踢最旧),已有会话保持在线。
|
||||
func TestLogin_TotalQuota_RejectsWhenFull(t *testing.T) {
|
||||
db := testutil.SetupTestDB()
|
||||
old := config.C.Session.LimitTotal
|
||||
config.C.Session.LimitTotal = 2
|
||||
defer func() { config.C.Session.LimitTotal = old }()
|
||||
|
||||
shop := testutil.CreateTestShop(db, "SESS01")
|
||||
testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
|
||||
svc := NewAuthService(db)
|
||||
@@ -23,38 +27,43 @@ func TestLogin_PerClassQuota_KicksOldest(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
p2, _, err := svc.Login("SESS01", "admin", "password123", dev)
|
||||
require.NoError(t, err)
|
||||
// 配额 2,第 3 次桌面端登录应踢掉最旧(p1)
|
||||
// 总配额 2 已满,第 3 次登录应被拒绝
|
||||
_, _, err = svc.Login("SESS01", "admin", "password123", dev)
|
||||
require.NoError(t, err)
|
||||
assert.ErrorIs(t, err, ErrDeviceLimitReached)
|
||||
|
||||
// 共 2 个未撤销会话
|
||||
// 仍为 2 个未撤销会话,两者都未被踢
|
||||
var active int64
|
||||
db.Model(&model.UserSession{}).Where("shop_id = ? AND revoked_at IS NULL", shop.ID).Count(&active)
|
||||
assert.Equal(t, int64(2), active)
|
||||
|
||||
// p1 的 refresh 应失败(会话被踢)
|
||||
_, err = svc.RefreshTokens(p1.RefreshToken)
|
||||
assert.ErrorIs(t, err, ErrSessionRevoked)
|
||||
// p2 仍可续期
|
||||
assert.NoError(t, err)
|
||||
_, err = svc.RefreshTokens(p2.RefreshToken)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
// 移动端与桌面端配额互不影响。
|
||||
func TestLogin_QuotaIsolatedByClass(t *testing.T) {
|
||||
// 总配额跨全部平台合并计数:不同平台类共用一个总上限,满额即拒。
|
||||
func TestLogin_TotalQuota_CountsAcrossClasses(t *testing.T) {
|
||||
db := testutil.SetupTestDB()
|
||||
old := config.C.Session.LimitTotal
|
||||
config.C.Session.LimitTotal = 2
|
||||
defer func() { config.C.Session.LimitTotal = old }()
|
||||
|
||||
shop := testutil.CreateTestShop(db, "SESS02")
|
||||
testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
|
||||
svc := NewAuthService(db)
|
||||
|
||||
// 桌面 + 移动 占满总配额 2
|
||||
_, _, err := svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "windows"})
|
||||
require.NoError(t, err)
|
||||
_, _, err = svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "android"})
|
||||
require.NoError(t, err)
|
||||
// 第三个不同平台(web)应被总配额拒绝
|
||||
_, _, err = svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "web"})
|
||||
assert.ErrorIs(t, err, ErrDeviceLimitReached)
|
||||
|
||||
var active int64
|
||||
db.Model(&model.UserSession{}).Where("shop_id = ? AND revoked_at IS NULL", shop.ID).Count(&active)
|
||||
assert.Equal(t, int64(2), active) // 桌面 1 + 移动 1,都没被踢
|
||||
assert.Equal(t, int64(2), active) // 仅前两个在线
|
||||
}
|
||||
|
||||
// 配额为 0 的平台拒绝登录(如禁 web)。
|
||||
@@ -72,24 +81,23 @@ func TestLogin_PlatformDisabled(t *testing.T) {
|
||||
assert.ErrorIs(t, err, ErrPlatformNotAllowed)
|
||||
}
|
||||
|
||||
// 每店 session_policy 覆盖全局默认。
|
||||
// 每店 session_policy["total"] 覆盖全局总配额默认。
|
||||
func TestLogin_PerShopPolicyOverride(t *testing.T) {
|
||||
db := testutil.SetupTestDB()
|
||||
shop := testutil.CreateTestShop(db, "SESS04")
|
||||
// 该店限桌面 1
|
||||
// 该店总配额限 1
|
||||
db.Model(&model.Shop{}).Where("id = ?", shop.ID).
|
||||
Update("custom_fields", model.JSON{"session_policy": map[string]interface{}{"desktop": float64(1)}})
|
||||
Update("custom_fields", model.JSON{"session_policy": map[string]interface{}{"total": float64(1)}})
|
||||
testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
|
||||
svc := NewAuthService(db)
|
||||
|
||||
p1, _, err := svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "windows"})
|
||||
require.NoError(t, err)
|
||||
_, _, err = svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "windows"})
|
||||
require.NoError(t, err)
|
||||
|
||||
// 第 2 次登录应把 p1 踢掉(配额 1)
|
||||
// 总配额 1 已满,第 2 次登录(不同平台)应被拒绝,p1 保持在线
|
||||
_, _, err = svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "android"})
|
||||
assert.ErrorIs(t, err, ErrDeviceLimitReached)
|
||||
_, err = svc.RefreshTokens(p1.RefreshToken)
|
||||
assert.ErrorIs(t, err, ErrSessionRevoked)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
// 被禁用用户无法用 refresh token 续命(修复历史漏洞)。
|
||||
|
||||
@@ -28,6 +28,7 @@ func InitConfig() {
|
||||
RefreshExpireH: 168,
|
||||
},
|
||||
Session: config.SessionConfig{
|
||||
LimitTotal: 5,
|
||||
LimitDesktop: 2,
|
||||
LimitMobile: 2,
|
||||
LimitWeb: 2,
|
||||
|
||||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.2 KiB |
@@ -553,7 +553,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
@@ -610,7 +610,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
||||
CLANG_ANALYZER_NONNULL = YES;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
|
||||
@@ -1,122 +1 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"size" : "20x20",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-20x20@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "20x20",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-20x20@3x.png",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"size" : "29x29",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-29x29@1x.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "29x29",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-29x29@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "29x29",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-29x29@3x.png",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"size" : "40x40",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-40x40@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "40x40",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-40x40@3x.png",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"size" : "60x60",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-60x60@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "60x60",
|
||||
"idiom" : "iphone",
|
||||
"filename" : "Icon-App-60x60@3x.png",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"size" : "20x20",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-20x20@1x.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "20x20",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-20x20@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "29x29",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-29x29@1x.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "29x29",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-29x29@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "40x40",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-40x40@1x.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "40x40",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-40x40@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "76x76",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-76x76@1x.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "76x76",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-76x76@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "83.5x83.5",
|
||||
"idiom" : "ipad",
|
||||
"filename" : "Icon-App-83.5x83.5@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "1024x1024",
|
||||
"idiom" : "ios-marketing",
|
||||
"filename" : "Icon-App-1024x1024@1x.png",
|
||||
"scale" : "1x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 520 B |
|
Before Width: | Height: | Size: 895 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 686 B After Width: | Height: | Size: 764 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 895 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 4.2 KiB |
@@ -23,7 +23,7 @@
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>jiu_client</string>
|
||||
<string>岩美酒库</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../auth/auth_state.dart';
|
||||
import '../config/app_config.dart';
|
||||
import '../config/app_constants.dart';
|
||||
import '../config/license_copy.dart';
|
||||
import '../errors/error_reporter.dart';
|
||||
import '../../providers/connectivity_provider.dart';
|
||||
@@ -15,8 +16,8 @@ final _publicDio = _buildPublicDio();
|
||||
Dio _buildPublicDio() {
|
||||
final dio = Dio(BaseOptions(
|
||||
baseUrl: AppConfig.apiBaseUrl,
|
||||
connectTimeout: const Duration(seconds: 8),
|
||||
receiveTimeout: const Duration(seconds: 15),
|
||||
connectTimeout: AppConstants.publicConnectTimeout,
|
||||
receiveTimeout: AppConstants.publicReceiveTimeout,
|
||||
));
|
||||
dio.interceptors.add(RetryInterceptor(dio));
|
||||
return dio;
|
||||
@@ -102,8 +103,8 @@ class ApiClient {
|
||||
_onAuthFailed = onAuthFailed;
|
||||
_dio = Dio(BaseOptions(
|
||||
baseUrl: AppConfig.apiBaseUrl,
|
||||
connectTimeout: const Duration(seconds: 8),
|
||||
receiveTimeout: const Duration(seconds: 15),
|
||||
connectTimeout: AppConstants.publicConnectTimeout,
|
||||
receiveTimeout: AppConstants.publicReceiveTimeout,
|
||||
headers: {
|
||||
if (token != null) 'Authorization': 'Bearer $token',
|
||||
},
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import '../config/app_constants.dart';
|
||||
|
||||
/// 网络层错误自动重试拦截器。
|
||||
///
|
||||
@@ -16,11 +17,7 @@ class RetryInterceptor extends Interceptor {
|
||||
|
||||
RetryInterceptor(
|
||||
this.dio, {
|
||||
this.delays = const [
|
||||
Duration(seconds: 1),
|
||||
Duration(seconds: 2),
|
||||
Duration(seconds: 4),
|
||||
],
|
||||
this.delays = AppConstants.retryBackoffs,
|
||||
});
|
||||
|
||||
static const _attemptKey = 'retry_attempt';
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../config/app_config.dart';
|
||||
import '../config/app_constants.dart';
|
||||
|
||||
const _kAccessToken = 'access_token';
|
||||
const _kRefreshToken = 'refresh_token';
|
||||
@@ -153,8 +154,8 @@ class AuthNotifier extends StateNotifier<AuthState> {
|
||||
try {
|
||||
await Dio(BaseOptions(
|
||||
baseUrl: AppConfig.apiBaseUrl,
|
||||
connectTimeout: const Duration(seconds: 4),
|
||||
receiveTimeout: const Duration(seconds: 4),
|
||||
connectTimeout: AppConstants.authProbeTimeout,
|
||||
receiveTimeout: AppConstants.authProbeTimeout,
|
||||
headers: {'Authorization': 'Bearer $token'},
|
||||
)).post('/auth/logout');
|
||||
} catch (_) {
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
/// 全局业务常量集中地。
|
||||
///
|
||||
/// 收口此前散落在各处的「业务魔数」:网络超时、轮询间隔、重试退避、输入防抖、
|
||||
/// 分页大小、业务上限等可调参数。**不**收 UI 尺寸/间距/字号等纯样式常量
|
||||
/// (那些保留在各自 widget / 主题里,离使用点最近更易维护)。
|
||||
///
|
||||
/// 新增需要复用或可能调整的业务数值时,统一加到这里,避免再写裸字面量。
|
||||
abstract final class AppConstants {
|
||||
// ── 网络超时 ──
|
||||
/// 未登录公共 Dio(登录/刷新)连接超时
|
||||
static const Duration publicConnectTimeout = Duration(seconds: 8);
|
||||
|
||||
/// 未登录公共 Dio 读取超时
|
||||
static const Duration publicReceiveTimeout = Duration(seconds: 15);
|
||||
|
||||
/// 登录态探测/轻量请求超时
|
||||
static const Duration authProbeTimeout = Duration(seconds: 4);
|
||||
|
||||
/// 异常上报请求超时
|
||||
static const Duration errorReportTimeout = Duration(seconds: 5);
|
||||
|
||||
/// 检查更新请求超时
|
||||
static const Duration updateCheckTimeout = Duration(seconds: 5);
|
||||
|
||||
/// 连通性探测请求超时
|
||||
static const Duration connectivityTimeout = Duration(seconds: 15);
|
||||
|
||||
/// 批量导入(Excel 上传)发送超时
|
||||
static const Duration importSendTimeout = Duration(seconds: 120);
|
||||
|
||||
/// 批量导入(Excel 解析入库)读取超时
|
||||
static const Duration importReceiveTimeout = Duration(seconds: 300);
|
||||
|
||||
// ── 重试 / 退避 ──
|
||||
/// 网络层错误自动重试的递增间隔(1s → 2s → 4s)
|
||||
static const List<Duration> retryBackoffs = [
|
||||
Duration(seconds: 1),
|
||||
Duration(seconds: 2),
|
||||
Duration(seconds: 4),
|
||||
];
|
||||
|
||||
/// 连通性探测的多轮预算(4s → 8s → 12s)
|
||||
static const List<Duration> connectivityBudgets = [
|
||||
Duration(seconds: 4),
|
||||
Duration(seconds: 8),
|
||||
Duration(seconds: 12),
|
||||
];
|
||||
|
||||
/// 连通性探测单轮(不重试)预算
|
||||
static const List<Duration> connectivitySingleBudget = [Duration(seconds: 4)];
|
||||
|
||||
/// 连通性探测每轮失败后的退避步长(600ms × 轮次)
|
||||
static const Duration connectivityRetryStep = Duration(milliseconds: 600);
|
||||
|
||||
// ── 轮询间隔 ──
|
||||
/// 会话心跳上报间隔
|
||||
static const Duration heartbeatInterval = Duration(seconds: 30);
|
||||
|
||||
/// 在线时连通性轮询间隔
|
||||
static const Duration connectivityOnlinePoll = Duration(seconds: 30);
|
||||
|
||||
/// 离线时连通性轮询间隔
|
||||
static const Duration connectivityOfflinePoll = Duration(minutes: 1);
|
||||
|
||||
/// 后台检查更新轮询间隔
|
||||
static const Duration updatePollInterval = Duration(hours: 1);
|
||||
|
||||
/// 启动后首次检查更新前的延迟
|
||||
static const Duration updateInitialDelay = Duration(seconds: 3);
|
||||
|
||||
// ── 输入防抖 / 交互延迟 ──
|
||||
/// 下拉框失焦自动收起延迟
|
||||
static const Duration dropdownCloseDelay = Duration(milliseconds: 150);
|
||||
|
||||
/// 搜索输入防抖
|
||||
static const Duration searchDebounce = Duration(milliseconds: 300);
|
||||
|
||||
/// 自更新流程各步骤间的过渡延迟
|
||||
static const Duration updaterStepDelay = Duration(milliseconds: 400);
|
||||
|
||||
// ── 分页 ──
|
||||
/// 列表默认每页条数
|
||||
static const int defaultPageSize = 20;
|
||||
|
||||
/// 入库选货弹窗一次性拉取的库存条数
|
||||
static const int stockInPickerPageSize = 500;
|
||||
|
||||
/// 出库选货弹窗一次性拉取的库存条数
|
||||
static const int stockOutPickerPageSize = 1000;
|
||||
|
||||
/// 盘点拉取库存的每页条数
|
||||
static const int inventoryCheckPageSize = 200;
|
||||
|
||||
// ── 业务上限 ──
|
||||
/// 授权未返回时的默认设备上限
|
||||
static const int defaultMaxDevices = 3;
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../config/app_config.dart';
|
||||
import '../config/app_constants.dart';
|
||||
|
||||
class ErrorType {
|
||||
static const flutterError = 'flutter_error';
|
||||
@@ -29,8 +30,8 @@ class ErrorReporter {
|
||||
Dio get _client {
|
||||
_dio ??= Dio(BaseOptions(
|
||||
baseUrl: AppConfig.apiBaseUrl,
|
||||
connectTimeout: const Duration(seconds: 5),
|
||||
receiveTimeout: const Duration(seconds: 5),
|
||||
connectTimeout: AppConstants.errorReportTimeout,
|
||||
receiveTimeout: AppConstants.errorReportTimeout,
|
||||
));
|
||||
return _dio!;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'dart:io';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import '../config/app_constants.dart';
|
||||
|
||||
// 桌面/原生平台的应用内更新实现。Web 版见 app_updater_web.dart。
|
||||
|
||||
@@ -34,7 +35,7 @@ Future<void> downloadAndInstall(
|
||||
await dio.download(url, exe, onReceiveProgress: prog);
|
||||
// 启动 Inno Setup 安装包后退出本应用,让其覆盖安装。
|
||||
await Process.start(exe, const [], mode: ProcessStartMode.detached);
|
||||
await Future<void>.delayed(const Duration(milliseconds: 400));
|
||||
await Future<void>.delayed(AppConstants.updaterStepDelay);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@@ -75,7 +76,7 @@ else
|
||||
fi
|
||||
''');
|
||||
await Process.start('/bin/sh', [script], mode: ProcessStartMode.detached);
|
||||
await Future<void>.delayed(const Duration(milliseconds: 400));
|
||||
await Future<void>.delayed(AppConstants.updaterStepDelay);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import '../core/config/app_constants.dart';
|
||||
|
||||
class LicenseInfo {
|
||||
final int id;
|
||||
final String type; // trial | monthly | annual | lifetime
|
||||
@@ -20,7 +22,8 @@ class LicenseInfo {
|
||||
id: (json['id'] as num?)?.toInt() ?? 0,
|
||||
type: json['type'] as String? ?? 'trial',
|
||||
isActive: json['is_active'] as bool? ?? false,
|
||||
maxDevices: (json['max_devices'] as num?)?.toInt() ?? 3,
|
||||
maxDevices:
|
||||
(json['max_devices'] as num?)?.toInt() ?? AppConstants.defaultMaxDevices,
|
||||
expiresAt: json['expires_at'] != null
|
||||
? DateTime.tryParse(json['expires_at'] as String)
|
||||
: null,
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'dart:async';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/config/app_config.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
|
||||
/// 每次从离线恢复到在线时自增。
|
||||
/// 数据 provider 通过 watch 此值实现网络恢复后自动刷新。
|
||||
@@ -44,27 +45,25 @@ class ConnectivityNotifier extends StateNotifier<bool> {
|
||||
// 独立轻量 Dio:无拦截器。连接预算用 Future.timeout 逐次控制,
|
||||
// 故 BaseOptions 超时放宽到 15s 作为兜底。
|
||||
final _dio = Dio(BaseOptions(
|
||||
connectTimeout: const Duration(seconds: 15),
|
||||
receiveTimeout: const Duration(seconds: 15),
|
||||
connectTimeout: AppConstants.connectivityTimeout,
|
||||
receiveTimeout: AppConstants.connectivityTimeout,
|
||||
));
|
||||
|
||||
/// 每次尝试的超时预算,逐次拉长(越来越长)。
|
||||
static const _budgets = <Duration>[
|
||||
Duration(seconds: 4),
|
||||
Duration(seconds: 8),
|
||||
Duration(seconds: 12),
|
||||
];
|
||||
static const _budgets = AppConstants.connectivityBudgets;
|
||||
|
||||
/// 在线时:每 30 秒轻量检测一次(单次,不重试)
|
||||
/// 在线时:轻量检测一次(单次,不重试)
|
||||
void _startOnlineTimer() {
|
||||
_timer?.cancel();
|
||||
_timer = Timer.periodic(const Duration(seconds: 30), (_) => _check());
|
||||
_timer =
|
||||
Timer.periodic(AppConstants.connectivityOnlinePoll, (_) => _check());
|
||||
}
|
||||
|
||||
/// 离线时:每 1 分钟嗅探一次,降低频率节省资源
|
||||
/// 离线时:降低频率嗅探,节省资源
|
||||
void _startOfflineTimer() {
|
||||
_timer?.cancel();
|
||||
_timer = Timer.periodic(const Duration(minutes: 1), (_) => _check());
|
||||
_timer =
|
||||
Timer.periodic(AppConstants.connectivityOfflinePoll, (_) => _check());
|
||||
}
|
||||
|
||||
/// 立即触发一次检测(供外部调用,如 API 请求失败 / 启动时)。单次,不重试。
|
||||
@@ -92,14 +91,14 @@ class ConnectivityNotifier extends StateNotifier<bool> {
|
||||
|
||||
/// 连通性检测。[withRetry]=true 时按 [_budgets] 退避重试,间隔递增。
|
||||
Future<bool> _check({bool withRetry = false}) async {
|
||||
final budgets = withRetry ? _budgets : const [Duration(seconds: 4)];
|
||||
final budgets = withRetry ? _budgets : AppConstants.connectivitySingleBudget;
|
||||
var ok = false;
|
||||
for (var i = 0; i < budgets.length; i++) {
|
||||
ok = await _ping(budgets[i]);
|
||||
if (ok) break;
|
||||
// 最后一次失败后不再等待;中间失败按递增间隔退避(0.6s, 1.2s…)
|
||||
if (i < budgets.length - 1) {
|
||||
await Future.delayed(Duration(milliseconds: 600 * (i + 1)));
|
||||
await Future.delayed(AppConstants.connectivityRetryStep * (i + 1));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import '../core/models/page_result.dart';
|
||||
import '../models/finance.dart';
|
||||
import '../repositories/finance_repository.dart';
|
||||
@@ -16,7 +17,7 @@ final financeListProvider =
|
||||
|
||||
class FinanceListNotifier extends AsyncNotifier<PageResult<FinanceRecord>> {
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
String _type = '';
|
||||
String _month = '';
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import '../core/models/page_result.dart';
|
||||
import '../models/inventory.dart';
|
||||
import '../repositories/inventory_repository.dart';
|
||||
@@ -17,7 +18,7 @@ final inventoryListProvider =
|
||||
|
||||
class InventoryListNotifier extends AsyncNotifier<PageResult<Inventory>> {
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
int? _warehouseId;
|
||||
String _keyword = '';
|
||||
List<String> _series = [];
|
||||
@@ -106,7 +107,7 @@ final inventoryLogProvider =
|
||||
|
||||
class InventoryLogNotifier extends AsyncNotifier<PageResult<InventoryLog>> {
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
PageResult<InventoryLog>? _cache;
|
||||
|
||||
@override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import '../core/models/page_result.dart';
|
||||
import '../models/partner.dart';
|
||||
import '../repositories/partner_repository.dart';
|
||||
@@ -25,7 +26,7 @@ final customerListProvider =
|
||||
class PartnerListNotifier extends AsyncNotifier<PageResult<Partner>> {
|
||||
final String? type;
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
String _keyword = '';
|
||||
PageResult<Partner>? _cache;
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import '../core/models/page_result.dart';
|
||||
import '../models/product.dart';
|
||||
import '../repositories/product_repository.dart';
|
||||
@@ -17,7 +18,7 @@ final productListProvider =
|
||||
|
||||
class ProductListNotifier extends AsyncNotifier<PageResult<Product>> {
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
String _keyword = '';
|
||||
int? _categoryId;
|
||||
PageResult<Product>? _cache;
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import 'license_provider.dart';
|
||||
|
||||
/// 登录态心跳:已登录时每 30s 执行一次 **单个** POST /auth/ping:
|
||||
@@ -27,7 +28,7 @@ class SessionHeartbeat {
|
||||
|
||||
void start() {
|
||||
_timer?.cancel();
|
||||
_timer = Timer.periodic(const Duration(seconds: 30), (_) => _ping());
|
||||
_timer = Timer.periodic(AppConstants.heartbeatInterval, (_) => _ping());
|
||||
}
|
||||
|
||||
Future<void> _ping() async {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import '../core/models/page_result.dart';
|
||||
import '../models/stock_in.dart';
|
||||
import '../repositories/stock_in_repository.dart';
|
||||
@@ -18,7 +19,7 @@ final stockInListProvider =
|
||||
|
||||
class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
String _status = '';
|
||||
String? _startDate;
|
||||
String? _endDate;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../core/api/api_client.dart';
|
||||
import '../core/auth/auth_state.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
import '../core/models/page_result.dart';
|
||||
import '../models/stock_out.dart';
|
||||
import '../repositories/stock_out_repository.dart';
|
||||
@@ -18,7 +19,7 @@ final stockOutListProvider =
|
||||
|
||||
class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
String _status = '';
|
||||
String? _startDate;
|
||||
String? _endDate;
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import '../core/config/app_config.dart';
|
||||
import '../core/config/app_constants.dart';
|
||||
|
||||
// ── 数据模型 ────────────────────────────────────────────────
|
||||
class AppUpdateInfo {
|
||||
@@ -40,8 +41,8 @@ class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
|
||||
bool _dismissed = false; // 用户已手动关闭非强制更新提示
|
||||
|
||||
final _dio = Dio(BaseOptions(
|
||||
connectTimeout: const Duration(seconds: 5),
|
||||
receiveTimeout: const Duration(seconds: 5),
|
||||
connectTimeout: AppConstants.updateCheckTimeout,
|
||||
receiveTimeout: AppConstants.updateCheckTimeout,
|
||||
));
|
||||
|
||||
@override
|
||||
@@ -51,12 +52,12 @@ class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
|
||||
_dio.close(force: true);
|
||||
});
|
||||
|
||||
// 启动后 3 秒延迟首次检查(避免与登录请求竞争)
|
||||
await Future.delayed(const Duration(seconds: 3));
|
||||
// 启动后延迟首次检查(避免与登录请求竞争)
|
||||
await Future.delayed(AppConstants.updateInitialDelay);
|
||||
final result = await _check();
|
||||
|
||||
// 每小时检查一次
|
||||
_timer = Timer.periodic(const Duration(hours: 1), (_) async {
|
||||
// 定期检查更新
|
||||
_timer = Timer.periodic(AppConstants.updatePollInterval, (_) async {
|
||||
_dismissed = false;
|
||||
final r = await _check();
|
||||
state = AsyncValue.data(r);
|
||||
|
||||
@@ -8,6 +8,7 @@ import 'package:go_router/go_router.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import '../../core/auth/auth_state.dart';
|
||||
import '../../core/config/app_config.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../core/theme/app_theme.dart';
|
||||
import '../../core/storage/login_history.dart';
|
||||
import '../../providers/connectivity_provider.dart';
|
||||
@@ -73,7 +74,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
} else {
|
||||
// 延迟关闭:让候选词的 onTap(pointer-up)先执行,再关闭下拉框
|
||||
_closeHotelTimer?.cancel();
|
||||
_closeHotelTimer = Timer(const Duration(milliseconds: 150), _closeHotel);
|
||||
_closeHotelTimer =
|
||||
Timer(AppConstants.dropdownCloseDelay, _closeHotel);
|
||||
}
|
||||
});
|
||||
_usernameFocus.addListener(() {
|
||||
@@ -88,9 +90,38 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
});
|
||||
} else {
|
||||
_closeUsernameTimer?.cancel();
|
||||
_closeUsernameTimer = Timer(const Duration(milliseconds: 150), _closeUsername);
|
||||
_closeUsernameTimer =
|
||||
Timer(AppConstants.dropdownCloseDelay, _closeUsername);
|
||||
}
|
||||
});
|
||||
// 处理「进入登录页之前」就已置入的会话失效提示:登出在 login_screen 挂载前就
|
||||
// 设好了 sessionEndedMessageProvider,而 build 里的 ref.listen 只捕获注册之后的
|
||||
// 变化,会漏掉这个既有值 → 之前「被顶下线无提示」的根因。这里在首帧主动读一次。
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final msg = ref.read(sessionEndedMessageProvider);
|
||||
if (msg != null && msg.isNotEmpty) _showSessionEndedDialog(msg);
|
||||
});
|
||||
}
|
||||
|
||||
/// 弹出「登录已失效 / 被强制下线」提示弹窗,并清空 provider 避免重复弹。
|
||||
void _showSessionEndedDialog(String msg) {
|
||||
if (!mounted) return;
|
||||
ref.read(sessionEndedMessageProvider.notifier).state = null;
|
||||
showDialog<void>(
|
||||
context: context,
|
||||
builder: (ctx) => AlertDialog(
|
||||
icon: const Icon(Icons.lock_outline, color: AppTheme.danger),
|
||||
title: const Text('登录已失效'),
|
||||
content: Text(msg),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(ctx).pop(),
|
||||
child: const Text('我知道了'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _loadHistory() async {
|
||||
@@ -343,14 +374,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// 被踢下线 / 会话失效:登出后跳回登录页,弹一次提示并清空
|
||||
// 已在登录页时会话再失效(例如停留在登录页期间后台请求被吊销):弹窗提示。
|
||||
// 进入登录页之前就置入的既有值由 initState 的首帧读取处理。
|
||||
ref.listen<String?>(sessionEndedMessageProvider, (prev, next) {
|
||||
if (next != null && next.isNotEmpty) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
|
||||
content: Text(next), backgroundColor: AppTheme.danger));
|
||||
ref.read(sessionEndedMessageProvider.notifier).state = null;
|
||||
_showSessionEndedDialog(next);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../../core/responsive/responsive.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../core/theme/app_theme.dart';
|
||||
import '../../models/finance.dart';
|
||||
import '../../providers/finance_provider.dart';
|
||||
@@ -49,7 +50,7 @@ class _FinanceTab extends ConsumerStatefulWidget {
|
||||
class _FinanceTabState extends ConsumerState<_FinanceTab> {
|
||||
late String _month;
|
||||
int _page = 1;
|
||||
int _pageSize = 20;
|
||||
int _pageSize = AppConstants.defaultPageSize;
|
||||
|
||||
late Future<List<FinanceRecord>> _future;
|
||||
List<FinanceRecord> _allRecords = [];
|
||||
|
||||
@@ -5,6 +5,7 @@ import 'package:go_router/go_router.dart';
|
||||
import '../../core/theme/app_theme.dart';
|
||||
import '../../models/inventory.dart';
|
||||
import '../../models/warehouse.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../providers/inventory_provider.dart';
|
||||
import '../../providers/warehouse_provider.dart';
|
||||
|
||||
@@ -51,7 +52,8 @@ class _InventoryCheckScreenState extends ConsumerState<InventoryCheckScreen> {
|
||||
try {
|
||||
final result = await ref
|
||||
.read(inventoryRepositoryProvider)
|
||||
.listInventory(warehouseId: wh.id, pageSize: 200);
|
||||
.listInventory(
|
||||
warehouseId: wh.id, pageSize: AppConstants.inventoryCheckPageSize);
|
||||
final items = result.data
|
||||
.where((inv) => inv.productId != null)
|
||||
.map((inv) => _CheckItem(inventory: inv))
|
||||
|
||||
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import '../../core/config/app_config.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../core/responsive/responsive.dart';
|
||||
import '../../core/theme/app_theme.dart';
|
||||
import '../../models/inventory.dart';
|
||||
@@ -165,8 +166,8 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
|
||||
final token = ref.read(authStateProvider).user?.accessToken ?? '';
|
||||
final dio = Dio(BaseOptions(
|
||||
baseUrl: AppConfig.apiBaseUrl,
|
||||
sendTimeout: const Duration(seconds: 120),
|
||||
receiveTimeout: const Duration(seconds: 300),
|
||||
sendTimeout: AppConstants.importSendTimeout,
|
||||
receiveTimeout: AppConstants.importReceiveTimeout,
|
||||
));
|
||||
dio.options.headers['Authorization'] = 'Bearer $token';
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../../core/models/page_result.dart';
|
||||
import '../../core/responsive/responsive.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../core/theme/app_theme.dart';
|
||||
import '../../models/partner.dart';
|
||||
import '../../providers/partner_provider.dart';
|
||||
@@ -77,7 +78,7 @@ class _PartnersScreenState extends ConsumerState<PartnersScreen> {
|
||||
searchCtrl: _supplierSearchCtrl,
|
||||
onSearchChanged: (v) {
|
||||
_supplierDebounce?.cancel();
|
||||
_supplierDebounce = Timer(const Duration(milliseconds: 300), () {
|
||||
_supplierDebounce = Timer(AppConstants.searchDebounce, () {
|
||||
ref.read(supplierListProvider.notifier).setKeyword(v);
|
||||
});
|
||||
},
|
||||
@@ -120,7 +121,7 @@ class _PartnersScreenState extends ConsumerState<PartnersScreen> {
|
||||
searchCtrl: _customerSearchCtrl,
|
||||
onSearchChanged: (v) {
|
||||
_customerDebounce?.cancel();
|
||||
_customerDebounce = Timer(const Duration(milliseconds: 300), () {
|
||||
_customerDebounce = Timer(AppConstants.searchDebounce, () {
|
||||
ref.read(customerListProvider.notifier).setKeyword(v);
|
||||
});
|
||||
},
|
||||
|
||||
@@ -11,6 +11,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import '../../core/auth/auth_state.dart';
|
||||
import '../../widgets/write_guard.dart';
|
||||
import '../../core/config/app_config.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../core/config/app_info.dart';
|
||||
import '../../core/config/license_copy.dart';
|
||||
import '../../core/responsive/responsive.dart';
|
||||
@@ -1375,8 +1376,8 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {
|
||||
|
||||
final dio = Dio(BaseOptions(
|
||||
baseUrl: AppConfig.apiBaseUrl,
|
||||
sendTimeout: const Duration(seconds: 120),
|
||||
receiveTimeout: const Duration(seconds: 300),
|
||||
sendTimeout: AppConstants.importSendTimeout,
|
||||
receiveTimeout: AppConstants.importReceiveTimeout,
|
||||
));
|
||||
dio.options.headers['Authorization'] = 'Bearer $token';
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import '../../core/auth/auth_state.dart';
|
||||
import '../../core/utils/print_util.dart';
|
||||
import '../../core/utils/date_util.dart';
|
||||
import '../../models/stock_in.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../providers/partner_provider.dart';
|
||||
import '../../providers/product_option_provider.dart';
|
||||
import '../../providers/product_provider.dart';
|
||||
@@ -196,7 +197,9 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
|
||||
try {
|
||||
final result = await ref
|
||||
.read(inventoryRepositoryProvider)
|
||||
.listInventory(warehouseId: warehouseId, pageSize: 500);
|
||||
.listInventory(
|
||||
warehouseId: warehouseId,
|
||||
pageSize: AppConstants.stockInPickerPageSize);
|
||||
setState(() {
|
||||
_inventoryMap = {
|
||||
for (final inv in result.data.where((inv) => inv.productId != null))
|
||||
@@ -601,24 +604,19 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
|
||||
const LinearProgressIndicator(),
|
||||
error: (_, __) => const Text('加载失败'),
|
||||
data: (warehouses) =>
|
||||
DropdownButtonFormField<int>(
|
||||
value: _warehouseId,
|
||||
hint: const Text('请选择仓库',
|
||||
style: TextStyle(fontSize: 13)),
|
||||
items: warehouses
|
||||
.map((w) => DropdownMenuItem(
|
||||
value: w.id,
|
||||
child: Text(w.name,
|
||||
style: const TextStyle(
|
||||
fontSize: 13))))
|
||||
SearchableOptionField(
|
||||
options: warehouses
|
||||
.map((w) => OptionItem(
|
||||
id: w.id, name: w.name))
|
||||
.toList(),
|
||||
selectedId: _warehouseId,
|
||||
hint: '请选择仓库',
|
||||
dialogTitle: '选择入库仓库',
|
||||
isRequired: true,
|
||||
onChanged: (v) {
|
||||
setState(() => _warehouseId = v);
|
||||
if (v != null) _loadInventory(v);
|
||||
},
|
||||
validator: (v) =>
|
||||
v == null ? '不能为空' : null,
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -630,22 +628,19 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
|
||||
const LinearProgressIndicator(),
|
||||
error: (_, __) => const Text('加载失败'),
|
||||
data: (result) =>
|
||||
DropdownButtonFormField<int>(
|
||||
value: _partnerId,
|
||||
hint: const Text('请选择供应商',
|
||||
style: TextStyle(fontSize: 13)),
|
||||
items: result.data
|
||||
.map((p) => DropdownMenuItem(
|
||||
value: p.id,
|
||||
child: Text(p.name,
|
||||
style: const TextStyle(
|
||||
fontSize: 13))))
|
||||
SearchableOptionField(
|
||||
options: result.data
|
||||
.map((p) => OptionItem(
|
||||
id: p.id,
|
||||
name: p.name,
|
||||
code: p.code))
|
||||
.toList(),
|
||||
selectedId: _partnerId,
|
||||
hint: '请选择供应商',
|
||||
dialogTitle: '选择供应商',
|
||||
isRequired: true,
|
||||
onChanged: (v) =>
|
||||
setState(() => _partnerId = v),
|
||||
validator: (v) =>
|
||||
v == null ? '不能为空' : null,
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -9,6 +9,8 @@ import '../../core/utils/print_util.dart';
|
||||
import '../../core/utils/date_util.dart';
|
||||
import '../../models/stock_out.dart';
|
||||
import '../../widgets/date_picker_field.dart';
|
||||
import '../../widgets/searchable_option_field.dart';
|
||||
import '../../core/config/app_constants.dart';
|
||||
import '../../providers/inventory_provider.dart';
|
||||
import '../../providers/partner_provider.dart';
|
||||
import '../../providers/stock_out_provider.dart';
|
||||
@@ -153,7 +155,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
|
||||
try {
|
||||
final result = await ref
|
||||
.read(inventoryRepositoryProvider)
|
||||
.listInventory(warehouseId: warehouseId, pageSize: 1000);
|
||||
.listInventory(
|
||||
warehouseId: warehouseId,
|
||||
pageSize: AppConstants.stockOutPickerPageSize);
|
||||
final Map<int, _PickerItem> productMap = {};
|
||||
for (final inv in result.data.where((inv) => inv.productId != null)) {
|
||||
final pid = inv.productId!;
|
||||
@@ -495,24 +499,19 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
|
||||
const LinearProgressIndicator(),
|
||||
error: (_, __) => const Text('加载失败'),
|
||||
data: (warehouses) =>
|
||||
DropdownButtonFormField<int>(
|
||||
value: _warehouseId,
|
||||
hint: const Text('请选择仓库',
|
||||
style: TextStyle(fontSize: 13)),
|
||||
items: warehouses
|
||||
.map((w) => DropdownMenuItem(
|
||||
value: w.id,
|
||||
child: Text(w.name,
|
||||
style: const TextStyle(
|
||||
fontSize: 13))))
|
||||
SearchableOptionField(
|
||||
options: warehouses
|
||||
.map((w) => OptionItem(
|
||||
id: w.id, name: w.name))
|
||||
.toList(),
|
||||
selectedId: _warehouseId,
|
||||
hint: '请选择仓库',
|
||||
dialogTitle: '选择出库仓库',
|
||||
isRequired: true,
|
||||
onChanged: (v) {
|
||||
setState(() => _warehouseId = v);
|
||||
if (v != null) _loadInventory(v);
|
||||
},
|
||||
validator: (v) =>
|
||||
v == null ? '不能为空' : null,
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -523,20 +522,18 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
|
||||
const LinearProgressIndicator(),
|
||||
error: (_, __) => const Text('加载失败'),
|
||||
data: (result) =>
|
||||
DropdownButtonFormField<int>(
|
||||
value: _partnerId,
|
||||
hint: const Text('请选择客户',
|
||||
style: TextStyle(fontSize: 13)),
|
||||
items: result.data
|
||||
.map((p) => DropdownMenuItem(
|
||||
value: p.id,
|
||||
child: Text(p.name,
|
||||
style: const TextStyle(
|
||||
fontSize: 13))))
|
||||
SearchableOptionField(
|
||||
options: result.data
|
||||
.map((p) => OptionItem(
|
||||
id: p.id,
|
||||
name: p.name,
|
||||
code: p.code))
|
||||
.toList(),
|
||||
selectedId: _partnerId,
|
||||
hint: '请选择客户',
|
||||
dialogTitle: '选择客户',
|
||||
onChanged: (v) =>
|
||||
setState(() => _partnerId = v),
|
||||
decoration: const InputDecoration(),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -489,7 +489,7 @@
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient.RunnerTests;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu.RunnerTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/jiu_client.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/jiu_client";
|
||||
@@ -504,7 +504,7 @@
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient.RunnerTests;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu.RunnerTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/jiu_client.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/jiu_client";
|
||||
@@ -519,7 +519,7 @@
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient.RunnerTests;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu.RunnerTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/jiu_client.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/jiu_client";
|
||||
|
||||
@@ -1,68 +1,68 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"size" : "16x16",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_16.png",
|
||||
"scale" : "1x"
|
||||
"info": {
|
||||
"version": 1,
|
||||
"author": "xcode"
|
||||
},
|
||||
{
|
||||
"size" : "16x16",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_32.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "32x32",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_32.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "32x32",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_64.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "128x128",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_128.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "128x128",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_256.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "256x256",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_256.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "256x256",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_512.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"size" : "512x512",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_512.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"size" : "512x512",
|
||||
"idiom" : "mac",
|
||||
"filename" : "app_icon_1024.png",
|
||||
"scale" : "2x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
"images": [
|
||||
{
|
||||
"size": "16x16",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_16.png",
|
||||
"scale": "1x"
|
||||
},
|
||||
{
|
||||
"size": "16x16",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_32.png",
|
||||
"scale": "2x"
|
||||
},
|
||||
{
|
||||
"size": "32x32",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_32.png",
|
||||
"scale": "1x"
|
||||
},
|
||||
{
|
||||
"size": "32x32",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_64.png",
|
||||
"scale": "2x"
|
||||
},
|
||||
{
|
||||
"size": "128x128",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_128.png",
|
||||
"scale": "1x"
|
||||
},
|
||||
{
|
||||
"size": "128x128",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_256.png",
|
||||
"scale": "2x"
|
||||
},
|
||||
{
|
||||
"size": "256x256",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_256.png",
|
||||
"scale": "1x"
|
||||
},
|
||||
{
|
||||
"size": "256x256",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_512.png",
|
||||
"scale": "2x"
|
||||
},
|
||||
{
|
||||
"size": "512x512",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_512.png",
|
||||
"scale": "1x"
|
||||
},
|
||||
{
|
||||
"size": "512x512",
|
||||
"idiom": "mac",
|
||||
"filename": "app_icon_1024.png",
|
||||
"scale": "2x"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 721 B |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -8,7 +8,7 @@
|
||||
PRODUCT_NAME = jiu_client
|
||||
|
||||
// The application's bundle identifier
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu
|
||||
|
||||
// The copyright displayed in application information
|
||||
PRODUCT_COPYRIGHT = Copyright © 2026 com.example. All rights reserved.
|
||||
PRODUCT_COPYRIGHT = Copyright © 2026 岩美技术有限公司. All rights reserved.
|
||||
|
||||
@@ -13,7 +13,9 @@
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<string>岩美酒库</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>岩美酒库</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
|
||||
@@ -65,6 +65,22 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.0"
|
||||
checked_yaml:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: checked_yaml
|
||||
sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.4"
|
||||
cli_util:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cli_util
|
||||
sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.4.2"
|
||||
clock:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -206,6 +222,14 @@ packages:
|
||||
description: flutter
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_launcher_icons:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_launcher_icons
|
||||
sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.14.4"
|
||||
flutter_lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
@@ -381,6 +405,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.1"
|
||||
json_annotation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: json_annotation
|
||||
sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.12.0"
|
||||
leak_tracker:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
@@ -37,6 +37,25 @@ dev_dependencies:
|
||||
sdk: flutter
|
||||
flutter_lints: ^4.0.0
|
||||
http_mock_adapter: ^0.6.1
|
||||
flutter_launcher_icons: ^0.14.1
|
||||
|
||||
# 全平台启动图标,单一源图 assets/brand/logo_mark.png(512×512),
|
||||
# 跑 `dart run flutter_launcher_icons` 重生成 android/ios/web/windows/macos 所有图标
|
||||
flutter_launcher_icons:
|
||||
image_path: "assets/brand/logo_mark.png"
|
||||
android: true
|
||||
ios: true
|
||||
remove_alpha_ios: true
|
||||
background_color_ios: "#FFFFFF"
|
||||
web:
|
||||
generate: true
|
||||
background_color: "#FFFFFF"
|
||||
theme_color: "#2563AC"
|
||||
windows:
|
||||
generate: true
|
||||
icon_size: 256
|
||||
macos:
|
||||
generate: true
|
||||
|
||||
flutter:
|
||||
uses-material-design: true
|
||||
|
||||
|
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 17 KiB |
@@ -30,13 +30,13 @@
|
||||
<!-- iOS meta tags & icons -->
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="apple-mobile-web-app-title" content="岩美">
|
||||
<meta name="apple-mobile-web-app-title" content="岩美酒库">
|
||||
<link rel="apple-touch-icon" href="icons/Icon-192.png">
|
||||
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/png" href="favicon.png"/>
|
||||
|
||||
<title>岩美</title>
|
||||
<title>岩美酒库</title>
|
||||
<link rel="manifest" href="manifest.json">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "岩美",
|
||||
"short_name": "岩美",
|
||||
"name": "岩美酒库",
|
||||
"short_name": "岩美酒库",
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"background_color": "#2563AC",
|
||||
@@ -32,4 +32,4 @@
|
||||
"purpose": "maskable"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -89,13 +89,13 @@ BEGIN
|
||||
BEGIN
|
||||
BLOCK "040904e4"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "com.yanmei" "\0"
|
||||
VALUE "FileDescription", "jiu_client" "\0"
|
||||
VALUE "CompanyName", "岩美技术有限公司" "\0"
|
||||
VALUE "FileDescription", "岩美酒库" "\0"
|
||||
VALUE "FileVersion", VERSION_AS_STRING "\0"
|
||||
VALUE "InternalName", "jiu_client" "\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2026 com.yanmei. All rights reserved." "\0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2026 岩美技术有限公司. All rights reserved." "\0"
|
||||
VALUE "OriginalFilename", "jiu_client.exe" "\0"
|
||||
VALUE "ProductName", "jiu_client" "\0"
|
||||
VALUE "ProductName", "岩美酒库" "\0"
|
||||
VALUE "ProductVersion", VERSION_AS_STRING "\0"
|
||||
END
|
||||
END
|
||||
|
||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 6.9 KiB |