Merge branch 'test'

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -31,6 +31,7 @@ import com.fdkankan.ucenter.vo.response.LoginVo;
 import com.fdkankan.ucenter.vo.response.SceneInfoVo;
 import com.fdkankan.ucenter.vo.response.UserVo;
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/fdkankan/ucenter/pay/paypal/PayPalDefaultConfig.java

@@ -22,19 +22,19 @@ public class PayPalDefaultConfig extends PayPalConfig {
     }
 
     public String getPaySuccessUrl(){
-        return "order/pay/paypal/callback";
+        return "api/order/pay/paypal/callback";
     }
 
     public String getH5PaySuccessUrl(){
-        return "order/pay/paypal/callbackH5";
+        return "api/order/pay/paypal/callbackH5";
     }
 
     public String getCancelUrl(){
-        return "order/pay/paypal/cancel";
+        return "api/order/pay/paypal/cancel";
     }
 
     public String getH5CancelUrl(){
-        return "order/pay/paypal/cancelH5";
+        return "api/order/pay/paypal/cancelH5";
     }
 
     public String getSuccessUrl(){

src/main/java/com/fdkankan/ucenter/service/impl/AppService.java

@@ -81,10 +81,10 @@ public class AppService {
         Long sceneProCount = sceneProService.getCountByUserId(user.getId(),resourceList);
         Long scenePlusCount = scenePlusService.getCountByUserId(user.getId(),resourceList);
         UserVo userVo = new UserVo();
+        BeanUtils.copyProperties(user,userVo);
         userVo.setCameraCount(count);
         userVo.setSceneCount(sceneProCount + scenePlusCount);
         userVo.setPassword(SecurityUtil.MD5(user.getPassword()));
-        BeanUtils.copyProperties(user,userVo);
         LoginVo vo = new LoginVo();
         vo.setToken(token);
         vo.setUser(userVo);

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -244,14 +244,17 @@ public class LoginService {
         }
         String code = String.valueOf((int)((Math.random()*9+1)*100000));
 
-        if("1".equals(country)){
-            SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, SendMailAcceUtils.EN_CODE_MSG.replace("${code}", code), null);
-        }else if("2".equals(country)){
-            SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
-        }else if("33".equals(country)){
-            SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, MailUtil.EN_CODE_MSG.replace("${code}", code), null);
-        }else {
-            SendMailAcceUtils.sendMail(email, SendMailAcceUtils.CN_CODE_SUBJECT, SendMailAcceUtils.CN_CODE_MSG.replace("${code}", code), null);
+        switch (country) {
+            case "1":
+            case "33":
+                SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, MailUtil.EN_CODE_MSG.replace("${code}", code), null);
+                break;
+            case "2":
+                SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
+                break;
+            default:
+                SendMailAcceUtils.sendMail(email, SendMailAcceUtils.CN_CODE_SUBJECT, SendMailAcceUtils.CN_CODE_MSG.replace("${code}", code), null);
+                break;
         }
 
         //删除缓存