图片变更

bjyy-weixin/src/main/java/com/wmeimob/bjyy/controller/MentalController.java

@@ -113,33 +113,33 @@ public class MentalController extends BaseController {
         String openId = SessionUtil.getValue(SessionUtil.SESSION_WX_OPENID);
         User user = RedisUtil.getObject(RedisUtil.PREFIX_USER_INFO + openId);
         //查找最新记录，判断是否已满2个星期
-        MentalTest queryMentalRecord = mentalService.queryMentalRecordNewest(user.getId());
+//        MentalTest queryMentalRecord = mentalService.queryMentalRecordNewest(user.getId());
-        if (null != queryMentalRecord) {
+//        if (null != queryMentalRecord) {
-//				Date monthSpace = DateUtil.getMonthSpace(-2);//当前时间的两个月前的时间
+////				Date monthSpace = DateUtil.getMonthSpace(-2);//当前时间的两个月前的时间
-            Date monthSpace = DateUtil.getDate(-14, new Date());
+//            Date monthSpace = DateUtil.getDate(-14, new Date());
-            if (queryMentalRecord.getCreateAt().getTime() < monthSpace.getTime()) {
+//            if (queryMentalRecord.getCreateAt().getTime() < monthSpace.getTime()) {
-//					ArrayList<Integer> arl=new ArrayList<Integer>();
+////					ArrayList<Integer> arl=new ArrayList<Integer>();
-//					arl.add(1);
+////					arl.add(1);
-//					arl.add(2);
+////					arl.add(2);
-//					arl.add(3);
+////					arl.add(3);
-                result.setCode(0);
+//                result.setCode(0);
-                //选择测评试卷（选择最新的两条记录）
+//                //选择测评试卷（选择最新的两条记录）
-//					List<MentalTest> queryMentalRecordTop=mentalService.queryMentalRecordTop(user.getId());
+////					List<MentalTest> queryMentalRecordTop=mentalService.queryMentalRecordTop(user.getId());
-//					for (MentalTest mentalTest : queryMentalRecordTop) {
+////					for (MentalTest mentalTest : queryMentalRecordTop) {
-//						arl.remove(mentalTest.getFromType()-1);
+////						arl.remove(mentalTest.getFromType()-1);
-//					}
+////					}
-                result.setData(new Random().nextInt(4) + 1);
+//                result.setData(new Random().nextInt(4) + 1);
-                log.info("已满14天。再次做题。题目类型是" + result.getData());
+//                log.info("已满14天。再次做题。题目类型是" + result.getData());
-            } else {
+//            } else {
-                result.setCode(-1);
+//                result.setCode(-1);
-                log.info("未满14天。题目类型是" + result.getData());
+//                log.info("未满14天。题目类型是" + result.getData());
-            }
+//            }
-        } else {
+//        } else {
             result.setCode(0);
             //选择测评试卷
             int nextInt = new Random().nextInt(3);
             result.setData(nextInt + 1);
-        }
+//        }
         log.info("开始测评返回" + result);
         return result;
     }

bjyy-weixin/src/main/java/com/wmeimob/bjyy/service/impl/AccountServiceImpl.java

@@ -3,6 +3,7 @@ package com.wmeimob.bjyy.service.impl;
 import java.util.Date;
 import java.util.UUID;
 
+import com.wmeimob.bjyy.util.SmsTxUtil;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,8 +44,10 @@ public class AccountServiceImpl implements AccountService {
 		try {
 			String code = CodeUtil.getNumberCode(4);
 //			String code="1234";
-			RedisUtil.setValue(RedisUtil.PREFIX_MOBILE_CODE + mobile, code);
+			int second = 600;
-			SmsUtil.send(mobile,code);
+
+			RedisUtil.setValue(RedisUtil.PREFIX_MOBILE_CODE + mobile, code, second);
+			SmsTxUtil.sendSms(mobile, code, second);
 			log.debug("#########AccountServiceImpl sendCode#########" + mobile + ":" + code);
 			result.setCode(0);
 		} catch (Exception e) {

bjyy-weixin/src/main/webapp/static/exam1/test21.html

@@ -30,9 +30,10 @@
                    </div>
                    <div class="resulttip">
                       <div class="basicinfo  clearfix basicinfoexplame">
-                       <h2>21.下图的时间，经过6个小时，应该到几点？对应的是哪副图?</h2>
+                       <h2 style="border-bottom: 0px;">21.下图的时间，经过6个小时，应该到几点？对应的是哪副图?</h2>
                        <div class="explame" style="margin-top: 0.3rem;"><img src="../images/42.jpg" width="100%"></div>
-                       <ul>
+                          <div style="border-bottom: 1px solid #f0f0f0;"></div>
+                      <ul>
                          <li><img src="../images/43.jpg" width="100%"></li>
                          <li class="right"><img src="../images/44.jpg" width="100%"></li>
                          <li><img src="../images/45.jpg" width="100%"></li>

bjyy-weixin/src/main/webapp/static/exam2/test21.html

@@ -30,9 +30,10 @@
                    </div>
                    <div class="resulttip">
                       <div class="basicinfo  clearfix basicinfoexplame">
-                       <h2>21.下图的时间，经过3个小时，应该到几点？对应的是哪副图？</h2>
+                       <h2 style="border-bottom: 0px;">21.下图的时间，经过3个小时，应该到几点？对应的是哪副图？</h2>
                        <div class="explame" style="margin-top: 0.3rem;"><img src="../images/42.jpg" width="100%"></div>
-                       <ul>
+                          <div style="border-bottom: 1px solid #f0f0f0;"></div>
+                          <ul>
                          <li class="right"><img src="../images/43.jpg" width="100%"></li>
                          <li><img src="../images/44.jpg" width="100%"></li>
                          <li><img src="../images/45.jpg" width="100%"></li>

bjyy-weixin/src/main/webapp/static/exam3/test21.html

@@ -30,9 +30,10 @@
                    </div>
                    <div class="resulttip">
                       <div class="basicinfo  clearfix basicinfoexplame">
-                       <h2>21.下图的时间，经过4个半小时，应该到几点？对应的是哪副图?</h2>
+                       <h2 style="border-bottom: 0px;">21.下图的时间，经过4个半小时，应该到几点？对应的是哪副图?</h2>
                        <div class="explame" style="margin-top: 0.3rem;"><img src="../images/42.jpg" width="100%"></div>
-                       <ul>
+                          <div style="border-bottom: 1px solid #f0f0f0;"></div>
+                          <ul>
                          <li><img src="../images/43.jpg" width="100%"></li>
                          <li><img src="../images/44.jpg" width="100%"></li>
                          <li class="right"><img src="../images/45.jpg" width="100%"></li>

bjyy-weixin/src/main/webapp/static/exam4/test21.html

@@ -30,9 +30,10 @@
                    </div>
                    <div class="resulttip">
                       <div class="basicinfo  clearfix basicinfoexplame">
-                       <h2>21.下图的时间，经过2个小时，应该到几点？对应的是哪副图?</h2>
+                       <h2 style="border-bottom: 0px;">21.下图的时间，经过2个小时，应该到几点？对应的是哪副图?</h2>
                        <div class="explame" style="margin-top: 0.3rem;"><img src="../images/4-21-0.jpg" width="100%"></div>
-                       <ul>
+                          <div style="border-bottom: 1px solid #f0f0f0;"></div>
+                          <ul>
                          <li><img src="../images/43.jpg" width="100%" height="100"></li>
                          <li><img src="../images/44.jpg" width="100%" height="100"></li>
                          <li><img src="../images/4-21-3.jpg" width="100%" height="100"></li>