Merge remote-tracking branch 'origin/master'

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

@@ -1,16 +1,17 @@
 package com.uas.platform.home.controller;
 
-import java.io.IOException;
-
+import com.uas.account.entity.UuzcUserSpaceDetail;
+import com.uas.account.util.AccountUtils;
+import com.uas.platform.home.core.support.SystemSession;
+import com.uas.platform.home.web.BaseController;
+import com.uas.sso.SSOHelper;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.platform.home.core.support.SystemSession;
-import com.uas.platform.home.web.BaseController;
-import com.uas.sso.SSOHelper;
+import java.io.IOException;
 
 @Controller
 public class AccountController extends BaseController {
@@ -22,8 +23,17 @@ public class AccountController extends BaseController {
 	 */
 	@RequestMapping(value = "/account", method = RequestMethod.GET)
 	@ResponseBody
-	public ModelMap getAccountInfo() {
-		return success(SystemSession.getUser());
+	public ModelMap getAccountInfo() throws Exception {
+	    if(null != SystemSession.getUser()) {
+            ModelMap map = new ModelMap();
+	        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(SystemSession.getUser().getSpaceUID());
+            map.put("content", SystemSession.getUser());
+            if(null != detail) {
+                map.put("space", detail);
+            }
+            return map;
+        }
+	    return success();
 	}
 
 	/**
@@ -49,5 +59,5 @@ public class AccountController extends BaseController {
 		SSOHelper.clearLogin(request, response);
 		return success();
 	}
-
+    
 }

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

@@ -0,0 +1,78 @@
+package com.uas.platform.home.controller;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.ui.ModelMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * controller基础类
+ * 
+ * @author yingp
+ *
+ */
+public class CommonController {
+
+	protected static final String defultCharset = "UTF-8";
+
+	@Autowired
+	protected HttpServletRequest request;
+
+	@Autowired
+	protected HttpServletResponse response;
+
+	protected static ModelMap success() {
+		return new ModelMap("success", true);
+	}
+
+	protected static ModelMap success(Object data) {
+		return new ModelMap("success", true).addAttribute("content", data);
+	}
+
+	protected static ModelMap error(String errMsg) {
+		return new ModelMap("error", true).addAttribute("errMsg", errMsg);
+	}
+
+	protected static ModelMap error(String errCode, String errMsg) {
+		return new ModelMap("error", true).addAttribute("errCode", errCode).addAttribute("errMsg", errMsg);
+	}
+
+	/**
+	 * 输出json格式
+	 * 
+	 * @param obj
+	 * @throws IOException
+	 */
+	protected void printJson(Object obj) throws IOException {
+		response.setStatus(HttpStatus.FORBIDDEN.value());
+		response.addHeader("Content-Type", "application/json; charset=" + defultCharset);
+		PrintWriter printWriter = response.getWriter();
+		printWriter.append(JSON.toJSONString(obj));
+		printWriter.flush();
+		printWriter.close();
+	}
+
+	/**
+	 * 输出流
+	 * 
+	 * @param fileName
+	 *            文件名
+	 * @param bytes
+	 * @throws IOException
+	 */
+	protected ResponseEntity<byte[]> outputStream(String fileName, byte[] bytes) {
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+		headers.setContentDispositionFormData("attachment", fileName);
+		return new ResponseEntity<byte[]>(bytes, headers, HttpStatus.CREATED);
+	}
+
+}

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

@@ -0,0 +1,50 @@
+package com.uas.platform.home.controller;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.home.core.support.SystemSession;
+import com.uas.platform.home.model.HttpAddress;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * created by shicr on 2017/11/23
+ **/
+@RestController
+@RequestMapping("/finance")
+public class FinanceController {
+
+    @Autowired
+    private HttpAddress httpAddress;
+
+    @RequestMapping
+    public ModelAndView getFinancePage(){
+        return new ModelAndView("finance");
+    }
+
+    @RequestMapping(value = "/loan")
+    public String loan(String jsonStr) {
+        JSONObject jsonObject = JSON.parseObject(jsonStr);
+        String url = httpAddress.getLoanAddress();
+        if (null != SystemSession.getUser() && null != SystemSession.getUser().getDialectUID()) {
+            jsonObject.putAll(JSON.parseObject(JSON.toJSONString(SystemSession.getUser())));
+            url = url + "?UID=" + Long.parseLong(SystemSession.getUser().getDialectUID());
+        }
+        com.uas.sso.common.util.HttpUtil.ResponseWrap res = null;
+        try {
+            res = com.uas.sso.common.util.HttpUtil.doPost(url, jsonObject);
+            if(res.isSuccess()) {
+                return "申请成功";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "申请失败";
+    }
+
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.uas.platform.home.controller;
+
+
+import com.uas.platform.home.core.support.SystemSession;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 账号登录配置
+ *
+ * Created by hejq on 2017-11-15.
+ */
+@RequestMapping(value = "/sso")
+@RestController
+public class SecurityController extends CommonController {
+    /**
+     * 账户信息、SSO配置
+     *
+     * @return
+     */
+    @RequestMapping(value = "/account", method = RequestMethod.GET)
+    public ModelMap getAccountInfo() {
+        return success(SystemSession.getUser());
+    }
+
+}

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

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * 关于优软众创的一些接口
- *
+ * <p>
  * Created by hejq on 2017-11-02.
  */
 @RestController
@@ -36,27 +36,28 @@ public class UuzcController extends BaseController {
     public ModelMap checkAccount() throws Exception {
         UserView user = SystemSession.getUser();
         ModelMap map = new ModelMap();
-        if(null != user) {
-            if ( null != user.getHr() && 1 == user.getHr()) {// hr账户
-                UuzcUserInfo info = getUserInfo(user, true);
+        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 != user.getUuzcUserSpaceDetail()) {// 先通过登录的信息判断是否是企业用户
+            } else if (null != detail) {// 先通过登录的信息判断是否是企业用户
                 map.put("usertype", "company");
-                UuzcUserInfo info = getUserInfo(user, true);
+                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.getName().equals(user.getUuzcUserSpaceDetail().getAdminName())) {
+                if (user.getUid().equals(detail.getAdminTel())) {
                     map.put("manager", true);
                 } else {
-                    map.put("managerName", user.getUuzcUserSpaceDetail().getAdminName());
+                    map.put("managerName", detail.getAdminName());
                 }
                 map.put("user", info);
-            } else if(null == user.getUuzcUserSpaceDetail()) {// 个人用户
-                UuzcUserInfo info = getUserInfo(user, false);
+            } 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");
@@ -75,7 +76,7 @@ public class UuzcController extends BaseController {
      * @param company
      * @return
      */
-    private UuzcUserInfo getUserInfo(UserView user, boolean company) {
+    private UuzcUserInfo getUserInfo(UserView user, UuzcUserSpaceDetail detail, boolean company) {
         UuzcUserInfo info = new UuzcUserInfo();
         info.setEmail(user.getSecondUID());
         info.setMobile(user.getUid());
@@ -83,18 +84,18 @@ public class UuzcController extends BaseController {
         info.setPassword(user.getPassword());
         info.setSalt(user.getSalt());
         info.setUsername(user.getName());
-        if(null != user.getUuzcUserSpaceDetail() && company) {
+        if (null != detail && company) {
             info.setCompanyname(user.getSpaceName());
             info.setLicense(user.getSpaceUID());
-            info.setContact(user.getUuzcUserSpaceDetail().getContactMan() != null ?
-                    user.getUuzcUserSpaceDetail().getContactMan() : user.getUuzcUserSpaceDetail().getAdminName());
-            info.setWebsite(user.getUuzcUserSpaceDetail().getUrl());
-            info.setTelephone(user.getUuzcUserSpaceDetail().getTel() != null ?
-                    user.getUuzcUserSpaceDetail().getTel() : user.getUuzcUserSpaceDetail().getAdminTel());
-            info.setLandine_tel(user.getUuzcUserSpaceDetail().getContactTel() != null ?
-                    user.getUuzcUserSpaceDetail().getContactTel() : user.getUuzcUserSpaceDetail().getAdminTel());
+            info.setContact(detail.getContactMan() != null ?
+                    detail.getContactMan() : detail.getAdminName());
+            info.setWebsite(detail.getUrl());
+            info.setTelephone(detail.getTel() != null ?
+                    detail.getTel() : detail.getAdminTel());
+            info.setLandine_tel(detail.getContactTel() != null ?
+                    detail.getContactTel() : detail.getAdminTel());
         }
-        return  info;
+        return info;
     }
 
     /**
@@ -105,7 +106,7 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/setHrAccount", method = RequestMethod.POST)
     public ModelMap setHrAccount(UuzcUserInfo user) throws Exception {
-        UuzcUserSpaceDetail detail = SystemSession.getUser().getUuzcUserSpaceDetail();
+        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(SystemSession.getUser().getSpaceUID());
         User userInfo = new User();
         userInfo.setHr((short) 1);
         userInfo.setName(user.getUsername());
@@ -124,8 +125,21 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/existusers", method = RequestMethod.GET)
     public ModelMap getExistUsers() throws Exception {
-        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getUuzcUserSpaceDetail().getBusinessCode());
+        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getSpaceUID());
         return success(users);
     }
 
+    /**
+     * 获取当前企业的hr账号信息
+     *
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/hrInfo", method = RequestMethod.GET)
+    public ModelMap getHrInfo() throws Exception {
+        if(null != SystemSession.getUser()) {
+            return new ModelMap("user", AccountUtils.getHrInfo(SystemSession.getUser().getSpaceUID()));
+        }
+        return null;
+    }
 }

src/main/java/com/uas/platform/home/core/util/HttpUtil.java

@@ -0,0 +1,101 @@
+package com.uas.platform.home.core.util;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.protocol.HTTP;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * created by shicr on 2017/11/24
+ **/
+public class HttpUtil {
+
+    /**
+     * 发送post请求
+     *
+     * @param postUrl
+     * @param formData
+     * @return
+     * @throws Exception
+     */
+    public static Response doPost(String postUrl, String formData,  int timeout) throws Exception {
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        HttpPost post = new HttpPost(postUrl);
+        StringEntity postingString = new StringEntity(formData, HTTP.UTF_8);
+        post.setEntity(postingString);
+        post.setHeader("Content-type", "application/json");
+        CloseableHttpResponse response = httpClient.execute(post);
+        return Response.getResponse(response);
+    }
+    public static class Response {
+        private int statusCode;
+        private String responseText;
+
+        public int getStatusCode() {
+            return statusCode;
+        }
+
+        public void setStatusCode(int statusCode) {
+            this.statusCode = statusCode;
+        }
+
+        public String getResponseText() {
+            return responseText;
+        }
+
+        public void setResponseText(String responseText) {
+            this.responseText = responseText;
+        }
+
+        public Response() {
+        }
+
+        public Response(boolean success, String content) {
+            super();
+            this.statusCode = success ? 200 : 404;
+            this.responseText = content;
+        }
+
+        public Response(HttpResponse response) throws IllegalStateException, IOException, Exception {
+            this.statusCode = response.getStatusLine().getStatusCode();
+            this.responseText = HttpUtil.read2String(response.getEntity().getContent());
+        }
+
+        public static Response getResponse(HttpResponse response) throws IllegalStateException, IOException, Exception {
+            if (response != null)
+                return new Response(response);
+            return null;
+        }
+    }
+
+    /**
+     * 将输入流转为字符串
+     *
+     * @param inStream
+     * @return
+     * @throws Exception
+     */
+    public static String read2String(InputStream inStream) throws Exception {
+        ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        while ((len = inStream.read(buffer)) != -1) {
+            outSteam.write(buffer, 0, len);
+        }
+        try {
+            outSteam.close();
+            inStream.close();
+        } catch (Exception e) {
+
+        }
+        return new String(outSteam.toByteArray(), "UTF-8");
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.uas.platform.home.model;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * created by shicr on 2017/11/27
+ **/
+@Component
+public class HttpAddress {
+    private static final long serialVersionUID = 1L;
+
+    private String sys;
+
+    @Value("#{url.loanAddress}")
+    private String loanAddress;
+
+    public String getLoanAddress() {
+        return loanAddress;
+    }
+
+    public void setLoanAddress(String loanAddress) {
+        this.loanAddress = loanAddress;
+    }
+
+    public String getSys() {
+        return sys;
+    }
+
+    public void setSys(String sys) {
+        this.sys = sys;
+    }
+}

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

@@ -0,0 +1,160 @@
+package com.uas.platform.home.model;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 贷款申请信息表
+ */
+
+public class Loan implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 产品名
+     */
+    private String product;
+
+    /**
+     * uuid
+     */
+    private Long userId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private Long telphone;
+
+    /**
+     * 公司名
+     */
+    private String companyName;
+
+    /**
+     * 借款金额
+     */
+    private Long amount;
+
+    /**
+     * 审核状态
+     */
+    private String status;
+
+    /**
+     * 单据创建时间
+     */
+    private Date createTime;
+
+    /**
+     * erp下载状态
+     */
+    private Integer sendStatus;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getProduct() {
+        return product;
+    }
+
+    public void setProduct(String product) {
+        this.product = product;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getTelphone() {
+        return telphone;
+    }
+
+    public void setTelphone(Long telphone) {
+        this.telphone = telphone;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public String getStatus() {
+
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+      return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getSendStatus() {
+        return sendStatus;
+    }
+
+    public void setSendStatus(Integer sendStatus) {
+        this.sendStatus = sendStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "Loan{" +
+                "id=" + id +
+                ", product='" + product + '\'' +
+                ", userId=" + userId +
+                ", name='" + name + '\'' +
+                ", telphone=" + telphone +
+                ", companyName='" + companyName + '\'' +
+                ", amount=" + amount +
+                ", status='" + status + '\'' +
+                ", createTime=" + createTime +
+                '}';
+    }
+}

src/main/resources/conf/account.properties

@@ -1,19 +1,15 @@
 ### sso config
 sso.app=home
-# token secretkey
+token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 
-#Õýʽ
-sso.cookie.domain=.ubtob.com
+#prod
+sso.cookie.domain=ubtob.com
 sso.login.url=https://account.ubtob.com/sso/login
 
-#±¾µØ
-#sso.cookie.domain=:8080/home
-#sso.login.url=http://hejq.ubtob.com:8090/account/sso/login
-
 ### 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.user.getContactPage.url=https://account.ubtob.com/business/groups

src/main/resources/conf/httpAddress.properties

@@ -0,0 +1 @@
+loanAddress=http://10.10.100.178:23000/loan/saveInfo

src/main/resources/spring/applicationContext.xml

@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:cache="http://www.springframework.org/schema/cache" xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd   
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd
-	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.1.xsd">
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.platform.home.core.support.ApplicationContextRegister" />
@@ -26,4 +21,6 @@
 		<property name="configPath" value="classpath:conf/account.properties" />
 	</bean>
 
+	<util:properties id="url"
+					 location="classpath:conf/httpAddress.properties" />
 </beans>

src/main/webapp/WEB-INF/views/normal/contact.html

@@ -28,7 +28,7 @@
 					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
 					<li><a href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<li><a href="/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
 						<a href="http://www.uuzcc.com/" class="">UU众创</a>
@@ -39,10 +39,10 @@
 						</ul>
 					</li>
 					<li>
-						<a href="#/help" class="link-help">服务专区</a>
+						<a href="./#/help" class="link-help">服务专区</a>
 						<ul>
-							<li><a href="#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
-							<li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
+							<li><a href="./#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
+							<li><a href="./#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
                     <li>

src/main/webapp/WEB-INF/views/normal/default/404.html

@@ -29,7 +29,7 @@
 					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
 					<li><a href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<li><a href="./#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
@@ -43,8 +43,8 @@
 					<li>
 						<a href="#/help" class="link-help">服务专区</a>
 						<ul>
-							<li><a href="#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
-							<li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
+							<li><a href="./#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
+							<li><a href="./#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
                     <li>

src/main/webapp/WEB-INF/views/normal/finance.html

@@ -0,0 +1,408 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+    <meta charset="UTF-8">
+    <title>金融服务</title>
+    <meta name="keywords" content="">
+    <meta name="description" content="">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="renderer" content="webkit">
+    <base href="../">
+    <link href="static/images/icon.png" rel="icon" type="image/x-icon"/>
+    <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="static/css/common.css"/>
+    <link rel="stylesheet" href="static/css/index.css"/>
+    <link rel="stylesheet" href="static/css/toastr.css">
+</head>
+<style>
+    .finance {
+        width: 100%;
+        margin: 0 auto;
+        z-index: 1;
+    }
+
+    .width1170 {
+        width: 1170px;
+        margin: 0 auto;
+    }
+
+    .finance .banner {
+        width: 100%;
+        margin: 0 auto;
+        max-height: 600px;
+    }
+
+    .finance .banner img {
+        width: 100%;
+        margin-top: 20px;
+    }
+
+    .finance-content a{
+        padding:15px 70px;
+        font-size: 20px;
+        font-weight: bold;
+        color:#000;
+        border:1px solid #000;
+    }
+    .finance-content a:hover{
+        text-decoration: none;
+        cursor:pointer;
+        color:#3c8cd7;
+        background: #e6e6e6;
+    }
+    .finance-content h5{
+        font-size: 16px;
+        color:#4f4f4f;
+        margin:35px 0 50px 0;
+    }
+    .finance-content .thumbnail{
+        width:320px;
+        height:215px;
+        padding-top:30px;
+        box-shadow: 0 0 3px rgba(0,0,0,.3);
+    }
+    .finance-content .thumbnail:hover{
+        cursor:pointer;
+        transform:scale(1.1)
+    }
+    .finance-content .thumbnail p:nth-child(1){
+        font-size: 22px;
+        font-weight: bold;
+        color:#3c8cd7;
+        margin-bottom:15px;
+    }
+    .finance-content .thumbnail p:nth-child(2){
+        font-size: 16px;
+        color:#6e6e6e;
+        margin-bottom:30px;
+    }
+
+    .finance-tel{
+        background: #2f2f2f;
+        text-align: center;
+        padding:55px 0 45px 0;
+    }
+
+    .finance-tel .title p{
+        color:#fff;
+        font-size: 15px;
+        margin-bottom:15px;
+    }
+
+    #note {
+        padding-bottom: 12px;
+    }
+
+    #span2 {
+        padding-left: 150px;
+    }
+
+    #span4 {
+        padding-left: 95px;
+    }
+
+    #span6 {
+        padding-left: 25px;
+    }
+
+    #span11 {
+        padding-left: 145px;
+    }
+    #check2{
+        color:cornflowerblue;
+        margin-left:30px;
+        cursor: pointer;
+    }
+    #note{
+        display: none;
+        padding-left: 30px;
+    }
+    .p2{
+        text-indent:30px
+    }
+    .modal-dialog {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+
+    .modal-content {
+        /*overflow-y: scroll; */
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        width: 100%;
+    }
+
+    .modal-body {
+        overflow-y: scroll;
+        position: absolute;
+        top: 55px;
+        bottom: 65px;
+        width: 100%;
+    }
+
+    .modal-header .close {margin-right: 15px;}
+
+    .modal-footer {
+        position: absolute;
+        width: 100%;
+        bottom: 0;
+    }
+</style>
+<body>
+<!--企业征信查询及系统数据获取授权书-->
+<div class="modal fade" id="applyModal1" tabindex="-1" role="dialog" aria-labelledby="applyModalLabel">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" >企业征信查询及系统数据获取授权书</h4>
+            </div>
+            <div class="modal-body">
+                <br>重要提示：</br>
+                <p class="p2">为了保障贵司的合法权益，贵司应当阅读并遵守本授权书，请贵司务必审慎阅读、充分理解本授权书条款内容，特别是免除或减轻我公司责任，或限制贵公司权力的条款，其中免除或者减轻责任条款可能以加粗形式提示贵司注意。贵公司的使用、登录、发起申请等行为即视为贵公司已阅读并同意本授权书条款的约束。</p>
+                <p class="p2"> 致深圳市英唐金控科技有限公司：</p>
+                <p>   一、本公司同意并不可撤销地授权：贵公司按照国家相关规定采集符合法律法规规定的公司信息及包括信贷信息在内的信用信息；</p>
+                <p>   二、本公司同意并不可撤销地授权：贵公司可以根据国家有关规定，通过中国人民银行金融信用信息基础数据库、其他依法设立的征信机构查询打印、保存符合法律法规的企业信息和包括信贷信息在内的信用信息。</p>
+                <p>   三、本公司同意并不可撤销地授权：贵公司在本公司使用的深圳市优软科技有限公司ERP系统、B2B平台、优软商城等上自动获取包括但不限于我公司的基本企业信息、财务数据数据信息、采购数据信息、销售数据信息、交易数据信息、生产加工信息、产品信息等。</p>
+                <p class="p2">    以上相关信息和数据的采集及使用期限为与贵公司的业务存续期用途如下：</p>
+                <p>  （一）审核本公司相关金融业务申请；
+                <p>   （二）处理贷后管理事务；
+                <p>  （三）处理企业征信异议；
+                <p>  （四）依法或经有权部门要求；
+                <p>   （五）其他本公司向贵公司申请或办理的业务。
+                <p class="p2">  我司已知悉本授权书全部内容（特别是加粗字体内容）的含义及因此产生的法律效力，自愿作出以上授权。本授权书是我司真实意思表示，我司同意承担由此带来的一切法律后果。
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+                <button class="btn btn-primary" id="agree">同意</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Modal -->
+<div class="modal fade" id="applyModal" tabindex="-1" role="dialog" aria-labelledby="applyModalLabel">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="applyModalLabel">立即申请</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">企业名称</label>
+                        <div class="col-sm-6">
+                            <input type="text" placeholder="请输入企业名称" class="form-control" id="loanCommpanyName">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">拟融资金额</label>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <input type="text" placeholder="请输入融资金额" class="form-control" id="loanAmount"
+                                       onkeyup="if(isNaN(value))execCommand('undo')"
+                                       onafterpaste="if(isNaN(value))execCommand('undo')">
+                                <div class="input-group-addon">元</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">联系人</label>
+                        <div class="col-sm-4">
+                            <input type="text" placeholder="请输入您的姓名" class="form-control" id="loanName">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">联系方式</label>
+                        <div class="col-sm-4">
+                            <input type="text" placeholder="请输入您的手机号" class="form-control" id="loanTelphone">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-10 col-sm-offset-2">
+                            <input type="checkbox" id="check">同意因开展应收账款保理业务而查询相关数据
+                        </div>
+                        <div class="col-sm-10 col-sm-offset-2">
+                            <input type="checkbox" id="check1">同意因开展应收账款保理业务提供相关材料
+                        </div>
+                        <p id="check2">需提供资料清单</p>
+                    </div>
+                    <div id="note">
+                        需提供以下资料清单（加盖公章)<br>
+                        <span>1、营业执照复印件</span> <span id="span2"> 2、组织机构代码证复印件</span><br>
+                        <span>3、国税、地税登记证复印件</span> <span id="span4"> 4、开户许可证复印件</span><br>
+                        <span>5、法人代表及实际控制人身份证复印件</span> <span id="span6">6、法人代表证明书</span><br>
+                        <span>7、公司近三年审计报告及最近一期的财务报表及科目明细（前五大）</span><br>
+                        <span>8、近1年主要结算银行流水对账单和用于公司账务结算的个人账户结算单复印件</span><br>
+                        <span>9、前五大上下游客户近一年贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证复印件</span><br>
+                        <span>10、公司基本情况表</span><span id="span11">11、拟融资应收账款发票清单、采购合同明细</span><br>
+                        <span>12、拟融资应收账款客户近一年的付款凭证（银行回单）</span><br>
+                        <span>13、拟融资应收账款相关贸易合同，货运证明或其他表明货物确已发运的单据；交易发票；提货单、质检证明（凭证）、预付款（定金）凭证</span><br>
+                        <span>14、近两年缴税完税凭证、水电费单、员工工资单等证明文件</span><br>
+                        <span>15、我公司要求的其他资料</span><br>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" data-dismiss="modal">取消</button>
+                <button class="btn btn-primary" id="loanSubmit">提交申请</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<!-- nav start -->
+<nav id="nav" class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <a href="" id="logo"><img src="static/img/logo.png" alt="" height="25px"/></a>
+        </div>
+        <div class="collapse navbar-collapse">
+            <ul class="nav navbar-nav navbar-left">
+                <li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
+                <li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
+                <li><a href="saas/about" class="link-saas">优企云服</a></li>
+                <li><a href="finance" class="link-finance">金融服务</a></li>
+                <!-- http://finance.ubtob.com -->
+                <li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
+                <li>
+                    <a href="http://www.uuzcc.com/">UU众创</a>
+                    <ul>
+                        <li><a href="http://zb.uuzcc.com/">任务外包</a></li>
+                        <li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
+                        <li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
+                    </ul>
+                </li>
+                <!-- http://member.ubtob.com -->
+                <li>
+                    <a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+                </li>
+                <li>
+                    <a href="#/help" class="link-help">服务专区</a>
+                    <ul>
+                        <li><a href="#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
+                        <li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
+                    </ul>
+                </li><!-- http://help.ubtob.com -->
+            </ul>
+            <ul class="nav navbar-nav navbar-right x-nologin">
+                <li><a href="#" class="link-login">登录</a></li>
+                <li><a href="https://account.ubtob.com/sso/register">注册</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right x-login">
+                <li class="dropdown"><a href="#" class="dropdown-toggle"><i
+                        class="fa fa-user"></i> <span class="title"></span></a></li>
+                <li><a href="#" class="link-logout">退出</a></li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<header class="finance">
+    <div class="banner"><img src="static/images/banner.png" /></div>
+</header>
+<!-- nav end -->
+<section class="finance-content" style="text-align: center;">
+    <div class="container">
+        <a onclick="applyLoan()">立即申请</a>
+        <h5>基于客户与优软云平台贸易产生的所有应收账款提供的融资服务</h5>
+        <div class="row">
+            <div class="col-xs-4">
+                <div class="thumbnail">
+                    <div class="caption">
+                        <p>额度充足</p>
+                        <p>融资额高，放款速度快</p>
+                        <img src="static/images/redu.png">
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-4">
+                <div class="thumbnail">
+                    <div class="caption">
+                        <p>门槛极低</p>
+                        <p>即时申请，手续简单</p>
+                        <img src="static/images/minkan.png">
+                    </div>
+                </div>
+
+            </div>
+            <div class="col-xs-4">
+                <div class="thumbnail">
+                    <div class="caption">
+                        <p>期限灵活</p>
+                        <p>账期可控，随借随还</p>
+                        <img src="static/images/qixian.png">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="finance-tel">
+    <div class="container">
+        <div class="title">
+            <p>联系电话：0755-26657231</p>
+            <p>传真：0755-86140331</p>
+            <p>邮箱：ytft@yitoa.com </p>
+            <p>地址：深圳市南山科技园科技南五路英唐大厦五楼</p>
+        </div>
+    </div>
+</section>
+<!-- footer start -->
+<footer>
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-3 col-sm-offset-2">
+                <div class="qrcode qrcode-uu">
+                    <div class="qrcode-img pull-left">
+                        <img src="static/img/qrcode/uu.png" width="100px" height="100px"
+                             alt="UU互联"/>
+                    </div>
+                    <div class="qrcode-text pull-left">
+                        <div>手机UU</div>
+                        <div>快人一步</div>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+            </div>
+            <div class="col-sm-3">
+                <div class="qrcode qrcode-uas">
+                    <div class="qrcode-img pull-left">
+                        <img src="static/img/qrcode/uas.png" width="100px" height="100px"
+                             alt="优软公众号"/>
+                    </div>
+                    <div class="qrcode-text pull-left">
+                        <div>微信扫描</div>
+                        <div>关注公众号</div>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+            </div>
+            <div class="col-sm-4">
+                <p>
+                    <a href="">关于优软</a>
+                    <a href="contact">联系我们</a>
+                    <a href="help/agreement">帮助</a>
+                </p>
+                <p>©2016 深圳市优软科技有限公司</p>
+                <p>粤ICP备15112126号-2</p>
+            </div>
+        </div>
+    </div>
+</footer>
+</body>
+
+<script type="text/javascript" src="static/lib/jquery/jquery.min.js"></script>
+<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="static/js/common/common.js"></script>
+<script type="text/javascript" src='static/js/common/toastr.js'></script>
+<script type="text/javascript" src="static/js/finance/finance.js"></script>
+</html>

src/main/webapp/WEB-INF/views/normal/help/agreement.html

@@ -29,7 +29,7 @@
 					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
 					<li><a href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<li><a href="./#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
@@ -41,10 +41,10 @@
 						</ul>
 					</li>
 					<li>
-						<a href="#/help" class="link-help">服务专区</a>
+						<a href="./#/help" class="link-help">服务专区</a>
 						<ul>
-							<li><a href="#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
-							<li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
+							<li><a href="./#/public" class="link-public">公共服务</a></li><!-- http://public.ubtob.com -->
+							<li><a href="./#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
                     <li>

src/main/webapp/WEB-INF/views/normal/index.html

@@ -27,6 +27,7 @@ var _hmt = _hmt || [];
   hm.src = "//hm.baidu.com/hm.js?ab3516f4a7187fa5ac0e449c7db9f195";
   var s = document.getElementsByTagName("script")[0]; 
   s.parentNode.insertBefore(hm, s);
+
 })();
 </script>
 </head>
@@ -61,22 +62,19 @@ var _hmt = _hmt || [];
 					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com/" class="link-mall">优软商城</a></li>
 					<li><a href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
+					<li><a href="finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<li><a href="#/uuzcJob" class="link-job">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
-						<!--<a href="http://www.uuzcc.com/" class="">UU众创</a>-->
-						<!--<ul>-->
-							<!--<li><a href="http://zb.uuzcc.com/">任务外包</a></li>-->
-							<!--<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>-->
-							<!--<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>-->
-						<!--</ul>-->
-                        <a href="#" class="x-link-info">UU众创</a>
-                        <ul>
-                            <li><a href="http://zb.uuzcc.com/">任务外包</a></li>
-                            <li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
-                            <li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
-                        </ul>
+						<a href="http://www.uuzcc.com/" class="">UU众创</a>
+						<ul>
+							<li><a href="http://zb.uuzcc.com/">任务外包</a></li>
+							<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
+							<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
+						</ul>
 					</li><!-- http://public.ubtob.com -->
+					<li>
+						<a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
+					</li>
 					<li>
 						<a href="#/help" class="link-help">服务专区</a>
 						<ul>
@@ -84,9 +82,6 @@ var _hmt = _hmt || [];
 							<li><a href="#/member" class="link-member">会员中心</a></li><!-- http://member.ubtob.com -->
 						</ul>
 					</li><!-- http://help.ubtob.com -->
-					<li>
-						<a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
-					</li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>
@@ -203,14 +198,16 @@ var _hmt = _hmt || [];
 					<img src="static/img/carousel/header-11.jpg" alt="" />
 					<div class="carousel-caption">
 						<div class="container">
-							<div class="header-text">
+							<div class="header-text" style="color: #000; top: 20px;">
 								<h1>人才招聘</h1>
 								<p>
-									优质服务,快速响应,急速入职!<br />专为电子信息行业的资深工程师发现更好的工作机会, <br/>为企业挖掘专业人才。
+									优质服务,快速响应,急速入职!<br />为行业资深工程师发现更好的工作机会， <br/>为企业挖掘专业人才。
 								</p>
 							</div>
 							<div class="header-btn">
-								<a href="#" class="link-job-get">我要招人</a><a href="#" class="link-job-post">我要求职</a>
+								<a href="#" class="link-job-get">我要招人</a>
+                                <a href="#" class="link-hr-set" style="display: none">设置HR账号</a>
+                                <a href="#" class="link-job-post">我要求职</a>
 							</div>
 						</div>
 					</div>

src/main/webapp/WEB-INF/views/normal/saas_about.html

@@ -29,11 +29,11 @@
 					<li><a href="http://uas.ubtob.com" class="link-b2b">B2B商务</a></li>
 					<li><a href="http://www.usoftmall.com" class="link-mall">优软商城</a></li>
 					<li><a href="saas/about" class="link-saas">优企云服</a></li>
-					<li><a href="#/finance" class="link-finance">金融服务</a></li>
+					<li><a href="finance" class="link-finance">金融服务</a></li>
 					<!-- http://finance.ubtob.com -->
 					<li><a href="http://job.uuzcc.com/" class="">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
-						<a href="http://www.uuzcc.com/" class="">UU众创</a>
+						<a href="http://www.uuzcc.com/">UU众创</a>
 						<ul>
 							<li><a href="http://zb.uuzcc.com/">任务外包</a></li>
 							<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
@@ -202,4 +202,5 @@
 	src="static/lib/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="static/js/common/common.js"></script>
 <script type="text/javascript" src="static/js/saas_about/app.js"></script>
+<script type="text/javascript" src="static/js/common/toastr.js"></script>
 </html>

src/main/webapp/WEB-INF/views/normal/setHrAccount.html

@@ -76,30 +76,18 @@
 			<div class="section-choose" >
 				<form action="">
 					<div class="form-group">
-						<input type="text" id="username" class="form-control" placeholder="姓名" />
-						<ul id="userList">
-<!--							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>
-							<li><b>李亚津</b><span class="phone">13800001111</span><span>liyj@ftchina.com</span></li>-->
+						<input type="text" id="username" class="form-control" placeholder="姓名" autocomplete="off" />
+						<ul id="userList" style="max-height: 200px; overflow-y: auto;">
 						</ul>
 					</div>
 					<div class="form-group">
-						<input type="text" id="usertel" class="form-control" placeholder="电话号码" />
+						<input type="text" id="usertel" class="form-control" placeholder="电话号码" autocomplete="off"/>
 					</div>
 					<div class="form-group">
-						<input type="text" id="useremail" class="form-control" placeholder="邮箱" />
+						<input type="text" id="useremail" class="form-control" placeholder="邮箱" autocomplete="off"/>
 					</div>
 					<div class="form-group">
-						<input type="text" id="useruu" class="form-control" placeholder="UU号" />
+						<input type="text" id="useruu" class="form-control" placeholder="UU号" autocomplete="off"/>
 					</div>
 					<div class="form-group">
 						<a class="btn" id="setHrAccount" type="submit">添加并设置为HR账号</a>

src/main/webapp/resources/css/index.css

@@ -322,6 +322,14 @@ header .carousel-caption .header-btn a:first-child{
 	color: #fff;
 	background: #f85659;
 }
+
+header .carousel-caption .header-btn .link-hr-set {
+    margin-right: 26px;
+    font-size: 16px;
+    color: #fff;
+    background: #f85659;
+}
+
 header .carousel-caption .header-btn a:last-child{
 	font-size: 16px;
 	color: #f85659;

src/main/webapp/resources/css/setHrAccount.css

@@ -153,4 +153,8 @@ section .container{
     left: 50%!important ;
     margin-left: -10%!important ;
     z-index: 999999;
+}
+#toast-container .toast-message {
+    font-size: 16px;
+    color: #fff;
 }

src/main/webapp/resources/css/toastr.css

@@ -4,6 +4,8 @@
 .toast-message {
   -ms-word-wrap: break-word;
   word-wrap: break-word;
+    font-size: 16px;
+    color: #fff;
 }
 
 .toast-message a,
@@ -209,6 +211,8 @@ button.toast-close-button {
 .toast-message {
     -ms-word-wrap: break-word;
     word-wrap: break-word;
-    font-size: .4rem;
+    /*font-size: .4rem;*/
+    font-size: 12px;
+    color:#fff;
 }
 

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

@@ -22,7 +22,33 @@ function getAccountInfo() {
                 $('.x-login').find('.title').text(data.content.name);
             }
 			window._hasAccountInfo = true;
-		}
+			var user = data.content;
+			if(null != data.space) {
+                // 管理员
+                if(user.uid == data.space.adminTel) {
+                    // 如果是hr
+                    if(user.hr == 1) {
+                        $('.link-job-get').show();
+                        $('.link-hr-set').hide();
+                    } else {
+                        $('.link-hr-set').show();
+                        $('.link-job-get').hide();
+                    }
+                } else {// 非管理员
+                    $('.link-job-get').show();
+                    $('.link-hr-set').hide();
+                    var location = window.location.pathname;
+                    if(location.indexOf('setHrAccount') > -1) {// 如果是在设置hr页面，非管理员跳转到首页
+                        window.location.href = 'http://www.ubtob.com/#/uuzcJob';
+                    }
+                }
+            }
+		} else {
+		    var location = window.location.pathname;
+		    if(location.indexOf('setHrAccount') > -1) {// 如果是在设置hr页面，没有登录的话跳转到登录页面
+               login(event);
+            }
+        }
 	});
 }
 
@@ -124,6 +150,32 @@ function jobUuzc() {
     });
 }
 
+/**
+ * 存储hrInfo,不用重新加载
+ *
+ * @type {null}
+ */
+var hrInfo = null;
+
+function getHrInfo() {
+    if(hrInfo == null) {
+        $.get('uuzc/hrInfo', function(userInfo) {
+            if(null != userInfo.user) {
+                hrInfo = userInfo.user;
+                // 默认给相关字段赋值
+                $('#hrname').val(hrInfo.name);
+                $('#hremail').val(hrInfo.secondUID);
+                $('#hrtel').val(hrInfo.uid);
+                $('#username').val(hrInfo.name);
+                $('#usertel').val(hrInfo.uid);
+                $('#useruu').val(hrInfo.dialectUID);
+                $('#useremail').val(hrInfo.secondUID);
+                $('#userList').css('display','none');
+            }
+        });
+    }
+}
+
 /**
  * 链接到优软众创人才招聘（招聘入口）
  */
@@ -135,14 +187,15 @@ function jobUuzcGet() {
         if(null != data && 'personal' == data.usertype) {
             toastr.error("您的账号为个人账号，不可进行此操作");
         } else if(null != data && 'company' == data.usertype) {
-            if(!data.hr) {// 企业不存在hr账号
-                if(data.manager) {// 管理员停留设置hr
+            // 先判断是否管理员
+            if(data.manager) {
+                // if(!data.hr) {// 企业不存在hr账号
                     window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
-                } else {
-                    toastr.error('请通知管理员' + data.managerName + '设置HR账号');
-                }
-            } else {// 如果企业存在hr
-                toastr.error('您的账号非HR账号，不可进行此操作');
+                // } else {// 如果企业存在hr
+                //     toastr.error('您的账号非HR账号，不可进行此操作');
+                // }
+            } else {
+                toastr.error('请通知管理员' + data.managerName + '设置HR账号');
             }
         } else if(data.usertype =='hr') {
             loginJobUuzc(user, loginUrl, 'hr');
@@ -217,18 +270,19 @@ function addHrAccount() {
                var result = data.result;
                if(result == 'success') {
                    toastr.success('设置HR账号成功');
-                   setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 500);
+                   hrInfo = null; // 清空已查询的数据，重新加载
+                   setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 2000);
                }
                if(result == 'exist') {
                    toastr.error('该企业HR账号已存在');
                }
                if(result == 'setFailure') {
-                   toastr.erroror('设置HR账号失败');
+                   toastr.error('设置HR账号失败');
                }
            }
         },
         error: function (error) {
-            toastr.erroror(error);
+            toastr.error(error);
         }
     });
 }
@@ -249,66 +303,75 @@ function setHrAccount() {
         async: false,
         success: function(data) {
             if(data) {
-                console.log(data);
                 var result = data.result;
                 if(result == 'success') {
                     toastr.success('设置HR账号成功');
-                    setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 500);
+                    hrInfo = null; // 清空已查询的数据，重新加载
+                    setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 2000);
                 }
                 if(result == 'exist') {
                     toastr.error('该企业HR账号已存在');
                 }
                 if(result == 'setFailure') {
-                    toastr.erroror('设置HR账号失败');
+                    toastr.error('设置HR账号失败');
                 }
             }
         },
         error: function (error) {
-            toastr.erroror(error);
+            toastr.error(error);
         }
     });
 }
 
+/**
+ * 获取的用户信息存放，全局调用，不用多次发生请求
+ *
+ * @type {Array}
+ */
+var users = [];
+
 /**
  * 获取当前企业已存在的用户的信息
  */
 function getExistUser() {
-    var users = [];
-    $.ajax('uuzc/existusers', {
-        dataType: 'json',
-        method: 'GET',
-        async: false,
-        success: function(data) {
-            users = data.content;
-            if(users.length == 0) {
-                $('#userList').css('display','none');
-            }
-            var ul = document.getElementById("userList");
-            for(var i = 0; i < users.length; i++) {
-                var li = document.createElement('li');
-                var b = document.createElement('b');
-                b.innerHTML = users[i].name;
-                li.appendChild(b);
-                var span = document.createElement('span');
-                span.class = "phone"
-                span.innerHTML = users[i].uid;
-                li.appendChild(span);
-                var span2 = document.createElement('span');
-                span2.innerHTML = users[i].secondUID;
-                li.appendChild(span2);
-                li.id = 'btn_' + i;
-                ul.appendChild(li);
-                (function(i) {
-                    $("#btn_" + i ).click(function() {
-                        setAccount(users[i]);
-                        $('#userList').css('display','none');
-                    });
-                })(i)
+    if(users.length == 0) {
+        $.ajax('uuzc/existusers', {
+            dataType: 'json',
+            method: 'GET',
+            async: false,
+            success: function(data) {
+                users = data.content;
+                if(users.length == 0) {
+                    $('#userList').css('display','none');
+                }
+                var ul = document.getElementById("userList");
+                for(var i = 0; i < users.length; i++) {
+                    var li = document.createElement('li');
+                    var b = document.createElement('b');
+                    b.innerHTML = users[i].name;
+                    li.appendChild(b);
+                    var span = document.createElement('span');
+                    span.class = "phone"
+                    span.innerHTML = users[i].uid;
+                    li.appendChild(span);
+                    var span2 = document.createElement('span');
+                    span2.innerHTML = users[i].secondUID;
+                    li.appendChild(span2);
+                    li.id = 'btn_' + i;
+                    ul.appendChild(li);
+                    (function(i) {
+                        $("#btn_" + i ).click(function() {
+                            setAccount(users[i]);
+                            $('#userList').css('display','none');
+                        });
+                    })(i)
+                }
             }
-        }
-    });
+        });
+    }
 }
 
+
 /**
  * 选择现有的人员赋值
  *
@@ -327,6 +390,47 @@ function setAccount(user) {
 function suspendMessage() {
     toastr.error('网站正在升级中，敬请期待！');
 }
+
+/**
+ * 监听输入框值的变化设置联想
+ */
+$('#username').bind('input propertychange', function() {
+    var nameList = [];
+    $("#userList").find("li").remove();// 先清除以前的样式
+    for(var i = 0; i < users.length; i++) {
+        if(users[i].name.indexOf($('#username').val()) > -1) {
+            nameList.push(users[i]);
+        }
+    }
+    if(nameList.length == 0) {
+        $('#userList').css('display','none');
+    } else {
+        $('#userList').css('display','show');
+    }
+    var ul = document.getElementById("userList");
+    for(var i = 0; i < nameList.length; i++) {
+        var li = document.createElement('li');
+        var b = document.createElement('b');
+        b.innerHTML = nameList[i].name;
+        li.appendChild(b);
+        var span = document.createElement('span');
+        span.class = "phone"
+        span.innerHTML = nameList[i].uid;
+        li.appendChild(span);
+        var span2 = document.createElement('span');
+        span2.innerHTML = nameList[i].secondUID;
+        li.appendChild(span2);
+        li.id = 'btn_' + i;
+        ul.appendChild(li);
+        (function(i) {
+            $("#btn_" + i ).click(function() {
+                setAccount(nameList[i]);
+                $('#userList').css('display','none');
+            });
+        })(i)
+    }
+});
+
 $(function() {
 	'use strict';
 	
@@ -341,6 +445,9 @@ $(function() {
 	
 	// 查询登录信息
 	getAccountInfo();
+
+	// 获取当前企业HR信息
+    getHrInfo();
 	
 	// 登录点击
 	$('.link-login').click(login);
@@ -354,9 +461,12 @@ $(function() {
     // 连接到众创招聘
     $('.link-job').click(jobUuzc);
 
-    // 求职
+    // 点击链接到众创人才招聘(求职)
     $('.link-job-post').click(jobUuzcPost);
 
+    // 点击链接到众创人才招聘(设置hr)
+    $('.link-hr-set').click(jobUuzcGet);
+
     // 添加hr账号（新增）
     $('#addHrAccount').click(addHrAccount);
 

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

@@ -177,7 +177,7 @@
                     },
                     iconClass: 'toast-info',
                     positionClass: 'toast-top-right',
-                    timeOut: 500000, // Set timeOut and extendedTimeOut to 0 to make it sticky
+                    timeOut: 5000, // Set timeOut and extendedTimeOut to 0 to make it sticky
                     titleClass: 'toast-title',
                     messageClass: 'toast-message',
                     target: 'body',

src/main/webapp/resources/js/finance/base.js

@@ -0,0 +1,59 @@
+$(function(){
+    $("#applyLoan").click(function () {
+        $('#applyModal').modal('toggle');
+        $("#loanAmount").val('');
+    })
+
+    $("#loanSubmit").click(function () {
+        var product = $("#applyLoan").siblings('h2').text();
+        var loanName = $("#loanName").val();//姓名
+        var loanTelphone = $("#loanTelphone").val();//手机号
+        var loanCommpanyName = $("#loanCommpanyName").val();//公司名
+        var loanAmount = $("#loanAmount").val();//借款金额
+        var check = $("#check").is(":checked");//是否同意查询银行记录
+        var flag = false;
+        var message = "";
+        if (loanCommpanyName == '') {
+            message = '企业全称不能为空'
+        } else if (loanAmount == '') {
+            message = '借贷金额不能为空';
+        } else if (loanName == '') {
+            message = "联系人不能为空";
+        } else if (loanTelphone == '') {
+            message = "联系方式不能为空！";
+        } else if (loanTelphone.length != 11) {
+            message = "请输入有效的手机号码！";
+        } else if (check != true) {
+            message = '请同意查询人民银行征信记录';
+        } else {
+            flag = true;
+        }
+        if (!flag) {
+            alert(message);
+        } else {
+            var jsonStr = {
+                product: product,
+                name: loanName,
+                telphone: loanTelphone,
+                companyName: loanCommpanyName,
+                amount: loanAmount
+            }
+            $.ajax({
+                url: "/finance/loan",
+                type: "post",
+                dataType: "json",
+                data: {jsonStr: JSON.stringify(jsonStr)},
+                success: function () {
+                    alert('已申请 ');
+                    $('#applyModal').modal('toggle');
+
+                },
+                error: function (XMLHttpRequest) {
+                    alert('申请失败');
+                    $('#applyModal').modal('toggle');
+                }
+            })
+        }
+    })
+})
+

src/main/webapp/resources/js/finance/finance.js

@@ -0,0 +1,120 @@
+
+/**
+ * 引入toaster方法
+ */
+document.write("<script language=javascript src='static/js/common/toastr.js'></script>");
+
+function applyModal1() {
+    $('#applyModal1').modal('toggle');
+}
+
+function agreeEvent() {
+    $('#applyModal1').modal('toggle');
+    $('#applyModal').modal('toggle');
+    $("#loanAmount").val('');
+}
+
+/**
+ * 相关提示信息
+ */
+function suspendMessage() {
+    toastr.error('网站正在升级中，敬请期待！');
+}
+
+function submitApply() {
+    var product = $("#applyLoan").siblings('h2').text();
+    var loanName = $("#loanName").val();//姓名
+    var loanTelphone = $("#loanTelphone").val();//手机号
+    var loanCommpanyName = $("#loanCommpanyName").val();//公司名
+    var loanAmount = $("#loanAmount").val();//借款金额
+    var check = $("#check").is(":checked");//是否同意查询相关数据
+    var check1 = $("#check1").is(":checked");//是否同意查询相关材料
+    var flag = false;
+    var message = "";
+    if (loanCommpanyName == '') {
+        message = '企业全称不能为空'
+    } else if (loanAmount == '') {
+        message = '借贷金额不能为空';
+    } else if (loanName == '') {
+        message = "联系人不能为空";
+    } else if (loanTelphone == '') {
+        message = "联系方式不能为空！";
+    } else if (loanTelphone.length != 11) {
+        message = "请输入有效的手机号码！";
+    } else if (check != true) {
+        message = '请同意因开展应收账款保理业务而查询相关数据';
+    } else if (check1 != true) {
+        message = '请同意因开展应收账款保理业务提供相关材料';
+    } else {
+        flag = true;
+    }
+    if (!flag) {
+        //alert(message);
+        toastr.info(message);
+    } else {
+        var jsonStr = {
+            product: product,
+            name: loanName,
+            telphone: loanTelphone,
+            companyName: loanCommpanyName,
+            amount: loanAmount
+        }
+        $.ajax({
+            url: "/finance/loan",
+            type: "post",
+            dataType: "json",
+            data: {jsonStr: JSON.stringify(jsonStr)},
+            success: function (data) {
+                toastr.info(data);
+                setTimeout( $('#applyModal').modal('toggle'), 800);
+            },
+            error: function (XMLHttpRequest) {
+                toastr.error("申请失败");
+                $('#applyModal').modal('toggle');
+            }
+        })
+    }
+}
+
+function checkEvent() {
+    if ($("#note").css("display") == "none") {
+        $("#note").css("display", "block");
+    } else {
+        $("#note").css("display", "none");
+    }
+}
+
+$(function() {
+    'use strict';
+    //applyLoan：理解立即申请的id
+    // 打开申请页面
+    $('#applyLoan').click(applyModal1);
+
+    // 同意申请
+    $('#agree').click(agreeEvent);
+
+    // 提交申请
+    $('#loanSubmit').click(submitApply);
+
+    // 判断是否已同意
+    $("#check2").click(checkEvent);
+
+    $('.x-link-info').click(function () {
+        alert('网站正在升级中，敬请期待!');
+    });
+});function applyLoan() {
+    $.ajax({
+        url:'/sso/account',
+        type:'GET',
+        success:function (data) {
+            if(data.content!=null){
+                window.location.href='http://finance.ubtob.com';
+            }else{
+                toastr.warning('请先登录');
+            }
+        },
+        error:function(){
+            toastr.error('系统错误');
+        }
+    })
+}

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

@@ -1,5 +1,13 @@
+
+/**
+ * 引入toaster方法
+ */
+document.write("<script language=javascript src='static/js/common/toastr.js></script>");
+
 $(function() {
 	'use strict';
+
+    
 	$('.btn-apply').click(function(){
 		// https://account.ubtob.com/userspace/applyApp?appId=saas有登录拦截判断，未登录会跳转到登录界面
 		// var url = isLogin() ? 'https://account.ubtob.com/userspace/applyApp?appId=saas' : 'https://account.ubtob.com/sso/register';
@@ -7,4 +15,9 @@ $(function() {
 		var url = 'https://account.ubtob.com/userspace/applyApp?appId=saas';
 		window.location.href = url;
 	});
+
+    $('.x-link-info').click(function () {
+        toastr.error('网站正在升级中，敬请期待!');
+        alert('网站正在升级中，敬请期待!');
+    });
 });