Merge branch 'master' into cy

# Conflicts:
#	cloud-market-server/src/main/java/com/muyu/master/controller/LogsController.java

.idea/encodings.xml

@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cloud-market-client/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/cloud-market-client/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cloud-market-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/cloud-market-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cloud-market-server/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cloud-market-server/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
-</project>
+</project>

cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 @Log4j2
 @RestController
-@RequestMapping("/master")
+@RequestMapping("/market")
 @Tag(name = "定义接口控制层",description = "进行客户管理，查看等相关操作")
 public class DefinedController {
 

cloud-market-server/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
     allow-bean-definition-overriding: true
   application:
     # 应用名称
-    name: cloud-master
+    name: cloud-market
   profiles:
     # 环境配置
     active: dev