fix: include trace id in sensitive access audit

server/internal/logic/sys/app_member.go

@@ -19,6 +19,7 @@ import (
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/util/grand"
 	"golang.org/x/crypto/bcrypt"
@@ -629,7 +630,7 @@ func (s *sSysAppMember) Sensitive(ctx context.Context, in *sysin.AppMemberSensit
 		result = 2
 	}
 	lc := dao.SensitiveAccessLog.Columns()
-	_, logErr := dao.SensitiveAccessLog.Ctx(ctx).Fields(lc.AccessNo, lc.ActorId, lc.TargetType, lc.TargetId, lc.FieldSet, lc.PurposeCode, lc.PurposeText, lc.AuthorizationNo, lc.MfaVerified, lc.Result).Hook(hook.SaveTenant).Data(g.Map{lc.AccessNo: res.AccessNo, lc.ActorId: contexts.GetUserId(ctx), lc.TargetType: in.TargetType, lc.TargetId: in.TargetId, lc.FieldSet: gjson.New(res.Fields), lc.PurposeCode: in.PurposeCode, lc.PurposeText: in.PurposeText, lc.AuthorizationNo: res.AccessNo, lc.MfaVerified: 0, lc.Result: result}).Insert()
+	_, logErr := dao.SensitiveAccessLog.Ctx(ctx).Fields(lc.AccessNo, lc.ActorId, lc.TargetType, lc.TargetId, lc.FieldSet, lc.PurposeCode, lc.PurposeText, lc.AuthorizationNo, lc.MfaVerified, lc.Result, lc.TraceId).Hook(hook.SaveTenant).Data(g.Map{lc.AccessNo: res.AccessNo, lc.ActorId: contexts.GetUserId(ctx), lc.TargetType: in.TargetType, lc.TargetId: in.TargetId, lc.FieldSet: gjson.New(res.Fields), lc.PurposeCode: in.PurposeCode, lc.PurposeText: in.PurposeText, lc.AuthorizationNo: res.AccessNo, lc.MfaVerified: 0, lc.Result: result, lc.TraceId: gctx.CtxId(ctx)}).Insert()
 	if logErr != nil {
 		return nil, gerror.Wrap(logErr, "记录敏感信息访问失败")
 	}

server/internal/logic/sys/product.go

@@ -45,7 +45,7 @@ func (s *sSysProduct) listModel(ctx context.Context) *gdb.Model {
 }
 func (s *sSysProduct) List(ctx context.Context, in *sysin.ProductListInp) (list []*sysin.ProductListModel, total int, err error) {
 	pc := dao.Product.Columns()
-	mod := s.listModel(ctx)
+	mod := s.listModel(ctx).Where(col("p", pc.ProductType), consts.ProductTypeStandard)
 	if in.Name != "" {
 		mod = mod.WhereLike(col("p", pc.Name), "%"+in.Name+"%")
 	}
@@ -55,6 +55,24 @@ func (s *sSysProduct) List(ctx context.Context, in *sysin.ProductListInp) (list
 	if in.CategoryId > 0 {
 		mod = mod.Where(col("p", pc.CategoryId), in.CategoryId)
 	}
+	var minAmount, maxAmount int64
+	if in.PriceMin != "" {
+		minAmount, err = parseCents(in.PriceMin)
+		if err != nil {
+			return nil, 0, gerror.New("最低价格格式不正确")
+		}
+		mod = mod.WhereGTE(col("p", pc.PriceAmount), minAmount)
+	}
+	if in.PriceMax != "" {
+		maxAmount, err = parseCents(in.PriceMax)
+		if err != nil {
+			return nil, 0, gerror.New("最高价格格式不正确")
+		}
+		mod = mod.WhereLTE(col("p", pc.PriceAmount), maxAmount)
+	}
+	if in.PriceMin != "" && in.PriceMax != "" && minAmount > maxAmount {
+		return nil, 0, gerror.New("最低价格不能高于最高价格")
+	}
 	if in.PublishStatus > 0 {
 		mod = mod.Where(col("p", pc.PublishStatus), in.PublishStatus)
 	}

server/internal/model/input/sysin/app_member.go

@@ -75,7 +75,7 @@ type AppMemberViewModel struct {
 
 type AppMemberEditInp struct {
 	Id              uint64 `json:"id"`
-	Username        string `json:"username" v:"required|length:3,64#用户名不能为空|用户名长度为3到64个字符"`
+	Username        string `json:"username" v:"required|length:2,64#用户名不能为空|用户名长度为2到64个字符"`
 	Mobile          string `json:"mobile" v:"phone-loose#手机号格式不正确"`
 	Password        string `json:"password"`
 	TradePassword   string `json:"tradePassword"`

server/internal/model/input/sysin/app_member_auth.go

@@ -9,7 +9,7 @@ import (
 )
 
 type AppMemberRegisterInp struct {
-	Username       string `json:"username" v:"required|length:3,64#用户名不能为空|用户名长度为3到64个字符"`
+	Username       string `json:"username" v:"required|length:2,64#用户名不能为空|用户名长度为2到64个字符"`
 	Mobile         string `json:"mobile" v:"required|phone-loose#手机号不能为空|手机号格式不正确"`
 	Password       string `json:"password" v:"required|length:6,64#密码不能为空|密码长度为6到64个字符"`
 	InviteCode     string `json:"inviteCode" v:"required#请输入邀请码"`

server/internal/model/input/sysin/product_task.go

@@ -45,6 +45,8 @@ type ProductListInp struct {
 	Name          string `json:"name"`
 	PaymentType   string `json:"paymentType"`
 	CategoryId    uint64 `json:"categoryId"`
+	PriceMin      string `json:"priceMin" dc:"最低价格"`
+	PriceMax      string `json:"priceMax" dc:"最高价格"`
 	PublishStatus int    `json:"publishStatus"`
 }
 

tests/test_deployment_contract.py

@@ -20,12 +20,12 @@ class DeploymentContract(unittest.TestCase):
         for ignored in (".git", "web/node_modules", "web/dist", "server/temp"):
             self.assertIn(ignored, dockerignore)
 
-    def test_manual_workflow_builds_and_rolls_out_test_image(self):
+    def test_manual_workflow_builds_and_rolls_out_pro_image(self):
         workflow = (ROOT / ".gitea/workflows/deploy.yml").read_text()
         self.assertIn("workflow_dispatch:", workflow)
-        self.assertIn("git.118im.com/im_team/olons-admin", workflow)
+        self.assertIn("git.olns.shop/pro/olons_admin", workflow)
-        self.assertIn("deployment/olons-admin", workflow)
+        self.assertIn("docker compose pull olons-admin", workflow)
-        self.assertIn("-n olons-admin-system", workflow)
+        self.assertIn("docker compose up -d --no-deps --wait olons-admin", workflow)
 
 
 if __name__ == "__main__":

web/src/views/app-member/list/index.vue

@@ -479,7 +479,7 @@
   const editRules = {
     username: [
       { required: true, message: '请输入用户名称', trigger: ['input', 'blur'] },
-      { min: 3, max: 64, message: '用户名长度为3到64个字符', trigger: ['input', 'blur'] },
+      { min: 2, max: 64, message: '用户名长度为2到64个字符', trigger: ['input', 'blur'] },
     ],
     mobile: {
       validator: () => true,

web/src/views/product-task/product/index.vue

@@ -1,7 +1,29 @@
 <template>
   <div>
     <n-card :bordered="false" class="proCard">
-      <BasicForm ref="searchRef" @register="register" @submit="reload" @keyup.enter="reload" />
+      <BasicForm ref="searchRef" @register="register" @submit="reload" @keyup.enter="reload">
+        <template #priceRangeSlot="{ model }">
+          <n-space :wrap="false" align="center">
+            <n-input-number
+              v-model:value="model.priceMin"
+              :min="0"
+              :precision="2"
+              :show-button="false"
+              clearable
+              placeholder="最低价"
+            />
+            <span>-</span>
+            <n-input-number
+              v-model:value="model.priceMax"
+              :min="0"
+              :precision="2"
+              :show-button="false"
+              clearable
+              placeholder="最高价"
+            />
+          </n-space>
+        </template>
+      </BasicForm>
       <BasicTable
         ref="tableRef"
         openChecked

web/src/views/product-task/product/model.ts

@@ -1,4 +1,4 @@
-import { computed, h, ref } from 'vue';
+import { h, ref } from 'vue';
 import { NImage, NTag } from 'naive-ui';
 import { FormSchema } from '@/components/Form';
 import { useDictStore } from '@/store/modules/dict';
@@ -13,14 +13,9 @@ export const schemas = ref<FormSchema[]>([
     componentProps: { clearable: true },
   },
   {
-    field: 'categoryId',
+    field: 'priceRange',
-    component: 'NSelect',
+    label: '价格范围',
-    label: '商品分类',
+    slot: 'priceRangeSlot',
-    componentProps: {
-      options: computed(() => dict.getOptionUnRef('productCategoryOption')),
-      clearable: true,
-      placeholder: '请选择',
-    },
   },
 ]);
 
@@ -62,4 +57,4 @@ export const columns = [
   },
 ];
 
-export const loadOptions = () => dict.loadOptions(['productCategoryOption', 'bizPublishStatus']);
+export const loadOptions = () => dict.loadOptions(['bizPublishStatus']);