Merge remote-tracking branch 'origin/jiapu_aijiuyi' into dev

code/app对接接口说明.md

@@ -286,6 +286,7 @@ curl -X POST "http://localhost:18888/api/app/user/device/bind-by-code" \
   "message": "操作成功",
   "data": {
     "id": 192837466,
+    "deviceId": 1001,
     "userId": 123,
     "deviceCode": "AJY-0001",
     "deviceName": "艾灸椅一号",

code/backend/src/main/java/com/aijiuyi/admin/entity/UserDevice.java

@@ -17,6 +17,10 @@ public class UserDevice {
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
+    /** 设备主键ID（关联 device.id，非持久化字段，仅在接口返回时填充） */
+    @TableField(exist = false)
+    private Long deviceId;
+
     /** 所属子用户ID（关联 user_profile.id） */
     private Long userId;
 

code/backend/src/main/java/com/aijiuyi/admin/service/impl/UserDeviceServiceImpl.java

@@ -127,6 +127,8 @@ public class UserDeviceServiceImpl extends ServiceImpl<UserDeviceMapper, UserDev
 
         // 确保 user_device 记录存在（两种类型都需要）
         UserDevice userDevice = ensureUserDevice(profile, device);
+        // 补充设备主键ID，方便前端一次拿到 device.id，无需再查设备详情
+        userDevice.setDeviceId(device.getId());
 
         LogUtil.info(UserDeviceServiceImpl.class,
                 "App用户[{}]为账号档案[{}]绑定设备[{}](类型:{})",

code/backend/src/main/resources/application-dev.yml

@@ -15,10 +15,10 @@ spring:
 
   # ==================== Redis 配置 ====================
   redis:
-    host: 39.107.191.207
+    host: 117.72.153.201
     port: 6379
     # 密码（无密码留空，有密码填写）
-    password: bwy123$%^
+    password: 123456
     database: 0
     # 连接超时时间
     timeout: 10000ms