From ce8d89f1eaed5855d6c0699d9e03b802c8d08c10 Mon Sep 17 00:00:00 2001
From: xiangZr-hhh <“2774915446@qq.com”>
Date: Tue, 23 Jan 2024 19:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsl/oa/controllers/UserController.java    |  7 +++-
 .../java/com/jsl/oa/mapper/ProjectMapper.java |  2 +-
 .../java/com/jsl/oa/mapper/RoleMapper.java    |  2 +-
 .../java/com/jsl/oa/mapper/UserMapper.java    |  1 -
 src/main/resources/application.yml            | 37 ++++++++++++++-----
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/jsl/oa/controllers/UserController.java b/src/main/java/com/jsl/oa/controllers/UserController.java
index ebcf258..6a3501d 100644
--- a/src/main/java/com/jsl/oa/controllers/UserController.java
+++ b/src/main/java/com/jsl/oa/controllers/UserController.java
@@ -163,7 +163,12 @@ public class UserController {
         return userService.userAdd(userAddVo, request);
     }
 
-
+    /**
+     * @Description: 管理员编辑用户
+     * @Date: 2024/1/18
+     * @Param userEditVO:
+     * @Param bindingResult:
+     **/
     @PutMapping("/user/edit")
     public BaseResponse userEdit(@RequestBody @Validated UserEditVO userEditVO, BindingResult bindingResult, HttpServletRequest request) {
         log.info("请求接口[PUT]: /user/edit");
diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
index a79b45d..25d51b7 100644
--- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java
@@ -36,7 +36,7 @@ public interface ProjectMapper {
     @Insert("insert into organize_oa.oa_config(value, data, created_at)value ('project_show',null,NOW())")
     void insertProjectShow();
 
-    @Update("UPDATE organize_oa.oa_config SET data = #{setProjectShow} WHERE value = 'project_show'")
+    @Update("UPDATE organize_oa.oa_config SET data = #{setProjectShow}, updated_at = CURRENT_TIMESTAMP WHERE value = 'project_show'")
     boolean setProjectShow(String setProjectShow);
 
     @Select("select * from organize_oa.oa_permissions")
diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java
index 90b8058..066ca33 100644
--- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java
@@ -33,7 +33,7 @@ public interface RoleMapper {
     @Update("UPDATE organize_oa.oa_role SET role_name=#{roleName},display_name=#{displayName},updated_at=CURRENT_TIMESTAMP WHERE id=#{id}")
     boolean roleEdit(RoleDO getRole);
 
-    @Update("UPDATE organize_oa.oa_role_user SET rid = #{rid} WHERE uid = #{uid}")
+    @Update("UPDATE organize_oa.oa_role_user SET rid = #{rid},updated_at = current_timestamp WHERE uid = #{uid}")
     boolean roleChangeUser(Long uid, Long rid);
 
     @Delete("DELETE FROM organize_oa.oa_role WHERE id=#{id}")
diff --git a/src/main/java/com/jsl/oa/mapper/UserMapper.java b/src/main/java/com/jsl/oa/mapper/UserMapper.java
index dea6651..1e3bc07 100755
--- a/src/main/java/com/jsl/oa/mapper/UserMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/UserMapper.java
@@ -74,7 +74,6 @@ public interface UserMapper {
             "signature = #{signature}, sex = #{sex}, avatar = #{avatar}, nickname = #{nickname}, " +
             "description = #{description} ,updated_at = current_timestamp " +
             "WHERE id = #{id}")
-
     void updateUser(UserDO userDO);
 
     @Select("SELECT * FROM organize_oa.oa_user WHERE email = #{email}")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5e48499..2f61e1a 100755
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,35 @@
-server:
-  port: 8080
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306
-    username: organize_oa
-    password: 123456
+    url: jdbc:mysql://localhost:3306?organize_oa
+    username: root
+    password: Zrx@20041009
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     database: 0
-    host: local
+    host: localhost
     port: 6379
-    password:
-  profiles:
-    active: dev
+    password: Zrx@20041009
+  mail:
+    default-encoding: UTF-8
+    host: smtp.qiye.aliyun.com
+    username: wxxydeveloper@x-lf.cn
+    password: 114477225588Zcw
+    properties:
+      form: wxxydeveloper@x-lf.cn
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+          ssl:
+            enable: true
 mybatis:
   configuration:
-    map-underscore-to-camel-case: true
\ No newline at end of file
+    map-underscore-to-camel-case: true
+logging:
+  level:
+    root: TRACE
+    sun.rmi: OFF
+    org.apache.tomcat: WARN
+server:
+  port: 8155
\ No newline at end of file