From a7cbc827c556ef1ef6b4e3994b34e197eee02759 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Thu, 11 Jan 2024 17:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/doctor/system/api/domain/User.java | 2 +- .../main/java/doctor/system/api/domain/UserVideoBuy.java | 2 +- .../java/doctor/system/api/domain/UserVideoCollection.java | 3 +-- .../src/main/java/doctor/system/api/domain/UserWallet.java | 2 +- .../src/main/java/doctor/system/api/domain/Video.java | 2 +- .../main/java/doctor/system/api/domain/VideoComment.java | 2 +- .../src/main/java/doctor/system/api/domain/VideoCount.java | 2 +- .../main/java/doctor/auth/service/HealthUserService.java | 7 ++++--- .../main/java/doctor/controller/HealthLoginController.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java index 6f0f2cb..3ed9ca3 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java @@ -1,4 +1,4 @@ -package doctor.domain.entity; +package doctor.system.api.domain; import org.springframework.format.annotation.DateTimeFormat; diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoBuy.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoBuy.java index 5903ee7..3e67b8c 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoBuy.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoBuy.java @@ -1,4 +1,4 @@ -package doctor.domain.entity; +package doctor.system.api.domain; /** * @ClassName : UserVideoBuy diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoCollection.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoCollection.java index b9ab680..f087ba6 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoCollection.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoCollection.java @@ -1,6 +1,5 @@ -package doctor.domain.entity; +package doctor.system.api.domain; -import io.swagger.models.auth.In; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserWallet.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserWallet.java index 1da779d..486cc7c 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserWallet.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserWallet.java @@ -1,4 +1,4 @@ -package doctor.domain.entity; +package doctor.system.api.domain; import org.springframework.format.annotation.DateTimeFormat; diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Video.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Video.java index a09e715..f4fc420 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Video.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Video.java @@ -1,4 +1,4 @@ -package doctor.domain.entity; +package doctor.system.api.domain; import org.springframework.format.annotation.DateTimeFormat; diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoComment.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoComment.java index 84db8bf..c472775 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoComment.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoComment.java @@ -1,4 +1,4 @@ -package doctor.domain.entity; +package doctor.system.api.domain; import org.springframework.format.annotation.DateTimeFormat; diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoCount.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoCount.java index c2e626c..a135252 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoCount.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoCount.java @@ -1,4 +1,4 @@ -package doctor.domain.entity; +package doctor.system.api.domain; import org.springframework.format.annotation.DateTimeFormat; diff --git a/doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java b/doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java index e087ba5..cb15bfb 100644 --- a/doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java +++ b/doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java @@ -32,7 +32,7 @@ public class HealthUserService { } catch (Exception e) { throw new RuntimeException(e); } - if (s.equals(data.getSysUser().getPassword())){ + if (s.equals(data.getUser().getPwd())){ Map token = tokenService.createToken(data); String accessToken = (String) token.get("access_token"); doctorUserVo.setSessionId(accessToken); @@ -44,8 +44,8 @@ public class HealthUserService { doctorUserVo.setJiGuangPwd(s); doctorUserVo.setHeadPic(data.getUser().getHeadPic()); doctorUserVo.setSex(data.getUser().getSex()); - doctorUserVo.setHeight(data.getUser().getHeight()); - doctorUserVo.setWeight(data.getUser().getWeight()); + doctorUserVo.setHeight(Integer.valueOf(data.getUser().getHeight())); + doctorUserVo.setWeight(Integer.valueOf(data.getUser().getWeight())); doctorUserVo.setFaceFlag(1); UUID uuid = UUID.randomUUID(); String inviteCode = uuid.toString().replaceAll("-", "").substring(0, 8); @@ -55,4 +55,5 @@ public class HealthUserService { } return null; } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthLoginController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthLoginController.java index ece2bf2..536b58c 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthLoginController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthLoginController.java @@ -3,9 +3,9 @@ package doctor.controller; import com.baomidou.dynamic.datasource.annotation.DS; import doctor.common.core.domain.R; import doctor.system.api.domain.Doctor; -import doctor.system.api.domain.User; import doctor.service.DoctorUserService; import doctor.system.api.domain.SysUser; +import doctor.system.api.domain.User; import doctor.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*;