diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 7f241e4..80f11fd 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java index 5dcfec9..a651960 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java @@ -54,8 +54,7 @@ public class Constants /** * 维度健康成功标识 */ - public static final String SUCCESS_HEALTH = "0000"; - public static final String FAIL_HEALTH = "9001"; + /** * 失败标记 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index e0b9071..d3e056c 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index 400e098..66f9597 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 9b8484d..81bc32c 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java deleted file mode 100644 index 746fd64..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java +++ /dev/null @@ -1,40 +0,0 @@ -package doctor.controller; - -import com.baomidou.dynamic.datasource.annotation.DS; -import doctor.common.core.domain.R; -import doctor.domain.entity.DoctorUser; -import doctor.service.IDoctorUserService; -import doctor.system.api.domain.SysUser; -import doctor.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/doctor") -@DS("master") -public class SysDoctorController { - - @Autowired - private IDoctorUserService iDoctorUserService; - - @PostMapping("/getUser") - public R getUser(String email) { - DoctorUser user = iDoctorUserService.getUser(email); - LoginUser loginUser = new LoginUser(); - SysUser sysUser = new SysUser(); - sysUser.setUserId(Long.valueOf(user.getId())); - sysUser.setNickName(user.getNickName()); - sysUser.setUserName(user.getUserName()); - sysUser.setPhonenumber(user.getPhone()); - sysUser.setPassword(user.getPwd()); - if (user.getSex()==0){ - sysUser.setSex("男"); - }else { - sysUser.setSex("女"); - } - loginUser.setSysUser(sysUser); - return R.ok(loginUser); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index 088253f..f37475a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -1,5 +1,9 @@ package doctor.domain.entity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.Date; /** @@ -8,6 +12,9 @@ import java.util.Date; * @Author : FJJ * @Date: 2024-01-10 20:46 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class UserEntity { private Integer id; private String phone; @@ -24,139 +31,5 @@ public class UserEntity { private Date updateTime; private Long createTime; - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getPwd() { - return pwd; - } - - public void setPwd(String pwd) { - this.pwd = pwd; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getHeadPic() { - return headPic; - } - - public void setHeadPic(String headPic) { - this.headPic = headPic; - } - - public Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public Integer getAge() { - return age; - } - - public void setAge(Integer age) { - this.age = age; - } - -<<<<<<< HEAD - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { -======= - public Integer getHeight() { - return height; - } - - public void setHeight(Integer height) { - this.height = height; - } - - public Integer getWeight() { - return weight; - } - - public void setWeight(Integer weight) { ->>>>>>> 16030f8df7026b88eca021372724f5ad3641a7be - this.weight = weight; - } - - public String getInvitationCode() { - return invitationCode; - } - - public void setInvitationCode(String invitationCode) { - this.invitationCode = invitationCode; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - -<<<<<<< HEAD - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { -======= - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { ->>>>>>> 16030f8df7026b88eca021372724f5ad3641a7be - this.createTime = createTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java index 65faf6a..b11e957 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java @@ -27,94 +27,4 @@ public class VideoEntity { private Integer duration; private Integer price; private Long createTime; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Integer getCategoryId() { - return categoryId; - } - - public void setCategoryId(Integer categoryId) { - this.categoryId = categoryId; - } - - public String getShearUrl() { - return shearUrl; - } - - public void setShearUrl(String shearUrl) { - this.shearUrl = shearUrl; - } - - public String getAbstracts() { - return abstracts; - } - - public void setAbstracts(String abstracts) { - this.abstracts = abstracts; - } - - public String getOriginalUrl() { - return originalUrl; - } - - public void setOriginalUrl(String originalUrl) { - this.originalUrl = originalUrl; - } - - public Integer getDuration() { - return duration; - } - - public void setDuration(Integer duration) { - this.duration = duration; - } - - public Integer getPrice() { - return price; - } - - public void setPrice(Integer price) { - this.price = price; - } - - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { - this.createTime = createTime; - } - - public VideoEntity(Integer id, String title, Integer categoryId, String shearUrl, String abstracts, String originalUrl, Integer duration, Integer price, Long createTime) { - this.id = id; - this.title = title; - this.categoryId = categoryId; - this.shearUrl = shearUrl; - this.abstracts = abstracts; - this.originalUrl = originalUrl; - this.duration = duration; - this.price = price; - this.createTime = createTime; - } - - public VideoEntity() { - } - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date createTime; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java deleted file mode 100644 index 8d7f5e3..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package doctor.mapper; - -import doctor.domain.entity.DoctorUser; -import org.apache.ibatis.annotations.Param; -import org.mybatis.spring.annotation.MapperScan; - -@MapperScan -public interface IDoctorUserMapper { - DoctorUser selectDoctorUserByEmail(@Param("email") String email); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java deleted file mode 100644 index b967765..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java +++ /dev/null @@ -1,8 +0,0 @@ -package doctor.service; - -import doctor.domain.entity.DoctorUser; -import doctor.system.api.model.LoginUser; - -public interface IDoctorUserService { - DoctorUser getUser(String email); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java deleted file mode 100644 index 193c931..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package doctor.service.impl; - -import doctor.mapper.IDoctorUserMapper; -import doctor.domain.entity.DoctorUser; -import doctor.service.IDoctorUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class IDoctorUserServiceImpl implements IDoctorUserService { - @Autowired - private IDoctorUserMapper iDoctorUserMapper; - - @Override - public DoctorUser getUser(String email) { - DoctorUser doctorUser = iDoctorUserMapper.selectDoctorUserByEmail(email); - return doctorUser; - } -} diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 691386c..203e553 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml deleted file mode 100644 index 41b82ff..0000000 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 687623f..ab123c4 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 632b0bd..14e7505 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index f378a98..d94bf20 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置