Merge branch 'release/v2.1.2' into 'develop'

Release/v2.1.2

See merge request dcuc-tjdsj/app-service!34

README.md

@@ -6,4 +6,6 @@
 ### 2.1.0
   - 新增同步应用资源目录、服务资源目录、数据资源目录
 ### 2.1.1
-  - 合并数据域代码
+  - 合并数据域代码
+### 2.1.2
+  - 新增服务资源目录相关字段 

dcuc-app-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.1.1-tjdsj-SNAPSHOT</version>
+        <version>2.1.2-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-app-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.1.1-tjdsj-SNAPSHOT</version>
+        <version>2.1.2-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-app-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.1.1-tjdsj-SNAPSHOT</version>
+        <version>2.1.2-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-app-service/src/main/resources/application-base.yml

@@ -2,10 +2,10 @@ spring:
   profiles:
     active: default
   datasource:
-    username: jzpt_bu
-    password: dragon
+    username: dcuc
+    password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+    url: jdbc:mysql://10.254.10.31:3306/dcuc_gd_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
     druid:
       filters: sqlaudit
   application:

dcuc-app-service/src/main/resources/config/mysql/V4_1_0002__Add_Index.sql

@@ -0,0 +1 @@
+-- mysql not need add index

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-app</artifactId>
-    <version>2.1.1-tjdsj-SNAPSHOT</version>
+    <version>2.1.2-tjdsj-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>dcuc-app-api</module>