更新金融项目的banner图片

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

@@ -1,12 +1,15 @@
 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.platform.home.core.support.SystemSession;
-import com.uas.platform.home.core.util.HttpUtil;
 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
@@ -18,20 +21,33 @@ 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);
+        User user = SystemSession.getUser();
+        jsonObject.putAll(JSON.parseObject(JSON.toJSONString(user)));
         String url = httpAddress.getLoanAddress();
         if (null != SystemSession.getUser() && null != SystemSession.getUser().getDialectUID()) {
             url = url + "?UID=" + Long.parseLong(SystemSession.getUser().getDialectUID());
         }
+//        try {
+//           HttpUtil.Response response =  HttpUtil.doPost(url, JSON.toJSONString(jsonObject), 5000);
+//           if(200 == response.getStatusCode())
+//               return "success";
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+        com.uas.sso.common.util.HttpUtil.ResponseWrap res = null;
         try {
-           HttpUtil.Response response =  HttpUtil.doPost(url, jsonStr, 5000);
-           if(200 == response.getStatusCode())
-               return "success";
+            res = com.uas.sso.common.util.HttpUtil.doPost(url, jsonObject);
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return "申请失败";
     }
 

src/main/resources/conf/httpAddress.properties

@@ -1 +1 @@
-loanAddress=http://192.168.253.227:8082/loan/saveInfo
+loanAddress=http://10.10.100.178:23000/loan/saveInfo

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>

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

@@ -13,7 +13,7 @@
     <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"/>
-
+    <base href="../">
 </head>
 <style>
     .finance {
@@ -235,7 +235,7 @@
                     </div>
                     <div class="form-group">
                         <div class="col-sm-10 col-sm-offset-2">
-                            <input type="checkbox" id="check">同意应开展应收账款保理业务而查询相关数据
+                            <input type="checkbox" id="check">同意因开展应收账款保理业务而查询相关数据
                         </div>
                         <div class="col-sm-10 col-sm-offset-2">
                             <input type="checkbox" id="check1">同意因开展应收账款保理业务提供相关材料
@@ -276,24 +276,20 @@
         <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="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="#/uuzcJob" class="link-job">人才招聘</a></li><!-- http://public.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>-->
-                    <!--<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>
+                    <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>
+                <!-- http://member.ubtob.com -->
                 <li>
                     <a href="http://diymall.ubtob.com/" class="link-diymall">定制商城</a></li><!-- http://diymall.ubtob.com -->
                 </li>
@@ -420,7 +416,7 @@
         } else if (loanTelphone.length != 11) {
             message = "请输入有效的手机号码！";
         } else if (check != true) {
-            message = '请同意应开展应收账款保理业务而查询相关数据';
+            message = '请同意因开展应收账款保理业务而查询相关数据';
         } else if(check1 != true){
             message = '请同意因开展应收账款保理业务提供相关材料';
         }else {

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

@@ -62,7 +62,7 @@ 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>-->

src/main/webapp/WEB-INF/views/normal/saas_about.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>
+					<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>

src/main/webapp/WEB-INF/webmvc.xml

@@ -52,7 +52,7 @@
 	<mvc:view-controller path="/help/index" view-name="help/index" />
 	<mvc:view-controller path="/hiring" view-name="hiring" />
 	<mvc:view-controller path="/setHrAccount" view-name="setHrAccount" />
-	<mvc:view-controller path="/finance" view-name="finance" />
+<!--	<mvc:view-controller path="/finance" view-name="finance" />-->
 
 	<mvc:interceptors>
 		<!-- SSO过滤 -->