From b805b7ddf7cf97b6d57c14ebdeda9a04db2bde46 Mon Sep 17 00:00:00 2001
From: lhc <taixingyiji@126.com>
Date: Tue, 25 May 2021 10:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/module/tableconfig/entity/OsSysField.java   |  2 +-
 .../mapping/tableconfig/OsSysFieldMapper.xml         |  2 +-
 .../src/main/resources/application.yml               |  4 ++--
 .../hcframe-user/src/main/resources/application.yml  | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

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 @@
     <result column="IS_FORM" jdbcType="INTEGER" property="isForm" />
     <result column="IS_BATCH" jdbcType="INTEGER" property="isBatch" />
     <result column="FK_TABLE" jdbcType="VARCHAR" property="fkTable" />
-    <result column="LOGIC" jdbcType="VARCHAR" property="logic" />
+    <result column="FIELD_LOGIC" jdbcType="VARCHAR" property="logic" />
     <result column="FIELD_SIGN" jdbcType="VARCHAR" property="sign" />
     <result column="IS_SEARCH" jdbcType="VARCHAR" property="isSearch" />
     <result column="FK_KEY" jdbcType="VARCHAR" property="fkKey" />
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
       # 初始化大小，最小，最大