diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java index c2178f6cc..4606940d4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java @@ -78,8 +78,8 @@ public class AppQueryBean { } } - params.put("status", status.toString()); - params.put("channel", channel.toString()); + params.put("status", status.getStatus()); + params.put("channel", channel.getChannels()); if (client_ids != null) { params.put("client_ids", client_ids); } diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index 00d68f90b..b118f7040 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -19,29 +19,24 @@ import au.com.royalpay.payment.tools.env.RequestEnvironment; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.utils.PasswordUtils; - import com.alibaba.fastjson.JSONObject; - import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; -import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafTemplateAvailabilityProvider; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.stereotype.Service; -import org.springframework.ui.velocity.VelocityEngineUtils; import org.springframework.util.Assert; import org.thymeleaf.context.Context; import org.thymeleaf.spring4.SpringTemplateEngine; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Resource; - /** * account service for sign in * Created by yixian on 2016-06-29. diff --git a/src/main/resources/templates/paynotice.html b/src/main/resources/templates/paynotice.html index 4e15e52b9..a4aed4286 100644 --- a/src/main/resources/templates/paynotice.html +++ b/src/main/resources/templates/paynotice.html @@ -103,11 +103,11 @@
-Remark