diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/AdminApp.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/AdminApp.java index 2c6a3eb..55250b9 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/AdminApp.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/AdminApp.java @@ -8,11 +8,13 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableDiscoveryClient @RefreshScope @EnableFeignClients +@EnableScheduling @EnableDynamicTp @ComponentScan(basePackages = {"com.recovery.admin.boot","com.recovery.common.base"}) @MapperScan("com.recovery.admin.boot.mapper") diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/aspect/WebLogAspect.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/aspect/WebLogAspect.java index b5fee59..14e3ef6 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/aspect/WebLogAspect.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/aspect/WebLogAspect.java @@ -51,7 +51,7 @@ public class WebLogAspect { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); //获取请求的域名 HttpServletRequest request = attributes.getRequest(); - // 根据域名获取网站信息 + // 根据域名获取c网站信息 StringBuffer urlBuf = request.getRequestURL(); URL url = new URL(urlBuf.toString()); String path = url.getPath(); diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/exception/GlobalExceptionHandler.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/exception/GlobalExceptionHandler.java index 7d41c49..52e60a1 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/exception/GlobalExceptionHandler.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/exception/GlobalExceptionHandler.java @@ -116,32 +116,7 @@ public class GlobalExceptionHandler { return ApiResult.failed("请求方式不支持"); } - /** - * 未登录异常 - */ - @ExceptionHandler(NotLoginException.class) - public ApiResult notLoginException(NotLoginException e) { - return ApiResult.failed(ResultCode.LOGIN_ERROR); - } - /** - * 通用异常 - */ - @ResponseStatus(HttpStatus.OK) - @ExceptionHandler(Exception.class) - public ApiResult exception(Exception e) { - if (e instanceof NotPermissionException){ - return ApiResult.failed("没有操作权限"); - } - e.printStackTrace(); - return ApiResult.failed(ResultCode.ACCESS_UNAUTHORIZED); - } - - //Security -// @ExceptionHandler(value = AccessDeniedException.class) -// public void accessDeniedException(AccessDeniedException e) { -// throw e; -// } } diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java index 1b159db..6630a90 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java @@ -31,7 +31,7 @@ public class UserRest { * 获取用户信息 */ @GetMapping("/getUserByUsername") - public ApiResult getUserByUsername(@RequestParam String username) { + public ApiResult getUserByUsername(@RequestParam(value = "username") String username) { UserAuthDTO user = iSysUserService.getByUsername(username); if (user == null) { throw new RuntimeException(); @@ -42,7 +42,7 @@ public class UserRest { * 获取会员用户信息 */ @GetMapping("/member/username/{username}") - public ApiResult getMemberUserByUsername(@PathVariable String username) { + public ApiResult getMemberUserByUsername(@RequestParam(value = "username") String username) { log.info("获取member user info。。。"); MemberUserAuthDTO user = memberUserService.getByUsername(username); return ApiResult.ok(user); diff --git a/hoe-admin/admin-boot/target/classes/bootstrap.yml b/hoe-admin/admin-boot/target/classes/bootstrap.yml deleted file mode 100644 index 530d7d3..0000000 --- a/hoe-admin/admin-boot/target/classes/bootstrap.yml +++ /dev/null @@ -1,78 +0,0 @@ - -spring: - application: - name: hoe-admin - main: - allow-bean-definition-overriding: true - profiles: - active: dev - cloud: - nacos: - discovery: - # metadata: - # serviceGroup: ytChen - server-addr: localhost:8848 - namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce - config: - server-addr: localhost:8848 - file-extension: yaml - prefix: hoe-admin - group: dev - namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce - dynamic: - tp: - enabled: true - enabledBanner: true # 是否开启banner打印,默认true - enabledCollect: true # 是否开启监控指标采集,默认false - collectorTypes: micrometer,logging # 监控数据采集器类型(logging | micrometer | internal_logging),默认micrometer - logPath: /home/logs # 监控日志数据路径,默认 ${user.home}/logs,采集类型非logging不用配置 - monitorInterval: 5 # 监控时间间隔(报警判断、指标采集),默认5s - platforms: # 通知报警平台配置 - - platform: email - receivers: 1650611030@qq.com - tomcatTp: # tomcat webserver线程池配置 - corePoolSize: 100 - maximumPoolSize: 200 - keepAliveTime: 60 - executors: # 动态线程池配置 - - threadPoolName: dtpExecutor - # 线程池别名 - executorType: common # 线程池类型common、eager:适用于io密集型 - corePoolSize: 5 # 核心线程数 - maximumPoolSize: 18 # 最大线程数 - queueCapacity: 400 # 任务队列容量 - queueType: VariableLinkedBlockingQueue # 任务队列,查看源码QueueTypeEnum枚举类 - rejectedHandlerType: CallerRunsPolicy # 拒绝策略,查看RejectedTypeEnum枚举类 - keepAliveTime: 50 - allowCoreThreadTimeOut: false # 是否允许核心线程池超时 - threadNamePrefix: test # 线程名前缀 - waitForTasksToCompleteOnShutdown: false # 参考spring线程池设计,优雅关闭线程池 - awaitTerminationSeconds: 5 # 单位(s) - preStartAllCoreThreads: false # 是否预热所有核心线程,默认false - runTimeout: 200 # 任务执行超时阈值,目前只做告警用,单位(ms) - queueTimeout: 100 # 任务在队列等待超时阈值,目前只做告警用,单位(ms) - taskWrapperNames: [ "ttl" ] # 任务包装器名称,集成TaskWrapper接口 - notifyItems: # 报警项,不配置自动会按默认值配置(变更通知、容量报警、活性报警、拒绝报警、任务超时报警) - - type: capacity # 报警项类型,查看源码 NotifyTypeEnum枚举类 - enabled: true - threshold: 80 # 报警阈值 - platforms: [ ding,wechat ] # 可选配置,不配置默认拿上层platforms配置的所以平台 - interval: 120 # 报警间隔(单位:s) - - type: change - enabled: true - - type: liveness - enabled: true - threshold: 80 - - type: reject - enabled: true - threshold: 1 - - type: run_timeout - enabled: true - threshold: 1 - - type: queue_timeout - enabled: true - threshold: 1 - -server: - port: 9002 - diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/AdminApp.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/AdminApp.class deleted file mode 100644 index a8939ac..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/AdminApp.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/aspect/WebLogAspect.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/aspect/WebLogAspect.class deleted file mode 100644 index 1d7756a..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/aspect/WebLogAspect.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/CorsConfig.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/CorsConfig.class deleted file mode 100644 index e441f1b..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/CorsConfig.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig$1.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig$1.class deleted file mode 100644 index b0aecf0..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig$1.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig$2.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig$2.class deleted file mode 100644 index 473c42c..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig$2.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig.class deleted file mode 100644 index efcb356..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/DynamicThreadPoolConfig.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/InterceptConfig.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/InterceptConfig.class deleted file mode 100644 index 23b5ba5..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/InterceptConfig.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/SaTokenConfigure.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/SaTokenConfigure.class deleted file mode 100644 index cbfa8ff..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/SaTokenConfigure.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/ds/DataSourceConfig.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/ds/DataSourceConfig.class deleted file mode 100644 index b2b15a4..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/config/ds/DataSourceConfig.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/OauthClientController.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/OauthClientController.class deleted file mode 100644 index 8876b25..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/OauthClientController.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/UserController.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/UserController.class deleted file mode 100644 index 389cddd..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/UserController.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/testController.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/testController.class deleted file mode 100644 index 87d73ad..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/controller/testController.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/MemberUser.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/MemberUser.class deleted file mode 100644 index 4996e8a..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/MemberUser.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/SysOauthClient.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/SysOauthClient.class deleted file mode 100644 index 291263d..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/SysOauthClient.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/SysPermission.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/SysPermission.class deleted file mode 100644 index 184999c..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/SysPermission.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/User.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/User.class deleted file mode 100644 index 579357a..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/entity/User.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/exception/BusinessException.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/exception/BusinessException.class deleted file mode 100644 index 760fc7e..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/exception/BusinessException.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/exception/GlobalExceptionHandler.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/exception/GlobalExceptionHandler.class deleted file mode 100644 index 675d362..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/exception/GlobalExceptionHandler.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/filter/RequestWrapper$1.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/filter/RequestWrapper$1.class deleted file mode 100644 index 10f689b..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/filter/RequestWrapper$1.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/filter/RequestWrapper.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/filter/RequestWrapper.class deleted file mode 100644 index 5eb0277..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/filter/RequestWrapper.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/interceptor/JwtInterceptor.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/interceptor/JwtInterceptor.class deleted file mode 100644 index 15c2cd8..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/interceptor/JwtInterceptor.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/listener/InitResourcePermissionCache.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/listener/InitResourcePermissionCache.class deleted file mode 100644 index a3ec626..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/listener/InitResourcePermissionCache.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/MemberUserMapper.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/MemberUserMapper.class deleted file mode 100644 index 6bf8904..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/MemberUserMapper.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/SysOauthClientMapper.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/SysOauthClientMapper.class deleted file mode 100644 index ec163e9..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/SysOauthClientMapper.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/SysPermissionMapper.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/SysPermissionMapper.class deleted file mode 100644 index e1f681b..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/SysPermissionMapper.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/UserMapper.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/UserMapper.class deleted file mode 100644 index 9e9b3d1..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/mapper/UserMapper.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/rest/UserRest.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/rest/UserRest.class deleted file mode 100644 index 92f5c0e..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/rest/UserRest.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/IMemberUserService.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/IMemberUserService.class deleted file mode 100644 index 98e4890..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/IMemberUserService.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysOauthClientService.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysOauthClientService.class deleted file mode 100644 index 9d6db97..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysOauthClientService.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysPermissionService.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysPermissionService.class deleted file mode 100644 index 8e5bfa5..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysPermissionService.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysUserService.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysUserService.class deleted file mode 100644 index b14f105..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/ISysUserService.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/MemberUserServiceImpl.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/MemberUserServiceImpl.class deleted file mode 100644 index 4f02373..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/MemberUserServiceImpl.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysOauthClientServiceImpl.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysOauthClientServiceImpl.class deleted file mode 100644 index 132019e..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysOauthClientServiceImpl.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysPermissionServiceImpl.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysPermissionServiceImpl.class deleted file mode 100644 index 0a96dfe..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysPermissionServiceImpl.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysUserServiceImpl.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysUserServiceImpl.class deleted file mode 100644 index d718853..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/service/impl/SysUserServiceImpl.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/util/UserUtil.class b/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/util/UserUtil.class deleted file mode 100644 index 40a7197..0000000 Binary files a/hoe-admin/admin-boot/target/classes/com/recovery/admin/boot/util/UserUtil.class and /dev/null differ diff --git a/hoe-admin/admin-boot/target/classes/logback-bak.xml b/hoe-admin/admin-boot/target/classes/logback-bak.xml deleted file mode 100644 index 76945c1..0000000 --- a/hoe-admin/admin-boot/target/classes/logback-bak.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - logback - - - - - - - - - ${consoleLayoutPattern} - - - - - - ${SYS_LOG_DIR}/${LOG_FILE} - - WARN - ACCEPT - DENY - - - ${SYS_LOG_DIR}/%d{yyyy-MM-dd}/${LOG_FILE}_%d{yyyy-MM-dd}_%i.zip - - 50MB - - - - ${fileLayoutPattern} - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hoe-admin/admin-boot/target/classes/logback-spring.xml b/hoe-admin/admin-boot/target/classes/logback-spring.xml deleted file mode 100644 index d2f4072..0000000 --- a/hoe-admin/admin-boot/target/classes/logback-spring.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - true - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{15}) - %highlight(%msg) %n - - - - - - - - - - ERROR - ACCEPT - DENY - - - - - ${log_dir}/%d{yyyy-MM-dd}/error-log.log - - ${maxHistory} - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n - - - - - - - - - - WARN - ACCEPT - DENY - - - - ${log_dir}/%d{yyyy-MM-dd}/warn-log.log - - - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n - - - - - - - - - - - INFO - ACCEPT - DENY - - - - ${log_dir}/%d{yyyy-MM-dd}/info-log.log - - - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n - - - - - - - - - - - DEBUG - ACCEPT - DENY - - - - ${log_dir}/%d{yyyy-MM-dd}/debug-log.log - - - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n - - - - - - - - - - - TRACE - ACCEPT - DENY - - - - ${log_dir}/%d{yyyy-MM-dd}/trace-log.log - - - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hoe-admin/admin-boot/target/classes/mapper/MemberUserMapper.xml b/hoe-admin/admin-boot/target/classes/mapper/MemberUserMapper.xml deleted file mode 100644 index 3b83b25..0000000 --- a/hoe-admin/admin-boot/target/classes/mapper/MemberUserMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id - ,username,nickname, - gender,password,dept_id, - avatar,mobile,status, - email,gmt_create,gmt_modified, - deleted - - - - - - - - - - - - - - - diff --git a/hoe-admin/admin-boot/target/classes/mapper/SysPermissionMapper.xml b/hoe-admin/admin-boot/target/classes/mapper/SysPermissionMapper.xml deleted file mode 100644 index 164658d..0000000 --- a/hoe-admin/admin-boot/target/classes/mapper/SysPermissionMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - id - ,name,menu_id, - url_perm,btn_perm,gmt_create, - gmt_modified - - - - - diff --git a/hoe-admin/admin-boot/target/classes/mapper/UserMapper.xml b/hoe-admin/admin-boot/target/classes/mapper/UserMapper.xml deleted file mode 100644 index fdd9792..0000000 --- a/hoe-admin/admin-boot/target/classes/mapper/UserMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/hoe-auth/src/main/java/com/recovery/auth/controller/AuthController.java b/hoe-auth/src/main/java/com/recovery/auth/controller/AuthController.java index faba712..b61fa43 100644 --- a/hoe-auth/src/main/java/com/recovery/auth/controller/AuthController.java +++ b/hoe-auth/src/main/java/com/recovery/auth/controller/AuthController.java @@ -69,7 +69,9 @@ public class AuthController { userDetails = result.getData(); } // 数据库中查询数据进行比对 - if (userDetails.getUserName().equals(authenticationRequest.getUsername()) && userDetails.getPassword().equals(EncryptUtil.encrypt(authenticationRequest.getPassword()))) { + if (userDetails.getUserName().equals(authenticationRequest.getUsername()) + && userDetails.getPassword().equals(EncryptUtil.encrypt(authenticationRequest.getPassword()))) + { log.info("密码校验成功!"); StpUtil.login(userDetails.getUserId(),"PC"); }else { diff --git a/hoe-auth/src/main/java/com/recovery/auth/feign/UserFeignClient.java b/hoe-auth/src/main/java/com/recovery/auth/feign/UserFeignClient.java index da954e1..6ec92c7 100644 --- a/hoe-auth/src/main/java/com/recovery/auth/feign/UserFeignClient.java +++ b/hoe-auth/src/main/java/com/recovery/auth/feign/UserFeignClient.java @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestParam; public interface UserFeignClient { @GetMapping("/api/rest/users/getUserByUsername") - ApiResult getUserByUsername(@RequestParam String username); + ApiResult getUserByUsername(@RequestParam(value = "username") String username); @GetMapping("/api/rest/users/member/username") - ApiResult getMemberUserByUsername(@RequestParam String username); + ApiResult getMemberUserByUsername(@RequestParam(value = "username") String username); }