From 9f9628a5d6e870639e934826b6abd7e80680ec66 Mon Sep 17 00:00:00 2001
From: "34701892@qq.com" <34701892@qq.com>
Date: Tue, 6 Jan 2026 18:00:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B1=9F=E5=8D=97=E8=A1=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reference/admin/mapper/H5UserMapper.java  |  9 ++--
 admin/src/main/resources/application.yml      | 45 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java b/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
index 2ffc6cd..305c2ed 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
@@ -65,8 +65,9 @@ public interface H5UserMapper {
     		"</script>" )
     void updateH5User(H5UserDTO h5UserDTO);
     
-
-    @ResultMap("h5UserMap")
+//       "<if test=\"createBy != null and createBy.trim().length() > 0 \">" +
+//               " and create_by = #{createBy} " +
+//               "</if>" +    @ResultMap("h5UserMap")
     @Select("<script>" +
             "select * from allowlist_detail " +
             "<where>" +
@@ -79,9 +80,7 @@ public interface H5UserMapper {
             "<if test=\"status != null \">" +
             " and status = #{status} " +
             "</if>" +
-            "<if test=\"createBy != null and createBy.trim().length() > 0 \">" +
-            " and create_by = #{createBy} " +
-            "</if>" +
+
             "</where>" +
             "<if test=\"orderBy != null\">" +
             "order by ${orderBy} " +
diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index 99f4b56..af421bb 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -1,3 +1,6 @@
+logging:
+  level:
+    root: DEBUG
 server:
   port: 13579
   compression:
@@ -19,29 +22,29 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://192.168.0.142:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-#    username: financial_prod
-#    password: mmTFncqmDal5HLRGY0BV
-    url: jdbc:mysql://10.127.2.207:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-    username: financial_prod
-    password: mmTFncqmDal5HLRGY0BV
+    #    url: jdbc:mysql://192.168.0.142:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    #    username: financial_prod
+    #    password: mmTFncqmDal5HLRGY0BV
+    url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    username: root
+    password: Xgf_8000
 redis:
-#  host: 192.168.0.172
-#  port: 6379
-#  password: Xgf_redis
-  host: 10.127.2.209
+  #  host: 192.168.0.172
+  #  port: 6379
+  #  password: Xgf_redis
+  host: 123.60.153.169
   port: 6379
-  password: dMrt4kmwiW6LDJXy
+  password: Xgf_redis
 elasticsearch:
- scheme: http
- # 111.13.176.3 部署地址
- # 10.127.2.194 本地测试地址
- host: 10.127.2.194
- port: 9200
- enable: true
- username: elastic
- password: ZxE,3VM@Thk0
+  scheme: http
+  # 111.13.176.3 部署地址
+  # 10.127.2.194 本地测试地址
+  host: 111.13.176.3
+  port: 9200
+  enable: true
+  username: elastic
+  password: ZxE,3VM@Thk0
 mybatis:
- type-handlers-package:com.jinrui.reference.core.typehandler
+  type-handlers-package:com.jinrui.reference.core.typehandler
 api:
- key: WBysu6N1z26AbA12l
\ No newline at end of file
+  key: WBysu6N1z26AbA12l
\ No newline at end of file

From f7021c3952afa192ac756779602895e0084d3f64 Mon Sep 17 00:00:00 2001
From: "34701892@qq.com" <34701892@qq.com>
Date: Tue, 6 Jan 2026 18:16:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B1=9F=E5=8D=97=E8=A1=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jinrui/reference/admin/mapper/H5UserMapper.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java b/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
index 305c2ed..b96ebba 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
@@ -67,7 +67,8 @@ public interface H5UserMapper {
     
 //       "<if test=\"createBy != null and createBy.trim().length() > 0 \">" +
 //               " and create_by = #{createBy} " +
-//               "</if>" +    @ResultMap("h5UserMap")
+//               "</if>" +
+    @ResultMap("h5UserMap")
     @Select("<script>" +
             "select * from allowlist_detail " +
             "<where>" +
@@ -82,9 +83,7 @@ public interface H5UserMapper {
             "</if>" +
 
             "</where>" +
-            "<if test=\"orderBy != null\">" +
-            "order by ${orderBy} " +
-            "</if>" +
+            "order by create_time desc " +
             "limit ${size} offset ${offset}" +
             "</script>")
     List<H5UserVO> queryH5User(H5UserQueryParam h5UserQueryParam);

From b1cf3a6939be0e042a01d34dc435ac9bb955bee7 Mon Sep 17 00:00:00 2001
From: "34701892@qq.com" <34701892@qq.com>
Date: Tue, 6 Jan 2026 19:03:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=B1=9F=E5=8D=97?=
 =?UTF-8?q?=E8=A1=8C=E5=92=8C=E6=99=AE=E9=80=9A=E7=99=BD=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reference/admin/mapper/H5UserMapper.java      | 11 ++++++++---
 .../admin/model/vo/admin/user/H5UserDTO.java      | 10 +++++++++-
 .../model/vo/admin/user/H5UserQueryParam.java     | 10 +++++++++-
 .../reference/admin/service/H5UserService.java    |  4 +++-
 admin/src/main/resources/application.yml          | 15 ++++++---------
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java b/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
index b96ebba..1bdcee5 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/mapper/H5UserMapper.java
@@ -26,8 +26,8 @@ public interface H5UserMapper {
     void createH5UserByPhone(@Param("phone") String phone);
     
     @Insert("<script>" +
-            "insert into allowlist_detail(mobile, department, name, create_by, create_time, update_time" +
-            ") values (#{mobile}, #{department},#{name}, #{createBy}, now(), now()" +
+            "insert into allowlist_detail(mobile, department, name, create_by, create_time, update_time, type" +
+            ") values (#{mobile}, #{department},#{name}, #{createBy}, now(), now(), #{type}" +
             ")" +
             "</script>")
     void createH5User(H5UserDTO h5UserDTO);
@@ -72,6 +72,9 @@ public interface H5UserMapper {
     @Select("<script>" +
             "select * from allowlist_detail " +
             "<where>" +
+            "<if test=\"type != null \">" +
+             " and type =  #{type} " +
+            "</if>" +
             "<if test=\"mobile != null and mobile.trim().length() > 0 \">" +
             " and mobile = #{mobile} " +
             "</if>" +
@@ -81,7 +84,6 @@ public interface H5UserMapper {
             "<if test=\"status != null \">" +
             " and status = #{status} " +
             "</if>" +
-
             "</where>" +
             "order by create_time desc " +
             "limit ${size} offset ${offset}" +
@@ -91,6 +93,9 @@ public interface H5UserMapper {
     @Select("<script>" +
             "select count(*) from allowlist_detail " +
             "<where>" +
+            "<if test=\"type != null \">" +
+            " and type =  #{type} " +
+            "</if>" +
             "<if test=\"mobile != null and mobile.trim().length() > 0 \">" +
             " and mobile = #{mobile} " +
             "</if>" +
diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserDTO.java b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserDTO.java
index 515b51b..8aafb1d 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserDTO.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserDTO.java
@@ -7,7 +7,8 @@ public class H5UserDTO {
 	private String department;
 	private Integer status;
 	private String createBy;
-	
+	private Integer type;
+
 	public Long getId() {
 		return id;
 	}
@@ -44,4 +45,11 @@ public class H5UserDTO {
 	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
+
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }
diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserQueryParam.java b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserQueryParam.java
index 0c4bf57..d32d511 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserQueryParam.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/model/vo/admin/user/H5UserQueryParam.java
@@ -11,7 +11,8 @@ public class H5UserQueryParam {
     private String department;
     private Integer status;
     private String createBy;
-    
+    private Integer type;
+
 	public int getPage() {
 		return page;
 	}
@@ -72,4 +73,11 @@ public class H5UserQueryParam {
 	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
+
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }
diff --git a/admin/src/main/java/com/jinrui/reference/admin/service/H5UserService.java b/admin/src/main/java/com/jinrui/reference/admin/service/H5UserService.java
index 8c5b657..e1195f8 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/service/H5UserService.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/service/H5UserService.java
@@ -55,7 +55,7 @@ public class H5UserService {
         }
         int page = h5UserQueryParam.getPage();
         h5UserQueryParam.setOffset(offset);
-        
+        h5UserQueryParam.setType(1);
         List<H5UserVO> h5UserList;
         try {
         	h5UserList = h5UserMapper.queryH5User(h5UserQueryParam);
@@ -91,6 +91,7 @@ public class H5UserService {
 
 	public ResultObject<Void> addOrUpdate(H5UserDTO h5UserDTO) {
 		if (h5UserDTO.getId() == null) {
+            h5UserDTO.setType(1);
 			h5UserMapper.createH5User(h5UserDTO);
 		} else {
 			h5UserMapper.updateH5User(h5UserDTO);
@@ -143,6 +144,7 @@ public class H5UserService {
             			H5UserDTO h5UserDTO = new H5UserDTO();
             			BeanUtils.copyProperties(h5UserUploadData, h5UserDTO);
             			h5UserDTO.setCreateBy(createBy);
+                        h5UserDTO.setType(1);
             			h5UserMapper.createH5User(h5UserDTO);
             			continue;
         			}
diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index af421bb..6c75b88 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -1,6 +1,3 @@
-logging:
-  level:
-    root: DEBUG
 server:
   port: 13579
   compression:
@@ -25,21 +22,21 @@ spring:
     #    url: jdbc:mysql://192.168.0.142:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
     #    username: financial_prod
     #    password: mmTFncqmDal5HLRGY0BV
-    url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-    username: root
-    password: Xgf_8000
+    url: jdbc:mysql://10.127.2.207:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    username: financial_prod
+    password: mmTFncqmDal5HLRGY0BV
 redis:
   #  host: 192.168.0.172
   #  port: 6379
   #  password: Xgf_redis
-  host: 123.60.153.169
+  host: 10.127.2.209
   port: 6379
-  password: Xgf_redis
+  password: dMrt4kmwiW6LDJXy
 elasticsearch:
   scheme: http
   # 111.13.176.3 部署地址
   # 10.127.2.194 本地测试地址
-  host: 111.13.176.3
+  host: 10.127.2.194
   port: 9200
   enable: true
   username: elastic