Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java

@@ -38,7 +38,7 @@ public class ScreenDto {
     public static class Start {
         @NotNull(message = "请选择游戏")
         @ApiModelProperty("游戏记录id")
-        private Long urlId;
+        private Long memberRecord;
         @NotNull(message = "请输入时间")
         @ApiModelProperty("本地时间")
         private Long localTime;

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -415,7 +415,7 @@ public class ScreenService implements IScreenService{
         long current = System.currentTimeMillis();
         long moreTime = start.getLocalTime() - current;
         //查询游戏
-        GameRecord gameRecord = gameRecordDao.selectByPrimaryKey(start.getUrlId());
+        GameRecord gameRecord = gameRecordDao.selectByPrimaryKey(start.getMemberRecord());
         log.info("游戏信息：{}", gameRecord);
         if (gameRecord == null) {
             throw new BaseException(CodeEnum.PARAM_ERROR);

game/src/main/resources/application.yml

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