Compare commits
No commits in common. "2af7cf939f80f5f30c005398015dd61d01cc2a7e" and "c4972a2af67984efcb9b7e1cb25eed5613c39d59" have entirely different histories.
2af7cf939f
...
c4972a2af6
@ -163,12 +163,7 @@ public class UserController {
|
|||||||
return userService.userAdd(userAddVo, request);
|
return userService.userAdd(userAddVo, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description: 管理员编辑用户
|
|
||||||
* @Date: 2024/1/18
|
|
||||||
* @Param userEditVO:
|
|
||||||
* @Param bindingResult:
|
|
||||||
**/
|
|
||||||
@PutMapping("/user/edit")
|
@PutMapping("/user/edit")
|
||||||
public BaseResponse userEdit(@RequestBody @Validated UserEditVO userEditVO, BindingResult bindingResult, HttpServletRequest request) {
|
public BaseResponse userEdit(@RequestBody @Validated UserEditVO userEditVO, BindingResult bindingResult, HttpServletRequest request) {
|
||||||
log.info("请求接口[PUT]: /user/edit");
|
log.info("请求接口[PUT]: /user/edit");
|
||||||
|
@ -36,7 +36,7 @@ public interface ProjectMapper {
|
|||||||
@Insert("insert into organize_oa.oa_config(value, data, created_at)value ('project_show',null,NOW())")
|
@Insert("insert into organize_oa.oa_config(value, data, created_at)value ('project_show',null,NOW())")
|
||||||
void insertProjectShow();
|
void insertProjectShow();
|
||||||
|
|
||||||
@Update("UPDATE organize_oa.oa_config SET data = #{setProjectShow}, updated_at = CURRENT_TIMESTAMP WHERE value = 'project_show'")
|
@Update("UPDATE organize_oa.oa_config SET data = #{setProjectShow} WHERE value = 'project_show'")
|
||||||
boolean setProjectShow(String setProjectShow);
|
boolean setProjectShow(String setProjectShow);
|
||||||
|
|
||||||
@Select("select * from organize_oa.oa_permissions")
|
@Select("select * from organize_oa.oa_permissions")
|
||||||
|
@ -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}")
|
@Update("UPDATE organize_oa.oa_role SET role_name=#{roleName},display_name=#{displayName},updated_at=CURRENT_TIMESTAMP WHERE id=#{id}")
|
||||||
boolean roleEdit(RoleDO getRole);
|
boolean roleEdit(RoleDO getRole);
|
||||||
|
|
||||||
@Update("UPDATE organize_oa.oa_role_user SET rid = #{rid},updated_at = current_timestamp WHERE uid = #{uid}")
|
@Update("UPDATE organize_oa.oa_role_user SET rid = #{rid} WHERE uid = #{uid}")
|
||||||
boolean roleChangeUser(Long uid, Long rid);
|
boolean roleChangeUser(Long uid, Long rid);
|
||||||
|
|
||||||
@Delete("DELETE FROM organize_oa.oa_role WHERE id=#{id}")
|
@Delete("DELETE FROM organize_oa.oa_role WHERE id=#{id}")
|
||||||
@ -41,6 +41,4 @@ public interface RoleMapper {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,35 +1,18 @@
|
|||||||
|
server:
|
||||||
|
port: 8080
|
||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:mysql://localhost:3306?organize_oa
|
url: jdbc:mysql://localhost:3306
|
||||||
username: root
|
username: organize_oa
|
||||||
password: Zrx@20041009
|
password: 123456
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
redis:
|
redis:
|
||||||
database: 0
|
database: 0
|
||||||
host: localhost
|
host: local
|
||||||
port: 6379
|
port: 6379
|
||||||
password: Zrx@20041009
|
password:
|
||||||
mail:
|
profiles:
|
||||||
default-encoding: UTF-8
|
active: dev
|
||||||
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:
|
mybatis:
|
||||||
configuration:
|
configuration:
|
||||||
map-underscore-to-camel-case: true
|
map-underscore-to-camel-case: true
|
||||||
logging:
|
|
||||||
level:
|
|
||||||
root: TRACE
|
|
||||||
sun.rmi: OFF
|
|
||||||
org.apache.tomcat: WARN
|
|
||||||
server:
|
|
||||||
port: 8155
|
|
Loading…
x
Reference in New Issue
Block a user