Yansen 2 년 전
부모
커밋
61e8b35eb3

+ 31
- 2
pom.xml 파일 보기

@@ -9,8 +9,8 @@
9 9
 		<relativePath/> <!-- lookup parent from repository -->
10 10
 	</parent>
11 11
 	<groupId>com.njyunzhi</groupId>
12
-	<artifactId>nanyang</artifactId>
13
-	<version>0.0.1</version>
12
+	<artifactId>data-collect</artifactId>
13
+	<version>0.0.2</version>
14 14
 	<name>data-collect</name>
15 15
 	<description>数据采集</description>
16 16
 	<properties>
@@ -88,6 +88,35 @@
88 88
 				</configuration>
89 89
 			</plugin>
90 90
 		</plugins>
91
+
92
+		<resources>
93
+			<resource>
94
+				<directory>src/main/resources</directory>
95
+				<filtering>true</filtering>
96
+				<includes>
97
+					<include>**/*.xml</include>
98
+					<include>application.yml</include>
99
+					<include>application-${profileActive}.yml</include>
100
+				</includes>
101
+			</resource>
102
+		</resources>
91 103
 	</build>
92 104
 
105
+	<profiles>
106
+		<profile>
107
+			<id>dev</id>
108
+			<properties>
109
+				<profileActive>dev</profileActive>
110
+			</properties>
111
+			<activation>
112
+				<activeByDefault>true</activeByDefault>
113
+			</activation>
114
+		</profile>
115
+		<profile>
116
+			<id>prod</id>
117
+			<properties>
118
+				<profileActive>prod</profileActive>
119
+			</properties>
120
+		</profile>
121
+	</profiles>
93 122
 </project>

+ 14
- 0
src/main/java/com/njyunzhi/nanyang/config/MybatisPlusConfig.java 파일 보기

@@ -0,0 +1,14 @@
1
+package com.njyunzhi.nanyang.config;
2
+
3
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
4
+import org.springframework.context.annotation.Bean;
5
+import org.springframework.context.annotation.Configuration;
6
+
7
+@Configuration
8
+public class MybatisPlusConfig {
9
+
10
+    @Bean
11
+    public PaginationInterceptor paginationInterceptor() {
12
+        return new PaginationInterceptor();
13
+    }
14
+}

+ 3
- 0
src/main/java/com/njyunzhi/nanyang/controller/TcBindController.java 파일 보기

@@ -90,6 +90,9 @@ public class TcBindController extends BaseController {
90 90
     @PutMapping("/tcBind/{id}")
91 91
     public ResponseBean edit(@RequestBody TcBind tcBind,
92 92
                             @PathVariable Integer id ) throws Exception {
93
+
94
+        tcBind.setSerialNo(id);
95
+
93 96
         tcBindService.updateById(tcBind);
94 97
         return ResponseBean.success(tcBind);
95 98
     }

+ 6
- 0
src/main/resources/application-dev.yml 파일 보기

@@ -0,0 +1,6 @@
1
+
2
+spring:
3
+  datasource:
4
+    url: jdbc:mysql://110.40.183.156:3306/nanyang_machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
5
+    username: nanyang_machinery
6
+    password: nanyang_machinery@ABCD1234

+ 6
- 0
src/main/resources/application-prod.yml 파일 보기

@@ -0,0 +1,6 @@
1
+
2
+spring:
3
+  datasource:
4
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
5
+    username: machinery
6
+    password: machinery@ABCD1234

+ 2
- 4
src/main/resources/application.yml 파일 보기

@@ -4,10 +4,8 @@ server:
4 4
     context-path: /api
5 5
 
6 6
 spring:
7
-  datasource:
8
-    url: jdbc:mysql://110.40.183.156:3306/nanyang_machinery?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
9
-    username: nanyang_machinery
10
-    password: nanyang_machinery@ABCD1234
7
+  profiles:
8
+    active: @profileActive@
11 9
 
12 10
 ###
13 11
 mybatis-plus: