diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/BizEmployeesInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/BizEmployeesInfoController.java index 6743ce0..4774fa5 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/BizEmployeesInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/BizEmployeesInfoController.java @@ -47,12 +47,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; */ @Api(tags="员工信息") @RestController -@RequestMapping("/bizEmployeesInfo/bizEmployeesInfo") +@RequestMapping("/admin/bizEmployeesInfo/bizEmployeesInfo") @Slf4j public class BizEmployeesInfoController extends JeecgController { @Autowired private IBizEmployeesInfoService bizEmployeesInfoService; - + /** * 分页列表查询 * @@ -75,7 +75,7 @@ public class BizEmployeesInfoController extends JeecgController pageList = bizEmployeesInfoService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -90,7 +90,7 @@ public class BizEmployeesInfoController extends JeecgController { @Autowired diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java index f37a275..ace1044 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java @@ -31,7 +31,7 @@ import java.util.Map; */ @Api(tags="体型标签") @RestController -@RequestMapping("/directiveTag/bodyTag") +@RequestMapping("/services/directiveTag/bodyTag") @Slf4j public class DirectiveBodyTagController extends JeecgController { @Autowired diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java index 19cc285..c5acce5 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java @@ -31,7 +31,7 @@ import java.util.Map; */ @Api(tags="情绪标签") @RestController -@RequestMapping("/directiveTag/emotionTag") +@RequestMapping("/services/directiveTag/emotionTag") @Slf4j public class DirectiveEmotionTagController extends JeecgController { @Autowired diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java index 5e0a28b..2983742 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java @@ -31,7 +31,7 @@ import java.util.Map; */ @Api(tags="服务类别") @RestController -@RequestMapping("/serviceCategory/configServiceCategory") +@RequestMapping("/services/serviceCategory/configServiceCategory") @Slf4j public class ConfigServiceCategoryController extends JeecgController { @Autowired diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index c6da25e..2989a34 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; */ @Api(tags = "服务指令") @RestController -@RequestMapping("/serviceDirective/configServiceDirective") +@RequestMapping("/services/serviceDirective/configServiceDirective") @Slf4j public class ConfigServiceDirectiveController extends JeecgController { @Autowired diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java index a9f578a..39cda00 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java @@ -34,7 +34,7 @@ import java.util.Map; */ @Api(tags = "服务标签") @RestController -@RequestMapping("/serviceTag/serviceTag") +@RequestMapping("/services/serviceTag/serviceTag") @Slf4j public class ServiceTagController extends JeecgController { @Autowired diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java index 28c9618..ec42df8 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java @@ -31,7 +31,7 @@ import java.util.Map; */ @Api(tags = "服务类型") @RestController -@RequestMapping("/ServiceType/configServiceType") +@RequestMapping("/services/ServiceType/configServiceType") @Slf4j public class ConfigServiceTypeController extends JeecgController { @Autowired diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml index 6470ac4..cf6e428 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml @@ -181,7 +181,7 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://mysql8-prod:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://mysql8-prod:3306/nursing_unit_002?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: fw8864sshdang password: uGDBkM25I6nZCNM2 driver-class-name: com.mysql.cj.jdbc.Driver