diff --git a/user-service/src/main/java/com/mh/user/controller/SysRoleController.java b/user-service/src/main/java/com/mh/user/controller/SysRoleController.java
index a3bdad7..ece8d38 100644
--- a/user-service/src/main/java/com/mh/user/controller/SysRoleController.java
+++ b/user-service/src/main/java/com/mh/user/controller/SysRoleController.java
@@ -119,6 +119,9 @@ public class SysRoleController {
 		try{
 			List<SysRole> list=sysRoleService.queryRoles(roleName,page,limit);
 			int count=sysRoleService.getCount(roleName,page,limit);
+			// 过滤掉超级管理员
+			list.removeIf(item -> "超级管理员".equalsIgnoreCase(item.getName()));
+			count = count - 1;
 			return HttpResult.ok(count,list);
 		}catch (Exception e){
 			return HttpResult.error();
diff --git a/user-service/src/main/java/com/mh/user/controller/SysUserController.java b/user-service/src/main/java/com/mh/user/controller/SysUserController.java
index 9431032..36a6f76 100644
--- a/user-service/src/main/java/com/mh/user/controller/SysUserController.java
+++ b/user-service/src/main/java/com/mh/user/controller/SysUserController.java
@@ -148,6 +148,16 @@ public class SysUserController {
 		try{
 			List<SysUser> list=sysUserService.queryUsers(userName,page,limit);
 			int count=sysUserService.getCount(userName,page,limit);
+			// 过滤掉超级管理员
+			list.removeIf(user -> SysConstants.ADMIN.equalsIgnoreCase(user.getUserName()));
+			// 过滤掉角色是超级管理员的
+			list.removeIf(user -> "超级管理员".equalsIgnoreCase(user.getRoleNames()));
+			count=count-2;
+			// 手机，邮箱进行敏感信息处理
+			for(SysUser user:list){
+				user.setMobile("******");
+				user.setEmail("******");
+			}
 			return HttpResult.ok(count,list);
 		}catch (Exception e){
 			return HttpResult.error();
diff --git a/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java b/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java
index d5d774b..5ee049d 100644
--- a/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java
+++ b/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java
@@ -70,7 +70,7 @@ public class CollectionLoopRunner implements ApplicationRunner {
 //		NettyEchoServer nettyEchoServer = new NettyEchoServer();
 //		nettyEchoServer.bind(8098);
 		// 初始化mqtt订阅记录
-		initializeMqttSubscription();
+//		initializeMqttSubscription();
 	}
 
 	/**
diff --git a/user-service/src/main/java/com/mh/user/model/SysUser.java b/user-service/src/main/java/com/mh/user/model/SysUser.java
index 02aec11..0ea957e 100644
--- a/user-service/src/main/java/com/mh/user/model/SysUser.java
+++ b/user-service/src/main/java/com/mh/user/model/SysUser.java
@@ -1,5 +1,6 @@
 package com.mh.user.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,10 +14,24 @@ public class SysUser extends BaseModel {
 
     private String userName;
 
+    /**
+     * 前端不显示出来
+     */
+    @JsonIgnore
     private String password;
 
+    /**
+     * 前端不显示出来
+     */
+    @JsonIgnore
     private String salt;
 
+    /**
+     * 前端不显示出来
+     */
+    @JsonIgnore
+    private String createBy;
+
     private String email;
 
     private String mobile;
diff --git a/user-service/src/main/resources/application-prod.yml b/user-service/src/main/resources/application-prod.yml
index 1fe34de..6a0a56b 100644
--- a/user-service/src/main/resources/application-prod.yml
+++ b/user-service/src/main/resources/application-prod.yml
@@ -75,7 +75,7 @@ spring:
 #      password: chws_gw@803
 
       # 华软江门
-      url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true
+      url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true;encrypt=false
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       username: chws_jm
       password: Mhtech@803
diff --git a/user-service/src/main/resources/application.yml b/user-service/src/main/resources/application.yml
index 5f109b8..081dc84 100644
--- a/user-service/src/main/resources/application.yml
+++ b/user-service/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher