reset 回滚 分支提交错误

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java

@@ -18,7 +18,6 @@ import java.util.List;
 @ConditionalOnProperty(value = "easy-es.enable", havingValue = "true")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/es")
 public class EsCrudController {
 
     private final DocumentMapper documentMapper;

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java

@@ -19,7 +19,7 @@ import java.io.File;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/mail")
+@RequestMapping("/demo/mail")
 public class MailController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java

@@ -22,7 +22,7 @@ import java.time.Duration;
 //@CacheConfig(cacheNames = CacheNames.DEMO_CACHE)
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/cache")
+@RequestMapping("/demo/cache")
 public class RedisCacheController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java

@@ -21,7 +21,7 @@ import java.time.LocalTime;
  */
 @Slf4j
 @RestController
-@RequestMapping("/redisLock")
+@RequestMapping("/demo/redisLock")
 public class RedisLockController {
 
     @Autowired

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/redis/pubsub")
+@RequestMapping("/demo/redis/pubsub")
 public class RedisPubSubController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java

@@ -23,7 +23,7 @@ import java.util.Map;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/sms")
+@RequestMapping("/demo/sms")
 public class SmsController {
 
     private final SmsProperties smsProperties;

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/batch")
+@RequestMapping("/demo/batch")
 public class TestBatchController extends BaseController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java

@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/demo")
+@RequestMapping("/demo/demo")
 public class TestDemoController extends BaseController {
 
     private final ITestDemoService iTestDemoService;

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestEncryptController.java

@@ -21,7 +21,7 @@ import java.util.Map;
  */
 @Validated
 @RestController
-@RequestMapping("/encrypt")
+@RequestMapping("/demo/encrypt")
 public class TestEncryptController {
 
     @Autowired

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @RestController
-@RequestMapping("/excel")
+@RequestMapping("/demo/excel")
 public class TestExcelController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java

@@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;
  */
 @Validated
 @RestController
-@RequestMapping("/i18n")
+@RequestMapping("/demo/i18n")
 public class TestI18nController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @see com.ruoyi.common.core.service.SensitiveService
  */
 @RestController
-@RequestMapping("/sensitive")
+@RequestMapping("/demo/sensitive")
 public class TestSensitiveController extends BaseController {
 
     /**

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java

@@ -31,7 +31,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/tree")
+@RequestMapping("/demo/tree")
 public class TestTreeController extends BaseController {
 
     private final ITestTreeService iTestTreeService;