正在显示
6 个修改的文件
包含
26 行增加
和
8 行删除
.idea/misc.xml
0 → 100644
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<project version="4"> | ||
3 | + <component name="FrameworkDetectionExcludesConfiguration"> | ||
4 | + <file type="web" url="file://$PROJECT_DIR$" /> | ||
5 | + </component> | ||
6 | + <component name="MavenProjectsManager"> | ||
7 | + <option name="originalFiles"> | ||
8 | + <list> | ||
9 | + <option value="$PROJECT_DIR$/pom.xml" /> | ||
10 | + </list> | ||
11 | + </option> | ||
12 | + </component> | ||
13 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | ||
14 | + <output url="file://$PROJECT_DIR$/out" /> | ||
15 | + </component> | ||
16 | + <component name="WebServicesPlugin" addRequiredLibraries="true" /> | ||
17 | +</project> |
.idea/vcs.xml
0 → 100644
@@ -2554,15 +2554,12 @@ public class ManifestController extends BasicController { | @@ -2554,15 +2554,12 @@ public class ManifestController extends BasicController { | ||
2554 | // 卸货地代码 | 2554 | // 卸货地代码 |
2555 | manifestEntity.setDestinationstation(arr.get(7)); | 2555 | manifestEntity.setDestinationstation(arr.get(7)); |
2556 | // 货物装载运输时间 | 2556 | // 货物装载运输时间 |
2557 | - SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss"); | ||
2558 | - manifestEntity.setStowagedate(simpleDateFormat1.parse(arr.get(8))); | 2557 | + manifestEntity.setStowagedate(new Date()); |
2559 | // 海关关区代码 | 2558 | // 海关关区代码 |
2560 | manifestEntity.setCustomscode(arr.get(9)); | 2559 | manifestEntity.setCustomscode(arr.get(9)); |
2561 | // 货物件数 | 2560 | // 货物件数 |
2562 | -// String s3 = arr.get(11); | ||
2563 | manifestEntity.setTotalpiece(arr.get(10)); | 2561 | manifestEntity.setTotalpiece(arr.get(10)); |
2564 | // 货物毛重 | 2562 | // 货物毛重 |
2565 | -// String s1 = arr.get(12); | ||
2566 | manifestEntity.setTotalweight(arr.get(11)); | 2563 | manifestEntity.setTotalweight(arr.get(11)); |
2567 | // 货物简要描述 | 2564 | // 货物简要描述 |
2568 | manifestEntity.setProductname(arr.get(12)); | 2565 | manifestEntity.setProductname(arr.get(12)); |
@@ -157,8 +157,6 @@ public class LoginController { | @@ -157,8 +157,6 @@ public class LoginController { | ||
157 | 157 | ||
158 | ResponseModel rm = new ResponseModel(200, "", null); | 158 | ResponseModel rm = new ResponseModel(200, "", null); |
159 | // 查询该账号是否被禁用 | 159 | // 查询该账号是否被禁用 |
160 | - | ||
161 | - | ||
162 | String rand = session.getAttribute("rand").toString(); | 160 | String rand = session.getAttribute("rand").toString(); |
163 | 161 | ||
164 | UserEntity userEntity = userService.findLoginaccount(loginAccount); | 162 | UserEntity userEntity = userService.findLoginaccount(loginAccount); |
@@ -29,7 +29,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. | @@ -29,7 +29,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. | ||
29 | <div style="margin-top: 10px;"> | 29 | <div style="margin-top: 10px;"> |
30 | <input class="verifyInputs" style="float: left; width: 191px; height: 26px; line-height: 35px; margin-left: 0px; padding: 5px;" name="verifyInput" id="verifyInput" placeholder="请输入验证码"> | 30 | <input class="verifyInputs" style="float: left; width: 191px; height: 26px; line-height: 35px; margin-left: 0px; padding: 5px;" name="verifyInput" id="verifyInput" placeholder="请输入验证码"> |
31 | 31 | ||
32 | - <img class="verifyCodes" style="float: left; width: 202px; height: 37px; line-height: 35px; margin-left: 11px; padding: 5px; margin-top: -5px;" onclick="changeCode()" src="/agent/getVerifyCode"> | 32 | + <img class="verifyCodes" style="float: left; width: 202px; height: 37px; line-height: 35px; margin-left: 11px; padding: 5px; margin-top: -5px;" onclick="changeCode()" src="<%=basePath %>agent/getVerifyCode"> |
33 | 33 | ||
34 | </div> | 34 | </div> |
35 | 35 | ||
@@ -152,7 +152,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. | @@ -152,7 +152,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. | ||
152 | 152 | ||
153 | function changeCode() { | 153 | function changeCode() { |
154 | 154 | ||
155 | - var src = "getVerifyCode?"+new Date().getTime(); //加时间戳,防止浏览器利用缓存 | 155 | + var src = "<%=basePath %>agent/getVerifyCode?"+new Date().getTime(); //加时间戳,防止浏览器利用缓存 |
156 | 156 | ||
157 | $('.verifyCodes').attr("src",src); | 157 | $('.verifyCodes').attr("src",src); |
158 | } | 158 | } |
不能预览此文件类型
-
请 注册 或 登录 后发表评论