From de0cb9860b366fb3e83c7900896198067fe9af37 Mon Sep 17 00:00:00 2001
From: yiyan <thelongcode@163.com>
Date: Tue, 25 Dec 2018 20:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/action/VipAction.java | 14 +++++-
 .../webapp/WEB-INF/view/vip/vipActivity.jsp   | 30 ++++++------
 .../webapp/WEB-INF/view/vip/vipMember.jsp     | 46 ++++++++++---------
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/ifish/action/VipAction.java b/src/main/java/com/ifish/action/VipAction.java
index f73f9e7..5631551 100644
--- a/src/main/java/com/ifish/action/VipAction.java
+++ b/src/main/java/com/ifish/action/VipAction.java
@@ -48,7 +48,7 @@ public class VipAction {
     @RequestMapping("/sendSms.do")
     @ResponseBody
     public Object vipSendSms(HttpServletRequest request) throws ClientException {
-        final String noticeType = "SMS_139227937";
+        final String noticeType = "SMS_153716473";
         final String noticeTypeCertif = "SMS_143712160";
         final String noticeTypeMember = "SMS_143717029";
         final String noticeTypeStudent = "SMS_142146106";
@@ -60,6 +60,8 @@ public class VipAction {
         String smsTitle = request.getParameter("smsTitle");
         String smsTime = request.getParameter("smsTime");
         String smsAddress = request.getParameter("smsAddress");
+        String smsAddress1 = request.getParameter("smsAddress1");
+        String smsAddress2 = request.getParameter("smsAddress2");
         String smsSignTime = request.getParameter("smsSignTime");
         String smsContact = request.getParameter("smsContact");
         String smsContactTel = request.getParameter("smsContactTel");
@@ -97,6 +99,8 @@ public class VipAction {
                 param.put("title",smsTitle);
                 param.put("time",smsTime);
                 param.put("address",smsAddress);
+                param.put("address1",smsAddress1);
+                param.put("address2",smsAddress2);
                 param.put("signTime",smsSignTime);
                 param.put("contact",smsContact + " " + smsContactTel);
                 response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString());
@@ -152,6 +156,8 @@ public class VipAction {
                     param.put("title",smsTitle);
                     param.put("time",smsTime);
                     param.put("address",smsAddress);
+                    param.put("address1",smsAddress1);
+                    param.put("address2",smsAddress2);
                     param.put("signTime",smsSignTime);
                     param.put("contact",smsContact + " " + smsContactTel);
                     response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString());
@@ -535,7 +541,7 @@ public class VipAction {
     public ModelAndView downloadActivityImportToExcel(@RequestParam("fileUpload") MultipartFile fileUpload,HttpServletRequest request){
         SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT");
 
-        final String noticeType = "SMS_139227937";
+        final String noticeType = "SMS_153716473";
         final String noticeTypeCertif = "SMS_143712160";
         final String noticeTypeMember = "SMS_143717029";
         final String noticeTypeStudent = "SMS_142146106";
@@ -545,6 +551,8 @@ public class VipAction {
         String smsTitle = request.getParameter("smsTitle");
         String smsTime = request.getParameter("smsTime");
         String smsAddress = request.getParameter("smsAddress");
+        String smsAddress1 = request.getParameter("smsAddress1");
+        String smsAddress2 = request.getParameter("smsAddress2");
         String smsSignTime = request.getParameter("smsSignTime");
         String smsContact = request.getParameter("smsContact");
         String smsContactTel = request.getParameter("smsContactTel");
@@ -563,6 +571,8 @@ public class VipAction {
             param.put("title",smsTitle);
             param.put("time",smsTime);
             param.put("address",smsAddress);
+            param.put("address1",smsAddress1);
+            param.put("address2",smsAddress2);
             param.put("signTime",smsSignTime);
             param.put("contact",smsContact + " " + smsContactTel);
         } else if (noticeTypeStudent.equals(smsType)) {
diff --git a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp
index 7b4793b..7559785 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp
@@ -240,46 +240,48 @@
                                             <label class="col-xs-2 control-label no-padding-right">短信类型<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <select id="smsType" name="smsType" class="form-control" onchange="changeSmsContent();">
-                                                    <option value="SMS_139227937">活动通知</option>
+                                                    <option value="SMS_153716473">活动通知</option>
                                                     <option value="SMS_142146106">学员培训通知</option>
                                                 </select>
                                             </div>
                                         </div>
-                                        <div id="SMS_139227937" style="display: block;">
+                                        <div id="SMS_153716473" style="display: block;">
                                             <div class="space-4"></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会议名称<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsTitle' name="smsTitle" class="input-medium"/>
+                                                    <input type="text" id='smsTitle' name="smsTitle" maxlength="20" class="input-medium"/>
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
-                                            <div class="form-group" id="SMS_139227937_smsTime">
+                                            <div class="form-group" id="SMS_153716473_smsTime">
                                                 <label class="col-xs-2 control-label no-padding-right">会议时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsTime' name="smsTime" class="input-medium" />
+                                                    <input type="text" id='smsTime' name="smsTime" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会议地址<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsAddress' name="smsAddress" class="input-medium" />
+                                                    <input type="text" id='smsAddress' name="smsAddress" maxlength="20" class="input-medium" style="width: 300px;"/><br/>
+                                                    <input type="text" id='smsAddress1' name="smsAddress1" maxlength="20" class="input-medium" style="width: 300px;"/><br/>
+                                                    <input type="text" id='smsAddress2' name="smsAddress2" maxlength="20" class="input-medium" style="width: 300px;"/><br/>
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">签到时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsSignTime' name="smsSignTime" class="input-medium" />
+                                                    <input type="text" id='smsSignTime' name="smsSignTime" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">联系人及电话<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsContact' name="smsContact" class="input-medium" value="胡萧" />
-                                                    <input type="text" id='smsContactTel' name="smsContactTel" class="input-medium" value="18907487848" />
+                                                    <input type="text" id='smsContact' name="smsContact" maxlength="20" class="input-medium" value="胡萧" />
+                                                    <input type="text" id='smsContactTel' name="smsContactTel" maxlength="20" class="input-medium" value="18907487848" />
                                                 </div>
                                             </div>
                                         </div>
@@ -295,29 +297,29 @@
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">培训时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='time' name="time" class="input-medium" />
+                                                    <input type="text" id='time' name="time" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">培训地址<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='adress' name="adress" class="input-medium" />
+                                                    <input type="text" id='adress' name="adress" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">签到时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='signTime' name="signTime" class="input-medium" />
+                                                    <input type="text" id='signTime' name="signTime" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">联系人及电话<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='linkMan' name="linkMan" class="input-medium" value="胡萧" />
-                                                    <input type="text" id='tel' name="tel" class="input-medium" value="18907487848" />
+                                                    <input type="text" id='linkMan' name="linkMan" maxlength="20" class="input-medium" value="胡萧" />
+                                                    <input type="text" id='tel' name="tel" maxlength="20" class="input-medium" value="18907487848" />
                                                 </div>
                                             </div>
                                         </div>
diff --git a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
index 77d5e49..5c6c3c2 100644
--- a/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
+++ b/src/main/webapp/WEB-INF/view/vip/vipMember.jsp
@@ -420,48 +420,50 @@
                                             <label class="col-xs-2 control-label no-padding-right">短信类型<span style="color:red;">*</span></label>
                                             <div class="col-xs-8">
                                                 <select id="smsType" name="smsType" class="form-control" onchange="changeSmsContent();">
-                                                    <option value="SMS_139227937">活动通知</option>
+                                                    <option value="SMS_153716473">活动通知</option>
                                                     <option value="SMS_143712160">证书到期通知</option>
                                                     <option value="SMS_143717029">会员到期通知</option>
                                                     <option value="SMS_142146106">学员培训通知</option>
                                                 </select>
                                             </div>
                                         </div>
-                                        <div id="SMS_139227937" style="display: block;">
+                                        <div id="SMS_153716473" style="display: block;">
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会议名称<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsTitle' name="smsTitle" class="input-medium" />
+                                                    <input type="text" id='smsTitle' name="smsTitle" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会议时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsTime' name="smsTime" class="input-medium" />
+                                                    <input type="text" id='smsTime' name="smsTime" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会议地址<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsAddress' name="smsAddress" class="input-medium" />
+                                                    <input type="text" id='smsAddress' name="smsAddress" maxlength="20" class="input-medium" style="width: 300px;"/><br/>
+                                                    <input type="text" id='smsAddress1' name="smsAddress1" maxlength="20" class="input-medium" style="width: 300px;"/><br/>
+                                                    <input type="text" id='smsAddress2' name="smsAddress2" maxlength="20" class="input-medium" style="width: 300px;"/><br/>
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">签到时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsSignTime' name="smsSignTime" class="input-medium" />
+                                                    <input type="text" id='smsSignTime' name="smsSignTime" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">联系人及电话<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsContact' name="smsContact" class="input-medium" value="胡萧" />
-                                                    <input type="text" id='smsContactTel' name="smsContactTel" class="input-medium" value="18907487848" />
+                                                    <input type="text" id='smsContact' name="smsContact" maxlength="20" class="input-medium" value="胡萧" />
+                                                    <input type="text" id='smsContactTel' name="smsContactTel" maxlength="20" class="input-medium" value="18907487848" />
                                                 </div>
                                             </div>
                                         </div>
@@ -470,36 +472,36 @@
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">培训名称<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='noticeText' name="noticeText" class="input-medium" />
+                                                    <input type="text" id='noticeText' name="noticeText" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">培训时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='time' name="time" class="input-medium" />
+                                                    <input type="text" id='time' name="time" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">培训地址<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='adress' name="adress" class="input-medium" />
+                                                    <input type="text" id='adress' name="adress" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">签到时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='signTime' name="signTime" class="input-medium" />
+                                                    <input type="text" id='signTime' name="signTime" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">联系人及电话<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='linkMan' name="linkMan" class="input-medium" value="胡萧" />
-                                                    <input type="text" id='tel' name="tel" class="input-medium" value="18907487848" />
+                                                    <input type="text" id='linkMan' name="linkMan" maxlength="20" class="input-medium" value="胡萧" />
+                                                    <input type="text" id='tel' name="tel" maxlength="20" class="input-medium" value="18907487848" />
                                                 </div>
                                             </div>
                                         </div>
@@ -509,14 +511,14 @@
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">证书到期时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsCertifDate' name="smsCertifDate" class="input-medium" />
+                                                    <input type="text" id='smsCertifDate' name="smsCertifDate" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">秘书处电话<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsCertifTel' name="smsCertifTel" class="input-medium" value="84476408 84477758"/>
+                                                    <input type="text" id='smsCertifTel' name="smsCertifTel" maxlength="20" class="input-medium" value="84476408 84477758"/>
                                                 </div>
                                             </div>
                                         </div>
@@ -526,42 +528,42 @@
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会员到期时间<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsMemberDate' name="smsMemberDate" class="input-medium" />
+                                                    <input type="text" id='smsMemberDate' name="smsMemberDate" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">会费<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsMoney' name="smsMoney" class="input-medium" />元
+                                                    <input type="text" id='smsMoney' name="smsMoney" maxlength="20" class="input-medium" />元
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">户名<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsAccountName' name="smsAccountName" class="input-medium" />
+                                                    <input type="text" id='smsAccountName' name="smsAccountName" maxlength="20" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">开户行<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsAccountBankName' name="smsAccountBankName" class="input-medium" />
+                                                    <input type="text" id='smsAccountBankName' maxlength="20" name="smsAccountBankName" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group">
                                                 <label class="col-xs-2 control-label no-padding-right">账号<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsAccountCode' name="smsAccountCode" class="input-medium" />
+                                                    <input type="text" id='smsAccountCode' maxlength="20" name="smsAccountCode" class="input-medium" />
                                                 </div>
                                             </div>
                                             <div class="space-4" ></div>
                                             <div class="form-group" >
                                                 <label class="col-xs-2 control-label no-padding-right">秘书处电话<span style="color:red;">*</span></label>
                                                 <div class="col-xs-8">
-                                                    <input type="text" id='smsMemberTel' name="smsMemberTel" class="input-medium" value="84476408 84477758"/>
+                                                    <input type="text" id='smsMemberTel' name="smsMemberTel" maxlength="20" class="input-medium" value="84476408 84477758"/>
                                                 </div>
                                             </div>
                                         </div>