From 7c37b88f4f94f7245111330036524a5379f6f382 Mon Sep 17 00:00:00 2001
From: lhc <taixingyiji@126.com>
Date: Thu, 1 Apr 2021 09:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eselect=20key=20select=20Value?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8F=AF=E7=BC=96=E8=BE=91=E5=9F=BA?=
 =?UTF-8?q?=E8=A1=A8=E8=87=AA=E5=8A=A8=E5=8F=8A=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/tableconfig/entity/OsSysField.java  |  2 ++
 .../service/impl/TableConfigServiceImpl.java   |  2 +-
 .../mapping/tableconfig/OsSysFieldMapper.xml   |  2 ++
 .../mapping/tableconfig/OsSysTableMapper.xml   |  2 +-
 .../src/main/resources/application-prod.yml    |  4 ----
 hcframe-parent/pom.xml                         | 18 +++++++++---------
 6 files changed, 15 insertions(+), 15 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 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<OsSysSelect> 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<String> list = osSysFieldDao.getTableAlise(stringBuilder.substring(0,stringBuilder.length()));
+                List<String> 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 @@
     <result column="LOGIC" jdbcType="VARCHAR" property="logic" />
     <result column="SIGN" jdbcType="VARCHAR" property="sign" />
     <result column="IS_SEARCH" jdbcType="VARCHAR" property="isSearch" />
+    <result column="FK_KEY" jdbcType="VARCHAR" property="fkKey" />
+    <result column="FK_VALUE" jdbcType="VARCHAR" property="fkValue" />
     <collection property="selectList" resultMap="com.hcframe.base.module.tableconfig.dao.OsSysSelectDao.OsSysSelectMap"/>
   </resultMap>
     <select id="getTableAlise" resultType="java.lang.String">
diff --git a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml
index 3d5716f..fa41051 100644
--- a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml
+++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysTableMapper.xml
@@ -16,7 +16,7 @@
         from OS_SYS_TABLE
                  left join OS_SYS_FIELD on OS_SYS_TABLE.TABLE_ID = OS_SYS_FIELD.TABLE_ID
                  left join OS_SYS_SELECT on OS_SYS_FIELD.FIELD_ID = OS_SYS_SELECT.FIELD_ID
-        where OS_SYS_TABLE.TABLE_ALIAS = #{typeName} order by OS_SYS_FIELD.FIELD_ID
+        where OS_SYS_TABLE.TABLE_ALIAS = #{typeName} order by OS_SYS_FIELD.FIELD_ID,OS_SYS_SELECT.SELECT_ID
     </select>
 
 </mapper>
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 @@
                 <!--当前环境-->
                 <profile.name>prod</profile.name>
                 <!--Nacos配置中心地址-->
-                <config.server-addr>127.0.0.1:8848</config.server-addr>
+                <config.server-addr>192.168.100.98:8848</config.server-addr>
                 <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
                 <config.namespace>2e9f0148-751e-4da2-83ec-cb00ffe0d83a</config.namespace>
                 <!--Nacos配置分组名称-->
                 <config.group>DEFAULT_GROUP</config.group>
                 <config.username>dev</config.username>
                 <config.password>123456</config.password>
-                <!--Nacos服务发现地址-->
-                <discovery.server-addr>127.0.0.1:8848</discovery.server-addr>
+                <!-- Nacos服务发现地址-->
+                <discovery.server-addr>192.168.100.98:8848</discovery.server-addr>
+                <!-- redis 配置-->
                 <redis.database>0</redis.database>
-                <redis.host>192.168.4.119</redis.host>
+                <redis.host>192.168.100.98</redis.host>
                 <redis.port>6379</redis.port>
                 <redis.password/>
                 <!-- cas配置 -->
-                <cas.enabled>true</cas.enabled>
-                <cas.cas-service-url>http://192.168.1.131:8080</cas.cas-service-url>
+                <cas.client-context-path>/user/cas/valid</cas.client-context-path>
+                <cas.cas-service-url>http://192.168.100.98:8080</cas.cas-service-url>
                 <cas.cas-context-path>/cas</cas.cas-context-path>
-                <cas.white-url>^(.*(/logout?))|(/user/cas/url)$</cas.white-url>
-                <cas.service-url>http://192.168.1.130:9527</cas.service-url>
+                <cas.white-url>^.*(/logout?)$</cas.white-url>
+                <cas.service-url>http://192.168.100.98:8084</cas.service-url>
                 <cas.cookie-holder-pattern>com.hcframe.gateway.config.MyDataStorage</cas.cookie-holder-pattern>
                 <cas.login-url>/login</cas.login-url>
                 <cas.logout-url>/logout</cas.logout-url>
-                <cas.client-context-path>/user/cas/valid</cas.client-context-path>
             </properties>
         </profile>
     </profiles>