From ad19d6f06a865aa9f32b2937f89ac3587d9710b1 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Sat, 19 Jul 2025 12:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml         | 6 +++---
 src/main/resources/application-prod.yml        | 2 +-
 src/main/resources/application-test.yml        | 2 +-
 src/main/resources/application.yml             | 2 +-
 src/main/resources/mapper/PermissionMapper.xml | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index d2ff5cc..cad027e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -35,9 +35,9 @@ spring:
   data:
     redis:
       database: 0
-      host: localhost
-      port: 6379
-      password: 123456
+      host: 18.143.76.3
+      port: 10703
+      password: Ngc0FYUTA6h3wC5J
 
       lettuce:
         pool:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 8a26daa..bf50271 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -36,7 +36,7 @@ spring:
     redis:
       database: 2
       host: 18.143.76.3
-      port: 6379
+      port: 10703
       password: Ngc0FYUTA6h3wC5J
 
       lettuce:
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 0789572..5bf84d4 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -36,7 +36,7 @@ spring:
     redis:
       database: 1
       host: 18.143.76.3
-      port: 6379
+      port: 10703
       password: Ngc0FYUTA6h3wC5J
 
       lettuce:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 70ce708..8b470bd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -70,7 +70,7 @@ spring:
     redis:
       database: 0
       host: 18.143.76.3
-      port: 6379
+      port: 10703
       password: Ngc0FYUTA6h3wC5J
 
       lettuce:
diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml
index e0d17ba..d7a0278 100644
--- a/src/main/resources/mapper/PermissionMapper.xml
+++ b/src/main/resources/mapper/PermissionMapper.xml
@@ -63,8 +63,8 @@
     <select id="getPermission" resultType="com.example.demo.domain.vo.Permission">
         select admin.id as id,admin.admin_name as name,admin.account,admin.market,admin.postiton,admin.remark,admin.admin_status as adminStatus,role.role_name as roleName,role.id as roleId
         from admin
-        left join admin_role on admin.id=admin_role.admin_id
-        left join role on admin_role.role_id=role.id
+
+        left join role on admin.role_id=role.id
 
         <where>
             <if test="account!=null and account.length>0">