0325.1

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -69,6 +69,7 @@ public class AbnormalService implements IAbnormalService{
         HealthAbnormal healthAbnormal = new HealthAbnormal();
         healthAbnormal.setId(snowflake.nextId());
         BeanUtil.copyProperties(addAbnormal,healthAbnormal);
+        healthAbnormal.setHealthStatus((short) addAbnormal.getHealthType());
         healthAbnormalDao.insertSelective(healthAbnormal);
 
         AbnormalVo.AbnormalStatisticsVo abnormalStatisticsVo = new AbnormalVo.AbnormalStatisticsVo();

health/src/main/java/com/ccsens/health/service/UserService.java

@@ -66,10 +66,10 @@ public class UserService implements IUserService{
         if(ObjectUtil.isNotNull(selectUser.getUserId())){
             userId = selectUser.getUserId();
         }else {
-            String id = tallFeignClient.getUserId(selectUser.getToken());
+//            String id = tallFeignClient.getUserId(selectUser.getToken());
-            if(StrUtil.isNotEmpty(id)){
+//            if(StrUtil.isNotEmpty(id)){
-                userId = Long.valueOf(id);
+                userId = params.getUserId();
-            }
+//            }
         }
 
         if(ObjectUtil.isNull(userId)){

health/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
+    active: prod
-    include: common, util-test
+    include: common, util-prod

tall/src/main/resources/application.yml

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