diff --git a/.woodpecker/my-first-workflow.yaml b/.woodpecker/my-first-workflow.yaml
index 67025fd2a..4cc28feef 100644
--- a/.woodpecker/my-first-workflow.yaml
+++ b/.woodpecker/my-first-workflow.yaml
@@ -8,12 +8,6 @@ when:
 skip_clone: true
 
 
-# 全局配置变量（替换占位符即可使用）
-variables:
-  SCREEN_NAME: "logic_service"
-  REMOTE_EXE_DIR: "/opt/logic"
-  JSON_CONFIG_URL: "https://你的JSON配置地址.com/deploy.json"
-  LOG_PATH: "$HOME/run.log"
 
 # 流水线核心步骤：理顺依赖链，确保各步骤依赖正确
 steps:
@@ -128,10 +122,10 @@ steps:
   scp-exe-to-servers:  # 与fetch-deploy-config同级，缩进2个空格
     image: appleboy/drone-scp:1.6.2  # 子元素，缩进4个空格
     settings:  # 子元素，缩进4个空格
-      host: 103.236.78.60  # settings内的项，缩进6个空格
-      port: 29713
-      username: root  # 统一缩进6个空格
-      password: dgaoXMPC8325  # 统一缩进6个空格
+      host: &ssh_host 103.236.78.60
+      port: &ssh_port 29713
+      username: &ssh_user root
+      password: &ssh_pass dgaoXMPC8325
       source:
         - blazing/build/**
       target: /opt/blazing/
@@ -144,10 +138,10 @@ steps:
     image: appleboy/drone-ssh:1.6.2
     depends_on: [scp-exe-to-servers]
     settings:  # 子元素，缩进4个空格
-      host: 103.236.78.60  # settings内的项，缩进6个空格
-      port: 29713
-      username: root  # 统一缩进6个空格
-      password: dgaoXMPC8325  # 统一缩进6个空格
+      host: *ssh_host
+      port: *ssh_port
+      username: *ssh_user
+      password: *ssh_pass
       script:
               - |
                 cd /opt/blazing/build
diff --git a/common/cool/coolconfig/config.go b/common/cool/coolconfig/config.go
index 8b923dc85..17f838ae9 100644
--- a/common/cool/coolconfig/config.go
+++ b/common/cool/coolconfig/config.go
@@ -1,6 +1,8 @@
 package coolconfig
 
 import (
+	"time"
+
 	"github.com/gogf/gf/v2/frame/g"
 )
 
@@ -44,6 +46,8 @@ type ServerList struct {
 	Owner     uint32 `gorm:"comment:'服务器属主'" json:"owner"`
 	Desc      string `gorm:"comment:'服务器描述'" json:"desc"`
 	OldScreen string `gorm:"comment:'服务器screen参数'" json:"old_screen"`
+	//到期时间ServerList
+	ExpireTime time.Time `gorm:"default:0;comment:'到期时间'" json:"expire_time"`
 }
 
 // OSS相关配置
diff --git a/logic/controller/action_egg.go b/logic/controller/action_扭蛋.go
similarity index 100%
rename from logic/controller/action_egg.go
rename to logic/controller/action_扭蛋.go
diff --git a/logic/controller/activce_leiyi.go b/logic/controller/activce_雷伊特训.go
similarity index 100%
rename from logic/controller/activce_leiyi.go
rename to logic/controller/activce_雷伊特训.go
diff --git a/logic/controller/active_xiyou_in1.go b/logic/controller/active_传送仓稀有.go
similarity index 100%
rename from logic/controller/active_xiyou_in1.go
rename to logic/controller/active_传送仓稀有.go
diff --git a/logic/controller/active_寒流枪.go b/logic/controller/active_寒流枪.go
new file mode 100644
index 000000000..ee2d70212
--- /dev/null
+++ b/logic/controller/active_寒流枪.go
@@ -0,0 +1,20 @@
+package controller
+
+import (
+	"blazing/common/socket/errorcode"
+	"blazing/logic/service/fight"
+	"blazing/logic/service/pet"
+	"blazing/logic/service/player"
+)
+
+// CatchPet 传送仓抓稀有宠物
+// data: 空输入结构
+// c: 当前玩家对象
+// 返回: 捕捉结果（消耗的EV值）和错误码
+func (h Controller) HanLiuQiang(data *pet.C2S_2608, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+
+	if c.ItemAdd(100245, 1) {
+		return
+	}
+	return result, -1
+}
diff --git a/logic/service/pet/BargeList.go b/logic/service/pet/BargeList.go
index 450d3567b..fbd1c52ee 100644
--- a/logic/service/pet/BargeList.go
+++ b/logic/service/pet/BargeList.go
@@ -44,3 +44,6 @@ type C2S_PET_EVOLVTION struct {
 	// 如果没有分支进化，只有一种进化形态，Index只能为1
 	// 后端直接判断进化条件的材料，执行进化并扣除材料
 }
+type C2S_2608 struct {
+	Head common.TomeeHeader `cmd:"2608" struc:"skip"`
+}