Browse Source

feature: 添加deployment.yaml

Feick 3 years ago
parent
commit
6632c30ab5

+ 52 - 0
deployment.yaml

@@ -0,0 +1,52 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: planning
+  namespace: dev
+  labels:
+    app: planning
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: planning
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: planning
+    spec:
+      containers:
+        - args:
+            - --spring.profiles.active=dev
+          image: yaoxiang/planning:${date}
+          imagePullPolicy: IfNotPresent
+          name: planning
+          ports:
+            - containerPort: 8080
+              name: 8080tcp01
+              protocol: TCP
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: planning
+  namespace: dev
+  labels:
+    app: planning
+spec:
+  selector:
+    app: planning
+  type: NodePort
+  ports:
+    - port: 8080
+      targetPort: 8080
+      nodePort: 32004
+      name: "http"
+      protocol: TCP

+ 2 - 7
pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.1</version>
+		<version>2.5.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yaoxiang</groupId>
@@ -16,7 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<kotlin.version>1.4.21</kotlin.version>
+		<kotlin.version>1.6.10</kotlin.version>
 	</properties>
 
 	<dependencies>
@@ -156,11 +156,6 @@
 						<artifactId>kotlin-maven-allopen</artifactId>
 						<version>${kotlin.version}</version>
 					</dependency>
-					<dependency>
-						<groupId>org.jetbrains.kotlin</groupId>
-						<artifactId>kotlin-maven-noarg</artifactId>
-						<version>${kotlin.version}</version>
-					</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>

+ 1 - 1
src/main/kotlin/com/yaoxiang/planning/service/UserService.kt

@@ -209,7 +209,7 @@ class UserService {
     }
 
     @Transactional
-    private fun update(userInfo: UserInfo): Boolean {
+    fun update(userInfo: UserInfo): Boolean {
         userInfoRepo.save(userInfo)
         return true
     }

+ 2 - 2
src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 spring.redis.host=yaoxiangedu.com
-spring.redis.port=32578
+spring.redis.port=32002
 spring.redis.password=134679258Aa_
 
-spring.datasource.url=jdbc:mysql://yaoxiangedu.com:30875/planning?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://yaoxiangedu.com:32001/planning?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
 spring.datasource.username=planning
 spring.datasource.password=134679258Aa_

+ 0 - 1
src/main/resources/application.properties

@@ -19,7 +19,6 @@ spring.datasource.testWhileIdle=true
 spring.datasource.testOnBorrow=false
 spring.datasource.testOnReturn=false
 
-#سÏó
 planning.department_name=\u723b\u8c61
 planning.secret=YaoXiang@1234
 planning.default_password=Admin123