Merge branch 'master' of ssh://gitlab.91step.com:9023/huangxingyao/bookinfo-pageproduct

# Conflicts: # src/main/java/com/bookinfo/rest/ProductPageController.java

Merge branch 'master' of ssh://gitlab.91step.com:9023/huangxingyao/bookinfo-pageproduct
# Conflicts: # src/main/java/com/bookinfo/rest/ProductPageController.java
c84cea91 · huangxingyao · b8ab0d18 · 0d3ca034 · c84cea91 · c84cea91
--- a/deployment.yaml
+++ b/deployment.yaml
+##################################################################################################
+# Productpage services
+##################################################################################################
 apiVersion: v1
 kind: Service
 metadata:
@@ -16,12 +19,11 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: bookinfo-productpage
-  labels:
-    account: productpage
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: default
  name: productpage-v1
  labels:
    app: productpage
@@ -41,7 +43,7 @@ spec:
      serviceAccountName: bookinfo-productpage
      containers:
      - name: productpage
-        image: bbowenhhuang/productpage:v1
+        image: docker.io/bbowenhhuang/productpage:v1
        imagePullPolicy: IfNotPresent
        ports:
        - containerPort: 8080
@@ -53,4 +55,4 @@ spec:
        - name: RATINGS_HOST
          value: http://ratings:8080

---
+---
\ No newline at end of file
--- a/src/main/java/com/bookinfo/rest/ProductPageController.java
+++ b/src/main/java/com/bookinfo/rest/ProductPageController.java
@@ -13,6 +13,7 @@ import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestClientException;

 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;

@@ -25,11 +26,7 @@ public class ProductPageController {
    @Autowired
    private RatingsClient ratingsClient;

-    @GetMapping("/")
-    public String getIndex(Model model) {
-        model.addAttribute("name", "hello world");
-        return "index";
-    }
+
    @GetMapping("/health")
    public String health(){
        return "Product page is healthy";
@@ -37,15 +34,18 @@ public class ProductPageController {

    @PostMapping("/login")
    public String login(@RequestParam(name = "username", required = true) String username,
-                        HttpServletRequest request){
+                        HttpServletRequest request, HttpServletResponse response){
        String user = username;
        request.getSession().setAttribute("user", user);
-        return "productpage";
+       
+        response.setHeader("end-user",user);
+        return "redirect:productpage";
    }
    @GetMapping("/logout")
    public String destroySession(HttpServletRequest request) {
        request.getSession().invalidate();
-        return "productpage";
+
+        return "redirect:productpage";
    }

    @GetMapping("/productpage")

--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
-<!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <title>Getting Started: Serving Web Content</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-<body>
-    <p th:text="'Hello, ' + ${name} + '!'" />
-</body>
-</html>