Browse Source

REPORT-2354 修改qq登录问题

master
kerry 7 years ago
parent
commit
db1f871b91
  1. 1
      designer_base/src/com/fr/design/extra/LoginWebBridge.java
  2. 7
      designer_base/src/com/fr/design/extra/PluginWebBridge.java
  3. 12
      designer_base/src/com/fr/design/extra/WebViewDlgHelper.java

1
designer_base/src/com/fr/design/extra/LoginWebBridge.java

@ -327,6 +327,7 @@ public class LoginWebBridge {
DesignerEnvManager.getEnvManager().setBBSName(username); DesignerEnvManager.getEnvManager().setBBSName(username);
DesignerEnvManager.getEnvManager().setBbsUid(uid); DesignerEnvManager.getEnvManager().setBbsUid(uid);
DesignerEnvManager.getEnvManager().setInShowBBsName(username); DesignerEnvManager.getEnvManager().setInShowBBsName(username);
BBSPluginLogin.getInstance().login(new BBSUserInfo(username, ""));
} else if (status.equals(LOGIN_FAILED)) { } else if (status.equals(LOGIN_FAILED)) {
//账号没有QQ授权 //账号没有QQ授权
closeQQWindow(); closeQQWindow();

7
designer_base/src/com/fr/design/extra/PluginWebBridge.java

@ -509,6 +509,13 @@ public class PluginWebBridge {
LoginWebBridge.getHelper().showQQ(); LoginWebBridge.getHelper().showQQ();
} }
//通过QQ登录后通知登录
public void ucsynLogin(long uid, String username){
BBSUserInfo bbsUserInfo = new BBSUserInfo(username, "");
BBSPluginLogin.getInstance().login(bbsUserInfo);
uiLabel.setText(username);
}
/** /**
* 清除用户信息 * 清除用户信息
*/ */

12
designer_base/src/com/fr/design/extra/WebViewDlgHelper.java

@ -80,6 +80,15 @@ public class WebViewDlgHelper {
public static void checkAndCopyMainFile(String indexPath, String mainJsPath){ public static void checkAndCopyMainFile(String indexPath, String mainJsPath){
File file = new File(indexPath); File file = new File(indexPath);
if (!file.exists()) { if (!file.exists()) {
copyMainFile(indexPath, mainJsPath);
}
}
/**
* 將script文件夹中的index.html文件复制到webreport下
*
*/
public static void copyMainFile(String indexPath, String mainJsPath){
try { try {
File mainJsFile = new File(mainJsPath); File mainJsFile = new File(mainJsPath);
int byteread = 0; int byteread = 0;
@ -96,7 +105,6 @@ public class WebViewDlgHelper {
FRContext.getLogger().error(e.getMessage()); FRContext.getLogger().error(e.getMessage());
} }
} }
}
/** /**
* 以关键词打开设计器商店 * 以关键词打开设计器商店
@ -186,7 +194,9 @@ public class WebViewDlgHelper {
try { try {
if (get()) { if (get()) {
String relativePath = "/scripts/store/web/index.html";
IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome); IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome);
copyMainFile(StableUtils.pathJoin(installHome, "index.html"), StableUtils.pathJoin(installHome, relativePath));
// TODO: 2017/4/17 删除之前存放在安装目录下的script // TODO: 2017/4/17 删除之前存放在安装目录下的script
int rv = JOptionPane.showOptionDialog( int rv = JOptionPane.showOptionDialog(
null, null,

Loading…
Cancel
Save