20210507

mt/src/main/java/com/ccsens/mt/api/CompeteController.java

@@ -37,7 +37,7 @@ public class CompeteController {
 
     @ApiOperation(value = "查看比赛列表", notes = "")
     @RequestMapping(value = "/competeTimeList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<CompeteVo.CompeteTime> getCompeteTimeList() {
+    public JsonResponse<CompeteVo.CompeteTimeList> getCompeteTimeList() {
         log.info("查看比赛列表");
         List<CompeteVo.CompeteTimeList> competeTime = competeService.getCompeteTimeList();
         return JsonResponse.newInstance().ok(competeTime);

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -70,7 +70,7 @@ public class CompeteVo {
         public byte getCompeteStatus() {
             if(signUpStartTime > System.currentTimeMillis()){
                 return 0;
-            }else if(signUpEndTime > System.currentTimeMillis()){
+            }else if(signUpEndTime < System.currentTimeMillis()){
                 return 2;
             }else {
                 return 1;

mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@@ -38,7 +38,7 @@ public class ProvinceCompeteVo {
     public static class PlayerByCompanyId{
         @ApiModelProperty("选手id")
         private Long playerId;
-        @ApiModelProperty("组别名字")
+        @ApiModelProperty("选手名字")
         private String playerName;
         @ApiModelProperty("组别名字")
         private String groupName;

mt/src/main/resources/application-test.yml

@@ -9,9 +9,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
     host: 127.0.0.1
-    password: 111111
+    password: guest
     port: 5672
-    username: admin
+    username: guest
   redis:
     database: 0
     host: 127.0.0.1

tall/src/main/resources/application-test.yml

@@ -13,9 +13,9 @@ spring:
   rabbitmq:
     host: 127.0.0.1
 #    host: api.ccsens.com
-    password: 111111
+    password: guest
     port: 5672
-    username: admin
+    username: guest
   redis:
     database: 0
     host: 127.0.0.1

tall/src/main/resources/application.yml

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