cbx
/
Medical_Treatment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

jpz
fjj 2024-01-11 17:29:36 +08:00
parent 3e2f582a3e
commit a7cbc827c5
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java
View File

@ -1,4 +1,4 @@
package doctor.domain.entity;
package doctor.system.api.domain;
import org.springframework.format.annotation.DateTimeFormat;

2
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoBuy.java
View File

@ -1,4 +1,4 @@
package doctor.domain.entity;
package doctor.system.api.domain;
/**
* @ClassName : UserVideoBuy

3
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoCollection.java
View File

@ -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;

2
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserWallet.java
View File

@ -1,4 +1,4 @@
package doctor.domain.entity;
package doctor.system.api.domain;
import org.springframework.format.annotation.DateTimeFormat;

2
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Video.java
View File

@ -1,4 +1,4 @@
package doctor.domain.entity;
package doctor.system.api.domain;
import org.springframework.format.annotation.DateTimeFormat;

2
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoComment.java
View File

@ -1,4 +1,4 @@
package doctor.domain.entity;
package doctor.system.api.domain;
import org.springframework.format.annotation.DateTimeFormat;

2
doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoCount.java
View File

@ -1,4 +1,4 @@
package doctor.domain.entity;
package doctor.system.api.domain;
import org.springframework.format.annotation.DateTimeFormat;

7
doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java
View File

@ -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<String, Object> 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;
}
}

2
doctor-modules/doctor-health/src/main/java/doctor/controller/HealthLoginController.java
View File

@ -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.*;