diff --git a/sql/wfc_system_db/wfc_system_db.sql b/sql/wfc_system_db/wfc_system_db.sql index 222cfc7..2e200c6 100644 --- a/sql/wfc_system_db/wfc_system_db.sql +++ b/sql/wfc_system_db/wfc_system_db.sql @@ -184,6 +184,7 @@ CREATE TABLE `sys_job` ( INSERT INTO `sys_job` VALUES (1, '系统默认(无参)', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', '2024-05-08 21:50:55', '', NULL, ''); INSERT INTO `sys_job` VALUES (2, '系统默认(有参)', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', '2024-05-08 21:50:55', '', NULL, ''); INSERT INTO `sys_job` VALUES (3, '系统默认(多参)', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', '2024-05-08 21:50:55', '', NULL, ''); +INSERT INTO `sys_job` VALUES (4, '系统默认(无参)', 'DEFAULT', 'cdrInfoTask.addCdrInfo', '0/30 * * * * ?', '3', '1', '0', 'admin', '2024-05-08 21:50:55', '', NULL, ''); -- ---------------------------- -- Table structure for sys_job_log diff --git a/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/RemoteUUserService.java b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/RemoteUUserService.java index 854cd9c..4cae856 100644 --- a/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/RemoteUUserService.java +++ b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/RemoteUUserService.java @@ -82,6 +82,6 @@ public interface RemoteUUserService /** * */ - @GetMapping("/user/uClient/recordClientUser") + @GetMapping("/client/recordClientUser") public R recordClientUser(@RequestBody UClientBo clientBo); } diff --git a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java index adc0040..92a3f22 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java +++ b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java @@ -55,7 +55,7 @@ public class TokenController { userInfo.setWanFiRedirectParams(wanFiRedirectParams); // 记录设备所属用户信息 UClientBo uClientBo = UClientBo.builder().clientMac(wanFiRedirectParams.getClientMac()) - .userId(userInfo.getUserid()).build(); + .userId(userInfo.getUser().getUserId()).build(); remoteUUserService.recordClientUser(uClientBo); // 获取登录token return R.ok(tokenService.createToken(userInfo));