Browse Source

细节修改

wangmh 7 years ago
parent
commit
cfe48e4ffe

+ 11 - 7
sso-common/src/main/java/com/uas/sso/entity/UserView.java

@@ -1,5 +1,7 @@
 package com.uas.sso.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import java.util.Date;
 
 /**
@@ -17,7 +19,7 @@ public class UserView {
     /**
      * 会员名
      */
-    private String vipName;
+    private String name;
 
     /**
      * 手机号
@@ -82,9 +84,9 @@ public class UserView {
     public UserView() {
     }
 
-    public UserView(Long userUU, String vipName, String mobile, String mobileArea, Short mobileValidCode, String password, String salt, Date registerDate, String email, Short emailValidCode, String realName, String idCard, Short identityValidCode, Integer lock) {
+    public UserView(Long userUU, String name, String mobile, String mobileArea, Short mobileValidCode, String password, String salt, Date registerDate, String email, Short emailValidCode, String realName, String idCard, Short identityValidCode, Integer lock) {
         this.userUU = userUU;
-        this.vipName = vipName;
+        this.name = name;
         this.mobile = mobile;
         this.mobileArea = mobileArea;
         this.mobileValidCode = mobileValidCode;
@@ -107,12 +109,14 @@ public class UserView {
         this.userUU = userUU;
     }
 
-    public String getVipName() {
-        return vipName;
+    @JSONField(name="vipName")
+    public String getName() {
+        return name;
     }
 
-    public void setVipName(String vipName) {
-        this.vipName = vipName;
+    @JSONField(name="vipName")
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getMobile() {

+ 4 - 4
sso-common/src/main/java/com/uas/sso/util/AccountUtils.java

@@ -131,7 +131,7 @@ public class AccountUtils {
      * @param businessCode 营业执照号
      * @return
      */
-    public List<UserSpaceView> findByBusinessCode(String businessCode) throws Exception {
+    public UserSpaceView findByBusinessCode(String businessCode) throws Exception {
         String saveUrl = AccountConfig.getSpaceSaveUrl();
         if (!StringUtils.isEmpty(saveUrl)) {
             ModelMap formData = new ModelMap();
@@ -145,7 +145,7 @@ public class AccountUtils {
                 if (!result.isSuccess()) {
                     throw new Exception(result.getErrMsg());
                 } else if (result.getContent() != null){
-                    return JSON.parseArray(result.getContent().toString(), UserSpaceView.class);
+                    return JSON.parseObject(result.getContent().toString(), UserSpaceView.class);
                 }
             }
         }
@@ -157,7 +157,7 @@ public class AccountUtils {
      * @param spaceName 营业执照号
      * @return
      */
-    public List<UserSpaceView> findBySpaceName(String spaceName) throws Exception {
+    public UserSpaceView findBySpaceName(String spaceName) throws Exception {
         String saveUrl = AccountConfig.getSpaceSaveUrl();
         if (!StringUtils.isEmpty(saveUrl)) {
             ModelMap formData = new ModelMap();
@@ -171,7 +171,7 @@ public class AccountUtils {
                 if (!result.isSuccess()) {
                     throw new Exception(result.getErrMsg());
                 } else if (result.getContent() != null){
-                    return JSON.parseArray(result.getContent().toString(), UserSpaceView.class);
+                    return JSON.parseObject(result.getContent().toString(), UserSpaceView.class);
                 }
             }
         }