添加 线上配置文件

boman-auth/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server: 
+  port: 7200
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: boman-auth
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        # 配置中心地址
+        server-addr: 118.178.139.79:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04

boman-gateway/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,44 @@
+# Tomcat
+server:
+  port: 7090
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: boman-gateway
+  profiles:
+    # 环境配置
+    active: prod
+  main:
+    allow-bean-definition-overriding: true
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        # 配置中心地址
+        server-addr: 118.178.139.79:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 127.0.0.1:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 118.178.139.79:8848
+            dataId: sentinel-boman-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: flow

boman-modules/boman-file/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 7300
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: boman-file
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        # 配置中心地址
+        server-addr: 118.178.139.79:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04

boman-modules/boman-gen/src/main/java/com/boman/gen/service/LoadTableServerImpl.java

@@ -155,8 +155,11 @@ public class LoadTableServerImpl implements ILoadTableServer{
             GenTable fkGenTable = genTableService.getByTableId(fkTableId);
             // 显示键 table_column 表的id
             Long dkColumnId = fkGenTable.getDkColumn();
-            GenTableColumn dkTableColumn = genTableColumnService.selectGenTableColumnListByColumnId(dkColumnId);
-            String dkColumnName = dkTableColumn.getColumnName();
+            String dkColumnName = fkColumnName;
+            if(dkColumnId != null){
+                GenTableColumn dkTableColumn = genTableColumnService.selectGenTableColumnListByColumnId(dkColumnId);
+                 dkColumnName = dkTableColumn.getColumnName();
+            }
             String fkTableName = fkGenTable.getTableName();
             Map<String, Object> fkInfo = Maps.newConcurrentMap();
             fkInfo.put(FormDataConstant.FK_TABLE_NAME, fkTableName);

boman-modules/boman-gen/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 7202
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: boman-gen
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        # 配置中心地址
+        server-addr: 118.178.139.79:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04

boman-modules/boman-job/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 7203
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: boman-job
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        # 配置中心地址
+        server-addr: 118.178.139.79:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04

boman-modules/boman-job/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ server:
 spring: 
   application:
     # 应用名称
-    name: boman-job-test
+    name: boman-job
   profiles:
     # 环境配置
     active: test
@@ -15,6 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         # 配置中心地址
         server-addr: 192.168.101.10:8848

boman-modules/boman-system/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,19 @@
+server:
+  port: 7201
+
+spring: 
+  application:
+    name: boman-system
+  profiles:
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        server-addr: 192.168.101.10:8848
+        file-extension: yml
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04

boman-visual/boman-monitor/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 7100
+
+# Spring
+spring: 
+  application:
+    # 应用名称
+    name: boman-monitor
+  profiles:
+    # 环境配置
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        # 配置中心地址
+        server-addr: 118.178.139.79:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04

boman-visual/boman-monitor/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ server:
 spring: 
   application:
     # 应用名称
-    name: boman-monitor-test
+    name: boman-monitor
   profiles:
     # 环境配置
     active: test
@@ -15,6 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 192.168.101.10:8848
+        namespace: 9690deba-607a-472c-9444-5a6a3b660db3
       config:
         # 配置中心地址
         server-addr: 192.168.101.10:8848

boman-web-core/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,19 @@
+server:
+  port: 7000
+
+spring: 
+  application:
+    name: boman-web-core
+  profiles:
+    active: prod
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 118.178.139.79:8848
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04
+      config:
+        server-addr: 118.178.139.79:8848
+        file-extension: yml
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 5d3b2dc4-f69e-47de-baa1-234d60012c04