Merge remote-tracking branch 'origin/master'

pom.xml

@@ -97,13 +97,13 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus</artifactId>
-            <version>3.4.1</version>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.0.5</version>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>Projectmanagement</finalName>
+        <finalName>projectManagement</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/resources/application-keda.properties

@@ -0,0 +1,19 @@
+#\u79D1\u5927\u9879\u76EE\u7BA1\u7406\u914D\u7F6E
+server.port=1010
+server.servlet.context-path=/project
+
+#\u79D1\u5927\u6570\u636E\u5E93\u8FDE\u63A5
+spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/keda?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.username=super
+spring.datasource.password=huoran888
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+spring.jackson.default-property-inclusion=non_null
+
+#\u65E5\u5FD7\u7EA7\u522B
+logging.level.jdbc=OFF
+logging.level.jdbc.sqltiming=DEBUG
+logging.level.jdbc.resultsettable=DEBUG
+logging.level.com.yipin.liuwar.mapper=DEBUG
+logging.level.com.yipin.liuwanr.mapper=DEBUG
+

src/main/resources/application-occupationlab.properties

@@ -0,0 +1,25 @@
+#\u804C\u7AD9\u9879\u76EE\u7BA1\u7406\u914D\u7F6E
+server.port=1010
+server.servlet.context-path=/project
+
+#\u6B63\u5F0F\u6570\u636E\u5E93\u8FDE\u63A5
+spring.datasource.url=jdbc:mysql://rm-wz90d92p0pf083nxzno.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=HuoRan@2021
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+#\u6D4B\u8BD5\u6570\u636E\u5E93\u8FDE\u63A5
+#spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#spring.datasource.username=super
+#spring.datasource.password=huoran888
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+spring.jackson.default-property-inclusion=non_null
+
+#\u65E5\u5FD7\u7EA7\u522B
+logging.level.jdbc=OFF
+logging.level.jdbc.sqltiming=DEBUG
+logging.level.jdbc.resultsettable=DEBUG
+logging.level.com.yipin.liuwar.mapper=DEBUG
+logging.level.com.yipin.liuwanr.mapper=DEBUG
+

src/main/resources/application.properties

@@ -1,18 +1,2 @@
-#易品测试liuwanr服务器 -职站项目
-#spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#spring.datasource.username=super
-#spring.datasource.password=huoran888
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-#或然正式服务器 -科大项目
-spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/keda?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-spring.datasource.username=super
-spring.datasource.password=huoran888
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.jackson.default-property-inclusion=non_null
-
-server.port=1010
-server.servlet.context-path=/project
-
-logging.level.com.yipin.liuwanr.mapper=debug
+#\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u5206\u79D1\u5927\u9879\u76EE\u548C\u804C\u7AD9\u9879\u76EE
+spring.profiles.active=occupationlab