Merge remote-tracking branch 'origin/dev' into dev

sso-server/src/main/java/com/uas/sso/controller/BaseController.java

@@ -180,8 +180,8 @@ public class BaseController {
         ModelMap data = new ModelMap();
         data.put("checkcode", code);
 
-        // 测试时方便获取验证码
-        request.getSession().setAttribute("code", code);
+        /// 测试时方便获取验证码
+//        request.getSession().setAttribute("code", code);
 
         // 手机短信
         sendSms("templateForSendSmsAboutValidAllCode", mobile, new Object[]{code});

sso-server/src/main/java/com/uas/sso/controller/UserManagerController.java

@@ -340,186 +340,4 @@ public class UserManagerController extends BaseController {
         data.put("spaces", userSpaces);
         return data;
     }
-
-    /**
-     * 数据从旧账户中心同步
-     * @return
-     */
-    @RequestMapping(value = "/sync", method = RequestMethod.GET)
-    public ModelMap sync(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize, @RequestParam(defaultValue = "true") boolean isAll, String mobile) {
-        Page<UserDetail> pUsers = null;
-        List<String> repeatMobile = new ArrayList<>();
-        String lastMobile = null;
-        do {
-            // 获取数据
-            try {
-                pUsers = AccountUtils.findAllUserDetail(null, mobile, pageNumber++, pageSize);
-            } catch (Exception e) {
-                writerToFile("pageNumber" + (pageNumber-1), null, e.getMessage());
-            }
-            int i = 1;
-            System.out.println("------------ start pageNumber:"+(pageNumber-1)+"    pageSize:"+pageSize+"-------------");
-            for (UserDetail detail : pUsers.getContent()) {
-                try {
-                    // 将数据保存
-                    if (lastMobile != null && lastMobile.equals(detail.getMobile())) {
-                        repeatMobile.add(lastMobile);
-                    }
-                    saveUser(detail);
-                    lastMobile = detail.getMobile();
-                    System.out.println(((pageNumber - 2) * pageSize + i++) + "\t" + detail.getMobile() + "\t" + detail.getName());
-                } catch (Exception e) {
-                    writerToFile((pageNumber-1) + "\t" + i++, detail.getMobile(), e.getMessage());
-                }
-            }
-            System.out.println("------------ end pageNumber:"+(pageNumber-1)+"pageSize"+pageSize+"-------------");
-        } while (isAll && (pUsers == null || !pUsers.isLast()));
-//        updateEmailUnique();
-        return success(repeatMobile);
-    }
-
-    private void updateEmailUnique() {
-        List<String> emails = userService.findRepeatEmail();
-        for (String email : emails) {
-            List<User> users = userService.findByEmail(email);
-            for (int i = 0; i<users.size(); i++) {
-                User user = users.get(i);
-                user.setEmail(email + Const.REPEAT_SEPARATOR + (i + 1));
-                user.setEmailValidCode((short) Status.NOT_APPLYING.getCode());
-                userService.save(user);
-            }
-        }
-    }
-
-    public void saveUser(UserDetail detail) throws Exception {
-        User user = new User();
-        if (StringUtils.isEmpty(detail.getMobile()) && StringUtils.isEmpty(detail.getEmail())) {
-            return;
-        }
-
-        // 手机号判空，正则判断
-        if (StringUtils.isEmpty(detail.getMobile())) {
-            user.setMobile("mobile" + System.currentTimeMillis());
-            user.setMobileValidCode((short) Status.NOT_APPLYING.getCode());
-        } else {
-            user.setMobile(detail.getMobile().trim());
-            user.setMobileValidCode(user.getMobile().matches(Const.REGEXP_MOBILE_CONTINENT) ? (short) Status.AUTHENTICATED.getCode() : (short) Status.NOT_APPLYING.getCode());
-        }
-
-        // 邮箱判空，正则判断
-        if (StringUtils.isEmpty(detail.getEmail())) {
-            user.setEmail(null);
-            user.setEmailValidCode((short) Status.NOT_APPLYING.getCode());
-        } else {
-            user.setEmail(detail.getEmail().trim());
-            user.setEmailValidCode(user.getEmail().matches(Const.REGEXP_MOBILE_CONTINENT) ? (short) Status.AUTHENTICATED.getCode() : (short) Status.NOT_APPLYING.getCode());
-        }
-
-        // 身份认证状态未申请
-        user.setIdentityValidCode((short) Status.NOT_APPLYING.getCode());
-
-        // 注册时间，现在时间
-        user.setRegisterDate(new Timestamp(System.currentTimeMillis()));
-
-        // 无用户名则为用户加时间戳
-        user.setVipName(StringUtils.isEmpty(detail.getName()) ? "用户"+System.currentTimeMillis() : detail.getName().trim());
-
-        // 获取密码，uu号，颜值，IMID
-        List<com.uas.account.entity.User> userInfos = AccountUtils.getUserInfoByUid(detail.getMobile());
-        boolean updateB2b = false;
-        for (com.uas.account.entity.User userInfo : userInfos) {
-            // 设置密码、盐值、uu号
-            if (userInfo.getAppId().equals("b2b")) {
-                // 判断是否修改过有关b2b的数据
-                if (updateB2b) {
-                    continue;
-                }
-
-                // 用户uu号，盐值，密码都不为空则认为是正确的数据
-                if (!StringUtils.isEmpty(userInfo.getDialectUID()) && !StringUtils.isEmpty(userInfo.getSalt()) && !StringUtils.isEmpty(userInfo.getPassword())) {
-                    user.setUserUU(Long.parseLong(userInfo.getDialectUID()));
-                    user.setPassword(userInfo.getPassword());
-                    user.setSalt(userInfo.getSalt());
-                    updateB2b = true;
-                }
-            }
-            // 设置imId
-            if (StringUtils.isEmpty(user.getImId()) && userInfo.getAppId().equals("im")) {
-                user.setImId(userInfo.getDialectUID());
-                continue;
-            }
-        }
-
-        // 没有uu号先记录，而外处理，不能自动生成
-        if (StringUtils.isEmpty(user.getUserUU())) {
-            // 去b2b 获取，手机号为自动生成的则用邮箱
-            Long userUU = getUserUUFromB2B(user.getMobile().startsWith("mobile") ? user.getEmail() : user.getMobile());
-            user.setUserUU(userUU);
-        }
-
-        // 密码为空处理
-        if (StringUtils.isEmpty(user.getPassword())) {
-            user.setPassword(userService.getEncryPassword(Const.ENCRY_FORMAT, "111111", user.getSalt()));
-        }
-        userService.save(user);
-
-        UserRecord userRecord = new UserRecord();
-        userRecord.setLastLoginTime(StringUtils.isEmpty(detail.getLastLoginTime()) ? null : new Timestamp(detail.getLastLoginTime()));
-        userRecord.setUserUU(user.getUserUU());
-        userService.save(userRecord);
-    }
-
-    private Long getUserUUFromB2B(String keyword) {
-        String url = "http://10.1.51.50:8090/platform-b2b";
-        url = url + "/account/user/searchUser";
-        Long userUU = null;
-        try {
-            HttpUtil.ResponseWrap responseWrap = HttpUtil.doGet(url, new ModelMap("keyWord", keyword));
-            if (responseWrap.isSuccess()) {
-                JSONObject userInfo = JSON.parseObject(responseWrap.getContent());
-                userUU = Long.valueOf(userInfo.get("userUU").toString());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            writerToFile(keyword, "获取"+keyword+"uu号", e.getMessage());
-        }
-        return userUU;
-    }
-
-
-    /**
-     * 写入日志
-     * @param mobile 用户手机号
-     * @param message 错误信息
-     */
-    private void writerToFile(String id, String mobile, String message) {
-        FileWriter fw = null;
-        try {
-            //如果文件存在，则追加内容；如果文件不存在，则创建文件
-            File f=new File("logs/user.log");
-            fw = new FileWriter(f, true);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        PrintWriter pw = new PrintWriter(fw);
-        pw.println(id + "\t" + mobile + "\t" + message);
-        pw.flush();
-        try {
-            fw.flush();
-            pw.close();
-            fw.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-    @RequestMapping(value = "/getToken", method = RequestMethod.GET)
-    @ResponseBody
-    public ModelMap getToken(Long userUU, Long spaceUU) {
-        ModelMap data = new ModelMap();
-        data.put("userUU", userUU);
-        data.put("spaceUU", spaceUU);
-        Token token = new Token(data);
-        tokenService.save(token);
-        return success(token.getId());
-    }
 }

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -356,282 +356,8 @@ public class UserspaceManagerController extends BaseController {
         return info;
     }
 
-    /**
-     * 同步旧企业数据到账户中心
-     *
-     * @param spaceUU 企业uu号，为空则同步所有
-     * @return
-     */
-    @RequestMapping("/saveOldUserSpaces/{spaceUU}")
-    public ModelMap syncOldUserSpaces(@PathVariable Long spaceUU, @RequestParam(defaultValue = "1") int pageNumber,
-                                      @RequestParam(defaultValue = "20") int pageSize, @RequestParam(defaultValue = "false") boolean isAll) {
-        // 由于旧数据问题，记录重复的企业名称和营业执照号
-        Map<String, Integer> repeatSpaceName = new HashMap<>();
-        Map<String, Integer> repeatBusinessCode = new HashMap<>();
-
-        Userspace userspace;
-        com.uas.sso.support.Page<UserSpaceDetail> page = null;
-        // 循环分页请求，如果是最后一页则退出循环
-        while (page == null || !page.isLast()) {
-            // 获取分页信息
-            page = getUserSpace(pageNumber++, pageSize);
-
-            // 循环遍历企业信息并保存
-            int i = 1;
-            for (UserSpaceDetail detail : page.getContent()) {
-                try {
-                    userspace = userspaceService.findByBusinessCode(detail.getBusinessCode());
-                    if (userspace != null) {
-                        continue;
-                    }
-                    userspace = saveUserspace(detail);
-                    System.out.println(page.getNumber() + "\t" + page.getSize() + "\t" + i++ + "\t" + userspace.getSpaceName() + "\t" + userspace.getBusinessCode());
-                } catch (Exception e) {
-                    writerToFile(page.getNumber() + "\t" + page.getSize() + "\t" + i++ + "\t" + detail.getName() + "\t" + detail.getBusinessCode(), e.getMessage());
-                }
-            }
-            spaceNameUnique();
-            if (!isAll) {
-                break;
-            }
-        }
-        return success();
-    }
-
-    private Userspace saveUserspace(UserSpaceDetail detail) throws Exception {
-        Userspace userspace;
-        userspace = new Userspace();
-        // 设置企业秘钥
-        userspace.setAccessSecret(getAccessSecret(detail.getBusinessCode()));
-        // 设置管理员uu号
-        User user = userService.findByMobile(detail.getAdminTel());
-        userspace.setAdminUU(user == null ? null : user.getUserUU());
-        userspace.setBusinessCode(detail.getBusinessCode());
-        userspace.setBusinessCodeImage(detail.getBusinessCodeImage());
-        userspace.setCorporation(detail.getCorporation());
-        userspace.setDomain(detail.getDomain());
-        userspace.setLogoImage(detail.getLogoImage());
-        userspace.setProfession(detail.getProfession());
-        userspace.setRegAddress(detail.getAddress());
-        userspace.setRegCity(detail.getCity());
-        userspace.setRegDistrict(detail.getDistrict());
-        userspace.setRegProvince(detail.getProvince());
-        userspace.setRegStreet(detail.getStreet());
-        userspace.setRegisterDate(detail.getRegisterDate() == null ? null : new Timestamp(detail.getRegisterDate()));
-        userspace.setSpaceName(detail.getName());
-        // 设置企业uu号
-        userspace.setSpaceUU(getSpaceUU(detail.getBusinessCode(), detail.getName()));
-        userspace.setTags(detail.getTags());
-        userspace.setTelephone(detail.getTel());
-        userspace.setValidCode((short) Status.AUTHENTICATED.getCode());
-        if (userspace.getSpaceUU() == null) {
-            throw new Exception("无uu号");
-        }
-//        userspace.setWebsite(getWebsite());
-
-        // 设置企业用户
-        addUsersByBusinessCode(userspace);
-
-        // 设置默认应用
-        addDefaultApp(userspace);
-        userspaceService.save(userspace);
-        return userspace;
-    }
-
-    private void addDefaultApp(Userspace userspace) throws Exception {
-        if (userspace.getApps() == null) {
-            userspace.setApps(new ArrayList<App>());
-        }
-        String url = "http://10.1.51.50:8080/api/userspace";
-        ModelMap data = new ModelMap();
-        data.put("businessCode", userspace.getBusinessCode());
-        data.put("_operate", "getapp");
-        HttpUtil.ResponseWrap res = HttpUtil.doGet(url, data);
-        if (!res.isSuccess()) {
-            throw new Exception(res.getContent());
-        } else {
-            ResultWrap result = JSON.parseObject(res.getContent(), ResultWrap.class);
-            if (!result.isSuccess()) {
-                throw new Exception(result.getErrMsg());
-            } else if (result.getContent() != null) {
-                List<UserSpace> userSpaceList = JSON.parseArray(result.getContent().toString(), UserSpace.class);
-                for (int i = 0; i < userSpaceList.size(); i++) {
-                    App app = appService.findOne(userSpaceList.get(i).getAppId());
-                    if (app != null && !userspace.getApps().contains(app)) {
-                        userspace.getApps().add(app);
-                    }
-                }
-                App app = appService.findOne("sso");
-                if (!userspace.getApps().contains(app)) {
-                    userspace.getApps().add(app);
-                }
-                app = appService.findOne("mall");
-                if (!userspace.getApps().contains(app)) {
-                    userspace.getApps().add(app);
-                }
-            }
-        }
-    }
-
-    private void addUsersByBusinessCode(Userspace userspace) throws Exception {
-        if (userspace.getUsers() == null) {
-            userspace.setUsers(new ArrayList<User>());
-        }
-        int pageNumber = 1;
-        int pageSize = 20;
-        com.uas.sso.support.Page<com.uas.account.entity.User> page;
-        String url = "http://10.1.51.50:8080/api/user";
-        url = url + "/findByBusinessCode";
-        do {
-            ModelMap data = new ModelMap();
-            data.put("businessCode", userspace.getBusinessCode());
-            data.put("appId", "b2b");
-            data.put("pageNumber", pageNumber++);
-            data.put("pageSize", pageSize);
-            HttpUtil.ResponseWrap res = HttpUtil.doGet(url, data);
-            if (!res.isSuccess()) {
-                throw new Exception(res.getContent());
-            } else {
-                page = JSON.parseObject(res.getContent(), new TypeReference<com.uas.sso.support.Page<com.uas.account.entity.User>>() {
-                });
-                List<com.uas.account.entity.User> users = page.getContent();
-                for (int i = 0; i < users.size(); i++) {
-                    User user = users.get(i).getDialectUID() == null ? userService.findByMobile(users.get(i).getUid()) : userService.findOne(Long.valueOf(users.get(i).getDialectUID()));
-                    if (user != null && !userspace.getUsers().contains(user)) {
-                        userspace.getUsers().add(user);
-                    }
-                }
-            }
-        } while (page == null || !page.isLast());
-    }
-
-    private Long getSpaceUU(String businessCode, String name) throws Exception {
-        if (StringUtils.isEmpty(businessCode)) {
-            return null;
-        }
-
-        String url = "http://10.1.51.50:8080/api/userspace/info";
-        if (!StringUtils.isEmpty(businessCode)) {
-            businessCode = businessCode.trim();
-        }
-        if (!StringUtils.isEmpty(name)) {
-            name = name.trim();
-        }
-//        url = url + "/" + URLEncoder.encode(businessCode, "UTF-8") + "/" + URLEncoder.encode(name, "UTF-8");
-        HttpUtil.ResponseWrap res = null;
-        ModelMap data = new ModelMap();
-        data.put("businessCode", businessCode);
-        data.put("name", name);
-        res = HttpUtil.doGet(url, data);
-        if (res.isSuccess() && !StringUtils.isEmpty(res.getContent())) {
-            JSONObject jsonObject = JSON.parseObject(res.getContent());
-            if (jsonObject.containsKey("dialectUID")) {
-                return Long.valueOf(jsonObject.get("dialectUID").toString());
-            }
-        }
-        return null;
-    }
-
-    public com.uas.sso.support.Page<UserSpaceDetail> getUserSpace(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
-        com.uas.sso.support.Page<UserSpaceDetail> page = null;
-        String url = "http://10.1.51.50:8080/api/partners";
-        if (!StringUtils.isEmpty(url)) {
-            HttpUtil.ResponseWrap res = null;
-            try {
-                ModelMap data = new ModelMap("_operate", "getUserSpaces");
-                data.put("pageNumber", Integer.valueOf(pageNumber));
-                data.put("pageSize", Integer.valueOf(pageSize));
-                res = HttpUtil.doGet(url, data);
-                if (res.isSuccess()) {
-                    return JSON.parseObject(res.getContent(), new TypeReference<com.uas.sso.support.Page<UserSpaceDetail>>() {
-                    });
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return page;
-    }
-
-    /**
-     * 从b2b获取erp企业秘钥
-     *
-     * @return
-     */
-    @RequestMapping(value = "/saveAccessSecret/{businessCode}")
-    public ModelMap saveAccessSecret(@PathVariable String businessCode) throws UnsupportedEncodingException {
-        if (!StringUtils.isEmpty(businessCode)) {
-            getAccessSecret(businessCode);
-        }
-        return success();
-    }
-
-    /**
-     * 从b2b获取密钥
-     *
-     * @param businessCode 营业执照号
-     * @return
-     */
-    public String getAccessSecret(String businessCode) throws UnsupportedEncodingException {
-        String url = "http://10.1.51.50:8090/platform-b2b";
-        url = url + "/account/enterprise/info/" + URLEncoder.encode(businessCode, "UTF-8");
-        String accessSecret = null;
-        try {
-            HttpUtil.ResponseWrap responseWrap = HttpUtil.doGet(url);
-            if (responseWrap.isSuccess()) {
-                JSONObject enterprise = parseObject(responseWrap.getContent());
-                accessSecret = (String) enterprise.get("accessSecret");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return accessSecret;
-    }
-
-    /**
-     * 写入日志
-     *
-     * @param businessCode 营业执照号
-     * @param accessSecret 密钥
-     */
-    private void writerToFile(String businessCode, String accessSecret) {
-        FileWriter fw = null;
-        try {
-            //如果文件存在，则追加内容；如果文件不存在，则创建文件
-            File f = new File("logs/userspace.log");
-            fw = new FileWriter(f, true);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        PrintWriter pw = new PrintWriter(fw);
-        pw.println(businessCode + "\t" + accessSecret);
-        pw.flush();
-        try {
-            fw.flush();
-            pw.close();
-            fw.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping("/spaceName/unique")
-    public ModelMap spaceNameUnique() {
-        List<String> repeatName = userspaceService.findRepeatName();
-        for (String name : repeatName) {
-            List<Userspace> userspaces = userspaceService.findAllBySpaceName(name);
-            for (int i = 0; i < userspaces.size(); i++) {
-                Userspace userspace = userspaces.get(i);
-                userspace.setSpaceName(userspace.getSpaceName() + Const.REPEAT_SEPARATOR + (i + 1));
-                userspaceService.save(userspace);
-            }
-        }
-        return success();
-    }
-
     /**
      * 从其他应用注册企业信息
-     *
      * @param userspace 企业信息
      */
     @RequestMapping(value = "/register/other", method = RequestMethod.POST)