Merge branch 'dev-mysql' into feature/yc-payCenter-1031

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -210,6 +210,9 @@ public class SecurityController {
 				SSOHelper.setSSOCookie(request, response, tk, true);
 				User user = getUserByToken(tk);
 				if (user != null) {
+					if (!user.getUserPwd().equals(FlexJsonUtils.fromJson(tk.getData(), com.uas.account.entity.User.class).getPassword())){
+						return "successCallback({success:'0'})";
+					}
 					user.setIp(AgentUtils.getIp(request));
 					request.getSession().setAttribute("user", user);
 					SystemSession.setUser(user);

src/main/resources/prod/sys.properties

@@ -18,10 +18,10 @@ enName=\u6DF1\u5733\u5E02\u4F18\u8F6F\u5546\u57CE\u79D1\u6280\u6709\u9650\u516C\
 
 # YesPay config
 yes_gateway=https://openapi.ysepay.com/gateway.do
-notifyURL=http://www.usoftmall.com/api/payment/ysepayNotify
-returnUrl=http://www.usoftmall.com/api/yesreturn
+notifyURL=https://www.usoftmall.com/api/payment/ysepayNotify
+returnUrl=https://www.usoftmall.com/api/yesreturn
 paymentPrice=prod
-orderProxyUrl=http://www.usoftmall.com/order/proxy
+orderProxyUrl=https://www.usoftmall.com/order/proxy
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C