Merge remote-tracking branch 'origin/master'

pom.xml

@@ -238,17 +238,17 @@
             <artifactId>jaxen</artifactId>
             <version>1.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <version>2.0.6.RELEASE</version>
-        </dependency>
+
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
             <version>1.9.4</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <version>2.0.6.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>

src/main/java/com/dlbridge/jadp/job/WeiXinAccessToken.java

@@ -27,7 +27,7 @@ public class WeiXinAccessToken {
     @Resource
     private ValueOperations valueOperations;
 
-    @Scheduled(fixedRate = 3600 * 1000)
+    /*@Scheduled(fixedRate = 3600 * 1000)
     public void accessToken() {
         log.info("获取access_token...");
         ResponseEntity<String> forEntity = restTemplate.getForEntity("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&" +
@@ -37,14 +37,14 @@ public class WeiXinAccessToken {
         ACCESS_TOKEN = JSONObject.parseObject(forEntity.getBody()).getString("access_token");
         log.info("access_token:" + ACCESS_TOKEN);
         valueOperations.set("micro_gk:access_token",ACCESS_TOKEN);
-    }
+    }*/
 
-  /*  @Scheduled(fixedRate = 3600 * 1000)
+    @Scheduled(fixedRate = 1800 * 1000)
     public void accessToken() {
-        log.info("获取access_token...");
-
         ACCESS_TOKEN = (String) valueOperations.get("micro_gk:access_token");
-    }*/
+        log.info("获取access_token: " + ACCESS_TOKEN);
+    }
+
 
     public static String getAccessToken(){
         return ACCESS_TOKEN;

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptScoreRuleMapper.xml

@@ -114,7 +114,7 @@
               LEFT join gksite.gk_cmpt_score_rule_map rulemap on rule.id = rulemap.rule_id and enroll.nick_id=rulemap.mark_no
               left join geexekscore.cmpt_subsection_score score on rulemap.score_item_id = score.id
               left join geerunner.cmpt_item item on item.item_id = enroll.cmpt_item
-			   left join gksite.gk_cmpt_score_field_value fv on fv.rule_id=rule.id  and fv.markNo=enroll.nick_id
+			   left join gksite.gk_cmpt_score_field_value fv on fv.rule_id=rule.id  and fv.markNo=enroll.nick_id and fv.isDelete=0
         where enroll.cmpt_id=#{cmptId}
               and enroll.cmpt_item=#{roadId} and enroll.del_flg=0
     </select>

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -895,6 +895,9 @@ public class MicroApiController {
         CmptScoreRule rule = cmptScoreRuleService.getCmptScoreRulesByCmptIdAndIndex(score.getCmptId(),score.getIndexId());
         if(rule == null) return Result.fail().setContent("未找到匹配的规则");
         EnrollInfo userInfo = remoteService.getUserInfoByMarkNo(score.getMarkNo(), score.getCmptId());
+        if(userInfo == null){
+            return Result.fail().setMsg("未查询到用户信息，请重新绑定！");
+        }
         log.info("用户信息："+userInfo);
         Map<String,Object> result = new HashMap<>();
         result.put("user",userInfo);

src/main/webapp/WEB-INF/views/cmpt/autoscore.jsp

@@ -5,7 +5,7 @@
 <!doctype html>
 <html>
 <head>
-    <title>自助打卡</title>
+    <title>自动打卡</title>
     <!-- Bootstrap CSS-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/vendor/bootstrap/css/bootstrap.min.css">
     <!-- Font Awesome CSS-->
@@ -145,7 +145,7 @@
     <jsp:include page="../common/menu.jsp"></jsp:include>
     <div class="rght">
         <div class="title-new">
-            <span class="title">自助打卡</span>
+            <span class="title">自动打卡</span>
             <div style="line-height: 22px">
                 <span class="road-notice"></span>
                 <span class="road-notice-txt">此功能仅适用于线下自助赛</span>

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -151,7 +151,7 @@
             <li class="auto menu-item">
                 <a href="/gk/auto/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
                     <span class="menuico left-arrow"></span>
-                    <span class="menu-txt">自助打卡</span>
+                    <span class="menu-txt">自动打卡</span>
                 </a>
             </li>
         </ul>