latest
This commit is contained in:
36
bookstore-api/.idea/workspace.xml
generated
36
bookstore-api/.idea/workspace.xml
generated
@@ -80,7 +80,7 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="Payment.java" pinned="false" current-in-tab="true">
|
<file leaf-file-name="Payment.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="228">
|
<state relative-caret-position="228">
|
||||||
@@ -90,6 +90,16 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
|
<file leaf-file-name="LoginResource.java" pinned="false" current-in-tab="true">
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="348">
|
||||||
|
<caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
<file leaf-file-name="BillingAddress.java" pinned="false" current-in-tab="false">
|
<file leaf-file-name="BillingAddress.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java">
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
@@ -156,7 +166,6 @@
|
|||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/BookstoreApplication.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/BookstoreApplication.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginController.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginController.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/HttpSessionConfig.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/HttpSessionConfig.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/RequestFilter.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/RequestFilter.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/SecurityConfig.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/config/SecurityConfig.java" />
|
||||||
@@ -182,6 +191,7 @@
|
|||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShippingAddress.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShippingAddress.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/BillingAddress.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java" />
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java" />
|
||||||
|
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
@@ -1007,12 +1017,12 @@
|
|||||||
<workItem from="1488378219247" duration="650000" />
|
<workItem from="1488378219247" duration="650000" />
|
||||||
<workItem from="1488461561430" duration="18419000" />
|
<workItem from="1488461561430" duration="18419000" />
|
||||||
<workItem from="1488731165185" duration="30270000" />
|
<workItem from="1488731165185" duration="30270000" />
|
||||||
<workItem from="1489159532831" duration="12604000" />
|
<workItem from="1489159532831" duration="13556000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="104886000" />
|
<option name="totallyTimeSpent" value="105838000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="72" y="23" width="1280" height="797" extended-state="0" />
|
<frame x="72" y="23" width="1280" height="797" extended-state="0" />
|
||||||
@@ -1059,7 +1069,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
<option name="time" value="18" />
|
<option name="time" value="19" />
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
<watches-manager />
|
<watches-manager />
|
||||||
</component>
|
</component>
|
||||||
@@ -1227,14 +1237,6 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="647">
|
|
||||||
<caret line="71" column="33" lean-forward="false" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java">
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="270">
|
<state relative-caret-position="270">
|
||||||
@@ -1545,5 +1547,13 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/LoginResource.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="348">
|
||||||
|
<caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@@ -41,29 +41,33 @@ public class LoginResource {
|
|||||||
return new ResponseEntity("Logout success.",HttpStatus.OK);
|
return new ResponseEntity("Logout success.",HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value="login", method = RequestMethod.POST)
|
// @RequestMapping(value="login", method = RequestMethod.POST)
|
||||||
public String loginPost(@RequestBody Map<String, String> json) throws
|
// public String loginPost(
|
||||||
ServletException {
|
// @RequestBody Map<String, String> json,
|
||||||
if(json.get("username") == null || json.get("password") ==null) {
|
// HttpServletRequest request
|
||||||
throw new ServletException("Please fill in username and password");
|
// ) throws
|
||||||
}
|
// ServletException {
|
||||||
|
// if(json.get("username") == null || json.get("password") ==null) {
|
||||||
String username = json.get("username");
|
// throw new ServletException("Please fill in username and password");
|
||||||
String password = json.get("password");
|
// }
|
||||||
|
//
|
||||||
User user= userService.findByUsername(username);
|
// String username = json.get("username");
|
||||||
if (user==null) {
|
// String password = json.get("password");
|
||||||
throw new ServletException("User name not found.");
|
//
|
||||||
}
|
// User user= userService.findByUsername(username);
|
||||||
|
// if (user==null) {
|
||||||
String pwd = user.getPassword();
|
// throw new ServletException("User name not found.");
|
||||||
|
// }
|
||||||
if(!password.equals(pwd)) {
|
//
|
||||||
throw new ServletException("Invalid login. Please check your name and password");
|
// String pwd = user.getPassword();
|
||||||
}
|
//
|
||||||
|
// if(!password.equals(pwd)) {
|
||||||
return "login success";
|
// throw new ServletException("Invalid login. Please check your name and password");
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// return "login success";
|
||||||
|
// }
|
||||||
|
|
||||||
@RequestMapping(value = "/user/logout", method = RequestMethod.POST)
|
@RequestMapping(value = "/user/logout", method = RequestMethod.POST)
|
||||||
public String logout() {
|
public String logout() {
|
||||||
@@ -90,7 +94,15 @@ public class LoginResource {
|
|||||||
|
|
||||||
@RequestMapping("/token")
|
@RequestMapping("/token")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Map<String,String> token(HttpSession session) {
|
public Map<String,String> token(HttpSession session, HttpServletRequest request) {
|
||||||
|
System.out.println(request.getRemoteHost());
|
||||||
|
|
||||||
|
String remoteHost = request.getRemoteHost();
|
||||||
|
int portNumber = request.getRemotePort();
|
||||||
|
|
||||||
|
System.out.println(remoteHost+":"+portNumber);
|
||||||
|
System.out.println(request.getRemoteAddr());
|
||||||
|
|
||||||
return Collections.singletonMap("token", session.getId());
|
return Collections.singletonMap("token", session.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user