No commit message

redkale · Mar 11, 2016 · b82ed6a · b82ed6a
1 parent ab8130b
commit b82ed6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/org/redkale/demo/user/LoginQQBean.java b/src/org/redkale/demo/user/LoginQQBean.java
@@ -18,7 +18,7 @@ public class LoginQQBean extends BaseBean {
 
     protected String openid;
 
-    protected String reghost;
+    protected String regagent;
 
     protected String regaddr;
 
@@ -60,12 +60,12 @@ public void setOpenid(String openid) {
         this.openid = openid;
     }
 
-    public String getReghost() {
-        return reghost;
+    public String getRegagent() {
+        return regagent;
     }
 
-    public void setReghost(String reghost) {
-        this.reghost = reghost;
+    public void setRegagent(String regagent) {
+        this.regagent = regagent;
     }
 
     public String getRegaddr() {

diff --git a/src/org/redkale/demo/user/UserService.java b/src/org/redkale/demo/user/UserService.java
@@ -272,7 +272,7 @@ public RetResult<UserInfo> qqlogin(LoginQQBean bean) {
                 UserDetail detail = new UserDetail();
                 detail.setUsername(formatUserName(jsonmap.getOrDefault("nickname", "qq-user"), "qq-"));
                 detail.setQqopenid(bean.getOpenid());
-                detail.setRegagent(bean.getReghost());
+                detail.setRegagent(bean.getRegagent());
                 detail.setRegaddr(bean.getRegaddr());
                 String genstr = jsonmap.getOrDefault("gender", "");
                 detail.setGender("男".equals(genstr) ? UserInfo.GENDER_MALE : ("女".equals(genstr) ? UserInfo.GENDER_FEMALE : (short) 0));
@@ -328,7 +328,7 @@ public RetResult<UserInfo> wxlogin(LoginWXBean bean) {
                 detail.setUsername(formatUserName(wxmap.getOrDefault("nickname", "wx-user"), "wx-"));
                 detail.setWxunionid(unionid);
                 detail.setApptoken(bean.getApptoken());
-                detail.setRegagent(bean.getReghost());
+                detail.setRegagent(bean.getRegagent());
                 detail.setRegaddr(bean.getRegaddr());
                 detail.setGender((short) (Short.parseShort(wxmap.getOrDefault("sex", "0")) * 2));
                 logger.fine(bean + " --wxlogin-->" + convert.convertTo(wxmap));

diff --git a/src/org/redkale/demo/user/UserServlet.java b/src/org/redkale/demo/user/UserServlet.java
@@ -126,7 +126,7 @@ public void qqlogin(HttpRequest req, HttpResponse resp) throws IOException {
         bean.setApptoken(req.getParameter("apptoken", ""));
         bean.setOpenid(openid);
         bean.setRegaddr(req.getRemoteAddr());
-        bean.setReghost((wxbrowser ? "wx." : "") + req.getHost());
+        bean.setRegagent((wxbrowser ? "wx." : "") + req.getHost());
         bean.setSessionid(req.changeSessionid());
         RetResult<UserInfo> rr = service.qqlogin(bean);
         if (rr.isSuccess()) {
@@ -192,7 +192,7 @@ public void wxlogin(HttpRequest req, HttpResponse resp) throws IOException {
         bean.setAutoreg(autoreg);
         bean.setApptoken(req.getParameter("apptoken", ""));
         bean.setRegaddr(req.getRemoteAddr());
-        bean.setReghost((wxbrowser ? "wx." : "") + req.getHost());
+        bean.setRegagent((wxbrowser ? "wx." : "") + req.getHost());
         if (autoreg) bean.setSessionid(req.changeSessionid());
         RetResult<UserInfo> rr = service.wxlogin(bean);
         if (autoreg && rr.isSuccess() && (wxbrowser || (access_token != null && !access_token.isEmpty()))) {