Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/BizEmployeesInfoController.java

@@ -47,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Api(tags="员工信息")
 @RestController
-@RequestMapping("/bizEmployeesInfo/bizEmployeesInfo")
+@RequestMapping("/admin/bizEmployeesInfo/bizEmployeesInfo")
 @Slf4j
 public class BizEmployeesInfoController extends JeecgController<BizEmployeesInfo, IBizEmployeesInfoService> {
 	@Autowired

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java

@@ -32,7 +32,7 @@ import java.util.Map;
  */
 @Api(tags = "服务指令包")
 @RestController
-@RequestMapping("/directivePackage/directivePackage")
+@RequestMapping("/services/directivePackage/directivePackage")
 @Slf4j
 public class DirectivePackageController extends JeecgController<DirectivePackage, IDirectivePackageService> {
     @Autowired

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<DirectiveBodyTag, IDirectiveBodyTagService> {
 	@Autowired

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<DirectiveEmotionTag, IDirectiveEmotionTagService> {
 	@Autowired

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<ConfigServiceCategory, IConfigServiceCategoryService> {
 	@Autowired

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<ConfigServiceDirective, IConfigServiceDirectiveService> {
     @Autowired

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<ServiceTag, IServiceTagService> {
     @Autowired

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<ConfigServiceType, IConfigServiceTypeService> {
     @Autowired

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