From d1614c2b6f2b4bcad537db5478f82201cb62c562 Mon Sep 17 00:00:00 2001
From: little-cat-sweet <2116400472@qq.com>
Date: Thu, 5 Aug 2021 10:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=B8=AE=E5=8A=A9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-gateway/src/main/resources/bootstrap.yml      |  8 ++++----
 .../ruoyi-system/src/main/resources/bootstrap.yml   |  4 ++--
 .../xhpc-general/src/main/resources/bootstrap.yml   |  4 ++--
 .../main/resources/mapper/XhpcAgreementMapper.xml   | 13 ++++++++++++-
 .../src/main/resources/mapper/XhpcHelpMapper.xml    |  2 +-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index bda0f0c5..3306f5ff 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -16,10 +16,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.24.137.203:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 118.24.137.203:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -30,12 +30,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 118.24.137.203:8718
+        dashboard: 127.0.0.1:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 118.24.137.203:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 7dfa1916..9f189be1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.24.137.203:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 118.24.137.203:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/xhpc-modules/xhpc-general/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-general/src/main/resources/bootstrap.yml
index 0e236a89..d1cc6f1e 100644
--- a/xhpc-modules/xhpc-general/src/main/resources/bootstrap.yml
+++ b/xhpc-modules/xhpc-general/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 118.24.137.203:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 118.24.137.203:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml
index 61172176..4966c1ec 100644
--- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml
+++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcAgreementMapper.xml
@@ -58,7 +58,18 @@
 
     <select id="selectAgreementItem" resultMap="BaseResultMap">
 
-        select *
+        select
+        agreement_id,
+        title,
+        cast(content as char) as content,
+        type,
+        status,
+        del_flag,
+        create_time,
+        create_by,
+        update_time,
+        update_by,
+        remark
         from xhpc_agreement
         where agreement_id=#{agreementId}
     </select>
diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml
index 4012f82c..95b19d9d 100644
--- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml
+++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml
@@ -66,7 +66,7 @@
 
     <select id="selectDetails" resultType="map">
 
-        select title,content
+        select title,cast(content as char) as content
         from xhpc_help
         where help_id=#{helpId}
     </select>