新账户中心接口修改

pom.xml

@@ -58,9 +58,15 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.uas.account</groupId>
-			<artifactId>account-common</artifactId>
+			<groupId>com.uas.sso</groupId>
+			<artifactId>sso-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>tomcat-embed-core</artifactId>
+					<groupId>org.apache.tomcat.embed</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

src/main/java/com/uas/platform/home/controller/AccountController.java

@@ -1,7 +1,8 @@
 package com.uas.platform.home.controller;
 
-import com.uas.account.entity.UuzcUserSpaceDetail;
-import com.uas.account.util.AccountUtils;
+import com.uas.platform.home.model.UuzcUserSpaceDetail;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.home.core.support.SystemSession;
 import com.uas.platform.home.web.BaseController;
 import com.uas.sso.SSOHelper;
@@ -26,7 +27,7 @@ public class AccountController extends BaseController {
 	public ModelMap getAccountInfo() throws Exception {
 	    if(null != SystemSession.getUser()) {
             ModelMap map = new ModelMap();
-	        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(SystemSession.getUser().getSpaceUID());
+	        UserSpaceView detail = AccountUtils.findByBusinessCode(SystemSession.getUser().getBusinessCode());
             map.put("content", SystemSession.getUser());
             if(null != detail) {
                 map.put("space", detail);

src/main/java/com/uas/platform/home/controller/FinanceController.java

@@ -29,9 +29,9 @@ public class FinanceController {
     public String loan(String jsonStr) {
         JSONObject jsonObject = JSON.parseObject(jsonStr);
         String url = httpAddress.getLoanAddress();
-        if (null != SystemSession.getUser() && null != SystemSession.getUser().getDialectUID()) {
+        if (null != SystemSession.getUser() && null != SystemSession.getUser().getUserUU()) {
             jsonObject.putAll(JSON.parseObject(JSON.toJSONString(SystemSession.getUser())));
-            url = url + "?UID=" + Long.parseLong(SystemSession.getUser().getDialectUID());
+            url = url + "?UID=" + SystemSession.getUser().getUserUU();
         }
         com.uas.sso.common.util.HttpUtil.ResponseWrap res = null;
         try {

src/main/java/com/uas/platform/home/controller/SaasController.java

@@ -5,7 +5,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.uas.account.entity.UserView;
+import com.uas.platform.home.model.User;
 import com.uas.platform.home.core.support.SystemSession;
 
 @Controller
@@ -14,7 +14,7 @@ public class SaasController {
 
 	@RequestMapping("/about")
 	public ModelAndView getSaasPage() {
-		UserView user = SystemSession.getUser();
+		User user = SystemSession.getUser();
 		if (null == user || StringUtils.isEmpty(user.getSpaceDomain())) {
 			// TODO:考虑场景：
 			// 张三绑定了企业A、B和C，A、B企业开通了saas、b2b，C企业只开通了b2b

src/main/java/com/uas/platform/home/controller/UuzcController.java

@@ -2,10 +2,12 @@ package com.uas.platform.home.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserView;
-import com.uas.account.entity.UuzcUserSpaceDetail;
-import com.uas.account.util.AccountUtils;
+import com.uas.platform.home.model.User;
+import com.uas.platform.home.model.UuzcUserSpaceDetail;
+import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.support.Page;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.home.core.support.SystemSession;
 import com.uas.platform.home.model.ResultInfo;
 import com.uas.platform.home.model.UuzcUserInfo;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,6 +30,11 @@ import java.util.List;
 @RequestMapping(value = "/uuzc")
 public class UuzcController extends BaseController {
 
+    /**
+     * uu众创url
+     */
+    private static final String URL = "http://job.uutest.com";
+
     /**
      * 对当前登录账号进行检验
      *
@@ -34,38 +42,38 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/account/check", method = RequestMethod.GET)
     public ModelMap checkAccount() throws Exception {
-        UserView user = SystemSession.getUser();
+        User user = SystemSession.getUser();
         ModelMap map = new ModelMap();
-        if (null != user) {
-	        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(user.getSpaceUID());
-	        if (null != user.getHr() && 1 == user.getHr()) {// hr账户
-                UuzcUserInfo info = getUserInfo(user, detail, true);
-                map.put("ishr", true);
-                map.put("user", info);
-                map.put("usertype", "hr");
-            } else if (null != detail) {// 先通过登录的信息判断是否是企业用户
-                map.put("usertype", "company");
-                UuzcUserInfo info = getUserInfo(user, detail, true);
-                //判断是否设置了hr
-                String result = AccountUtils.getHrAccount(info.getLicense());
-                ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
-                map.put("hr", resInfo.getExistHr() ? true : false);
-                if (user.getUid().equals(detail.getAdminTel())) {
-                    map.put("manager", true);
-                } else {
-                    map.put("managerName", detail.getAdminName());
-                }
-                map.put("user", info);
-            } else if (null == detail) {// 个人用户
-                UuzcUserInfo info = getUserInfo(user, detail, false);
-                JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
-                map.put("user", formData);
-                map.put("usertype", "personal");
-            }
-        } else {
+        if (user == null) {
             SSOHelper.clearLogin(request, response);
             return success(SSOHelper.getRedirectRefererLoginUrl(request));
         }
+
+//        UserSpaceView detail = AccountUtils.findByBusinessCode(user.getBusinessCode());
+//        if (null != user.getHr() && 1 == user.getHr()) {// hr账户
+//            UuzcUserInfo info = getUserInfo(user, detail, true);
+//            map.put("ishr", true);
+//            map.put("user", info);
+//            map.put("usertype", "hr");
+//        } else if (null != detail) {// 先通过登录的信息判断是否是企业用户
+//            map.put("usertype", "company");
+//            UuzcUserInfo info = getUserInfo(user, detail, true);
+//            //判断是否设置了hr
+//            String result = AccountUtils.getHrAccount(info.getLicense());
+//            ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
+//            map.put("hr", resInfo.getExistHr() ? true : false);
+//            if (user.getUid().equals(detail.getAdminTel())) {
+//                map.put("manager", true);
+//            } else {
+//                map.put("managerName", detail.getAdminName());
+//            }
+//            map.put("user", info);
+//        } else if (null == detail) {// 个人用户
+//            UuzcUserInfo info = getUserInfo(user, detail, false);
+//            JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
+//            map.put("user", formData);
+//            map.put("usertype", "personal");
+//        }
         return map;
     }
 
@@ -76,17 +84,15 @@ public class UuzcController extends BaseController {
      * @param company
      * @return
      */
-    private UuzcUserInfo getUserInfo(UserView user, UuzcUserSpaceDetail detail, boolean company) {
+    private UuzcUserInfo getUserInfo(User user, UuzcUserSpaceDetail detail, boolean company) {
         UuzcUserInfo info = new UuzcUserInfo();
-        info.setEmail(user.getSecondUID());
-        info.setMobile(user.getUid());
-        info.setUc_uid(user.getDialectUID());
-        info.setPassword(user.getPassword());
-        info.setSalt(user.getSalt());
+        info.setEmail(user.getEmail());
+        info.setMobile(user.getMobile());
+        info.setUc_uid(user.getUserUU().toString());
         info.setUsername(user.getName());
         if (null != detail && company) {
             info.setCompanyname(user.getSpaceName());
-            info.setLicense(user.getSpaceUID());
+            info.setLicense(user.getSpaceUU().toString());
             info.setContact(detail.getContactMan() != null ?
                     detail.getContactMan() : detail.getAdminName());
             info.setWebsite(detail.getUrl());
@@ -106,15 +112,12 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/setHrAccount", method = RequestMethod.POST)
     public ModelMap setHrAccount(UuzcUserInfo user) throws Exception {
-        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(SystemSession.getUser().getSpaceUID());
-        User userInfo = new User();
-        userInfo.setHr((short) 1);
-        userInfo.setName(user.getUsername());
-        userInfo.setUid(user.getMobile());
-        userInfo.setSecondUID(user.getEmail());
-        String result = AccountUtils.setHrAccount(userInfo, detail);
-        ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
-        return new ModelMap("result", resInfo.getMsg());
+        UserView userView = new UserView();
+        userView.setMobile(user.getMobile());
+        userView.setName(user.getUsername());
+        userView.setEmail(user.getEmail());
+        userView = AccountUtils.addUser(SystemSession.getUser().getSpaceUU(), userView);
+        return success(userView);
     }
 
     /**
@@ -125,7 +128,14 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/existusers", method = RequestMethod.GET)
     public ModelMap getExistUsers() throws Exception {
-        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getSpaceUID());
+        List<UserView> users = new ArrayList<>();
+        int pageNumber = 1;
+        int pageSize = 20;
+        Page<UserView> pUser;
+        do {
+            pUser = AccountUtils.findUsersByBusinessCode(SystemSession.getUser().getSpaceUU(), pageNumber++, pageSize);
+            users.addAll(pUser.getContent());
+        } while (!pUser.isLast());
         return success(users);
     }
 
@@ -137,9 +147,9 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/hrInfo", method = RequestMethod.GET)
     public ModelMap getHrInfo() throws Exception {
-        if(null != SystemSession.getUser()) {
-            return new ModelMap("user", AccountUtils.getHrInfo(SystemSession.getUser().getSpaceUID()));
-        }
+//        if(null != SystemSession.getUser()) {
+//            return new ModelMap("user", AccountUtils.getHrInfo(SystemSession.getUser().getSpaceUID()));
+//        }
         return null;
     }
 }

src/main/java/com/uas/platform/home/core/support/SystemSession.java

@@ -1,6 +1,7 @@
 package com.uas.platform.home.core.support;
 
-import com.uas.account.entity.UserView;
+import com.uas.platform.home.model.User;
+import com.uas.sso.entity.UserView;
 
 /**
  * 每次请求服务器时，用户信息存放在本次线程中
@@ -10,13 +11,13 @@ import com.uas.account.entity.UserView;
  */
 public class SystemSession {
 
-	private static ThreadLocal<UserView> local = new ThreadLocal<UserView>();
+	private static ThreadLocal<User> local = new ThreadLocal<User>();
 
-	public static void setUser(UserView session) {
+	public static void setUser(User session) {
 		local.set(session);
 	}
 
-	public static UserView getUser() {
+	public static User getUser() {
 		return local.get();
 	}
 

src/main/java/com/uas/platform/home/model/User.java

@@ -0,0 +1,135 @@
+package com.uas.platform.home.model;
+
+import com.uas.sso.entity.UserAccount;
+
+import java.io.Serializable;
+
+/**
+ * @author wangmh
+ * @create 2018-03-16 10:28
+ * @desc 登录用户信息
+ **/
+public class User implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 用户uu号
+     */
+    private Long userUU;
+
+    /**
+     * 用户手机号
+     */
+    private String mobile;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 企业uu号
+     */
+    private Long spaceUU;
+
+    /**
+     * 企业名称
+     */
+    private String spaceName;
+
+    /**
+     * 企业域名
+     */
+    private String spaceDomain;
+
+    /**
+     * 企业营业执照号
+     */
+    private String businessCode;
+
+    public User() {
+    }
+
+    public User(UserAccount userAccount) {
+        this.setUserUU(userAccount.getUserUU());
+        this.setName(userAccount.getVipName());
+        this.setMobile(userAccount.getMobile());
+        this.setEmail(userAccount.getEmail());
+        this.setSpaceUU(userAccount.getSpaceUU());
+        this.setSpaceName(userAccount.getSpaceName());
+        this.setBusinessCode(userAccount.getBusinessCode());
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Long getSpaceUU() {
+        return spaceUU;
+    }
+
+    public void setSpaceUU(Long spaceUU) {
+        this.spaceUU = spaceUU;
+    }
+
+    public String getSpaceName() {
+        return spaceName;
+    }
+
+    public void setSpaceName(String spaceName) {
+        this.spaceName = spaceName;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getSpaceDomain() {
+        return spaceDomain;
+    }
+
+    public void setSpaceDomain(String spaceDomain) {
+        this.spaceDomain = spaceDomain;
+    }
+}

src/main/java/com/uas/platform/home/model/UuzcUserSpaceDetail.java

@@ -0,0 +1,152 @@
+package com.uas.platform.home.model;
+
+/**
+ * 优软众创企业信息需要的资料
+ *
+ * Created by hejq on 2017-11-09.
+ */
+public class UuzcUserSpaceDetail {
+
+    /**
+     * 企业名称
+     */
+    private String name;
+
+    /**
+     * 企业营业执照号
+     */
+    private String businessCode;
+
+    /**
+     * 法人名
+     */
+    private String corporation;
+
+    /**
+     * 企业电话
+     */
+    private String tel;
+
+    /**
+     * 企业官网
+     */
+    private String url;
+
+    /**
+     * 管理员姓名
+     */
+    private String adminName;
+
+    /**
+     * 管理员联系方式
+     */
+    private String adminTel;
+
+    /**
+     * 管理员邮箱
+     */
+    private String adminEmail;
+
+    /**
+     * 联系人
+     */
+    private String contactMan;
+
+    /**
+     * 联系人电话
+     */
+    private String contactTel;
+
+    /**
+     * 联系人邮箱
+     */
+    private String contactEmail;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getCorporation() {
+        return corporation;
+    }
+
+    public void setCorporation(String corporation) {
+        this.corporation = corporation;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
+    public String getAdminTel() {
+        return adminTel;
+    }
+
+    public void setAdminTel(String adminTel) {
+        this.adminTel = adminTel;
+    }
+
+    public String getAdminEmail() {
+        return adminEmail;
+    }
+
+    public void setAdminEmail(String adminEmail) {
+        this.adminEmail = adminEmail;
+    }
+
+    public String getContactMan() {
+        return contactMan;
+    }
+
+    public void setContactMan(String contactMan) {
+        this.contactMan = contactMan;
+    }
+
+    public String getContactTel() {
+        return contactTel;
+    }
+
+    public void setContactTel(String contactTel) {
+        this.contactTel = contactTel;
+    }
+
+    public String getContactEmail() {
+        return contactEmail;
+    }
+
+    public void setContactEmail(String contactEmail) {
+        this.contactEmail = contactEmail;
+    }
+}

src/main/java/com/uas/platform/home/web/filter/SSOInterceptor.java

@@ -3,7 +3,10 @@ package com.uas.platform.home.web.filter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.uas.account.entity.UserView;
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.home.model.User;
+import com.uas.sso.entity.UserAccount;
+import com.uas.sso.entity.UserView;
 import com.uas.platform.home.core.support.SystemSession;
 import com.uas.platform.home.core.util.FastjsonUtils;
 import com.uas.sso.SSOHelper;
@@ -21,10 +24,12 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 	@Override
 	protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
 		SSOToken token = SSOHelper.attrToken(request);
-		if (token.getData() != null)
-			SystemSession.setUser(FastjsonUtils.fromJson(token.getData(), UserView.class));
-		else
+		if (token.getData() != null) {
+			UserAccount userAccount = JSON.parseObject(token.getData(), UserAccount.class);
+			SystemSession.setUser(new User(userAccount));
+		} else {
 			SystemSession.clear();
+		}
 	}
 
 	@Override

src/main/resources/conf/account.properties

@@ -6,10 +6,10 @@ sso.cookie.secure=false
 
 #prod
 sso.cookie.domain=ubtob.com
-sso.login.url=https://account.ubtob.com/sso/login
+sso.login.url=http://192.168.253.118:3001
 
 ### account center config,
-account.us.save.url=http://10.10.100.133:8080/api/userspace
-account.user.save.url=http://10.10.100.133:8080/api/user
-account.user.getPartners.url = http://10.10.100.133:8080/api/partners
-account.user.getContactPage.url=https://account.ubtob.com/business/groups
+account.us.save.url=http://192.168.253.118:3001/api/userspace
+account.user.save.url=http://192.168.253.118:3001/api/user
+account.user.getPartners.url =http://192.168.253.118:3001/api/partners
+account.user.getContactPage.url=http://192.168.253.118:3001/business/groups

src/main/resources/spring/applicationContext.xml

@@ -16,7 +16,7 @@
 	<context:component-scan base-package="com.uas.platform.home" />
 
 	<!-- 账户中心配置 -->
-	<bean id="accountConfigurer" class="com.uas.account.web.AccountConfigurer"
+	<bean id="accountConfigurer" class="com.uas.sso.web.AccountConfigurer"
 		init-method="init">
 		<property name="configPath" value="classpath:conf/account.properties" />
 	</bean>

src/main/webapp/resources/js/common/common.js

@@ -11,8 +11,9 @@ document.write("<script language=javascript src='static/js/common/toastr.js'></s
  *  获取用户信息
  */
 function getAccountInfo() {
-	$.get('account', function(data){
+	$.get('/account', function(data){
 		if (data.content) {
+            window.loginInfo = data;
 			$('.x-nologin').hide();
 			$('.x-login').show();
 
@@ -127,27 +128,57 @@ function logoutUuzcJob() {
  * 点击顶部导航栏跳转到人才招聘
  */
 function jobUuzc() {
-    var url = 'http://job.uuzcc.com/';
-    var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
-    $.get('uuzc/account/check', function(data) {
-        var user = data.user;
-        if(data.usertype == 'hr') { // 账号类型是hr直接登录
-            loginJobUuzc(user, loginUrl, 'hr');
-            setTimeout(window.location.href = url, 200);
-        } else if(data.usertype == 'company' && !data.ishr) {// 如果是企业账号并且未设置hr账号，停留在当前页，其他的都跳转到人才招聘页
-            if(data.hr) {// 如果企业存在hr账号，直接跳转
-                loginJobUuzc(user, loginUrl, data.usertype);
-                setTimeout(window.location.href = url, 200);
-            } else {
-                return;
-            }
-        } else if(data.usertype == 'personal') {
-            loginJobUuzc(user, loginUrl, data.usertype);
+    var url = 'http://job.uutest.com/';
+    var loginUrl = 'http://job.uutest.com/index.php?m=&c=ubtob&a=login';
+    if (!window.loginInfo) {
+        // 未登录，跳转人才招聘首页
+        window.location.href = url;
+    }
+
+    if (!window.loginInfo.space) {
+        // 个人账号也跳转人才招聘首页
+        loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
+        setTimeout(window.location.href = url, 200);
+    }
+
+    $.get("http://job.uutest.com/index.php?m=&c=ubtob&a=check_space_uu", {
+        "spaceUU": window.loginInfo.space.spaceUU
+    }, function (data) {
+        // 企业有HR则跳转人才招聘
+        if (data.data.code == 1) {
+            loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
             setTimeout(window.location.href = url, 200);
-        } else {
-            window.location.href = url;
         }
-    });
+    })
+    // // 判断当前登录账号是否已注册
+    // $.get("http://job.uutest.com/index.php", {
+    //     "c": "ubtob",
+    //     "a": "check_user",
+    //     "uc_uid": window.loginInfo.content.userUU
+    // }, function (data) {
+    //     if (data.data && data.data.code == 0 && window.loginInfo.space) {
+    //         // 在人才招聘未注册并且为企业账号，则判断是否有hr
+    //         $.get("http://job.uutest.com/index.php", {
+    //             "c": "ubtob",
+    //             "a": "company_hr",
+    //             "company_name": window.loginInfo.space.spaceName
+    //         }, function (data) {
+    //             if (data.data.code == 1) {
+    //                 // 有hr则跳转人才招聘登录
+    //                 loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
+    //                 setTimeout(window.location.href = url, 200);
+    //             } else if (window.loginInfo.content.userUU == window.loginInfo.space.adminUU) {
+    //                 // 管理员则不操作
+    //                 return;
+    //             }
+    //         })
+    //     } else {
+    //         // 否则跳转人才招聘登录
+    //         loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
+    //         setTimeout(window.location.href = url, 200);
+    //     }
+    //
+    // })
 }
 
 /**
@@ -182,28 +213,71 @@ function getHrInfo() {
 function jobUuzcGet() {
     var url = 'http://job.uuzcc.com/';
     var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
-    $.get('uuzc/account/check', function(data) {
-        var user = data.user;
-        if(null != data && 'personal' == data.usertype) {
-            toastr.error("您的账号为个人账号，不可进行此操作");
-        } else if(null != data && 'company' == data.usertype) {
-            // 先判断是否管理员
-            if(data.manager) {
-                // if(!data.hr) {// 企业不存在hr账号
-                    window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
-                // } else {// 如果企业存在hr
-                //     toastr.error('您的账号非HR账号，不可进行此操作');
-                // }
+    if (!window.loginInfo) {
+        // 未登录，跳转登录页面
+        $.get('/uuzc/account/check', function(data) {
+            data.content && (window.location.href = data.content);
+        })
+    }
+
+    if (!window.loginInfo.space) {
+        // 个人账号
+        toastr.error("您的账号为个人账号，不可进行此操作");
+    }
+
+    $.get("http://job.uutest.com/index.php?m=&c=ubtob&a=check_space_uu", {
+        "spaceUU": window.loginInfo.space.spaceUU
+    }, function (data) {
+        // 企业有HR则跳转人才招聘
+        if (data.data.code == 1) {
+            // 企业有hr
+            // TODO 判断是否为当前用户是否为本企业hr
+            if (false) {
+                toastr.error("您的账号为非HR账号，不可进行此操作");
             } else {
-                toastr.error('请通知管理员' + data.managerName + '设置HR账号');
+                loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
+                setTimeout(window.location.href = url, 200);
             }
-        } else if(data.usertype =='hr') {
-            loginJobUuzc(user, loginUrl, 'hr');
-            setTimeout(window.location.href = url, 200);
+        } else if (window.loginInfo.content.userUU == window.loginInfo.space.adminUU) {
+            // 是管理员则跳转设置HR页面
+            window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
         } else {
-            data.content && (window.location.href = data.content);
+            // 提示通知管理员设置HR
+            toastr.error('请通知管理员' + window.loginInfo.space.admin.vipName + '设置HR账号');
         }
-    });
+    })
+    //
+    // $.get("http://job.uutest.com/index.php", {
+    //     "c": "ubtob",
+    //     "a": "check_user",
+    //     "uc_uid": window.loginInfo.content.userUU
+    // }, function (data) {
+    //     switch (data.data.code) {
+    //         case 0:
+    //             $.get("http://job.uutest.com/index.php?c=ubtob&a=company_hr", {
+    //                 "company_name": window.loginInfo.space.spaceName
+    //             }, function (data) {
+    //                 if (data.data.code == 1) {
+    //                     toastr.error("您的账号为非HR账号，不可进行此操作");
+    //                 } else if (window.loginInfo.content.userUU == window.loginInfo.space.adminUU) {
+    //                     // 管理员账号，跳转设置HR页面
+    //                     window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
+    //                 } else {
+    //                     toastr.error('请通知管理员' + window.loginInfo.space.admin.vipName + '设置HR账号');
+    //                 }
+    //             })
+    //             break;
+    //         case 1:
+    //             toastr.error("您的账号为非HR账号，不可进行此操作");
+    //             break;
+    //         case 2:
+    //             loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
+    //             setTimeout(window.location.href = url, 200);
+    //             break;
+    //         default:
+    //             break;
+    //     }
+    // });
 }
 
 /**
@@ -212,20 +286,22 @@ function jobUuzcGet() {
 function jobUuzcPost() {
     var url = 'http://job.uuzcc.com/';
     var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
-    $.get('uuzc/account/check', function(data) {
-        if(null != data.usertype) {
-            var user = data.user;
-            if(data.usertype == 'hr') {
+    if(window.loginInfo) {
+        $.get("http://job.uutest.com/index.php", {
+            "c": "ubtob",
+            "a": "check_user",
+            "uc_uid": window.loginInfo.content.userUU
+        }, function (data) {
+            if (data.data.code == 1) {
                 toastr.error('您的账号为HR账号，不能进行此操作');
-                return;
             } else {
-                loginJobUuzc(user, loginUrl, data.usertype);
+                loginJobUuzc(window.loginInfo.content.userUU, loginUrl);
                 setTimeout(window.location.href = url, 200);
             }
-        } else {// 求职时可以未登录
-            data.content && (window.location.href = url);
-        }
-    });
+        });
+    } else {// 求职时可以未登录
+       window.location.href = url;
+    }
 }
 
 /**
@@ -233,21 +309,9 @@ function jobUuzcPost() {
  * @param user
  * @param userLoginUrl
  */
-function loginJobUuzc(user, url, type) {
+function loginJobUuzc(uc_uid, url) {
     $('#J_commenting').attr("action", url);
-    $('#username').val(user.username);
-    $('#password').val(user.password);
-    $('#email').val(user.email);
-    $('#mobile').val(user.mobile);
-    $('#uc_uid').val(user.uc_uid);
-    $('#salt').val(user.salt);
-    if(type == 'hr') {// 只有hr会带出当前企业的信息
-        $('#companyname').val(user.companyname);
-        $('#license').val(user.license);
-        $('#website').val(user.website);
-        $('#landine_tel').val(user.landine_tel);
-        $('#telephone').val(user.telephone);
-    }
+    $('#uc_uid').val(uc_uid);
     $('#J_commenting').submit();
 }
 
@@ -257,8 +321,20 @@ function loginJobUuzc(user, url, type) {
 function addHrAccount() {
     var user = {
         username: $('#hrname').val(),
+        password: null,
         email: $('#hremail').val(),
-        mobile: $('#hrtel').val()
+        mobile: $('#hrtel').val(),
+        uc_uid: '',
+        salt: null,
+        companyname: window.loginInfo.space.spaceName,
+        contact: $('#hrname').val(),
+        telephone: $('#hrtel').val(),
+        landline_tel: null,
+        license: window.loginInfo.space.businessCode,
+        spaceUU: window.loginInfo.space.spaceUU,
+        registered: null,
+        currency: null,
+        website: null
     };
     $.ajax({
         url: 'uuzc/setHrAccount',
@@ -266,19 +342,11 @@ function addHrAccount() {
         method: 'POST',
         async: false,
         success: function(data) {
-           if(data) {
-               var result = data.result;
-               if(result == 'success') {
-                   toastr.success('设置HR账号成功');
-                   hrInfo = null; // 清空已查询的数据，重新加载
-                   setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 2000);
-               }
-               if(result == 'exist') {
-                   toastr.error('该企业HR账号已存在');
-               }
-               if(result == 'setFailure') {
-                   toastr.error('设置HR账号失败');
-               }
+           if(data.success) {
+               var result = data.content;
+               user.uc_uid = result.userUU;
+               user.password = result.userUU;
+               uuzcSetHr(user);
            }
         },
         error: function (error) {
@@ -293,27 +361,37 @@ function addHrAccount() {
 function setHrAccount() {
     var user = {
         username: $('#username').val(),
+        password: $('#useruu').val(),
         email: $('#useremail').val(),
-        mobile: $('#usertel').val()
+        mobile: $('#usertel').val(),
+        uc_uid: $('#useruu').val(),
+        salt: null,
+        companyname: window.loginInfo.space.spaceName,
+        contact: $('#hrname').val(),
+        telephone: $('#usertel').val(),
+        landline_tel: null,
+        license: window.loginInfo.space.businessCode,
+        spaceUU: window.loginInfo.space.spaceUU,
+        registered: null,
+        currency: null,
+        website: null
     };
+    uuzcSetHr(user);
+}
+
+function uuzcSetHr(user) {
     $.ajax({
-        url: 'uuzc/setHrAccount',
+        url: 'http://job.uutest.com/index.php?m=&c=ubtob&a=reg_hr',
         data: user,
         method: 'POST',
         async: false,
         success: function(data) {
             if(data) {
-                var result = data.result;
-                if(result == 'success') {
-                    toastr.success('设置HR账号成功');
-                    hrInfo = null; // 清空已查询的数据，重新加载
-                    setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 2000);
-                }
-                if(result == 'exist') {
-                    toastr.error('该企业HR账号已存在');
-                }
-                if(result == 'setFailure') {
-                    toastr.error('设置HR账号失败');
+                if (!data.code || data.code == 0) {
+                    // 设置失败
+                    toastr.error(data.msg);
+                } else {
+                    toastr.info("hr设置成功");
                 }
             }
         },
@@ -348,14 +426,14 @@ function getExistUser() {
                 for(var i = 0; i < users.length; i++) {
                     var li = document.createElement('li');
                     var b = document.createElement('b');
-                    b.innerHTML = users[i].name;
+                    b.innerHTML = users[i].vipName;
                     li.appendChild(b);
                     var span = document.createElement('span');
                     span.class = "phone"
-                    span.innerHTML = users[i].uid;
+                    span.innerHTML = users[i].mobile;
                     li.appendChild(span);
                     var span2 = document.createElement('span');
-                    span2.innerHTML = users[i].secondUID;
+                    span2.innerHTML = users[i].email;
                     li.appendChild(span2);
                     li.id = 'btn_' + i;
                     ul.appendChild(li);
@@ -378,10 +456,10 @@ function getExistUser() {
  * @param user
  */
 function setAccount(user) {
-    $('#username').val(user.name);
-    $('#useremail').val(user.secondUID);
-    $('#usertel').val(user.uid);
-    $('#useruu').val(user.dialectUID);
+    $('#username').val(user.vipName);
+    $('#useremail').val(user.email);
+    $('#usertel').val(user.mobile);
+    $('#useruu').val(user.userUU);
 }
 
 /**

src/main/webapp/resources/js/uuzcc/app.js

@@ -0,0 +1,3 @@
+/**
+ * Created by uas on 2018/3/16.
+ */