From bd3b69d0ed7466fa2f41a7a1a4c0e3e72d19f65d Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 29 Jun 2018 17:13:39 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-7947=20=E3=80=9010.0=E3=80=91=E5=9C=A8?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=B8=8A=E7=99=BB=E5=BD=95bbs?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/bbs/BBSLoginUtils.java  | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/com/fr/design/bbs/BBSLoginUtils.java b/designer-base/src/com/fr/design/bbs/BBSLoginUtils.java
index 9a8eef094..5b46b7c68 100644
--- a/designer-base/src/com/fr/design/bbs/BBSLoginUtils.java
+++ b/designer-base/src/com/fr/design/bbs/BBSLoginUtils.java
@@ -1,5 +1,6 @@
 package com.fr.design.bbs;
 
+import com.fr.config.BBSAttr;
 import com.fr.config.Configuration;
 import com.fr.config.MarketConfig;
 import com.fr.log.FineLoggerFactory;
@@ -15,12 +16,14 @@ import java.util.List;
 public class BBSLoginUtils {
 
     public static void bbsLogin(final String username, final String password) {
+        final BBSAttr bbsAttr = new BBSAttr();
+        bbsAttr.setBbsUsername(username);
+        bbsAttr.setBbsPassword(password);
         try {
             Configurations.update(new Worker() {
                 @Override
                 public void run() {
-                    MarketConfig.getInstance().setBbsUsername(username);
-                    MarketConfig.getInstance().setBbsPassword(password);
+                    MarketConfig.getInstance().setBBsAttr(bbsAttr);
                 }
                 @Override
                 public Class<? extends Configuration>[] targets() {
@@ -35,16 +38,18 @@ public class BBSLoginUtils {
 
     public static void bbsLogin(List<String> list) {
         try {
-            final String uid = list.get(0);
-            final String username = list.get(1);
-            final String password = list.get(2);
+            String uid = list.get(0);
+            String username = list.get(1);
+            String password = list.get(2);
+            final BBSAttr bbsAttr = new BBSAttr();
+            bbsAttr.setBbsUsername(username);
+            bbsAttr.setBbsPassword(password);
+            bbsAttr.setBbsUid(Integer.parseInt(uid));
+            bbsAttr.setInShowBBsName(username);
             Configurations.update(new Worker() {
                 @Override
                 public void run() {
-                    MarketConfig.getInstance().setBbsUsername(username);
-                    MarketConfig.getInstance().setBbsPassword(password);
-                    MarketConfig.getInstance().setBbsUid(Integer.parseInt(uid));
-                    MarketConfig.getInstance().setInShowBBsName(username);
+                    MarketConfig.getInstance().setBBsAttr(bbsAttr);
                 }
                 @Override
                 public Class<? extends Configuration>[] targets() {
@@ -58,11 +63,13 @@ public class BBSLoginUtils {
     }
 
     public static void bbsLogout() {
+        final BBSAttr bbsAttr = new BBSAttr();
+        bbsAttr.setBbsUsername(StringUtils.EMPTY);
+        bbsAttr.setBbsPassword(StringUtils.EMPTY);
+        bbsAttr.setBbsUid(0);
+        bbsAttr.setInShowBBsName(StringUtils.EMPTY);
         try {
-            MarketConfig.getInstance().setBbsUsername(StringUtils.EMPTY);
-            MarketConfig.getInstance().setBbsPassword(StringUtils.EMPTY);
-            MarketConfig.getInstance().setBbsUid(0);
-            MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY);
+            MarketConfig.getInstance().setBBsAttr(bbsAttr);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage());
         }