admin
2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12
Merge remote-tracking branch 'origin/master'
2个文件已修改
20 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1922,6 +1922,21 @@
        resultData.put("secondTeam", secondTeam);
        resultData.put("secondTeamTotal", secondTeamTotal);
        resultData.put("boss", bossData);
        boolean hasCode = false;
        try {
            String inviteCode = userInfoExtraService.getUserInviteCode(uid);
            if (inviteCode != null && inviteCode.trim().length() > 0) {
                hasCode = true;    // 已有邀请码
            } else {
                // 邀请激活链接
                resultData.put("activationlink", configService.get("invite_activation_url"));
            }
        } catch (UserInfoExtraException e) {
            e.printStackTrace();
        }
        resultData.put("hasCode", hasCode);
        out.print(JsonUtil.loadTrueResult(resultData));
    }
fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java
@@ -72,9 +72,8 @@
    
    public static String getInviteShortLink (Long uid) {
        return HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
                + Constant.systemCommonConfig.getProjectName() + "/"
                + java.lang.System.currentTimeMillis()+
                "/client/threeShareNew?uid=" + uid);
                + Constant.systemCommonConfig.getProjectName() +
                "/client/threeShareNew?uid=" + uid +"&_=" + java.lang.System.currentTimeMillis());
    }