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 4433f46..dda1913 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,7 +75,7 @@ public class OsSysField implements Serializable { @ColumnType(column = "FIELD_SIGN") private Integer sign; - + @ColumnType(column = "FIELD_LOGIC") private Integer logic; private String fkKey; private String fkValue; 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 2fa1863..d891aa9 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 @@ -15,7 +15,7 @@ - + diff --git a/hcframe-parent/hcframe-config/src/main/resources/application.yml b/hcframe-parent/hcframe-config/src/main/resources/application.yml index 0403929..d9d6523 100644 --- a/hcframe-parent/hcframe-config/src/main/resources/application.yml +++ b/hcframe-parent/hcframe-config/src/main/resources/application.yml @@ -55,8 +55,8 @@ spring: # 配置sqlite文件路径,需要填写绝对路径,推荐将sqlite文件放入到服务器上,而非程序jar包或war包中 driver-class-name: org.sqlite.JDBC # url: jdbc:sqlite:/Volumes/DATA/ideaProject/common-frame/hcframe/hcframe-parent/hcframe-config/src/main/resources/datasource.db -# url: jdbc:sqlite:D:/cloud/datasource.db - url: jdbc:sqlite:/home/it/user/gateway/datasource.db + url: jdbc:sqlite:D:/cloud/datasource.db +# url: jdbc:sqlite:/home/it/user/gateway/datasource.db username: password: #使用Druid数据源 diff --git a/hcframe-parent/hcframe-user/src/main/resources/application.yml b/hcframe-parent/hcframe-user/src/main/resources/application.yml index 07c5da4..439ecb4 100644 --- a/hcframe-parent/hcframe-user/src/main/resources/application.yml +++ b/hcframe-parent/hcframe-user/src/main/resources/application.yml @@ -52,15 +52,15 @@ spring: druid: # 配置sqlite文件路径,需要填写绝对路径,推荐将sqlite文件放入到服务器上,而非程序jar包或war包中 driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://192.168.100.98:5236/GBCAS?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 -# username: GBCAS -# password: 123456789 + url: jdbc:dm://192.168.100.98:5236/GBCAS?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 + username: GBCAS + password: 123456789 # url: jdbc:dm://10.211.55.4:5236/GBCAS?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 # username: GBCAS # password: 123456789 - url: jdbc:dm://DM1/TYSFRZ?useUnicode=true&characterEncoding=UTF-8 - username: TYSFRZ - password: TYSFRZ123 +# url: jdbc:dm://DM1/TYSFRZ?useUnicode=true&characterEncoding=UTF-8 +# username: TYSFRZ +# password: TYSFRZ123 #使用Druid数据源 initialSize: 5 # 初始化大小,最小,最大