diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java index 80f03ae..ead7451 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/entity/OsSysField.java @@ -75,6 +75,8 @@ public class OsSysField implements Serializable { private Integer sign; private Integer logic; + private String fkKey; + private String fkValue; private List selectList; } diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java index fb7aed9..8c55a22 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/service/impl/TableConfigServiceImpl.java @@ -235,7 +235,7 @@ public class TableConfigServiceImpl implements TableConfigService { stringBuilder.append(osSysSelect.getFieldId()).append(","); } if (selects.size() > 0) { - List list = osSysFieldDao.getTableAlise(stringBuilder.substring(0,stringBuilder.length())); + List list = osSysFieldDao.getTableAlise(stringBuilder.substring(0,stringBuilder.length()-1)); for (String tableAlise : list) { tableCache.delete(tableAlise); } diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml index fca9342..fa13018 100644 --- a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml +++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml @@ -17,6 +17,8 @@ + + diff --git a/hcframe-parent/hcframe-gateway/src/main/resources/application-prod.yml b/hcframe-parent/hcframe-gateway/src/main/resources/application-prod.yml index 7fbb843..3eb74bc 100644 --- a/hcframe-parent/hcframe-gateway/src/main/resources/application-prod.yml +++ b/hcframe-parent/hcframe-gateway/src/main/resources/application-prod.yml @@ -2,10 +2,6 @@ server: port: 8084 spring: cloud: - nacos: - discovery: - server-addr: 192.168.1.131:8848 - namespace: 2e9f0148-751e-4da2-83ec-cb00ffe0d83a gateway: discovery: locator: diff --git a/hcframe-parent/pom.xml b/hcframe-parent/pom.xml index 2af817e..479f26e 100644 --- a/hcframe-parent/pom.xml +++ b/hcframe-parent/pom.xml @@ -204,29 +204,29 @@ prod - 127.0.0.1:8848 + 192.168.100.98:8848 2e9f0148-751e-4da2-83ec-cb00ffe0d83a DEFAULT_GROUP dev 123456 - - 127.0.0.1:8848 + + 192.168.100.98:8848 + 0 - 192.168.4.119 + 192.168.100.98 6379 - true - http://192.168.1.131:8080 + /user/cas/valid + http://192.168.100.98:8080 /cas - ^(.*(/logout?))|(/user/cas/url)$ - http://192.168.1.130:9527 + ^.*(/logout?)$ + http://192.168.100.98:8084 com.hcframe.gateway.config.MyDataStorage /login /logout - /user/cas/valid