From 5257bcc5c8e0029a822a9f06ede4d923e82aff71 Mon Sep 17 00:00:00 2001
From: lj7788 <lj7788@126.com>
Date: Mon, 25 Aug 2025 11:38:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9userCode=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml      |  8 ++++----
 .../src/main/resources/application.yml            |  1 +
 .../resources/mapper/system/SysUserMapper.xml     | 15 +++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examapi/ruoyi-admin/src/main/resources/application-druid.yml b/examapi/ruoyi-admin/src/main/resources/application-druid.yml
index 455e9fa..f41f6f2 100644
--- a/examapi/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/examapi/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,11 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://62.234.3.186:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-                url: jdbc:mysql://127.0.0.1:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+                url: jdbc:mysql://62.234.3.186:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://127.0.0.1:3306/yanzhu_exam?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
                 username: root
-                #password: Sxyanzhu@cf123
-                password: haha123321
+                password: Sxyanzhu@cf123
+                #password: haha123321
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/examapi/ruoyi-admin/src/main/resources/application.yml b/examapi/ruoyi-admin/src/main/resources/application.yml
index 3253ade..653cf30 100644
--- a/examapi/ruoyi-admin/src/main/resources/application.yml
+++ b/examapi/ruoyi-admin/src/main/resources/application.yml
@@ -10,6 +10,7 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /Users/mac/data/uploadPath/exam
+  #profile: /data/uploadPath/exam
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
diff --git a/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index ced92c4..e49b5a0 100644
--- a/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/examapi/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -9,7 +9,6 @@
 		<result property="deptId"       column="dept_id"      />
 		<result property="countyCode"   column="county_code"  />
 		<result property="userName"     column="user_name"    />
-		<result property="userCode"     column="user_code"    />
 		<result property="nickName"     column="nick_name"    />
 		<result property="email"        column="email"        />
 		<result property="phonenumber"  column="phonenumber"  />
@@ -48,7 +47,7 @@
 	</resultMap>
 
 	<sql id="selectUserVo">
-		select u.user_id, u.user_code,u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
 			   d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
 			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
 		from sys_user u
@@ -58,7 +57,7 @@
 	</sql>
 
 	<select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.user_code,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		<if test="nickName != null and nickName != ''">
 			AND u.nick_name like concat('%', #{nickName}, '%')
@@ -86,7 +85,7 @@
 	</select>
 
 	<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
-		select distinct u.user_id, u.user_code,u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+		select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_user_role ur on u.user_id = ur.user_id
@@ -103,7 +102,7 @@
 	</select>
 
 	<select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
-		select distinct u.user_id, u.user_code,u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+		select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_user_role ur on u.user_id = ur.user_id
@@ -130,7 +129,7 @@
 	</select>
 
 	<select id="selectUserByWechatOpenid" parameterType="String" resultMap="SysUserResult">
-		select u.user_id, u.user_code,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 																																																													 left join sys_dept d on u.dept_id = d.dept_id
 		where u.wechat_openid = #{openid} and u.del_flag = '0'
 	</select>
@@ -178,7 +177,7 @@
 		insert into sys_user(
 		<if test="deptId != null and deptId != 0">dept_id,</if>
 		<if test="userName != null and userName != ''">user_name,</if>
-		<if test="userCode != null and userCode != ''">user_code,</if>
+
 		<if test="nickName != null and nickName != ''">nick_name,</if>
 		<if test="email != null and email != ''">email,</if>
 		<if test="avatar != null and avatar != ''">avatar,</if>
@@ -193,7 +192,7 @@
 		)values(
 		<if test="deptId != null and deptId != ''">#{deptId},</if>
 		<if test="userName != null and userName != ''">#{userName},</if>
-		<if test="userCode != null and userCode != ''">#{userCode},</if>
+
 		<if test="nickName != null and nickName != ''">#{nickName},</if>
 		<if test="email != null and email != ''">#{email},</if>
 		<if test="avatar != null and avatar != ''">#{avatar},</if>