Skip to content

B
bookinfo-pageproduct
提交 c84cea91 authored 作者: huangxingyao's avatar huangxingyao
浏览文件
操作

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

# Conflicts:
#	src/main/java/com/bookinfo/rest/ProductPageController.java
上级 b8ab0d18 0d3ca034
显示空白字符变更
内嵌 并排
正在显示 包含 13 行增加 和 21 行删除
deployment.yaml
浏览文件 @ c84cea91
##################################################################################################
# Productpage services
##################################################################################################
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
...@@ -16,12 +19,11 @@ apiVersion: v1 ...@@ -16,12 +19,11 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: bookinfo-productpage name: bookinfo-productpage
labels:
account: productpage
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
namespace: default
name: productpage-v1 name: productpage-v1
labels: labels:
app: productpage app: productpage
...@@ -41,7 +43,7 @@ spec: ...@@ -41,7 +43,7 @@ spec:
serviceAccountName: bookinfo-productpage serviceAccountName: bookinfo-productpage
containers: containers:
- name: productpage - name: productpage
image: bbowenhhuang/productpage:v1 image: docker.io/bbowenhhuang/productpage:v1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 8080 - containerPort: 8080
......
src/main/java/com/bookinfo/rest/ProductPageController.java
浏览文件 @ c84cea91
...@@ -13,6 +13,7 @@ import org.springframework.web.client.HttpClientErrorException; ...@@ -13,6 +13,7 @@ import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -25,11 +26,7 @@ public class ProductPageController { ...@@ -25,11 +26,7 @@ public class ProductPageController {
@Autowired @Autowired
private RatingsClient ratingsClient; private RatingsClient ratingsClient;
@GetMapping("/")
public String getIndex(Model model) {
model.addAttribute("name", "hello world");
return "index";
}
@GetMapping("/health") @GetMapping("/health")
public String health(){ public String health(){
return "Product page is healthy"; return "Product page is healthy";
...@@ -37,15 +34,18 @@ public class ProductPageController { ...@@ -37,15 +34,18 @@ public class ProductPageController {
@PostMapping("/login") @PostMapping("/login")
public String login(@RequestParam(name = "username", required = true) String username, public String login(@RequestParam(name = "username", required = true) String username,
HttpServletRequest request){ HttpServletRequest request, HttpServletResponse response){
String user = username; String user = username;
request.getSession().setAttribute("user", user); request.getSession().setAttribute("user", user);
return "productpage";
response.setHeader("end-user",user);
return "redirect:productpage";
} }
@GetMapping("/logout") @GetMapping("/logout")
public String destroySession(HttpServletRequest request) { public String destroySession(HttpServletRequest request) {
request.getSession().invalidate(); request.getSession().invalidate();
return "productpage";
return "redirect:productpage";
} }
@GetMapping("/productpage") @GetMapping("/productpage")
......
src/main/resources/templates/index.html deleted 100644 → 0
浏览文件 @ b8ab0d18
<!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>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论