Merge remote-tracking branch 'origin/master'

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/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/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 );
-    }
-}