From 08c2dacb77dc00bf4baf92b97e26a9fdf8fd3c68 Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Tue, 9 Jan 2024 22:31:00 +0800 Subject: [PATCH 1/5] zmy01 --- .../controller/HealthUserVideoController.java | 38 +++++++++++++++++++ .../doctor/entity/VideoCategoryEntity.java | 21 ++++++++++ .../doctor/entity/VideoCommentEntity.java | 22 +++++++++++ .../java/doctor/entity/VideoCountEntity.java | 23 +++++++++++ .../main/java/doctor/entity/VideoEntity.java | 26 +++++++++++++ .../doctor/mapper/HealthUserVideoMapper.java | 15 ++++++++ .../service/HealthUserVideoService.java | 14 +++++++ .../impl/HealthUserVideoServiceImpl.java | 27 +++++++++++++ .../mapper/HealthUserVideoMapper.xml | 14 +++++++ 9 files changed, 200 insertions(+) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java new file mode 100644 index 0000000..d43d6c8 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java @@ -0,0 +1,38 @@ +package doctor.controller; + + +import doctor.common.core.web.controller.BaseController; +import doctor.common.core.web.page.TableDataInfo; +import doctor.entity.VideoCategoryEntity; +import doctor.entity.VideoEntity; +import doctor.service.HealthUserVideoService; +import doctor.system.api.domain.SysUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/user/video/v1") +public class HealthUserVideoController extends BaseController { + @Autowired + private HealthUserVideoService healthUserVideoService; + + @GetMapping("/findVideoCategoryList") + public TableDataInfo findVideoCategoryList(VideoCategoryEntity entity){ + startPage(); + List List = healthUserVideoService.findVideoCategoryList(entity); + return getDataTable(List); + } + + @GetMapping("/findVideoVoList") + public TableDataInfo findVideoVoList(@RequestParam("categoryId") Integer categoryId){ + startPage(); + List List = healthUserVideoService.findVideoVoList(categoryId); + return getDataTable(List); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java new file mode 100644 index 0000000..ba2e6c8 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java @@ -0,0 +1,21 @@ +package doctor.entity; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoCategoryEntity { + private Integer id; + private String name; + @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/entity/VideoCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java new file mode 100644 index 0000000..952ce05 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java @@ -0,0 +1,22 @@ +package doctor.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoCommentEntity { + private Integer id; + private Integer userId; + private Integer videoId; + private String content; + @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/entity/VideoCountEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java new file mode 100644 index 0000000..9965c9f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java @@ -0,0 +1,23 @@ +package doctor.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoCountEntity { + private Integer id; + private Integer videoId; + private Integer buyNum; + private Integer collectionNum; + private Integer commentNum; + @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/entity/VideoEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java new file mode 100644 index 0000000..c7daafd --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java @@ -0,0 +1,26 @@ +package doctor.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoEntity { + private Integer id; + private String title; + private Integer categoryId; + private String shearUrl; + private String abstracts; + private String originalUrl; + private Integer duration; + private Integer price; + @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/HealthUserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java new file mode 100644 index 0000000..23b8b24 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java @@ -0,0 +1,15 @@ +package doctor.mapper; + + +import doctor.entity.VideoCategoryEntity; +import doctor.entity.VideoEntity; +import doctor.system.api.domain.SysUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface HealthUserVideoMapper { + List findVideoCategoryList(VideoCategoryEntity entity); + + List findVideoVoList(@Param("categoryId") Integer categoryId); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java new file mode 100644 index 0000000..f90a472 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java @@ -0,0 +1,14 @@ +package doctor.service; + + + +import doctor.entity.VideoCategoryEntity; +import doctor.entity.VideoEntity; + +import java.util.List; + +public interface HealthUserVideoService { + List findVideoCategoryList(VideoCategoryEntity entity); + + List findVideoVoList(Integer categoryId); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java new file mode 100644 index 0000000..6ed7e09 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java @@ -0,0 +1,27 @@ +package doctor.service.impl; + + +import doctor.entity.VideoCategoryEntity; +import doctor.entity.VideoEntity; +import doctor.mapper.HealthUserVideoMapper; +import doctor.service.HealthUserVideoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class HealthUserVideoServiceImpl implements HealthUserVideoService { + @Autowired + private HealthUserVideoMapper healthUserVideoMapper; + + @Override + public List findVideoCategoryList(VideoCategoryEntity entity) { + return healthUserVideoMapper.findVideoCategoryList(entity); + } + + @Override + public List findVideoVoList(Integer categoryId) { + return healthUserVideoMapper.findVideoVoList(categoryId); + } +} diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml new file mode 100644 index 0000000..3efe450 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + -- 2.40.1 From b37198b733a9b464e6028ef8a878fb425a744ee2 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Tue, 9 Jan 2024 22:34:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?auth=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doctor-api/doctor-api-system/pom.xml | 8 +- .../system/api/RemoteDoctorService.java | 16 +++ .../doctor/system/api/RemoteUserService.java | 8 +- .../factory/RemoteDoctorFallbackFactory.java | 15 ++ .../factory/RemoteUserFallbackFactory.java | 2 +- .../doctor/system/api/model/LoginUser.java | 3 + ...ot.autoconfigure.AutoConfiguration.imports | 1 + doctor-auth/pom.xml | 24 ++-- .../{auth => }/DoctorAuthApplication.java | 2 +- .../auth/controller/HealthController.java | 21 ++- .../java/doctor/auth/form/DoctorUserBody.java | 5 + .../doctor/auth/service/HealthService.java | 43 ++++++ .../main/java/doctor/auth/util/RSAUtils.java | 133 ++++++++++++++++++ .../main/java/doctor/auth/util/RsaKey.java | 20 +++ .../java/doctor/auth/vo/DoctorUserVo.java | 130 +++++++++++++++++ doctor-common/doctor-common-core/pom.xml | 5 +- .../core/constant/ServiceNameConstants.java | 3 +- .../controller/SysDoctorController.java | 40 ++++++ .../java/doctor/domain/entity/DoctorUser.java | 133 ++++++++++++++++++ .../java/doctor/mapper/IDoctorUserMapper.java | 10 ++ .../doctor/service/IDoctorUserService.java | 8 ++ .../service/impl/IDoctorUserServiceImpl.java | 19 +++ .../doctor/IDoctorUserServiceMapper.xml | 11 ++ doctor-modules/doctor-system/pom.xml | 28 ++-- 24 files changed, 645 insertions(+), 43 deletions(-) create mode 100644 doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteDoctorService.java create mode 100644 doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteDoctorFallbackFactory.java rename doctor-auth/src/main/java/doctor/{auth => }/DoctorAuthApplication.java (98%) create mode 100644 doctor-auth/src/main/java/doctor/auth/form/DoctorUserBody.java create mode 100644 doctor-auth/src/main/java/doctor/auth/util/RSAUtils.java create mode 100644 doctor-auth/src/main/java/doctor/auth/util/RsaKey.java create mode 100644 doctor-auth/src/main/java/doctor/auth/vo/DoctorUserVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml diff --git a/doctor-api/doctor-api-system/pom.xml b/doctor-api/doctor-api-system/pom.xml index cdc2f56..8e3aef1 100644 --- a/doctor-api/doctor-api-system/pom.xml +++ b/doctor-api/doctor-api-system/pom.xml @@ -8,7 +8,7 @@ 3.6.3 4.0.0 - + doctor-api-system @@ -16,13 +16,13 @@ - + doctor doctor-common-core - + - \ No newline at end of file + diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteDoctorService.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteDoctorService.java new file mode 100644 index 0000000..495cc8b --- /dev/null +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteDoctorService.java @@ -0,0 +1,16 @@ +package doctor.system.api; + +import doctor.common.core.constant.ServiceNameConstants; +import doctor.common.core.domain.R; +import doctor.system.api.factory.RemoteDoctorFallbackFactory; +import doctor.system.api.model.LoginUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient(contextId = "remoteDoctorService", value = ServiceNameConstants.FILE_DOCTOR, fallback = RemoteDoctorFallbackFactory.class) +public interface RemoteDoctorService { + + @PostMapping("/doctor/getUser") + R getDoctorUserInfo(@RequestParam("email") String email); +} diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteUserService.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteUserService.java index 9dfb85c..af7956e 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteUserService.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteUserService.java @@ -1,11 +1,7 @@ package doctor.system.api; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.*; import doctor.common.core.constant.SecurityConstants; import doctor.common.core.constant.ServiceNameConstants; import doctor.common.core.domain.R; @@ -15,7 +11,7 @@ import doctor.system.api.model.LoginUser; /** * 用户服务 - * + * * @author ruoyi */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteDoctorFallbackFactory.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteDoctorFallbackFactory.java new file mode 100644 index 0000000..5dd9347 --- /dev/null +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteDoctorFallbackFactory.java @@ -0,0 +1,15 @@ +package doctor.system.api.factory; + +import doctor.common.core.domain.R; +import doctor.system.api.RemoteDoctorService; +import doctor.system.api.model.LoginUser; +import org.springframework.stereotype.Component; + +@Component +public class RemoteDoctorFallbackFactory implements RemoteDoctorService { + + @Override + public R getDoctorUserInfo(String email) { + return R.fail("登录超时"); + } +} diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteUserFallbackFactory.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteUserFallbackFactory.java index a2826a4..d8d406c 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteUserFallbackFactory.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteUserFallbackFactory.java @@ -11,7 +11,7 @@ import doctor.system.api.model.LoginUser; /** * 用户服务降级处理 - * + * * @author ruoyi */ @Component diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/model/LoginUser.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/model/LoginUser.java index 9829ab1..32bc281 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/model/LoginUser.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/model/LoginUser.java @@ -2,6 +2,7 @@ package doctor.system.api.model; import java.io.Serializable; import java.util.Set; + import doctor.system.api.domain.SysUser; /** @@ -58,6 +59,7 @@ public class LoginUser implements Serializable */ private SysUser sysUser; + public String getToken() { return token; @@ -143,6 +145,7 @@ public class LoginUser implements Serializable return sysUser; } + public void setSysUser(SysUser sysUser) { this.sysUser = sysUser; diff --git a/doctor-api/doctor-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/doctor-api/doctor-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2213598..9f4d25b 100644 --- a/doctor-api/doctor-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/doctor-api/doctor-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,4 @@ doctor.system.api.factory.RemoteUserFallbackFactory doctor.system.api.factory.RemoteLogFallbackFactory doctor.system.api.factory.RemoteFileFallbackFactory +doctor.system.api.factory.RemoteDoctorFallbackFactory diff --git a/doctor-auth/pom.xml b/doctor-auth/pom.xml index ec697a0..c3b0a3e 100644 --- a/doctor-auth/pom.xml +++ b/doctor-auth/pom.xml @@ -7,53 +7,53 @@ 3.6.3 4.0.0 - + doctor-auth - + doctor-auth认证授权中心 - + - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-web - + org.springframework.boot spring-boot-starter-actuator - + doctor doctor-common-security - + - + ${project.artifactId} @@ -70,5 +70,5 @@ - + diff --git a/doctor-auth/src/main/java/doctor/auth/DoctorAuthApplication.java b/doctor-auth/src/main/java/doctor/DoctorAuthApplication.java similarity index 98% rename from doctor-auth/src/main/java/doctor/auth/DoctorAuthApplication.java rename to doctor-auth/src/main/java/doctor/DoctorAuthApplication.java index bde90a1..81acc94 100644 --- a/doctor-auth/src/main/java/doctor/auth/DoctorAuthApplication.java +++ b/doctor-auth/src/main/java/doctor/DoctorAuthApplication.java @@ -1,4 +1,4 @@ -package doctor.auth; +package doctor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java b/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java index e8432be..f85c60e 100644 --- a/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java +++ b/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java @@ -1,13 +1,30 @@ package doctor.auth.controller; import doctor.auth.service.HealthService; +import doctor.auth.vo.DoctorUserVo; +import doctor.common.core.domain.R; +import doctor.common.security.service.TokenService; +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.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController +@RequestMapping("/doctor/v1") public class HealthController { -// @Autowired -// private HealthService healthService; + + @Autowired + private HealthService healthService; + + @PostMapping("/login") + public R login(@RequestParam String email,String pwd) { + DoctorUserVo userInfo = healthService.login(email,pwd); + return R.ok(userInfo); + } } diff --git a/doctor-auth/src/main/java/doctor/auth/form/DoctorUserBody.java b/doctor-auth/src/main/java/doctor/auth/form/DoctorUserBody.java new file mode 100644 index 0000000..d0a3550 --- /dev/null +++ b/doctor-auth/src/main/java/doctor/auth/form/DoctorUserBody.java @@ -0,0 +1,5 @@ +package doctor.auth.form; + +public class DoctorUserBody { + +} diff --git a/doctor-auth/src/main/java/doctor/auth/service/HealthService.java b/doctor-auth/src/main/java/doctor/auth/service/HealthService.java index 2700339..0166629 100644 --- a/doctor-auth/src/main/java/doctor/auth/service/HealthService.java +++ b/doctor-auth/src/main/java/doctor/auth/service/HealthService.java @@ -1,4 +1,47 @@ package doctor.auth.service; +import doctor.auth.util.RSAUtils; +import doctor.auth.util.RsaKey; +import doctor.auth.vo.DoctorUserVo; +import doctor.common.core.domain.R; +import doctor.common.security.service.TokenService; +import doctor.system.api.RemoteDoctorService; +import doctor.system.api.model.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component public class HealthService { + @Autowired + private RemoteDoctorService remoteDoctorService; + @Autowired + private TokenService tokenService; + + public DoctorUserVo login(String email, String pwd) { + DoctorUserVo doctorUserVo = new DoctorUserVo(); + R userResult = remoteDoctorService.getDoctorUserInfo(email); + LoginUser data = userResult.getData(); + String s=""; + try { + s = RSAUtils.rsaDecrypt(pwd, RsaKey.PRIVATE_KEY); + } catch (Exception e) { + throw new RuntimeException(e); + } + Map token = tokenService.createToken(data); + String accessToken = (String) token.get("access_token"); + doctorUserVo.setSessionId(accessToken); + doctorUserVo.setEmail(data.getSysUser().getEmail()); + doctorUserVo.setUserId(data.getSysUser().getUserId().intValue()); + doctorUserVo.setUserName(data.getSysUser().getUserName()); + doctorUserVo.setNickName(data.getSysUser().getNickName()); + doctorUserVo.setJiGuangPwd(s); + if (data.getSysUser().getSex()=="男"){ + doctorUserVo.setSex(0); + }else { + doctorUserVo.setSex(1); + } + return doctorUserVo; + } } diff --git a/doctor-auth/src/main/java/doctor/auth/util/RSAUtils.java b/doctor-auth/src/main/java/doctor/auth/util/RSAUtils.java new file mode 100644 index 0000000..b6c65ad --- /dev/null +++ b/doctor-auth/src/main/java/doctor/auth/util/RSAUtils.java @@ -0,0 +1,133 @@ +package doctor.auth.util; +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import java.security.*; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.util.*; + + +/** + * RSA工具类 生成秘钥 加解密 + * @author : WangZhanpeng + * @date : 2024/1/9 15:13 + */ +public class RSAUtils { + + + private static Map keyMap = new HashMap(); + + public static void getKey() throws NoSuchAlgorithmException { + genKeyPair(); + System.out.println("公钥===:"+keyMap.get(0)); + System.out.println("私钥===:"+keyMap.get(1)); + } + /** + * 随机生成密钥对 + * + * @throws NoSuchAlgorithmException + */ + public static void genKeyPair() throws NoSuchAlgorithmException { + // KeyPairGenerator类用于生成公钥和私钥对，基于RSA算法生成对象 + KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("RSA"); + // 初始化密钥对生成器，密钥大小为96-1024位 + keyPairGen.initialize(1024, new SecureRandom()); + // 生成一个密钥对，保存在keyPair中 + KeyPair keyPair = keyPairGen.generateKeyPair(); + // 得到私钥 + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + // 得到公钥 + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + String publicKeyString = new String(Base64.encodeBase64(publicKey.getEncoded())); + // 得到私钥字符串 + String privateKeyString = new String(Base64.encodeBase64((privateKey.getEncoded()))); + // 将公钥和私钥保存到Map + //0表示公钥 + keyMap.put(0, publicKeyString); + //1表示私钥 + keyMap.put(1, privateKeyString); + } + + /** + * RSA私钥解密 + * @param str 解密字符串 + * @param privateKey 私钥 + * @return 明文 + */ + public static String rsaDecrypt(String str, String privateKey) throws Exception { + //base64编码的私钥 + byte[] decoded = Base64.decodeBase64(privateKey); + RSAPrivateKey priKey = (RSAPrivateKey) KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(decoded)); + //RSA解密 + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, priKey); + byte[] inputArray = Base64.decodeBase64(str.getBytes("UTF-8")); + int inputLength = inputArray.length; + // 最大加密字节数，超出最大字节数需要分组加密 + int MAX_ENCRYPT_BLOCK = 128; + // 标识 + int offSet = 0; + byte[] resultBytes = {}; + byte[] cache; + while (inputLength - offSet > 0) { + if (inputLength - offSet > MAX_ENCRYPT_BLOCK) { + cache = cipher.doFinal(inputArray, offSet, MAX_ENCRYPT_BLOCK); + offSet += MAX_ENCRYPT_BLOCK; + } else { + cache = cipher.doFinal(inputArray, offSet, inputLength - offSet); + offSet = inputLength; + } + resultBytes = Arrays.copyOf(resultBytes, resultBytes.length + cache.length); + System.arraycopy(cache, 0, resultBytes, resultBytes.length - cache.length, cache.length); + } + String outStr = new String(resultBytes); + return outStr; + } + + /** + * RSA公钥加密 + * @param input 需要加密的字符串 + * @param rsaPublicKey 公钥 + * @return 密文 + * @throws Exception 加密过程中的异常信息 + */ + public static List rsaEncrypt(String input, String rsaPublicKey) throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + String result = ""; + // 将Base64编码后的公钥转换成PublicKey对象 + byte[] buffer = Base64.decodeBase64(rsaPublicKey); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer); + PublicKey publicKey = keyFactory.generatePublic(keySpec); + // 加密 + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + byte[] inputArray = input.getBytes(); + int inputLength = inputArray.length; + System.out.println("加密字节数：" + inputLength); + // 最大加密字节数，超出最大字节数需要分组加密 + int MAX_ENCRYPT_BLOCK = 117; + // 标识 + int offSet = 0; + List results=new ArrayList<>(); + byte[] cache; + while (inputLength - offSet > 0) { + if (inputLength - offSet > MAX_ENCRYPT_BLOCK) { + cache = cipher.doFinal(inputArray, offSet, MAX_ENCRYPT_BLOCK); + offSet += MAX_ENCRYPT_BLOCK; + } else { + cache = cipher.doFinal(inputArray, offSet, inputLength - offSet); + offSet = inputLength; + } + results.add(Base64.encodeBase64String(cache)); + } + return results; + } + +} diff --git a/doctor-auth/src/main/java/doctor/auth/util/RsaKey.java b/doctor-auth/src/main/java/doctor/auth/util/RsaKey.java new file mode 100644 index 0000000..52d5f89 --- /dev/null +++ b/doctor-auth/src/main/java/doctor/auth/util/RsaKey.java @@ -0,0 +1,20 @@ +package doctor.auth.util; + +/** + * 存放RSA 公钥和私钥 + * @author : WangZhanpeng + * @date : 2024/1/9 15:49 + */ +public class RsaKey { + + /** + * 公钥 + */ + public static final String PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7xkwklONlHn8TGmTH6yyvv7Bv9AcxXgpkAhuPxpOCVHgkpGGJUJVc8JCMOAhmqI4zdJRqTJa1aOk1glcOaOWja28o6lqNzxn3X3fqdkcWoF/L9Znw1MSDK7oFeSsHqubc9wA2GKb4EFt2TWuaFB+dWfPUhFeJ1GoZhpjjgZLO9QIDAQAB"; + /** + * 私钥 + */ + public static final String PRIVATE_KEY = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALvGTCSU42UefxMaZMfrLK+/sG/0BzFeCmQCG4/Gk4JUeCSkYYlQlVzwkIw4CGaojjN0lGpMlrVo6TWCVw5o5aNrbyjqWo3PGfdfd+p2RxagX8v1mfDUxIMrugV5Kweq5tz3ADYYpvgQW3ZNa5oUH51Z89SEV4nUahmGmOOBks71AgMBAAECgYAQNJTts0vMtk0RQP3hoxJAOLLpdo4IXK1Y5DWsut6QKOoVf3pLd4DsfHZ9I3jWI0XievU0F1gKX/uAerc4ryTiR6dxHRyKQxhAamLCFqAgTd6GQf6nl7LlKJkHOKZ1/Un0l245zSLoUzNYxzLZhXfOX8lMNfnXpznfZV43nJJMIQJBAPEeKpEzK8/lEJCszBCXgAH75Qcwu+J/LjZFXChsEqx0ubbhg9orgwg+z5Z2uLXVbeScTkBIi+yY6Jd5RUbyhTsCQQDHXUUcylpo0vo9z/xMPTcd5m5UqTm6ZVacdnrkOQtGJJCKOLYTLhWGUPmE0s+cgn9/24H0H8FjOM/ta8tdTPmPAkEAyV5lNICk7WojzH/TqWOtb3q8yqWDtGR85qxEjCm96rNNSpPKt1ExjJhQbBvYpVuK/KshmwQ7f6wwTBjmp5rxcwJAVbJPAggtgr+l16ourmrl5VFm/bdcXDYxW8JGIxIuOXGAPBoSkf4OPJVUHHctzP3/Zmtp2hFIZKlIH6tlWG69GwJAUcnD0XMH8+h9mYUFdwgD0JtaEbeY3ofkO+RymFdcYO//ZjwnVWyGRIhi/lJ5URPiiDzt2MmX5G2a0NJPwP60Lg=="; + + +} diff --git a/doctor-auth/src/main/java/doctor/auth/vo/DoctorUserVo.java b/doctor-auth/src/main/java/doctor/auth/vo/DoctorUserVo.java new file mode 100644 index 0000000..fc6f292 --- /dev/null +++ b/doctor-auth/src/main/java/doctor/auth/vo/DoctorUserVo.java @@ -0,0 +1,130 @@ +package doctor.auth.vo; + +public class DoctorUserVo { + private Integer userId; + private String sessionId; + private String nickName; + private String userName; + private String jiGuangPwd; + private String headPic; + private Integer sex; + private Integer age; + private Integer height; + private Integer weight; + private String email; + private Integer whetherBingWeChat; + private String invitationCode; + private Integer faceFlag; + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getSessionId() { + return sessionId; + } + + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + 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 getJiGuangPwd() { + return jiGuangPwd; + } + + public void setJiGuangPwd(String jiGuangPwd) { + this.jiGuangPwd = jiGuangPwd; + } + + 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; + } + + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Integer getWhetherBingWeChat() { + return whetherBingWeChat; + } + + public void setWhetherBingWeChat(Integer whetherBingWeChat) { + this.whetherBingWeChat = whetherBingWeChat; + } + + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + + public Integer getFaceFlag() { + return faceFlag; + } + + public void setFaceFlag(Integer faceFlag) { + this.faceFlag = faceFlag; + } +} diff --git a/doctor-common/doctor-common-core/pom.xml b/doctor-common/doctor-common-core/pom.xml index a16ea3a..32f7577 100644 --- a/doctor-common/doctor-common-core/pom.xml +++ b/doctor-common/doctor-common-core/pom.xml @@ -10,7 +10,7 @@ 4.0.0 doctor-common-core - + doctor-common-core核心模块 @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-starter-openfeign - + org.springframework.cloud @@ -113,6 +113,7 @@ swagger-annotations + diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/ServiceNameConstants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/ServiceNameConstants.java index 4f2f846..229a55d 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/ServiceNameConstants.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/ServiceNameConstants.java @@ -2,7 +2,7 @@ package doctor.common.core.constant; /** * 服务名称 - * + * * @author ruoyi */ public class ServiceNameConstants @@ -21,4 +21,5 @@ public class ServiceNameConstants * 文件服务的serviceid */ public static final String FILE_SERVICE = "doctor-file"; + public static final String FILE_DOCTOR = "doctor-health"; } 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 new file mode 100644 index 0000000..6f9f27b --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java @@ -0,0 +1,40 @@ +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("slave") +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/DoctorUser.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.java new file mode 100644 index 0000000..acc8ce3 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.java @@ -0,0 +1,133 @@ +package doctor.domain.entity; + +import java.security.Timestamp; + +public class DoctorUser { + + private int id; + private String phone; + private String pwd; + private String email; + private String nickName; + private String userName; + private String headPic; + private int sex; + private int age; + private int height; + private int weight; + private String invitationCode; + private Timestamp updateTime; + private Timestamp createTime; + + public int getId() { + return id; + } + + public void setId(int 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 int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public int getHeight() { + return height; + } + + public void setHeight(int height) { + this.height = height; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } + + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + public Timestamp getCreateTime() { + return createTime; + } + + public void setCreateTime(Timestamp createTime) { + this.createTime = 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 new file mode 100644 index 0000000..8d7f5e3 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..b967765 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..193c931 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java @@ -0,0 +1,19 @@ +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/mapper/doctor/IDoctorUserServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml new file mode 100644 index 0000000..41b82ff --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/doctor-modules/doctor-system/pom.xml b/doctor-modules/doctor-system/pom.xml index b22571b..56b9211 100644 --- a/doctor-modules/doctor-system/pom.xml +++ b/doctor-modules/doctor-system/pom.xml @@ -8,70 +8,70 @@ 3.6.3 4.0.0 - + doctor-modules-system doctor-modules-system系统模块 - + - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-actuator - + io.springfox springfox-swagger-ui ${swagger.fox.version} - + com.mysql mysql-connector-j - + doctor doctor-common-datasource - + doctor doctor-common-datascope - + doctor doctor-common-log - + doctor @@ -96,5 +96,5 @@ - - \ No newline at end of file + + -- 2.40.1 From 4d51a66ed0f4d097ee7fda26c45be52b976add43 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 10 Jan 2024 11:35:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?auth=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/HealthController.java | 9 +- .../doctor/auth/service/HealthService.java | 29 ++-- .../common/core/constant/HealthConstants.java | 135 ++++++++++++++++++ .../doctor/common/core/domain/HealthR.java | 117 +++++++++++++++ .../controller/SysDoctorController.java | 2 +- 5 files changed, 276 insertions(+), 16 deletions(-) create mode 100644 doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/HealthConstants.java create mode 100644 doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java diff --git a/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java b/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java index f85c60e..1b42008 100644 --- a/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java +++ b/doctor-auth/src/main/java/doctor/auth/controller/HealthController.java @@ -2,6 +2,7 @@ package doctor.auth.controller; import doctor.auth.service.HealthService; import doctor.auth.vo.DoctorUserVo; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.common.security.service.TokenService; import doctor.system.api.model.LoginUser; @@ -21,9 +22,13 @@ public class HealthController { private HealthService healthService; @PostMapping("/login") - public R login(@RequestParam String email,String pwd) { + public HealthR login(@RequestParam String email, @RequestParam String pwd) { DoctorUserVo userInfo = healthService.login(email,pwd); - return R.ok(userInfo); + if (userInfo!=null){ + return HealthR.ok(userInfo); + }else { + return HealthR.fail(); + } } diff --git a/doctor-auth/src/main/java/doctor/auth/service/HealthService.java b/doctor-auth/src/main/java/doctor/auth/service/HealthService.java index 0166629..e9a13e6 100644 --- a/doctor-auth/src/main/java/doctor/auth/service/HealthService.java +++ b/doctor-auth/src/main/java/doctor/auth/service/HealthService.java @@ -29,19 +29,22 @@ public class HealthService { } catch (Exception e) { throw new RuntimeException(e); } - Map token = tokenService.createToken(data); - String accessToken = (String) token.get("access_token"); - doctorUserVo.setSessionId(accessToken); - doctorUserVo.setEmail(data.getSysUser().getEmail()); - doctorUserVo.setUserId(data.getSysUser().getUserId().intValue()); - doctorUserVo.setUserName(data.getSysUser().getUserName()); - doctorUserVo.setNickName(data.getSysUser().getNickName()); - doctorUserVo.setJiGuangPwd(s); - if (data.getSysUser().getSex()=="男"){ - doctorUserVo.setSex(0); - }else { - doctorUserVo.setSex(1); + if (s.equals(data.getSysUser().getPassword())){ + Map token = tokenService.createToken(data); + String accessToken = (String) token.get("access_token"); + doctorUserVo.setSessionId(accessToken); + doctorUserVo.setEmail(data.getSysUser().getEmail()); + doctorUserVo.setUserId(data.getSysUser().getUserId().intValue()); + doctorUserVo.setUserName(data.getSysUser().getUserName()); + doctorUserVo.setNickName(data.getSysUser().getNickName()); + doctorUserVo.setJiGuangPwd(s); + if (data.getSysUser().getSex()=="男"){ + doctorUserVo.setSex(0); + }else { + doctorUserVo.setSex(1); + } + return doctorUserVo; } - return doctorUserVo; + return null; } } diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/HealthConstants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/HealthConstants.java new file mode 100644 index 0000000..bfbbeb1 --- /dev/null +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/HealthConstants.java @@ -0,0 +1,135 @@ +package doctor.common.core.constant; + +/** + * 通用常量信息 + * + * @author ruoyi + */ +public class HealthConstants +{ + /** + * UTF-8 字符集 + */ + public static final String UTF8 = "UTF-8"; + + /** + * GBK 字符集 + */ + public static final String GBK = "GBK"; + + /** + * www主域 + */ + public static final String WWW = "www."; + + /** + * RMI 远程方法调用 + */ + public static final String LOOKUP_RMI = "rmi:"; + + /** + * LDAP 远程方法调用 + */ + public static final String LOOKUP_LDAP = "ldap:"; + + /** + * LDAPS 远程方法调用 + */ + public static final String LOOKUP_LDAPS = "ldaps:"; + + /** + * http请求 + */ + public static final String HTTP = "http://"; + + /** + * https请求 + */ + public static final String HTTPS = "https://"; + + /** + * 成功标记 + */ + public static final String SUCCESS = "0000"; + + /** + * 失败标记 + */ + public static final String FAIL = "9999"; + + /** + * 登录成功状态 + */ + public static final String LOGIN_SUCCESS_STATUS = "0"; + + /** + * 登录失败状态 + */ + public static final String LOGIN_FAIL_STATUS = "1"; + + /** + * 登录成功 + */ + public static final String LOGIN_SUCCESS = "Success"; + + /** + * 注销 + */ + public static final String LOGOUT = "Logout"; + + /** + * 注册 + */ + public static final String REGISTER = "Register"; + + /** + * 登录失败 + */ + public static final String LOGIN_FAIL = "Error"; + + /** + * 当前记录起始索引 + */ + public static final String PAGE_NUM = "pageNum"; + + /** + * 每页显示记录数 + */ + public static final String PAGE_SIZE = "pageSize"; + + /** + * 排序列 + */ + public static final String ORDER_BY_COLUMN = "orderByColumn"; + + /** + * 排序的方向 "desc" 或者 "asc". + */ + public static final String IS_ASC = "isAsc"; + + /** + * 验证码有效期（分钟） + */ + public static final long CAPTCHA_EXPIRATION = 2; + + /** + * 资源映射路径 前缀 + */ + public static final String RESOURCE_PREFIX = "/profile"; + + /** + * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） + */ + public static final String[] JSON_WHITELIST_STR = { "org.springframework", "doctor" }; + + /** + * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） + */ + public static final String[] JOB_WHITELIST_STR = { "doctor" }; + + /** + * 定时任务违规的字符 + */ + public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "doctor.common.core.utils.file" }; +} diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java new file mode 100644 index 0000000..b15d23e --- /dev/null +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java @@ -0,0 +1,117 @@ +package doctor.common.core.domain; + +import doctor.common.core.constant.Constants; +import doctor.common.core.constant.HealthConstants; + +import java.io.Serializable; + +/** + * 响应信息主体 + * + * @author ruoyi + */ +public class HealthR implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 成功 */ + public static final String SUCCESS = HealthConstants.SUCCESS; + + /** 失败 */ + public static final String FAIL = HealthConstants.FAIL; + + private String message; + + private String status; + + private T result; + + public static HealthR ok() + { + return restResult(null,SUCCESS, null); + } + + public static HealthR ok(T result) + { + return restResult(result,SUCCESS, null); + } + + public static HealthR ok(T result, String message) + { + return restResult(result, SUCCESS, message); + } + + public static HealthR fail() + { + return restResult(null,FAIL, null); + } + + public static HealthR fail(String message) + { + return restResult(null, FAIL, message); + } + + public static HealthR fail(T result) + { + return restResult(result,FAIL, null); + } + + public static HealthR fail(T result, String message) + { + return restResult(result,FAIL, message); + } + + public static HealthR fail(String status, String message) + { + return restResult(null, status, message); + } + + private static HealthR restResult(T result, String status, String message) + { + HealthR apiResult = new HealthR<>(); + apiResult.setStatus(status); + apiResult.setResult(result); + apiResult.setMessage(message); + return apiResult; + } + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public T getResult() + { + return result; + } + + public void setResult(T result) + { + this.result = result; + } + + public static Boolean isError(HealthR ret) + { + return !isSuccess(ret); + } + + public static Boolean isSuccess(HealthR ret) + { + return HealthR.SUCCESS .equals(ret.getStatus()) ; + } +} 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 index 6f9f27b..746fd64 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/doctor") -@DS("slave") +@DS("master") public class SysDoctorController { @Autowired -- 2.40.1 From e1e029d11e1554fe459ab0e65a42c17a635be9f7 Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Wed, 10 Jan 2024 22:05:24 +0800 Subject: [PATCH 4/5] zmy02 --- doctor-modules/doctor-health/pom.xml | 4 ++++ .../doctor/controller/HealthUserVideoController.java | 9 ++++----- .../doctor/{ => domain}/entity/VideoCategoryEntity.java | 2 +- .../doctor/{ => domain}/entity/VideoCommentEntity.java | 2 +- .../doctor/{ => domain}/entity/VideoCountEntity.java | 2 +- .../java/doctor/{ => domain}/entity/VideoEntity.java | 5 ++++- .../main/java/doctor/mapper/HealthUserVideoMapper.java | 7 +++---- .../main/java/doctor/service/HealthUserVideoService.java | 6 +++--- .../doctor/service/impl/HealthUserVideoServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/HealthUserVideoMapper.xml | 4 ++-- 10 files changed, 27 insertions(+), 22 deletions(-) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/VideoCategoryEntity.java (94%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/VideoCommentEntity.java (94%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/VideoCountEntity.java (95%) rename doctor-modules/doctor-health/src/main/java/doctor/{ => domain}/entity/VideoEntity.java (84%) diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml index d9360ce..08360fd 100644 --- a/doctor-modules/doctor-health/pom.xml +++ b/doctor-modules/doctor-health/pom.xml @@ -74,6 +74,10 @@ doctor doctor-common-swagger + + org.projectlombok + lombok + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java index d43d6c8..2c6c474 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java @@ -3,10 +3,9 @@ package doctor.controller; import doctor.common.core.web.controller.BaseController; import doctor.common.core.web.page.TableDataInfo; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import doctor.service.HealthUserVideoService; -import doctor.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,9 +21,9 @@ public class HealthUserVideoController extends BaseController { private HealthUserVideoService healthUserVideoService; @GetMapping("/findVideoCategoryList") - public TableDataInfo findVideoCategoryList(VideoCategoryEntity entity){ + public TableDataInfo findVideoCategoryList(){ startPage(); - List List = healthUserVideoService.findVideoCategoryList(entity); + List List = healthUserVideoService.findVideoCategoryList(); return getDataTable(List); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCategoryEntity.java similarity index 94% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCategoryEntity.java index ba2e6c8..903c042 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCategoryEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCategoryEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java similarity index 94% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java index 952ce05..cf35c5a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java similarity index 95% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java index 9965c9f..6393a84 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoCountEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java similarity index 84% rename from doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java index c7daafd..c6579f7 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/VideoEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java @@ -1,4 +1,4 @@ -package doctor.entity; +package doctor.domain.entity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -19,6 +19,9 @@ public class VideoEntity { private String abstracts; private String originalUrl; private Integer duration; + private Integer whetherCollection; + private Integer whetherBuy; + private Integer buyNum; private Integer price; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java index 23b8b24..082c162 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java @@ -1,15 +1,14 @@ package doctor.mapper; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; -import doctor.system.api.domain.SysUser; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import org.apache.ibatis.annotations.Param; import java.util.List; public interface HealthUserVideoMapper { - List findVideoCategoryList(VideoCategoryEntity entity); + List findVideoCategoryList(); List findVideoVoList(@Param("categoryId") Integer categoryId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java index f90a472..a1f7375 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java @@ -2,13 +2,13 @@ package doctor.service; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import java.util.List; public interface HealthUserVideoService { - List findVideoCategoryList(VideoCategoryEntity entity); + List findVideoCategoryList(); List findVideoVoList(Integer categoryId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java index 6ed7e09..f4c1147 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java @@ -1,8 +1,8 @@ package doctor.service.impl; -import doctor.entity.VideoCategoryEntity; -import doctor.entity.VideoEntity; +import doctor.domain.entity.VideoCategoryEntity; +import doctor.domain.entity.VideoEntity; import doctor.mapper.HealthUserVideoMapper; import doctor.service.HealthUserVideoService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +16,8 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService { private HealthUserVideoMapper healthUserVideoMapper; @Override - public List findVideoCategoryList(VideoCategoryEntity entity) { - return healthUserVideoMapper.findVideoCategoryList(entity); + public List findVideoCategoryList() { + return healthUserVideoMapper.findVideoCategoryList(); } @Override diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml index 3efe450..25c0127 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/HealthUserVideoMapper.xml @@ -5,10 +5,10 @@ - select * from video_category - select * from video where category_id=#{categoryId} -- 2.40.1 From 8804ae80bb82b148f681a1a97c8d70dcf71eeaf6 Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Thu, 11 Jan 2024 19:35:46 +0800 Subject: [PATCH 5/5] zmy03 --- doctor-auth/src/main/resources/bootstrap.yml | 4 +- .../common/core/constant/Constants.java | 12 +++- .../doctor/common/core/domain/HealthR.java | 57 +++++++++---------- .../core/web/controller/BaseController.java | 10 ++-- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../doctor/gen/controller/GenController.java | 6 +- .../src/main/resources/bootstrap.yml | 4 +- .../main/resources/vm/java/controller.java.vm | 5 +- .../controller/HealthUserVideoController.java | 29 +++++----- .../main/java/doctor/domain/dto/VideoDto.java | 14 +++++ .../doctor/domain/entity/VideoEntity.java | 3 - .../doctor/domain/vo/VideoCategoryVo.java | 13 +++++ .../main/java/doctor/domain/vo/VideoVo.java | 23 ++++++++ .../doctor/mapper/HealthUserVideoMapper.java | 4 +- .../service/HealthUserVideoService.java | 7 ++- .../impl/HealthUserVideoServiceImpl.java | 18 ++++-- .../main/java/doctor/util/ConvertUtil.java | 53 +++++++++++++++++ .../src/main/resources/bootstrap.yml | 4 +- .../job/controller/SysJobController.java | 4 +- .../job/controller/SysJobLogController.java | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../controller/SysConfigController.java | 4 +- .../controller/SysDictDataController.java | 6 +- .../controller/SysDictTypeController.java | 4 +- .../controller/SysLogininforController.java | 4 +- .../controller/SysNoticeController.java | 4 +- .../controller/SysOperlogController.java | 4 +- .../system/controller/SysPostController.java | 4 +- .../system/controller/SysRoleController.java | 8 +-- .../system/controller/SysUserController.java | 6 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 33 files changed, 231 insertions(+), 107 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCategoryVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/util/ConvertUtil.java diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index c30cba2..343a2f2 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 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 9554ee4..30c56fd 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 @@ -2,7 +2,7 @@ package doctor.common.core.constant; /** * 通用常量信息 - * + * * @author ruoyi */ public class Constants @@ -57,6 +57,16 @@ public class Constants */ public static final Integer FAIL = 500; + /** + * 成功标记 + */ + public static final String SUCCESS_HEALTH = "0000"; + + /** + * 失败标记 + */ + public static final String FAIL_HEALTH = "9001"; + /** * 登录成功状态 */ diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java index b15d23e..64b5893 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java @@ -1,7 +1,8 @@ package doctor.common.core.domain; + + import doctor.common.core.constant.Constants; -import doctor.common.core.constant.HealthConstants; import java.io.Serializable; @@ -15,25 +16,25 @@ public class HealthR implements Serializable private static final long serialVersionUID = 1L; /** 成功 */ - public static final String SUCCESS = HealthConstants.SUCCESS; + public static final String SUCCESS = Constants.SUCCESS_HEALTH; /** 失败 */ - public static final String FAIL = HealthConstants.FAIL; - - private String message; + public static final String FAIL = Constants.FAIL_HEALTH; private String status; + private String message; + private T result; public static HealthR ok() { - return restResult(null,SUCCESS, null); + return restResult(null, SUCCESS, null); } public static HealthR ok(T result) { - return restResult(result,SUCCESS, null); + return restResult(result, SUCCESS, null); } public static HealthR ok(T result, String message) @@ -43,7 +44,7 @@ public class HealthR implements Serializable public static HealthR fail() { - return restResult(null,FAIL, null); + return restResult(null, FAIL, null); } public static HealthR fail(String message) @@ -53,12 +54,12 @@ public class HealthR implements Serializable public static HealthR fail(T result) { - return restResult(result,FAIL, null); + return restResult(result, FAIL, null); } public static HealthR fail(T result, String message) { - return restResult(result,FAIL, message); + return restResult(result, FAIL, message); } public static HealthR fail(String status, String message) @@ -69,39 +70,33 @@ public class HealthR implements Serializable private static HealthR restResult(T result, String status, String message) { HealthR apiResult = new HealthR<>(); - apiResult.setStatus(status); apiResult.setResult(result); apiResult.setMessage(message); + apiResult.setStatus(status); return apiResult; } - public String getMessage() - { - return message; - } - - public void setMessage(String message) - { - this.message = message; - } - - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public T getResult() - { + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public T getResult() { return result; } - public void setResult(T result) - { + public void setResult(T result) { this.result = result; } @@ -112,6 +107,8 @@ public class HealthR implements Serializable public static Boolean isSuccess(HealthR ret) { - return HealthR.SUCCESS .equals(ret.getStatus()) ; + return HealthR.SUCCESS == ret.getStatus(); } + + } diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java index 40cc094..c120f73 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java @@ -16,7 +16,7 @@ import doctor.common.core.web.page.TableDataInfo; /** * web层通用数据处理 - * + * * @author ruoyi */ public class BaseController @@ -43,9 +43,9 @@ public class BaseController /** * 设置请求分页数据 */ - protected void startPage() + protected void startPage(Integer page, Integer count) { - PageUtils.startPage(); + PageUtils.startPage(page,count); } /** @@ -120,7 +120,7 @@ public class BaseController /** * 响应返回结果 - * + * * @param rows 影响行数 * @return 操作结果 */ @@ -131,7 +131,7 @@ public class BaseController /** * 响应返回结果 - * + * * @param result 结果 * @return 操作结果 */ diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index cc0e562..2eaa492 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 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 c992149..0ecdb89 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/java/doctor/gen/controller/GenController.java b/doctor-modules/doctor-gen/src/main/java/doctor/gen/controller/GenController.java index 2594b3f..cd3d73e 100644 --- a/doctor-modules/doctor-gen/src/main/java/doctor/gen/controller/GenController.java +++ b/doctor-modules/doctor-gen/src/main/java/doctor/gen/controller/GenController.java @@ -30,7 +30,7 @@ import doctor.gen.service.IGenTableService; /** * 代码生成 操作处理 - * + * * @author ruoyi */ @RequestMapping("/gen") @@ -50,7 +50,7 @@ public class GenController extends BaseController @GetMapping("/list") public TableDataInfo genList(GenTable genTable) { - startPage(); + startPage(page, count); List list = genTableService.selectGenTableList(genTable); return getDataTable(list); } @@ -79,7 +79,7 @@ public class GenController extends BaseController @GetMapping("/db/list") public TableDataInfo dataList(GenTable genTable) { - startPage(); + startPage(page, count); List list = genTableService.selectDbTableList(genTable); return getDataTable(list); } diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 007713f..823a6a8 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/vm/java/controller.java.vm b/doctor-modules/doctor-gen/src/main/resources/vm/java/controller.java.vm index ff7baeb..c88e18d 100644 --- a/doctor-modules/doctor-gen/src/main/resources/vm/java/controller.java.vm +++ b/doctor-modules/doctor-gen/src/main/resources/vm/java/controller.java.vm @@ -1,7 +1,6 @@ package ${packageName}.controller; import java.util.List; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -27,7 +26,7 @@ import doctor.common.core.web.page.TableDataInfo; /** * ${functionName}Controller - * + * * @author ${author} * @date ${datetime} */ @@ -46,7 +45,7 @@ public class ${ClassName}Controller extends BaseController #if($table.crud || $table.sub) public TableDataInfo list(${ClassName} ${className}) { - startPage(); + startPage(page, count); List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return getDataTable(list); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java index 2c6c474..f3311e7 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java @@ -1,37 +1,40 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.web.controller.BaseController; import doctor.common.core.web.page.TableDataInfo; +import doctor.domain.dto.VideoDto; import doctor.domain.entity.VideoCategoryEntity; import doctor.domain.entity.VideoEntity; +import doctor.domain.vo.VideoCategoryVo; +import doctor.domain.vo.VideoVo; import doctor.service.HealthUserVideoService; +import doctor.util.ConvertUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import static com.github.pagehelper.page.PageMethod.startPage; + @RestController @RequestMapping("/user/video/v1") -public class HealthUserVideoController extends BaseController { +public class HealthUserVideoController{ @Autowired private HealthUserVideoService healthUserVideoService; @GetMapping("/findVideoCategoryList") - public TableDataInfo findVideoCategoryList(){ - startPage(); - List List = healthUserVideoService.findVideoCategoryList(); - return getDataTable(List); + public HealthR> findVideoCategoryList(){ + List List = healthUserVideoService.findVideoCategoryList(); + return HealthR.ok(List); } @GetMapping("/findVideoVoList") - public TableDataInfo findVideoVoList(@RequestParam("categoryId") Integer categoryId){ - startPage(); - List List = healthUserVideoService.findVideoVoList(categoryId); - return getDataTable(List); + public HealthR> findVideoVoList(@RequestBody VideoDto videoDto){ + startPage(videoDto.getPage(), videoDto.getCount()); + List List = healthUserVideoService.findVideoVoList(videoDto); + return HealthR.ok(List); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java new file mode 100644 index 0000000..3ed0734 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java @@ -0,0 +1,14 @@ +package doctor.domain.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoDto { + private Integer categoryId; + private Integer page=1; + private Integer count=1; +} 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 c6579f7..4c120a2 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 @@ -19,9 +19,6 @@ public class VideoEntity { private String abstracts; private String originalUrl; private Integer duration; - private Integer whetherCollection; - private Integer whetherBuy; - private Integer buyNum; private Integer price; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCategoryVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCategoryVo.java new file mode 100644 index 0000000..3e74d75 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCategoryVo.java @@ -0,0 +1,13 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoCategoryVo { + private Integer id; + private String name; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoVo.java new file mode 100644 index 0000000..81fc60b --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoVo.java @@ -0,0 +1,23 @@ +package doctor.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class VideoVo { + + private Integer id; + private Integer categoryId; + private String title; + private String shearUrl; + private String abstracts; + private String originalUrl; + private Integer price; + private Integer duration; + private Integer whetherCollection; + private Integer whetherBuy; + private Integer buyNum; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java index 082c162..bba93fb 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java @@ -1,8 +1,10 @@ package doctor.mapper; +import doctor.domain.dto.VideoDto; import doctor.domain.entity.VideoCategoryEntity; import doctor.domain.entity.VideoEntity; +import doctor.domain.vo.VideoCategoryVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,5 +12,5 @@ import java.util.List; public interface HealthUserVideoMapper { List findVideoCategoryList(); - List findVideoVoList(@Param("categoryId") Integer categoryId); + List findVideoVoList(VideoDto videoDto); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java index a1f7375..5540cce 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java @@ -2,13 +2,16 @@ package doctor.service; +import doctor.domain.dto.VideoDto; import doctor.domain.entity.VideoCategoryEntity; import doctor.domain.entity.VideoEntity; +import doctor.domain.vo.VideoCategoryVo; +import doctor.domain.vo.VideoVo; import java.util.List; public interface HealthUserVideoService { - List findVideoCategoryList(); + List findVideoCategoryList(); - List findVideoVoList(Integer categoryId); + List findVideoVoList(VideoDto videoDto); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java index f4c1147..49236b6 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java @@ -1,10 +1,15 @@ package doctor.service.impl; +import doctor.domain.dto.VideoDto; import doctor.domain.entity.VideoCategoryEntity; import doctor.domain.entity.VideoEntity; +import doctor.domain.vo.VideoCategoryVo; +import doctor.domain.vo.VideoVo; import doctor.mapper.HealthUserVideoMapper; import doctor.service.HealthUserVideoService; +import doctor.util.ConvertUtil; +import io.netty.util.internal.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,12 +21,17 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService { private HealthUserVideoMapper healthUserVideoMapper; @Override - public List findVideoCategoryList() { - return healthUserVideoMapper.findVideoCategoryList(); + public List findVideoCategoryList() { + + List videoCategoryList =healthUserVideoMapper.findVideoCategoryList(); + List videoCategoryVos = ConvertUtil.entityToVoList(videoCategoryList, VideoCategoryVo.class); + return videoCategoryVos; } @Override - public List findVideoVoList(Integer categoryId) { - return healthUserVideoMapper.findVideoVoList(categoryId); + public List findVideoVoList(VideoDto videoDto) { + List videoVoList = healthUserVideoMapper.findVideoVoList(videoDto); + List videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class); + return videoVos; } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/util/ConvertUtil.java b/doctor-modules/doctor-health/src/main/java/doctor/util/ConvertUtil.java new file mode 100644 index 0000000..16bda75 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/util/ConvertUtil.java @@ -0,0 +1,53 @@ +package doctor.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + + +/** + * @Author ifredom + * @Description 类型转换: Entity - Vo转换 + * @Date 2022/5/10 15:59 + * @Param [params] + **/ +public class ConvertUtil { + public static final Logger logger = LoggerFactory.getLogger(ConvertUtil.class); + + public static T entityToVo(Object source, Class target) { + if (source == null) { + return null; + } + T targetObject = null; + try { + targetObject = target.newInstance(); + BeanUtils.copyProperties(source, targetObject); + } catch (Exception e) { + e.printStackTrace(); + } + return targetObject; + } + + public static List entityToVoList(Collection sourceList, Class target) { + if (sourceList == null) { + return null; + } + List targetList = new ArrayList<>(sourceList.size()); + + try { + for (Object source : sourceList) { + T targetObject = target.newInstance(); + BeanUtils.copyProperties(source, targetObject); + targetList.add(targetObject); + } + } catch (Exception e) { + logger.error("convert error ", e); + } + return targetList; + } +} + diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 31e3ecc..205fb38 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobController.java b/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobController.java index d46226a..510596f 100644 --- a/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobController.java +++ b/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobController.java @@ -30,7 +30,7 @@ import doctor.job.util.ScheduleUtils; /** * 调度任务信息操作处理 - * + * * @author ruoyi */ @RestController @@ -47,7 +47,7 @@ public class SysJobController extends BaseController @GetMapping("/list") public TableDataInfo list(SysJob sysJob) { - startPage(); + startPage(page, count); List list = jobService.selectJobList(sysJob); return getDataTable(list); } diff --git a/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobLogController.java b/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobLogController.java index f14d447..5f3c276 100644 --- a/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobLogController.java +++ b/doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobLogController.java @@ -21,7 +21,7 @@ import doctor.job.service.ISysJobLogService; /** * 调度日志操作处理 - * + * * @author ruoyi */ @RestController @@ -38,7 +38,7 @@ public class SysJobLogController extends BaseController @GetMapping("/list") public TableDataInfo list(SysJobLog sysJobLog) { - startPage(); + startPage(page, count); List list = jobLogService.selectJobLogList(sysJobLog); return getDataTable(list); } diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 537c5d6..0bffaa1 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysConfigController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysConfigController.java index 5609697..7d3a031 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysConfigController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysConfigController.java @@ -25,7 +25,7 @@ import doctor.system.service.ISysConfigService; /** * 参数配置 信息操作处理 - * + * * @author ruoyi */ @RestController @@ -42,7 +42,7 @@ public class SysConfigController extends BaseController @GetMapping("/list") public TableDataInfo list(SysConfig config) { - startPage(); + startPage(page, count); List list = configService.selectConfigList(config); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictDataController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictDataController.java index 2a55c84..c0b9cac 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictDataController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictDataController.java @@ -28,7 +28,7 @@ import doctor.system.service.ISysDictTypeService; /** * 数据字典信息 - * + * * @author ruoyi */ @RestController @@ -37,7 +37,7 @@ public class SysDictDataController extends BaseController { @Autowired private ISysDictDataService dictDataService; - + @Autowired private ISysDictTypeService dictTypeService; @@ -45,7 +45,7 @@ public class SysDictDataController extends BaseController @GetMapping("/list") public TableDataInfo list(SysDictData dictData) { - startPage(); + startPage(page, count); List list = dictDataService.selectDictDataList(dictData); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictTypeController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictTypeController.java index 626c35d..0fcc048 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictTypeController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictTypeController.java @@ -25,7 +25,7 @@ import doctor.system.service.ISysDictTypeService; /** * 数据字典信息 - * + * * @author ruoyi */ @RestController @@ -39,7 +39,7 @@ public class SysDictTypeController extends BaseController @GetMapping("/list") public TableDataInfo list(SysDictType dictType) { - startPage(); + startPage(page, count); List list = dictTypeService.selectDictTypeList(dictType); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysLogininforController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysLogininforController.java index 910777a..640b73d 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysLogininforController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysLogininforController.java @@ -25,7 +25,7 @@ import doctor.system.service.ISysLogininforService; /** * 系统访问记录 - * + * * @author ruoyi */ @RestController @@ -42,7 +42,7 @@ public class SysLogininforController extends BaseController @GetMapping("/list") public TableDataInfo list(SysLogininfor logininfor) { - startPage(); + startPage(page, count); List list = logininforService.selectLogininforList(logininfor); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysNoticeController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysNoticeController.java index ff0f974..94e6472 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysNoticeController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysNoticeController.java @@ -23,7 +23,7 @@ import doctor.system.service.ISysNoticeService; /** * 公告 信息操作处理 - * + * * @author ruoyi */ @RestController @@ -40,7 +40,7 @@ public class SysNoticeController extends BaseController @GetMapping("/list") public TableDataInfo list(SysNotice notice) { - startPage(); + startPage(page, count); List list = noticeService.selectNoticeList(notice); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysOperlogController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysOperlogController.java index d92e73d..590417a 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysOperlogController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysOperlogController.java @@ -23,7 +23,7 @@ import doctor.system.service.ISysOperLogService; /** * 操作日志记录 - * + * * @author ruoyi */ @RestController @@ -37,7 +37,7 @@ public class SysOperlogController extends BaseController @GetMapping("/list") public TableDataInfo list(SysOperLog operLog) { - startPage(); + startPage(page, count); List list = operLogService.selectOperLogList(operLog); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysPostController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysPostController.java index 8d42c0f..5b1916d 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysPostController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysPostController.java @@ -25,7 +25,7 @@ import doctor.system.service.ISysPostService; /** * 岗位信息操作处理 - * + * * @author ruoyi */ @RestController @@ -42,7 +42,7 @@ public class SysPostController extends BaseController @GetMapping("/list") public TableDataInfo list(SysPost post) { - startPage(); + startPage(page, count); List list = postService.selectPostList(post); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysRoleController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysRoleController.java index 1d1748d..282560b 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysRoleController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysRoleController.java @@ -30,7 +30,7 @@ import doctor.system.service.ISysUserService; /** * 角色信息 - * + * * @author ruoyi */ @RestController @@ -50,7 +50,7 @@ public class SysRoleController extends BaseController @GetMapping("/list") public TableDataInfo list(SysRole role) { - startPage(); + startPage(page, count); List list = roleService.selectRoleList(role); return getDataTable(list); } @@ -173,7 +173,7 @@ public class SysRoleController extends BaseController @GetMapping("/authUser/allocatedList") public TableDataInfo allocatedList(SysUser user) { - startPage(); + startPage(page, count); List list = userService.selectAllocatedList(user); return getDataTable(list); } @@ -185,7 +185,7 @@ public class SysRoleController extends BaseController @GetMapping("/authUser/unallocatedList") public TableDataInfo unallocatedList(SysUser user) { - startPage(); + startPage(page, count); List list = userService.selectUnallocatedList(user); return getDataTable(list); } diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysUserController.java b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysUserController.java index 23e76fa..5496501 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysUserController.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysUserController.java @@ -41,7 +41,7 @@ import doctor.system.service.ISysUserService; /** * 用户信息 - * + * * @author ruoyi */ @RestController @@ -73,7 +73,7 @@ public class SysUserController extends BaseController @GetMapping("/list") public TableDataInfo list(SysUser user) { - startPage(); + startPage(page, count); List list = userService.selectUserList(user); return getDataTable(list); } @@ -151,7 +151,7 @@ public class SysUserController extends BaseController /** * 获取用户信息 - * + * * @return 用户信息 */ @GetMapping("getInfo") diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 8def34f..d48b98a 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 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 979155f..ed199de 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: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a # 配置文件格式 file-extension: yml # 共享配置 -- 2.40.1