Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-student-server/src/main/java/com/keao/edu/controller/ExamOrderController.java

@@ -65,15 +65,15 @@ public class ExamOrderController extends BaseController {
         signParams.put("appId", ConfigInit.appId);
         signParams.put("amount", amount);
         signParams.put("orderNo", orderNo);
-        signParams.put("notifyUrl", notifyUrl);
-        signParams.put("returnUrl", returnUrl);
+//        signParams.put("notifyUrl", notifyUrl);
+//        signParams.put("returnUrl", returnUrl);
         signParams.put("orderSubject", orderSubject);
         signParams.put("orderBody", orderBody);
         signParams.put("wxAppId", ConfigInit.wxAppId);
 
         String originalStr = JSONObject.toJSONString(signParams);
         String newSign = DigestUtils.md5DigestAsHex(originalStr.getBytes());
-        if(sign != newSign){
+        if(!sign.equals(newSign)){
             return failed("请勿非法请求");
         }
 

edu-user/edu-student-server/src/main/resources/bootstrap-prod.properties

@@ -7,7 +7,7 @@ spring.cloud.nacos.config.namespace=a97db240-8024-45f2-bceb-bbccbb07ea1d
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=user
+spring.cloud.nacos.config.prefix=student
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0

edu-user/edu-student-server/src/test/java/com/keao/edu/AppTest.java

@@ -1,38 +0,0 @@
-package com.keao.edu;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-user/edu-teacher-server/src/main/resources/bootstrap-prod.properties

@@ -7,7 +7,7 @@ spring.cloud.nacos.config.namespace=a97db240-8024-45f2-bceb-bbccbb07ea1d
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=user
+spring.cloud.nacos.config.prefix=teacher
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u52a8\u6001\u5237\u65b0

edu-user/edu-teacher-server/src/test/java/com/keao/edu/AppTest.java

@@ -1,38 +0,0 @@
-package com.keao.edu;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -199,7 +199,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
                 examRegistration.setOrganization(new Organization(examRegistration.getOrganId(), organIdNameMap.get(examRegistration.getOrganId())));
                 examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getSubjectId()));
                 examRegistration.getSysUser().setCertificatePhoto(idPhotoMap.get(examRegistration.getStudentId()));
-                examRegistration.setIsFinishedExam(registExamStatusMap.get(examRegistration.getId()));
+                examRegistration.setIsFinishedExam(Objects.isNull(registExamStatusMap.get(examRegistration.getId()))?3:registExamStatusMap.get(examRegistration.getId()));
                 examRegistration.setExaminationBasic(new ExaminationBasic(examRegistration.getExaminationBasicId(), examIdNameMap.get(examRegistration.getExaminationBasicId())));
             }
         }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentServiceImpl.java

@@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -157,6 +154,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Transactional
     public Student updateInfo(Student student) {
         student.setId(student.getUserId());
+        student.setUpdateTime(new Date());
         if (sysUserDao.update(student) <= 0 || studentDao.update(student) <= 0) {
             throw new BizException("学生信息更新失败，请重试");
         }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ShortUrlController.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Objects;