From a4f005aeacfb103acaf8397bdf415f3717c25ce5 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 17 May 2016 13:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lymsh/yimiao/main/data/util/LoginUtil.java | 17 ++++++++++++++---
 .../lyms/yimiao/web/controller/v1/UserController.java   |  9 +++++----
 webApi/src/main/resources/config.properties             |  4 ++--
 webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm  |  3 +--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java
index 619bb78..bd0be59 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/LoginUtil.java
@@ -102,7 +102,17 @@ public class LoginUtil {
         return false;
     }
 
-    public static boolean sendCode(String phone, String typeId, String token) {
+    /**
+     *  阿里大鱼
+     * @param phone
+     * @param typeId
+     * @param token
+     * @return
+     */
+    public static LoginContext sendCode(String phone, String typeId, String token) {
+
+        LoginContext loginState = new LoginContext();
+
         HttpClient client = new HttpClient();
         GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/authCode.action");
         NameValuePair[] data = {
@@ -119,12 +129,13 @@ public class LoginUtil {
             System.out.println("result:" + result);
             get.releaseConnection();
             if (result != null && result.indexOf("成功") > 0) {
-                return true;
+                loginState = JsonUtil.str2Obj(result, LoginContext.class);
+                return loginState;
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return false;
+        return loginState;
     }
 
 
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
index c05c819..34fa21c 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/UserController.java
@@ -61,15 +61,16 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/authCode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8")
     public void sendVercode(HttpServletResponse response,@RequestParam("phone") String phone) {
 
-        Boolean result = LoginUtil.sendVerCode(phone, typeId, token);
-//        Boolean result = LoginUtil.sendCode(phone, typeId, token);
-        if (result){
+//        Boolean result = LoginUtil.sendVerCode(phone, typeId, token);
+        LoginContext result = LoginUtil.sendCode(phone, typeId, token);
+        if (result.getErrorcode()==0){
             ResultUtils.buildSuccessResultAndWrite(response);
         }else {
-            ResultUtils.buildParameterErrorResultAndWrite(response,"发送失败");
+            ResultUtils.buildParameterErrorResultAndWrite(response,result.getErrormsg());
         }
     }
 
+
     /**
      * 登陆
      * @param response
diff --git a/webApi/src/main/resources/config.properties b/webApi/src/main/resources/config.properties
index 7090b69..4221702 100644
--- a/webApi/src/main/resources/config.properties
+++ b/webApi/src/main/resources/config.properties
@@ -35,8 +35,8 @@ mailServerDefaultFrom=411441657@qq.com
 mailServerUsername=411441657@qq.com
 mailServerPassword=yt12304
 
-#redis.servers=192.168.5.250:6379:mommybaby123
-redis.servers=192.168.1.43:6379:Lyms@2016
+redis.servers=192.168.5.250:6379:mommybaby123
+#redis.servers=192.168.1.43:6379:Lyms@2016
 ams.login.msg=��֤��{0}�������ڵ�¼AMS�����DZ��˲���������й¶��
 token.prefix=ams
 
diff --git a/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm b/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
index eee7373..ff9c5f9 100644
--- a/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
+++ b/webApi/src/main/webapp/WEB-INF/html/inoculateRecord.vm
@@ -20,7 +20,6 @@
             margin-top: 10px;
         }
         .container .title {
-            height: 25px;
             background-color: #A3D1EA;
             padding-left: 15px;
             padding-bottom: 15px;
@@ -160,7 +159,7 @@
                     <span>接种剂次</span>
                 </li>
                 <li class="content">
-                    <span class="half">$!recordObj.icPosition</span>
+                    <span class="half">$!recordObj.vnPosition</span>
                     <span>$!recordObj.icJiCi</span>
                 </li>
                 <li class="header">
-- 
1.8.3.1