1、新增维修记录

2、新增保养记录
3、新增港口码头主数据
4、新增铁路车站主数据
5、新增空港机场主数据
6、测试版nacos配置
7、测试版Harbor配置
8、其他配置修改

doc/nacos/blade-dev.yaml

@@ -46,7 +46,7 @@ blade:
   datasource:
     dev:
       # MySql
-      url: jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+      url: jdbc:mysql://localhost:3306/transport?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
       username: root
       password: root
       # PostgreSQL

doc/nacos/blade-prod.yaml

@@ -5,9 +5,9 @@ spring:
       ##redis 单机环境配置
       ##将docker脚本部署的redis服务映射为宿主机ip
       ##生产环境推荐使用阿里云高可用redis服务并设置密码
-      host: 192.168.0.188
-      port: 3379
-      password:
+      host: 172.16.203.228
+      port: 6379
+      password: redis_G3BmPA
       database: 0
       ssl:
         enabled: false
@@ -38,10 +38,10 @@ blade:
     enabled: false
     ##将docker脚本部署的redis服务映射为宿主机ip
     ##生产环境推荐使用阿里云高可用redis服务并设置密码
-    address: redis://192.168.0.188:3379
+    address: redis://172.16.203.228:6379
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     prod:
-      url: jdbc:mysql://192.168.0.188:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-      username: root
-      password: root
+      url: jdbc:mysql://172.16.203.228:3306/transport?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+      username: transport
+      password: ab3acJYSC8A4ySpk

doc/nacos/blade.yaml

@@ -119,7 +119,7 @@ blade:
   #oauth2配置
   oauth2:
     #启用 oauth2
-    enabled: true
+    enabled: false
     #使用 @org.springblade.test.Sm2KeyGenerator 获取,用于国密sm2验签,需和前端保持一致
     public-key: ${BLADE_OAUTH2_PUBLIC_KEY}
     #使用 @org.springblade.test.Sm2KeyGenerator 获取,用于国密sm2解密,前端无需配置
@@ -133,9 +133,9 @@ blade:
     #单用户登录范围
     single-level: all
     #token签名 使用blade-auth服务 @org.springblade.test.SignKeyGenerator 获取
-    sign-key: ${BLADE_TOKEN_SIGN_KEY}
+    sign-key: 9Jc5LMDJ28CHggO9X030ZnL85BlbzC0n
     #token加密 使用blade-auth服务 @org.springblade.test.CryptoKeyGenerator 获取
-    crypto-key: ${BLADE_TOKEN_CRYPTO_KEY}
+    crypto-key: NWmP0cuIWAfL6GPeLJlbY8898b5iPk1y
   #超级密钥配置
   key:
     #启用超级密钥
@@ -147,11 +147,11 @@ blade:
     #报文加密配置
     crypto:
       #启用报文加密配置
-      enabled: false
+      enabled: true
       #使用blade-auth服务 @org.springblade.test.CryptoKeyGenerator 获取,需和前端保持一致
-      aes-key: ${BLADE_API_CRYPTO_AES_KEY}
+      aes-key: gLJvoZfX9pOp3nkIdQ9U2DzxlzsrTvJC
       #使用blade-auth服务 @org.springblade.test.CryptoKeyGenerator 获取,需和前端保持一致
-      des-key: ${BLADE_API_CRYPTO_DES_KEY}
+      des-key: hdlxNCD2KZI91Taq
   #jackson配置
   jackson:
     #null自动转空值

doc/nacos/routes/blade-gateway-dev.json

@@ -13,6 +13,20 @@
     "filters": [],
     "uri": "lb://blade-desk-me"
   },
+  {
+    "id": "transport-route",
+    "order": 0,
+    "predicates": [
+      {
+        "name": "Path",
+        "args": {
+          "pattern": "/blade-transport/**"
+        }
+      }
+    ],
+    "filters": [],
+    "uri": "lb://blade-transport"
+  },
   {
     "id": "example-route",
     "order": 0,