Merge branch 'master' into 'master'

# Conflicts:
#   README.md

.gitlab-ci.yml

@@ -55,4 +55,4 @@ deploy-job:
     REGISTRY_REMOTE_USER: $REGISTRY_REMOTE_USER
     REGISTRY_REMOTE_PASSWORD: $REGISTRY_REMOTE_PASSWORD
     # 设置镜像 tag，使用 git tag 标识作为镜像 tag
-    TAG: ${REGISTRY_REMOTE}/basic/basic-api:${CI_BUILD_REF_NAME}
+    TAG: ${REGISTRY_REMOTE}/kshg/kshg-api:${CI_BUILD_REF_NAME}

README.md

-# Basic API（Template）
+# 可赛化工安全生产平台 API
+
+> 项目 Fork 自 [basic-api-project](https://gitlab.yiring.com/basic/basic-api-project)
 
 ## 开发环境
 

app/src/main/resources/application-dev.yml

 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/basic_app?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/kshg_app?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: root
     password: 123456
   jpa:

app/src/main/resources/application-mock.yml

@@ -5,10 +5,13 @@ spring:
     password: 123456
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
-    show-sql: true
     open-in-view: true
     hibernate:
       ddl-auto: update
+    show-sql: true
+    properties:
+      hibernate:
+        format_sql: true
   h2:
     console:
       enabled: true

app/src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   application:
-    name: "basic-api-app"
+    name: "kshg-api"
   profiles:
     include: auth
     active: dev

docker-compose.yml

@@ -2,14 +2,14 @@ version: '3'
 
 services:
   # 应用服务
-  basic-api:
+  kshg-api:
     build:
       context: .
       dockerfile: Dockerfile
     # 镜像名称
-    image: 127.0.0.1:18500/basic/basic-api:0.0.1
+    image: 127.0.0.1:18500/kshg/kshg-api:0.0.1
     # 容器名称
-    container_name: 'basic-api'
+    container_name: 'kshg-api'
     # 端口绑定
     ports:
       - "18181:8181"
@@ -17,14 +17,14 @@ services:
     restart: always
     # 挂载目录
     volumes:
-      - "/volume/basic/app/data:/data"
-      - "/volume/basic/app/logs:/logs"
+      - "/volume/kshg/app/data:/data"
+      - "/volume/kshg/app/logs:/logs"
     environment:
       # 设置时区
       - TZ=Asia/Shanghai
     # 指定网络
     networks:
-      - basic
+      - kshg
 
 networks:
-  basic:
+  kshg:

settings.gradle

@@ -4,7 +4,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-rootProject.name = 'basic'
+rootProject.name = 'kshg-api'
 include 'app'
 include 'basic-auth'
 include 'basic-common:core'