Merge remote-tracking branch 'origin/pt' into pt

recovery/src/main/java/com/ccsens/recovery/api/PatientController.java

@@ -111,7 +111,6 @@ public class PatientController {
         return JsonResponse.newInstance().ok(recipeRecordId);
     }
 
-    @MustLogin
     @ApiOperation(value = "结束训练", notes = "zy:")
     @RequestMapping(value = "/end", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse endDrill(@ApiParam @Validated @RequestBody QueryDto<PatientDto.EndDrill> params) {

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common
 

util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java

@@ -18,6 +18,7 @@ public class RabbitMQConfig {
     public static final String GAME_STATUS = PropUtil.gameMqName;
 
     public static final String WISDOM_CAR = "wisdom_car";
+    public static final String WISDOM_CAR_2 = "wisdom_car2";
 
     public static final String BENEFICIATION = "beneficiation";
 
@@ -66,6 +67,11 @@ public class RabbitMQConfig {
         return new Queue(WISDOM_CAR);
     }
 
+    @Bean
+    public Queue wisdomCar2(){
+        return new Queue(WISDOM_CAR_2);
+    }
+
 
     @Bean
     public Queue beneficiation(){

wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java

@@ -24,7 +24,7 @@ import java.util.*;
 
 @Slf4j
 @Component
-@RabbitListener(queues = RabbitMQConfig.WISDOM_CAR)
+@RabbitListener(queues = RabbitMQConfig.WISDOM_CAR_2)
 public class RabbitController {
     @Resource
     private IRecordService recordService;

wisdomcar/src/main/resources/application-prod.yml

@@ -4,17 +4,17 @@ server:
     context-path:
 spring:
   application:
-    name: wisdomcar
+    name: wisdomcar2
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: 127.0.0.1
+    host: www.tall.wiki
     password: 111111
     port: 5672
     username: admin
   redis:
     database: 0
-    host: 127.0.0.1
+    host: www.tall.wiki
     jedis:
       pool:
         max-active: 200

wisdomcar/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
-    include: common, util-dev
+    include: common, util-prod
 
 

wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml

@@ -23,7 +23,7 @@
         AND st.batch = st2.batch
         AND st2.step_id = #{stepId}
         AND pc.car_id = #{carId}
-        AND pc.start_time $lt;= #{time} AND pc.end_time = 0 AND pc.start_time  + 2 * 60 * 60 * 1000 > #{time}
+        AND pc.start_time <= #{time} AND pc.end_time = 0 AND pc.start_time  + 2 * 60 * 60 * 1000 > #{time}
         order by pc.created_at desc limit 1
     </select>
 </mapper>