diff --git a/.gitignore b/.gitignore index b01d539..1d85c91 100644 --- a/.gitignore +++ b/.gitignore @@ -80,8 +80,3 @@ package-lock.json yarn.lock .VSCodeCounter - -ruoyi-ui-old - -ruoyi-ui/src/typings/auto-imports.d.ts -ruoyi-ui/src/typings/components.d.ts diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt index eea3a32..c3ceade 100644 --- a/docker/nginx/html/dist/readme.txt +++ b/docker/nginx/html/dist/readme.txt @@ -1 +1 @@ -存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。 \ No newline at end of file +锟斤拷锟角帮拷锟絯fc-ui锟斤拷锟斤拷锟矫的撅拷态锟侥硷拷锟斤拷锟斤拷锟斤拷nginx锟斤拷锟斤拷锟斤拷省锟 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0146f55..1ef2d51 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,7 @@ dev - 192.168.2.248:8848 + 192.168.9.58:18848 wfc-dev diff --git a/wfc-api/wfc-api-omada/pom.xml b/wfc-api/wfc-api-omada/pom.xml index 9d73416..0c67e9c 100644 --- a/wfc-api/wfc-api-omada/pom.xml +++ b/wfc-api/wfc-api-omada/pom.xml @@ -15,7 +15,7 @@ - + org.wfc wfc-common-core diff --git a/wfc-api/wfc-api-system/pom.xml b/wfc-api/wfc-api-system/pom.xml index 79c2f22..1ef28e8 100644 --- a/wfc-api/wfc-api-system/pom.xml +++ b/wfc-api/wfc-api-system/pom.xml @@ -17,7 +17,7 @@ - + org.wfc wfc-common-core diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteFileService.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteFileService.java index e1d0842..b01f516 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteFileService.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteFileService.java @@ -13,7 +13,7 @@ import org.wfc.system.api.factory.RemoteFileFallbackFactory; /** * 鏂囦欢鏈嶅姟 * - * @author ruoyi + * @author wfc */ @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) public interface RemoteFileService diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteLogService.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteLogService.java index 4080ead..1d2d00f 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteLogService.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteLogService.java @@ -14,7 +14,7 @@ import org.wfc.system.api.factory.RemoteLogFallbackFactory; /** * 鏃ュ織鏈嶅姟 * - * @author ruoyi + * @author wfc */ @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) public interface RemoteLogService diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteUserService.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteUserService.java index fba840b..fc9a94a 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteUserService.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/RemoteUserService.java @@ -17,7 +17,7 @@ import org.wfc.system.api.model.LoginUser; /** * 鐢ㄦ埛鏈嶅姟 * - * @author ruoyi + * @author wfc */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDept.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDept.java index 6354513..4ab1d0d 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDept.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDept.java @@ -14,7 +14,7 @@ import java.util.List; /** * 閮ㄩ棬琛 sys_dept * - * @author ruoyi + * @author wfc */ public class SysDept extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictData.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictData.java index 666d04e..d41f2c3 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictData.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictData.java @@ -12,7 +12,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 瀛楀吀鏁版嵁琛 sys_dict_data * - * @author ruoyi + * @author wfc */ public class SysDictData extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictType.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictType.java index a0d0870..e61755d 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictType.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysDictType.java @@ -12,7 +12,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 瀛楀吀绫诲瀷琛 sys_dict_type * - * @author ruoyi + * @author wfc */ public class SysDictType extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java index 7fb722a..2e6b9b4 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysFile.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 鏂囦欢淇℃伅 * - * @author ruoyi + * @author wfc */ public class SysFile { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysLogininfor.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysLogininfor.java index eb024e1..34e635c 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysLogininfor.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysLogininfor.java @@ -9,7 +9,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 绯荤粺璁块棶璁板綍琛 sys_logininfor * - * @author ruoyi + * @author wfc */ public class SysLogininfor extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysOperLog.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysOperLog.java index 2575f11..97a2ffa 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysOperLog.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysOperLog.java @@ -9,7 +9,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 鎿嶄綔鏃ュ織璁板綍琛 oper_log * - * @author ruoyi + * @author wfc */ public class SysOperLog extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysRole.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysRole.java index e24151e..b65202c 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysRole.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysRole.java @@ -13,7 +13,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 瑙掕壊琛 sys_role * - * @author ruoyi + * @author wfc */ public class SysRole extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysUser.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysUser.java index 6be5e61..018687e 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysUser.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/domain/SysUser.java @@ -15,7 +15,7 @@ import org.wfc.common.core.xss.Xss; /** * 鐢ㄦ埛瀵硅薄 sys_user * - * @author ruoyi + * @author wfc */ public class SysUser extends BaseEntity { diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteFileFallbackFactory.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteFileFallbackFactory.java index e5a83b0..eb097fe 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteFileFallbackFactory.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteFileFallbackFactory.java @@ -12,7 +12,7 @@ import org.wfc.system.api.domain.SysFile; /** * 鏂囦欢鏈嶅姟闄嶇骇澶勭悊 * - * @author ruoyi + * @author wfc */ @Component public class RemoteFileFallbackFactory implements FallbackFactory diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteLogFallbackFactory.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteLogFallbackFactory.java index a386ae9..f85cb57 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteLogFallbackFactory.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteLogFallbackFactory.java @@ -12,7 +12,7 @@ import org.wfc.system.api.domain.SysOperLog; /** * 鏃ュ織鏈嶅姟闄嶇骇澶勭悊 * - * @author ruoyi + * @author wfc */ @Component public class RemoteLogFallbackFactory implements FallbackFactory diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteUserFallbackFactory.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteUserFallbackFactory.java index 2e99938..46a732c 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteUserFallbackFactory.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/factory/RemoteUserFallbackFactory.java @@ -12,7 +12,7 @@ import org.wfc.system.api.model.LoginUser; /** * 鐢ㄦ埛鏈嶅姟闄嶇骇澶勭悊 * - * @author ruoyi + * @author wfc */ @Component public class RemoteUserFallbackFactory implements FallbackFactory diff --git a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/model/LoginUser.java b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/model/LoginUser.java index bd71cbf..651e7d0 100644 --- a/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/model/LoginUser.java +++ b/wfc-api/wfc-api-system/src/main/java/org/wfc/system/api/model/LoginUser.java @@ -7,7 +7,7 @@ import org.wfc.system.api.domain.SysUser; /** * 鐢ㄦ埛淇℃伅 * - * @author ruoyi + * @author wfc */ public class LoginUser implements Serializable { diff --git a/wfc-auth/pom.xml b/wfc-auth/pom.xml index eac8bac..49aaf53 100644 --- a/wfc-auth/pom.xml +++ b/wfc-auth/pom.xml @@ -46,7 +46,7 @@ spring-boot-starter-actuator - + org.wfc wfc-common-security diff --git a/wfc-auth/src/main/java/org/wfc/auth/WfcAuthApplication.java b/wfc-auth/src/main/java/org/wfc/auth/WfcAuthApplication.java index 4ba2143..171b278 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/WfcAuthApplication.java +++ b/wfc-auth/src/main/java/org/wfc/auth/WfcAuthApplication.java @@ -8,7 +8,7 @@ import org.wfc.common.security.annotation.EnableRyFeignClients; /** * 璁よ瘉鎺堟潈涓績 * - * @author ruoyi + * @author wfc */ @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) diff --git a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java index c81f39c..8df0db8 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java +++ b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java @@ -20,7 +20,7 @@ import org.wfc.system.api.model.LoginUser; /** * token 鎺у埗 * - * @author ruoyi + * @author wfc */ @RestController public class TokenController diff --git a/wfc-auth/src/main/java/org/wfc/auth/form/LoginBody.java b/wfc-auth/src/main/java/org/wfc/auth/form/LoginBody.java index ab56cb2..ce56b6a 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/form/LoginBody.java +++ b/wfc-auth/src/main/java/org/wfc/auth/form/LoginBody.java @@ -3,7 +3,7 @@ package org.wfc.auth.form; /** * 鐢ㄦ埛鐧诲綍瀵硅薄 * - * @author ruoyi + * @author wfc */ public class LoginBody { @@ -17,6 +17,11 @@ public class LoginBody */ private String password; + /** + * 璁よ瘉绫诲瀷 鐢ㄦ埛u/瀹㈡埛sys + */ + private String authType; + public String getUsername() { return username; @@ -36,4 +41,12 @@ public class LoginBody { this.password = password; } + + public String getAuthType() { + return authType; + } + + public void setAuthType(String authType) { + this.authType = authType; + } } diff --git a/wfc-auth/src/main/java/org/wfc/auth/form/RegisterBody.java b/wfc-auth/src/main/java/org/wfc/auth/form/RegisterBody.java index 7cada22..7aba435 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/form/RegisterBody.java +++ b/wfc-auth/src/main/java/org/wfc/auth/form/RegisterBody.java @@ -3,7 +3,7 @@ package org.wfc.auth.form; /** * 鐢ㄦ埛娉ㄥ唽瀵硅薄 * - * @author ruoyi + * @author wfc */ public class RegisterBody extends LoginBody { diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java b/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java index aa18841..fe74b1f 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java +++ b/wfc-auth/src/main/java/org/wfc/auth/service/SysLoginService.java @@ -22,7 +22,7 @@ import org.wfc.system.api.model.LoginUser; /** * 鐧诲綍鏍￠獙鏂规硶 * - * @author ruoyi + * @author wfc */ @Component public class SysLoginService diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/SysPasswordService.java b/wfc-auth/src/main/java/org/wfc/auth/service/SysPasswordService.java index a4455fc..1e60a67 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/service/SysPasswordService.java +++ b/wfc-auth/src/main/java/org/wfc/auth/service/SysPasswordService.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; /** * 鐧诲綍瀵嗙爜鏂规硶 * - * @author ruoyi + * @author wfc */ @Component public class SysPasswordService diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/SysRecordLogService.java b/wfc-auth/src/main/java/org/wfc/auth/service/SysRecordLogService.java index 792483d..2a193aa 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/service/SysRecordLogService.java +++ b/wfc-auth/src/main/java/org/wfc/auth/service/SysRecordLogService.java @@ -12,7 +12,7 @@ import org.wfc.system.api.domain.SysLogininfor; /** * 璁板綍鏃ュ織鏂规硶 * - * @author ruoyi + * @author wfc */ @Component public class SysRecordLogService diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java new file mode 100644 index 0000000..94414c4 --- /dev/null +++ b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java @@ -0,0 +1,161 @@ +package org.wfc.auth.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.wfc.common.core.constant.CacheConstants; +import org.wfc.common.core.constant.Constants; +import org.wfc.common.core.constant.SecurityConstants; +import org.wfc.common.core.constant.UserConstants; +import org.wfc.common.core.domain.R; +import org.wfc.common.core.enums.UserStatus; +import org.wfc.common.core.exception.ServiceException; +import org.wfc.common.core.text.Convert; +import org.wfc.common.core.utils.DateUtils; +import org.wfc.common.core.utils.StringUtils; +import org.wfc.common.core.utils.ip.IpUtils; +import org.wfc.common.redis.service.RedisService; +import org.wfc.common.security.utils.SecurityUtils; +import org.wfc.system.api.RemoteUserService; +import org.wfc.system.api.domain.SysUser; +import org.wfc.system.api.model.LoginUser; + +/** + * 鐢ㄦ埛骞冲彴-鐧诲綍鏍￠獙鏂规硶 + * + * @author wfc + */ +@Component +public class ULoginService +{ + @Autowired + private RemoteUserService remoteUserService; + + @Autowired + private SysPasswordService passwordService; + + @Autowired + private SysRecordLogService recordLogService; + + @Autowired + private RedisService redisService; + + /** + * 鐧诲綍 + */ + public LoginUser login(String username, String password) + { + // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒 + if (StringUtils.isAnyBlank(username, password)) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛/瀵嗙爜蹇呴』濉啓"); + throw new ServiceException("user.password.not.blank"); + } + // 瀵嗙爜濡傛灉涓嶅湪鎸囧畾鑼冨洿鍐 閿欒 + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛瀵嗙爜涓嶅湪鎸囧畾鑼冨洿"); + throw new ServiceException("鐢ㄦ埛瀵嗙爜涓嶅湪鎸囧畾鑼冨洿"); + } + // 鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥村唴 閿欒 + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥"); + throw new ServiceException("鐢ㄦ埛鍚嶄笉鍦ㄦ寚瀹氳寖鍥"); + } + // IP榛戝悕鍗曟牎楠 + String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST)); + if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "寰堥仐鎲撅紝璁块棶IP宸茶鍒楀叆绯荤粺榛戝悕鍗"); + throw new ServiceException("寰堥仐鎲撅紝璁块棶IP宸茶鍒楀叆绯荤粺榛戝悕鍗"); + } + // 鏌ヨ鐢ㄦ埛淇℃伅 + R userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + + if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐧诲綍鐢ㄦ埛涓嶅瓨鍦"); + throw new ServiceException("鐧诲綍鐢ㄦ埛锛" + username + " 涓嶅瓨鍦"); + } + + if (R.FAIL == userResult.getCode()) + { + throw new ServiceException(userResult.getMsg()); + } + + LoginUser userInfo = userResult.getData(); + SysUser user = userResult.getData().getSysUser(); + if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿宸茶鍒犻櫎"); + throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛" + username + " 宸茶鍒犻櫎"); + } + if (UserStatus.DISABLE.getCode().equals(user.getStatus())) + { + recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "鐢ㄦ埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳"); + throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛" + username + " 宸插仠鐢"); + } + passwordService.validate(user, password); + recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "鐧诲綍鎴愬姛"); + recordLoginInfo(user.getUserId()); + return userInfo; + } + + /** + * 璁板綍鐧诲綍淇℃伅 + * + * @param userId 鐢ㄦ埛ID + */ + public void recordLoginInfo(Long userId) + { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + // 鏇存柊鐢ㄦ埛鐧诲綍IP + sysUser.setLoginIp(IpUtils.getIpAddr()); + // 鏇存柊鐢ㄦ埛鐧诲綍鏃堕棿 + sysUser.setLoginDate(DateUtils.getNowDate()); + remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER); + } + + public void logout(String loginName) + { + recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "閫鍑烘垚鍔"); + } + + /** + * 娉ㄥ唽 + */ + public void register(String username, String password) + { + // 鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖ 閿欒 + if (StringUtils.isAnyBlank(username, password)) + { + throw new ServiceException("user.password.not.blank"); + } + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + throw new ServiceException("璐︽埛闀垮害蹇呴』鍦2鍒20涓瓧绗︿箣闂"); + } + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + throw new ServiceException("瀵嗙爜闀垮害蹇呴』鍦5鍒20涓瓧绗︿箣闂"); + } + + // 娉ㄥ唽鐢ㄦ埛淇℃伅 + SysUser sysUser = new SysUser(); + sysUser.setUserName(username); + sysUser.setNickName(username); + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + R registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + + if (R.FAIL == registerResult.getCode()) + { + throw new ServiceException(registerResult.getMsg()); + } + recordLogService.recordLogininfor(username, Constants.REGISTER, "娉ㄥ唽鎴愬姛"); + } +} diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excel.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excel.java index bbcb9eb..0aa6f25 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excel.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excel.java @@ -12,7 +12,7 @@ import org.wfc.common.core.utils.poi.ExcelHandlerAdapter; /** * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ * - * @author ruoyi + * @author wfc */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excels.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excels.java index 8de25d7..2973f1d 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excels.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/annotation/Excels.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel娉ㄨВ闆 * - * @author ruoyi + * @author wfc */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/CacheConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/CacheConstants.java index f09aa5a..0309847 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/CacheConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/CacheConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 缂撳瓨甯搁噺淇℃伅 * - * @author ruoyi + * @author wfc */ public class CacheConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/Constants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/Constants.java index d02ebbb..c88d799 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/Constants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/Constants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 閫氱敤甯搁噺淇℃伅 * - * @author ruoyi + * @author wfc */ public class Constants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/GenConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/GenConstants.java index 2e07f94..9686249 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/GenConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/GenConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 浠ｇ爜鐢熸垚閫氱敤甯搁噺 * - * @author ruoyi + * @author wfc */ public class GenConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/HttpStatus.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/HttpStatus.java index 6ca5d84..21339bb 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/HttpStatus.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/HttpStatus.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 杩斿洖鐘舵佺爜 * - * @author ruoyi + * @author wfc */ public class HttpStatus { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ScheduleConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ScheduleConstants.java index d387aee..f45df75 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ScheduleConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ScheduleConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 浠诲姟璋冨害閫氱敤甯搁噺 * - * @author ruoyi + * @author wfc */ public class ScheduleConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/SecurityConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/SecurityConstants.java index 009c2c7..6d44064 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/SecurityConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/SecurityConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 鏉冮檺鐩稿叧閫氱敤甯搁噺 * - * @author ruoyi + * @author wfc */ public class SecurityConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java index 7cfc2eb..fb6e8a7 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 鏈嶅姟鍚嶇О * - * @author ruoyi + * @author wfc */ public class ServiceNameConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/TokenConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/TokenConstants.java index 58643f4..7922114 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/TokenConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/TokenConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * Token鐨凨ey甯搁噺 * - * @author ruoyi + * @author wfc */ public class TokenConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/UserConstants.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/UserConstants.java index 310c322..9cd68c0 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/UserConstants.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/UserConstants.java @@ -3,7 +3,7 @@ package org.wfc.common.core.constant; /** * 鐢ㄦ埛甯搁噺淇℃伅 * - * @author ruoyi + * @author wfc */ public class UserConstants { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/context/SecurityContextHolder.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/context/SecurityContextHolder.java index 4220231..c659a08 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/context/SecurityContextHolder.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/context/SecurityContextHolder.java @@ -11,7 +11,7 @@ import org.wfc.common.core.utils.StringUtils; * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般乀oken绛変俊鎭 * 娉ㄦ剰锛 蹇呴』鍦ㄧ綉鍏抽氳繃璇锋眰澶寸殑鏂规硶浼犲叆锛屽悓鏃跺湪HeaderInterceptor鎷︽埅鍣ㄨ缃笺 鍚﹀垯杩欓噷鏃犳硶鑾峰彇 * - * @author ruoyi + * @author wfc */ public class SecurityContextHolder { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/domain/R.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/domain/R.java index 75cf950..e3e1e14 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/domain/R.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/domain/R.java @@ -6,7 +6,7 @@ import org.wfc.common.core.constant.Constants; /** * 鍝嶅簲淇℃伅涓讳綋 * - * @author ruoyi + * @author wfc */ public class R implements Serializable { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/enums/UserStatus.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/enums/UserStatus.java index d8033da..dc0b39e 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/enums/UserStatus.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/enums/UserStatus.java @@ -3,7 +3,7 @@ package org.wfc.common.core.enums; /** * 鐢ㄦ埛鐘舵 * - * @author ruoyi + * @author wfc */ public enum UserStatus { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CaptchaException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CaptchaException.java index c38c46c..e3253aa 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CaptchaException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CaptchaException.java @@ -5,7 +5,7 @@ import org.wfc.common.core.exception.user.UserException; /** * 楠岃瘉鐮侀敊璇紓甯哥被 * - * @author ruoyi + * @author wfc */ public class CaptchaException extends UserException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CheckedException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CheckedException.java index 5d5aee4..c0afd2b 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CheckedException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/CheckedException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception; /** * 妫鏌ュ紓甯 * - * @author ruoyi + * @author wfc */ public class CheckedException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/DemoModeException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/DemoModeException.java index 7c06180..aace289 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/DemoModeException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/DemoModeException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception; /** * 婕旂ず妯″紡寮傚父 * - * @author ruoyi + * @author wfc */ public class DemoModeException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/GlobalException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/GlobalException.java index 14b6241..3233857 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/GlobalException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/GlobalException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception; /** * 鍏ㄥ眬寮傚父 * - * @author ruoyi + * @author wfc */ public class GlobalException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/InnerAuthException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/InnerAuthException.java index e5ac823..9451db4 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/InnerAuthException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/InnerAuthException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception; /** * 鍐呴儴璁よ瘉寮傚父 * - * @author ruoyi + * @author wfc */ public class InnerAuthException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/PreAuthorizeException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/PreAuthorizeException.java index 54873bb..e48c743 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/PreAuthorizeException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/PreAuthorizeException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception; /** * 鏉冮檺寮傚父 * - * @author ruoyi + * @author wfc */ public class PreAuthorizeException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/ServiceException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/ServiceException.java index 06023d4..c44bb63 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/ServiceException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/ServiceException.java @@ -6,7 +6,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 涓氬姟寮傚父 * - * @author ruoyi + * @author wfc */ public final class ServiceException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/UtilException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/UtilException.java index faf6c13..b8a48e3 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/UtilException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/UtilException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception; /** * 宸ュ叿绫诲紓甯 * - * @author ruoyi + * @author wfc */ public class UtilException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotLoginException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotLoginException.java index 38ac218..c11ac75 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotLoginException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotLoginException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception.auth; /** * 鏈兘閫氳繃鐨勭櫥褰曡璇佸紓甯 * - * @author ruoyi + * @author wfc */ public class NotLoginException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotPermissionException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotPermissionException.java index f5bd57b..8f7a1ff 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotPermissionException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotPermissionException.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils; /** * 鏈兘閫氳繃鐨勬潈闄愯璇佸紓甯 * - * @author ruoyi + * @author wfc */ public class NotPermissionException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotRoleException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotRoleException.java index 922a2e7..ed9af14 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotRoleException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/auth/NotRoleException.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.StringUtils; /** * 鏈兘閫氳繃鐨勮鑹茶璇佸紓甯 * - * @author ruoyi + * @author wfc */ public class NotRoleException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/base/BaseException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/base/BaseException.java index 05a4cec..b2c2d28 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/base/BaseException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/base/BaseException.java @@ -6,7 +6,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鍩虹寮傚父 * - * @author ruoyi + * @author wfc */ public class BaseException extends RuntimeException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileException.java index 1bc1123..c397443 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileException.java @@ -5,7 +5,7 @@ import org.wfc.common.core.exception.base.BaseException; /** * 鏂囦欢淇℃伅寮傚父绫 * - * @author ruoyi + * @author wfc */ public class FileException extends BaseException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileNameLengthLimitExceededException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileNameLengthLimitExceededException.java index 67ab375..f876d5f 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception.file; /** * 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫 * - * @author ruoyi + * @author wfc */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileSizeLimitExceededException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileSizeLimitExceededException.java index 6a31be3..8ed5205 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileSizeLimitExceededException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileSizeLimitExceededException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception.file; /** * 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被 * - * @author ruoyi + * @author wfc */ public class FileSizeLimitExceededException extends FileException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileUploadException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileUploadException.java index 0c8ff3e..1d4948f 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileUploadException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/FileUploadException.java @@ -6,7 +6,7 @@ import java.io.PrintWriter; /** * 鏂囦欢涓婁紶寮傚父绫 * - * @author ruoyi + * @author wfc */ public class FileUploadException extends Exception { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/InvalidExtensionException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/InvalidExtensionException.java index 4267a0e..3e1eef3 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/InvalidExtensionException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/file/InvalidExtensionException.java @@ -5,7 +5,7 @@ import java.util.Arrays; /** * 鏂囦欢涓婁紶 璇紓甯哥被 * - * @author ruoyi + * @author wfc */ public class InvalidExtensionException extends FileUploadException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/job/TaskException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/job/TaskException.java index 2c76a0a..d322d18 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/job/TaskException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/job/TaskException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception.job; /** * 璁″垝绛栫暐寮傚父 * - * @author ruoyi + * @author wfc */ public class TaskException extends Exception { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/CaptchaExpireException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/CaptchaExpireException.java index 7eef03d..69d7bd1 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/CaptchaExpireException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/CaptchaExpireException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception.user; /** * 楠岃瘉鐮佸け鏁堝紓甯哥被 * - * @author ruoyi + * @author wfc */ public class CaptchaExpireException extends UserException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserException.java index e782400..fce3ef8 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserException.java @@ -5,7 +5,7 @@ import org.wfc.common.core.exception.base.BaseException; /** * 鐢ㄦ埛淇℃伅寮傚父绫 * - * @author ruoyi + * @author wfc */ public class UserException extends BaseException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserPasswordNotMatchException.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserPasswordNotMatchException.java index c24e0e4..6bad0ad 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserPasswordNotMatchException.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/exception/user/UserPasswordNotMatchException.java @@ -3,7 +3,7 @@ package org.wfc.common.core.exception.user; /** * 鐢ㄦ埛瀵嗙爜涓嶆纭垨涓嶇鍚堣鑼冨紓甯哥被 * - * @author ruoyi + * @author wfc */ public class UserPasswordNotMatchException extends UserException { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/CharsetKit.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/CharsetKit.java index 2c67251..909a9d9 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/CharsetKit.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/CharsetKit.java @@ -7,7 +7,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 瀛楃闆嗗伐鍏风被 * - * @author ruoyi + * @author wfc */ public class CharsetKit { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/Convert.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/Convert.java index 3e3bf22..4febb94 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/Convert.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/Convert.java @@ -12,7 +12,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 绫诲瀷杞崲鍣 * - * @author ruoyi + * @author wfc */ public class Convert { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/StrFormatter.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/StrFormatter.java index 8df9911..f5a7c17 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/StrFormatter.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/StrFormatter.java @@ -5,7 +5,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 瀛楃涓叉牸寮忓寲 * - * @author ruoyi + * @author wfc */ public class StrFormatter { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/DateUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/DateUtils.java index d6cf663..cf1428e 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/DateUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/DateUtils.java @@ -14,7 +14,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; /** * 鏃堕棿宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ExceptionUtil.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ExceptionUtil.java index f35df11..232e19b 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ExceptionUtil.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ExceptionUtil.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 閿欒淇℃伅澶勭悊绫汇 * - * @author ruoyi + * @author wfc */ public class ExceptionUtil { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/JwtUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/JwtUtils.java index 8db5d9e..6cba9c7 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/JwtUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/JwtUtils.java @@ -11,7 +11,7 @@ import io.jsonwebtoken.SignatureAlgorithm; /** * Jwt宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class JwtUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/PageUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/PageUtils.java index 1c249ea..a4ddf84 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/PageUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/PageUtils.java @@ -8,7 +8,7 @@ import org.wfc.common.core.web.page.TableSupport; /** * 鍒嗛〉宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class PageUtils extends PageHelper { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ServletUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ServletUtils.java index 71bad1d..0fc2bbe 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ServletUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ServletUtils.java @@ -30,7 +30,7 @@ import reactor.core.publisher.Mono; /** * 瀹㈡埛绔伐鍏风被 * - * @author ruoyi + * @author wfc */ public class ServletUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/SpringUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/SpringUtils.java index b993556..9290aa8 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/SpringUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/SpringUtils.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** * spring宸ュ叿绫 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean * - * @author ruoyi + * @author wfc */ @Component public final class SpringUtils implements BeanFactoryPostProcessor diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/StringUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/StringUtils.java index 23657df..8c10f2d 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/StringUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/StringUtils.java @@ -10,7 +10,7 @@ import org.wfc.common.core.text.StrFormatter; /** * 瀛楃涓插伐鍏风被 * - * @author ruoyi + * @author wfc */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanUtils.java index 3f987ae..8150743 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanUtils.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanValidators.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanValidators.java index 712fed6..f6a75ab 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanValidators.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/bean/BeanValidators.java @@ -8,7 +8,7 @@ import javax.validation.Validator; /** * bean瀵硅薄灞炴ч獙璇 * - * @author ruoyi + * @author wfc */ public class BeanValidators { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileTypeUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileTypeUtils.java index 644fafe..99a05be 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileTypeUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileTypeUtils.java @@ -9,14 +9,14 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏂囦欢绫诲瀷宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class FileTypeUtils { /** * 鑾峰彇鏂囦欢绫诲瀷 *

- * 渚嬪: ruoyi.txt, 杩斿洖: txt + * 渚嬪: wfc.txt, 杩斿洖: txt * * @param file 鏂囦欢鍚 * @return 鍚庣紑锛堜笉鍚".") @@ -33,7 +33,7 @@ public class FileTypeUtils /** * 鑾峰彇鏂囦欢绫诲瀷 *

- * 渚嬪: ruoyi.txt, 杩斿洖: txt + * 渚嬪: wfc.txt, 杩斿洖: txt * * @param fileName 鏂囦欢鍚 * @return 鍚庣紑锛堜笉鍚".") diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileUtils.java index 4eeb567..f532fba 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/FileUtils.java @@ -16,7 +16,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鏂囦欢澶勭悊宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class FileUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/ImageUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/ImageUtils.java index 7359778..e20abb3 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/ImageUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/ImageUtils.java @@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory; /** * 鍥剧墖澶勭悊宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class ImageUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MimeTypeUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MimeTypeUtils.java index 70d7411..0eea164 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MimeTypeUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/file/MimeTypeUtils.java @@ -3,7 +3,7 @@ package org.wfc.common.core.utils.file; /** * 濯掍綋绫诲瀷宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class MimeTypeUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/EscapeUtil.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/EscapeUtil.java index aeeba5c..bc39852 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/EscapeUtil.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/EscapeUtil.java @@ -5,7 +5,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 杞箟鍜屽弽杞箟宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class EscapeUtil { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/HTMLFilter.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/HTMLFilter.java index 8014ba0..9743c5a 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/HTMLFilter.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/html/HTMLFilter.java @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆 * - * @author ruoyi + * @author wfc */ public final class HTMLFilter { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ip/IpUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ip/IpUtils.java index b9c5e65..3e1d29b 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ip/IpUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/ip/IpUtils.java @@ -9,7 +9,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鑾峰彇IP鏂规硶 * - * @author ruoyi + * @author wfc */ public class IpUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelHandlerAdapter.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelHandlerAdapter.java index 9406e10..2a9375a 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelHandlerAdapter.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelHandlerAdapter.java @@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook; /** * Excel鏁版嵁鏍煎紡澶勭悊閫傞厤鍣 * - * @author ruoyi + * @author wfc */ public interface ExcelHandlerAdapter { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelUtil.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelUtil.java index 936982d..0431455 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelUtil.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelUtil.java @@ -67,7 +67,7 @@ import org.wfc.common.core.utils.reflect.ReflectUtils; /** * Excel鐩稿叧澶勭悊 * - * @author ruoyi + * @author wfc */ public class ExcelUtil { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/reflect/ReflectUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/reflect/ReflectUtils.java index 1b6a866..59e3852 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/reflect/ReflectUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/reflect/ReflectUtils.java @@ -18,7 +18,7 @@ import org.wfc.common.core.utils.DateUtils; /** * 鍙嶅皠宸ュ叿绫. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟. * - * @author ruoyi + * @author wfc */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sign/Base64.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sign/Base64.java index e411378..1625304 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sign/Base64.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sign/Base64.java @@ -3,7 +3,7 @@ package org.wfc.common.core.utils.sign; /** * Base64宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public final class Base64 { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sql/SqlUtil.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sql/SqlUtil.java index 1a248ce..aec1c06 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sql/SqlUtil.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/sql/SqlUtil.java @@ -6,7 +6,7 @@ import org.wfc.common.core.utils.StringUtils; /** * sql鎿嶄綔宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class SqlUtil { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/IdUtils.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/IdUtils.java index ebd1617..75c1909 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/IdUtils.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/IdUtils.java @@ -3,7 +3,7 @@ package org.wfc.common.core.utils.uuid; /** * ID鐢熸垚鍣ㄥ伐鍏风被 * - * @author ruoyi + * @author wfc */ public class IdUtils { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/Seq.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/Seq.java index fd551b8..1c8285e 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/Seq.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/Seq.java @@ -5,7 +5,7 @@ import org.wfc.common.core.utils.DateUtils; import org.wfc.common.core.utils.StringUtils; /** - * @author ruoyi 搴忓垪鐢熸垚绫 + * @author wfc 搴忓垪鐢熸垚绫 */ public class Seq { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/UUID.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/UUID.java index 4f28772..a98b0b5 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/UUID.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/uuid/UUID.java @@ -10,7 +10,7 @@ import org.wfc.common.core.exception.UtilException; /** * 鎻愪緵閫氱敤鍞竴璇嗗埆鐮侊紙universally unique identifier锛夛紙UUID锛夊疄鐜 * - * @author ruoyi + * @author wfc */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/controller/BaseController.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/controller/BaseController.java index ece91d9..540d1f4 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/controller/BaseController.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/controller/BaseController.java @@ -17,7 +17,7 @@ import org.wfc.common.core.web.page.TableDataInfo; /** * web灞傞氱敤鏁版嵁澶勭悊 * - * @author ruoyi + * @author wfc */ public class BaseController { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/AjaxResult.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/AjaxResult.java index 7fff2f8..cd56635 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/AjaxResult.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/AjaxResult.java @@ -8,7 +8,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鎿嶄綔娑堟伅鎻愰啋 * - * @author ruoyi + * @author wfc */ public class AjaxResult extends HashMap { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/BaseEntity.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/BaseEntity.java index 8b7ab46..6623580 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/BaseEntity.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/BaseEntity.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** * Entity鍩虹被 * - * @author ruoyi + * @author wfc */ public class BaseEntity implements Serializable { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/TreeEntity.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/TreeEntity.java index 43c4c02..2a5b14e 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/TreeEntity.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/domain/TreeEntity.java @@ -6,7 +6,7 @@ import java.util.List; /** * Tree鍩虹被 * - * @author ruoyi + * @author wfc */ public class TreeEntity extends BaseEntity { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/PageDomain.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/PageDomain.java index 8d7d504..75f883c 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/PageDomain.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/PageDomain.java @@ -5,7 +5,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鍒嗛〉鏁版嵁 * - * @author ruoyi + * @author wfc */ public class PageDomain { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableDataInfo.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableDataInfo.java index 2466a06..b9b78d3 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableDataInfo.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableDataInfo.java @@ -6,7 +6,7 @@ import java.util.List; /** * 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄 * - * @author ruoyi + * @author wfc */ public class TableDataInfo implements Serializable { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableSupport.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableSupport.java index 944fa2b..9b2cd46 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableSupport.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableSupport.java @@ -6,7 +6,7 @@ import org.wfc.common.core.utils.ServletUtils; /** * 琛ㄦ牸鏁版嵁澶勭悊 * - * @author ruoyi + * @author wfc */ public class TableSupport { diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/Xss.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/Xss.java index 55480a8..31ae8f1 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/Xss.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/Xss.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 鑷畾涔墄ss鏍￠獙娉ㄨВ * - * @author ruoyi + * @author wfc */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/XssValidator.java b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/XssValidator.java index 021db29..b27755a 100644 --- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/XssValidator.java +++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/xss/XssValidator.java @@ -9,7 +9,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鑷畾涔墄ss鏍￠獙娉ㄨВ瀹炵幇 * - * @author ruoyi + * @author wfc */ public class XssValidator implements ConstraintValidator { diff --git a/wfc-common/wfc-common-datascope/pom.xml b/wfc-common/wfc-common-datascope/pom.xml index b0e1e7d..443ad20 100644 --- a/wfc-common/wfc-common-datascope/pom.xml +++ b/wfc-common/wfc-common-datascope/pom.xml @@ -17,7 +17,7 @@ - + org.wfc wfc-common-security diff --git a/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/annotation/DataScope.java b/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/annotation/DataScope.java index 4a9d494..19dcc62 100644 --- a/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/annotation/DataScope.java +++ b/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/annotation/DataScope.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 鏁版嵁鏉冮檺杩囨护娉ㄨВ * - * @author ruoyi + * @author wfc */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/aspect/DataScopeAspect.java b/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/aspect/DataScopeAspect.java index 2efb794..8ffdde8 100644 --- a/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/aspect/DataScopeAspect.java +++ b/wfc-common/wfc-common-datascope/src/main/java/org/wfc/common/datascope/aspect/DataScopeAspect.java @@ -20,7 +20,7 @@ import org.wfc.system.api.model.LoginUser; /** * 鏁版嵁杩囨护澶勭悊 * - * @author ruoyi + * @author wfc */ @Aspect @Component diff --git a/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Master.java b/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Master.java index 3845fb8..43ea2ad 100644 --- a/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Master.java +++ b/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Master.java @@ -10,7 +10,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; /** * 涓诲簱鏁版嵁婧 * - * @author ruoyi + * @author wfc */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Slave.java b/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Slave.java index cb0a831..1243111 100644 --- a/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Slave.java +++ b/wfc-common/wfc-common-datasource/src/main/java/org/wfc/common/datasource/annotation/Slave.java @@ -10,7 +10,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; /** * 浠庡簱鏁版嵁婧 * - * @author ruoyi + * @author wfc */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-log/pom.xml b/wfc-common/wfc-common-log/pom.xml index 6df0806..25b7e1a 100644 --- a/wfc-common/wfc-common-log/pom.xml +++ b/wfc-common/wfc-common-log/pom.xml @@ -17,7 +17,7 @@ - + org.wfc wfc-common-security diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/annotation/Log.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/annotation/Log.java index c18fadd..48f57d8 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/annotation/Log.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/annotation/Log.java @@ -11,7 +11,7 @@ import org.wfc.common.log.enums.OperatorType; /** * 鑷畾涔夋搷浣滄棩蹇楄褰曟敞瑙 * - * @author ruoyi + * @author wfc * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/aspect/LogAspect.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/aspect/LogAspect.java index 8bce393..12d2a8a 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/aspect/LogAspect.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/aspect/LogAspect.java @@ -32,7 +32,7 @@ import org.wfc.system.api.domain.SysOperLog; /** * 鎿嶄綔鏃ュ織璁板綍澶勭悊 * - * @author ruoyi + * @author wfc */ @Aspect @Component diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessStatus.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessStatus.java index 8ce0aa3..ebac3f6 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessStatus.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessStatus.java @@ -3,7 +3,7 @@ package org.wfc.common.log.enums; /** * 鎿嶄綔鐘舵 * - * @author ruoyi + * @author wfc * */ public enum BusinessStatus diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessType.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessType.java index 88406cf..78c86c9 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessType.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/BusinessType.java @@ -3,7 +3,7 @@ package org.wfc.common.log.enums; /** * Business type defination * - * @author ruoyi + * @author wfc */ public enum BusinessType { diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/OperatorType.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/OperatorType.java index 071cbfa..a694fa9 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/OperatorType.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/enums/OperatorType.java @@ -3,7 +3,7 @@ package org.wfc.common.log.enums; /** * 鎿嶄綔浜虹被鍒 * - * @author ruoyi + * @author wfc */ public enum OperatorType { diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/filter/PropertyPreExcludeFilter.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/filter/PropertyPreExcludeFilter.java index d37b41b..a8320a2 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/filter/PropertyPreExcludeFilter.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/filter/PropertyPreExcludeFilter.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; /** * 鎺掗櫎JSON鏁忔劅灞炴 * - * @author ruoyi + * @author wfc */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { diff --git a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/service/AsyncLogService.java b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/service/AsyncLogService.java index d93a4b1..d131a8c 100644 --- a/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/service/AsyncLogService.java +++ b/wfc-common/wfc-common-log/src/main/java/org/wfc/common/log/service/AsyncLogService.java @@ -10,7 +10,7 @@ import org.wfc.system.api.domain.SysOperLog; /** * 寮傛璋冪敤鏃ュ織鏈嶅姟 * - * @author ruoyi + * @author wfc */ @Service public class AsyncLogService diff --git a/wfc-common/wfc-common-redis/pom.xml b/wfc-common/wfc-common-redis/pom.xml index 2f7fd5b..7457bc9 100644 --- a/wfc-common/wfc-common-redis/pom.xml +++ b/wfc-common/wfc-common-redis/pom.xml @@ -23,7 +23,7 @@ spring-boot-starter-data-redis - + org.wfc wfc-common-core diff --git a/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/FastJson2JsonRedisSerializer.java b/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/FastJson2JsonRedisSerializer.java index 1b6d25a..8bb6cb9 100644 --- a/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/FastJson2JsonRedisSerializer.java +++ b/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -12,7 +12,7 @@ import org.wfc.common.core.constant.Constants; /** * Redis浣跨敤FastJson搴忓垪鍖 * - * @author ruoyi + * @author wfc */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/RedisConfig.java b/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/RedisConfig.java index 7254c6d..32643d6 100644 --- a/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/RedisConfig.java +++ b/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/configure/RedisConfig.java @@ -13,7 +13,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis閰嶇疆 * - * @author ruoyi + * @author wfc */ @Configuration @EnableCaching diff --git a/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/service/RedisService.java b/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/service/RedisService.java index 6a8bd5a..9f7f8f7 100644 --- a/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/service/RedisService.java +++ b/wfc-common/wfc-common-redis/src/main/java/org/wfc/common/redis/service/RedisService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; /** * spring redis 宸ュ叿绫 * - * @author ruoyi + * @author wfc **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/wfc-common/wfc-common-security/pom.xml b/wfc-common/wfc-common-security/pom.xml index 354d5b0..8b60657 100644 --- a/wfc-common/wfc-common-security/pom.xml +++ b/wfc-common/wfc-common-security/pom.xml @@ -22,13 +22,13 @@ spring-webmvc - + org.wfc wfc-api-system - + org.wfc wfc-common-redis diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/EnableRyFeignClients.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/EnableRyFeignClients.java index 340b3a9..488c75a 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/EnableRyFeignClients.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/EnableRyFeignClients.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; * 鑷畾涔塮eign娉ㄨВ * 娣诲姞basePackages璺緞 * - * @author ruoyi + * @author wfc */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/InnerAuth.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/InnerAuth.java index 8f022dc..93b8df8 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/InnerAuth.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/InnerAuth.java @@ -5,7 +5,7 @@ import java.lang.annotation.*; /** * 鍐呴儴璁よ瘉娉ㄨВ * - * @author ruoyi + * @author wfc */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/Logical.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/Logical.java index 420840d..86e74c7 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/Logical.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/Logical.java @@ -3,7 +3,7 @@ package org.wfc.common.security.annotation; /** * 鏉冮檺娉ㄨВ鐨勯獙璇佹ā寮 * - * @author ruoyi + * @author wfc * */ public enum Logical diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresLogin.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresLogin.java index 2ea575a..4213d30 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresLogin.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresLogin.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 鐧诲綍璁よ瘉锛氬彧鏈夌櫥褰曚箣鍚庢墠鑳借繘鍏ヨ鏂规硶 * - * @author ruoyi + * @author wfc * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresPermissions.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresPermissions.java index f851118..a4ee229 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresPermissions.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresPermissions.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 鏉冮檺璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氭潈闄愭墠鑳借繘鍏ヨ鏂规硶 * - * @author ruoyi + * @author wfc * */ @Retention(RetentionPolicy.RUNTIME) diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresRoles.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresRoles.java index b7270ad..97a1c58 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresRoles.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/annotation/RequiresRoles.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 瑙掕壊璁よ瘉锛氬繀椤诲叿鏈夋寚瀹氳鑹叉爣璇嗘墠鑳借繘鍏ヨ鏂规硶 * - * @author ruoyi + * @author wfc */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/aspect/InnerAuthAspect.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/aspect/InnerAuthAspect.java index 312c4ff..fcd3602 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/aspect/InnerAuthAspect.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/aspect/InnerAuthAspect.java @@ -14,7 +14,7 @@ import org.wfc.common.security.annotation.InnerAuth; /** * 鍐呴儴鏈嶅姟璋冪敤楠岃瘉澶勭悊 * - * @author ruoyi + * @author wfc */ @Aspect @Component diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthLogic.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthLogic.java index 8dbea46..6dd2c8d 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthLogic.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthLogic.java @@ -21,7 +21,7 @@ import org.wfc.system.api.model.LoginUser; /** * Token 鏉冮檺楠岃瘉锛岄昏緫瀹炵幇绫 * - * @author ruoyi + * @author wfc */ public class AuthLogic { diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthUtil.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthUtil.java index b9dffd9..215dce5 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthUtil.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/auth/AuthUtil.java @@ -7,7 +7,7 @@ import org.wfc.system.api.model.LoginUser; /** * Token 鏉冮檺楠岃瘉宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class AuthUtil { diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/ApplicationConfig.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/ApplicationConfig.java index 2ce27c3..c92f0d7 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/ApplicationConfig.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/ApplicationConfig.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean; /** * 绯荤粺閰嶇疆 * - * @author ruoyi + * @author wfc */ public class ApplicationConfig { diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/WebMvcConfig.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/WebMvcConfig.java index eb8773d..a968097 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/WebMvcConfig.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/config/WebMvcConfig.java @@ -7,7 +7,7 @@ import org.wfc.common.security.interceptor.HeaderInterceptor; /** * 鎷︽埅鍣ㄩ厤缃 * - * @author ruoyi + * @author wfc */ public class WebMvcConfig implements WebMvcConfigurer { diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignAutoConfiguration.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignAutoConfiguration.java index 930c3e3..6727faf 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignAutoConfiguration.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignAutoConfiguration.java @@ -7,7 +7,7 @@ import feign.RequestInterceptor; /** * Feign 閰嶇疆娉ㄥ唽 * - * @author ruoyi + * @author wfc **/ @Configuration public class FeignAutoConfiguration diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignRequestInterceptor.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignRequestInterceptor.java index 5c235f0..cc92e81 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignRequestInterceptor.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/feign/FeignRequestInterceptor.java @@ -13,7 +13,7 @@ import feign.RequestTemplate; /** * feign 璇锋眰鎷︽埅鍣 * - * @author ruoyi + * @author wfc */ @Component public class FeignRequestInterceptor implements RequestInterceptor diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java index 5a3afb8..8af0414 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/handler/GlobalExceptionHandler.java @@ -24,7 +24,7 @@ import org.wfc.common.core.web.domain.AjaxResult; /** * 鍏ㄥ眬寮傚父澶勭悊鍣 * - * @author ruoyi + * @author wfc */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/interceptor/HeaderInterceptor.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/interceptor/HeaderInterceptor.java index 1168185..3e99c52 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/interceptor/HeaderInterceptor.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/interceptor/HeaderInterceptor.java @@ -16,7 +16,7 @@ import org.wfc.system.api.model.LoginUser; * 鑷畾涔夎姹傚ご鎷︽埅鍣紝灏咹eader鏁版嵁灏佽鍒扮嚎绋嬪彉閲忎腑鏂逛究鑾峰彇 * 娉ㄦ剰锛氭鎷︽埅鍣ㄤ細鍚屾椂楠岃瘉褰撳墠鐢ㄦ埛鏈夋晥鏈熻嚜鍔ㄥ埛鏂版湁鏁堟湡 * - * @author ruoyi + * @author wfc */ public class HeaderInterceptor implements AsyncHandlerInterceptor { diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/service/TokenService.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/service/TokenService.java index f1dac23..f71f1df 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/service/TokenService.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/service/TokenService.java @@ -22,7 +22,7 @@ import org.wfc.system.api.model.LoginUser; /** * token楠岃瘉澶勭悊 * - * @author ruoyi + * @author wfc */ @Component public class TokenService diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/DictUtils.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/DictUtils.java index 1db9b6b..023c3a7 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/DictUtils.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/DictUtils.java @@ -12,7 +12,7 @@ import org.wfc.system.api.domain.SysDictData; /** * 瀛楀吀宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class DictUtils { diff --git a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/SecurityUtils.java b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/SecurityUtils.java index 0211102..f438e07 100644 --- a/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/SecurityUtils.java +++ b/wfc-common/wfc-common-security/src/main/java/org/wfc/common/security/utils/SecurityUtils.java @@ -12,7 +12,7 @@ import org.wfc.system.api.model.LoginUser; /** * 鏉冮檺鑾峰彇宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class SecurityUtils { diff --git a/wfc-common/wfc-common-sensitive/pom.xml b/wfc-common/wfc-common-sensitive/pom.xml index ef8f04c..477eee6 100644 --- a/wfc-common/wfc-common-sensitive/pom.xml +++ b/wfc-common/wfc-common-sensitive/pom.xml @@ -17,7 +17,7 @@ - + org.wfc wfc-common-security diff --git a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/annotation/Sensitive.java b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/annotation/Sensitive.java index 491a82d..61fc54d 100644 --- a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/annotation/Sensitive.java +++ b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/annotation/Sensitive.java @@ -12,7 +12,7 @@ import org.wfc.common.sensitive.enums.DesensitizedType; /** * 鏁版嵁鑴辨晱娉ㄨВ * - * @author ruoyi + * @author wfc */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/config/SensitiveJsonSerializer.java b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/config/SensitiveJsonSerializer.java index 85380b7..b1fefe1 100644 --- a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/config/SensitiveJsonSerializer.java +++ b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/config/SensitiveJsonSerializer.java @@ -16,7 +16,7 @@ import org.wfc.system.api.model.LoginUser; /** * 鏁版嵁鑴辨晱搴忓垪鍖栬繃婊 * - * @author ruoyi + * @author wfc */ public class SensitiveJsonSerializer extends JsonSerializer implements ContextualSerializer { diff --git a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/enums/DesensitizedType.java b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/enums/DesensitizedType.java index 63aa49f..f5a087c 100644 --- a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/enums/DesensitizedType.java +++ b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/enums/DesensitizedType.java @@ -6,7 +6,7 @@ import org.wfc.common.sensitive.utils.DesensitizedUtil; /** * 鑴辨晱绫诲瀷 * - * @author ruoyi + * @author wfc */ public enum DesensitizedType { diff --git a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/utils/DesensitizedUtil.java b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/utils/DesensitizedUtil.java index ca3b6df..61a2425 100644 --- a/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/utils/DesensitizedUtil.java +++ b/wfc-common/wfc-common-sensitive/src/main/java/org/wfc/common/sensitive/utils/DesensitizedUtil.java @@ -5,7 +5,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 鑴辨晱宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class DesensitizedUtil { diff --git a/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/SpringDocAutoConfiguration.java b/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/SpringDocAutoConfiguration.java index 4ccce7a..b36a3b6 100644 --- a/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/SpringDocAutoConfiguration.java +++ b/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/SpringDocAutoConfiguration.java @@ -17,7 +17,7 @@ import io.swagger.v3.oas.models.servers.Server; /** * Swagger 鏂囨。閰嶇疆 * - * @author ruoyi + * @author wfc */ @EnableConfigurationProperties(SpringDocProperties.class) @ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true) diff --git a/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/properties/SpringDocProperties.java b/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/properties/SpringDocProperties.java index 8bf6052..15dc595 100644 --- a/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/properties/SpringDocProperties.java +++ b/wfc-common/wfc-common-swagger/src/main/java/org/wfc/common/swagger/config/properties/SpringDocProperties.java @@ -8,7 +8,7 @@ import io.swagger.v3.oas.models.info.License; /** * Swagger 閰嶇疆灞炴 * - * @author ruoyi + * @author wfc */ @ConfigurationProperties(prefix = "springdoc") public class SpringDocProperties diff --git a/wfc-gateway/pom.xml b/wfc-gateway/pom.xml index 613a4ce..80071de 100644 --- a/wfc-gateway/pom.xml +++ b/wfc-gateway/pom.xml @@ -70,7 +70,7 @@ kaptcha - + org.wfc wfc-common-redis diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/WfcGatewayApplication.java b/wfc-gateway/src/main/java/org/wfc/gateway/WfcGatewayApplication.java index 9fd71b7..122af9a 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/WfcGatewayApplication.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/WfcGatewayApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 缃戝叧鍚姩绋嬪簭 * - * @author ruoyi + * @author wfc */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) public class WfcGatewayApplication diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/CaptchaConfig.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/CaptchaConfig.java index 587b1c0..c570c4d 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/CaptchaConfig.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/CaptchaConfig.java @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 楠岃瘉鐮侀厤缃 * - * @author ruoyi + * @author wfc */ @Configuration public class CaptchaConfig diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/GatewayConfig.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/GatewayConfig.java index 8579526..4709860 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/GatewayConfig.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/GatewayConfig.java @@ -9,7 +9,7 @@ import org.wfc.gateway.handler.SentinelFallbackHandler; /** * 缃戝叧闄愭祦閰嶇疆 * - * @author ruoyi + * @author wfc */ @Configuration public class GatewayConfig diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/KaptchaTextCreator.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/KaptchaTextCreator.java index 4f80148..fc8a9f3 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/KaptchaTextCreator.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/KaptchaTextCreator.java @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 楠岃瘉鐮佹枃鏈敓鎴愬櫒 * - * @author ruoyi + * @author wfc */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/RouterFunctionConfiguration.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/RouterFunctionConfiguration.java index ead1722..64683f3 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/RouterFunctionConfiguration.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/RouterFunctionConfiguration.java @@ -12,7 +12,7 @@ import org.wfc.gateway.handler.ValidateCodeHandler; /** * 璺敱閰嶇疆淇℃伅 * - * @author ruoyi + * @author wfc */ @Configuration public class RouterFunctionConfiguration diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/SpringDocConfig.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/SpringDocConfig.java index 69fd6b0..a393934 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/SpringDocConfig.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/SpringDocConfig.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; /** * SpringDoc閰嶇疆绫 * - * @author ruoyi + * @author wfc */ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true) diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/CaptchaProperties.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/CaptchaProperties.java index 940f8a2..9658991 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/CaptchaProperties.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/CaptchaProperties.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * 楠岃瘉鐮侀厤缃 * - * @author ruoyi + * @author wfc */ @Configuration @RefreshScope diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/IgnoreWhiteProperties.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/IgnoreWhiteProperties.java index e185426..242245a 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/IgnoreWhiteProperties.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/IgnoreWhiteProperties.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; /** * 鏀捐鐧藉悕鍗曢厤缃 * - * @author ruoyi + * @author wfc */ @Configuration @RefreshScope diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/XssProperties.java b/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/XssProperties.java index cba98e6..d1ba08a 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/XssProperties.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/config/properties/XssProperties.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; /** * XSS璺ㄧ珯鑴氭湰閰嶇疆 * - * @author ruoyi + * @author wfc */ @Configuration @RefreshScope diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java b/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java index b2be668..edbc2c0 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/filter/AuthFilter.java @@ -24,7 +24,7 @@ import reactor.core.publisher.Mono; /** * 缃戝叧閴存潈 * - * @author ruoyi + * @author wfc */ @Component public class AuthFilter implements GlobalFilter, Ordered diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/filter/BlackListUrlFilter.java b/wfc-gateway/src/main/java/org/wfc/gateway/filter/BlackListUrlFilter.java index 08408da..20466e3 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/filter/BlackListUrlFilter.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/filter/BlackListUrlFilter.java @@ -11,7 +11,7 @@ import org.wfc.common.core.utils.ServletUtils; /** * 榛戝悕鍗曡繃婊ゅ櫒 * - * @author ruoyi + * @author wfc */ @Component public class BlackListUrlFilter extends AbstractGatewayFilterFactory diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/filter/CacheRequestFilter.java b/wfc-gateway/src/main/java/org/wfc/gateway/filter/CacheRequestFilter.java index 5b539ce..03311d3 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/filter/CacheRequestFilter.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/filter/CacheRequestFilter.java @@ -15,7 +15,7 @@ import reactor.core.publisher.Mono; /** * 鑾峰彇body璇锋眰鏁版嵁锛堣В鍐虫祦涓嶈兘閲嶅璇诲彇闂锛 * - * @author ruoyi + * @author wfc */ @Component public class CacheRequestFilter extends AbstractGatewayFilterFactory diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/filter/ValidateCodeFilter.java b/wfc-gateway/src/main/java/org/wfc/gateway/filter/ValidateCodeFilter.java index 5d1bdd6..5decc69 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/filter/ValidateCodeFilter.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/filter/ValidateCodeFilter.java @@ -21,7 +21,7 @@ import reactor.core.publisher.Flux; /** * 楠岃瘉鐮佽繃婊ゅ櫒 * - * @author ruoyi + * @author wfc */ @Component public class ValidateCodeFilter extends AbstractGatewayFilterFactory diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/filter/XssFilter.java b/wfc-gateway/src/main/java/org/wfc/gateway/filter/XssFilter.java index 741de97..ebf409d 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/filter/XssFilter.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/filter/XssFilter.java @@ -28,7 +28,7 @@ import reactor.core.publisher.Mono; /** * 璺ㄧ珯鑴氭湰杩囨护鍣 * - * @author ruoyi + * @author wfc */ @Component @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/handler/GatewayExceptionHandler.java b/wfc-gateway/src/main/java/org/wfc/gateway/handler/GatewayExceptionHandler.java index e0d028c..2f5ee45 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/handler/GatewayExceptionHandler.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/handler/GatewayExceptionHandler.java @@ -15,7 +15,7 @@ import reactor.core.publisher.Mono; /** * 缃戝叧缁熶竴寮傚父澶勭悊 * - * @author ruoyi + * @author wfc */ @Order(-1) @Configuration diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/handler/SentinelFallbackHandler.java b/wfc-gateway/src/main/java/org/wfc/gateway/handler/SentinelFallbackHandler.java index f82d222..1ca1303 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/handler/SentinelFallbackHandler.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/handler/SentinelFallbackHandler.java @@ -11,7 +11,7 @@ import reactor.core.publisher.Mono; /** * 鑷畾涔夐檺娴佸紓甯稿鐞 * - * @author ruoyi + * @author wfc */ public class SentinelFallbackHandler implements WebExceptionHandler { diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/handler/ValidateCodeHandler.java b/wfc-gateway/src/main/java/org/wfc/gateway/handler/ValidateCodeHandler.java index fb24bf7..f6ce3bb 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/handler/ValidateCodeHandler.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/handler/ValidateCodeHandler.java @@ -16,7 +16,7 @@ import reactor.core.publisher.Mono; /** * 楠岃瘉鐮佽幏鍙 * - * @author ruoyi + * @author wfc */ @Component public class ValidateCodeHandler implements HandlerFunction diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/service/ValidateCodeService.java b/wfc-gateway/src/main/java/org/wfc/gateway/service/ValidateCodeService.java index dd7d590..729d8b5 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/service/ValidateCodeService.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/service/ValidateCodeService.java @@ -7,7 +7,7 @@ import org.wfc.common.core.web.domain.AjaxResult; /** * 楠岃瘉鐮佸鐞 * - * @author ruoyi + * @author wfc */ public interface ValidateCodeService { diff --git a/wfc-gateway/src/main/java/org/wfc/gateway/service/impl/ValidateCodeServiceImpl.java b/wfc-gateway/src/main/java/org/wfc/gateway/service/impl/ValidateCodeServiceImpl.java index 084b8d5..dc03bcd 100644 --- a/wfc-gateway/src/main/java/org/wfc/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/wfc-gateway/src/main/java/org/wfc/gateway/service/impl/ValidateCodeServiceImpl.java @@ -2,6 +2,7 @@ package org.wfc.gateway.service.impl; import com.google.code.kaptcha.Producer; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; import org.wfc.common.core.constant.CacheConstants; @@ -26,7 +27,7 @@ import java.util.concurrent.TimeUnit; /** * 楠岃瘉鐮佸疄鐜板鐞 * - * @author ruoyi + * @author wfc */ @Service public class ValidateCodeServiceImpl implements ValidateCodeService @@ -37,6 +38,9 @@ public class ValidateCodeServiceImpl implements ValidateCodeService @Resource(name = "captchaProducerMath") private Producer captchaProducerMath; + @Value("${spring.profiles.active}") + private String springProfilesActive; + @Autowired private RedisService redisService; @@ -94,6 +98,9 @@ public class ValidateCodeServiceImpl implements ValidateCodeService Map data = new HashMap<>(); data.put("uuid", uuid); data.put("img", Base64.encode(os.toByteArray())); + if ("dev".equals(springProfilesActive)) { + data.put("text", code); + } return AjaxResult.success(data); } diff --git a/wfc-gateway/src/main/resources/application.yml b/wfc-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..ca845bb --- /dev/null +++ b/wfc-gateway/src/main/resources/application.yml @@ -0,0 +1,77 @@ +spring: + redis: + host: 192.168.9.58 + port: 16379 + password: helloearth + cloud: + gateway: + discovery: + locator: + lowerCaseServiceId: true + enabled: true + routes: + # 璁よ瘉涓績 + - id: wfc-auth + uri: lb://wfc-auth + predicates: + - Path=/auth/** + filters: + # 楠岃瘉鐮佸鐞 + - CacheRequestFilter + - ValidateCodeFilter + - StripPrefix=1 + # 浠ｇ爜鐢熸垚 + - id: wfc-gen + uri: lb://wfc-gen + predicates: + - Path=/code/** + filters: + - StripPrefix=1 + # 瀹氭椂浠诲姟 + - id: wfc-job + uri: lb://wfc-job + predicates: + - Path=/schedule/** + filters: + - StripPrefix=1 + # 绯荤粺妯″潡 + - id: wfc-system + uri: lb://wfc-system + predicates: + - Path=/system/** + filters: + - StripPrefix=1 + # 鏂囦欢鏈嶅姟 + - id: wfc-file + uri: lb://wfc-file + predicates: + - Path=/file/** + filters: + - StripPrefix=1 + # 鐢ㄦ埛骞冲彴妯″潡 + - id: wfc-modules-user + uri: lb://wfc-modules-user + predicates: + - Path=/u/** + filters: + - StripPrefix=1 + +# 瀹夊叏閰嶇疆 +security: + # 楠岃瘉鐮 + captcha: + enabled: true + type: math + # 闃叉XSS鏀诲嚮 + xss: + enabled: true + excludeUrls: + - /system/notice + # 涓嶆牎楠岀櫧鍚嶅崟 + ignore: + whites: + - /auth/logout + - /auth/login + - /auth/register + - /*/v2/api-docs + - /csrf diff --git a/wfc-modules/wfc-file/pom.xml b/wfc-modules/wfc-file/pom.xml index 3416020..aeccd4c 100644 --- a/wfc-modules/wfc-file/pom.xml +++ b/wfc-modules/wfc-file/pom.xml @@ -60,7 +60,7 @@ ${minio.version} - + org.wfc wfc-api-system diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/WfcFileApplication.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/WfcFileApplication.java index 48f15ab..88c3003 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/WfcFileApplication.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/WfcFileApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 鏂囦欢鏈嶅姟 * - * @author ruoyi + * @author wfc */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) public class WfcFileApplication diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/MinioConfig.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/MinioConfig.java index 32e085d..1ed076e 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/MinioConfig.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/MinioConfig.java @@ -8,7 +8,7 @@ import io.minio.MinioClient; /** * Minio 閰嶇疆淇℃伅 * - * @author ruoyi + * @author wfc */ @Configuration @ConfigurationProperties(prefix = "minio") diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/ResourcesConfig.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/ResourcesConfig.java index 2a846cc..c8332c4 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/ResourcesConfig.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/config/ResourcesConfig.java @@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * 閫氱敤鏄犲皠閰嶇疆 * - * @author ruoyi + * @author wfc */ @Configuration public class ResourcesConfig implements WebMvcConfigurer diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java index 7f30f19..862f8ee 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/controller/SysFileController.java @@ -14,7 +14,7 @@ import org.wfc.system.api.domain.SysFile; /** * 鏂囦欢璇锋眰澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController public class SysFileController diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java index 3cd86c4..02fb6aa 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/FastDfsSysFileServiceImpl.java @@ -13,7 +13,7 @@ import org.wfc.common.core.utils.file.FileTypeUtils; /** * FastDFS 鏂囦欢瀛樺偍 * - * @author ruoyi + * @author wfc */ @Service public class FastDfsSysFileServiceImpl implements ISysFileService diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/ISysFileService.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/ISysFileService.java index 0c13827..cf315c6 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/ISysFileService.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/ISysFileService.java @@ -5,7 +5,7 @@ import org.springframework.web.multipart.MultipartFile; /** * 鏂囦欢涓婁紶鎺ュ彛 * - * @author ruoyi + * @author wfc */ public interface ISysFileService { diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java index 24d09b3..a79e37f 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/LocalSysFileServiceImpl.java @@ -9,7 +9,7 @@ import org.wfc.file.utils.FileUploadUtils; /** * 鏈湴鏂囦欢瀛樺偍 * - * @author ruoyi + * @author wfc */ @Primary @Service diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java index 338422a..9b5686b 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/service/MinioSysFileServiceImpl.java @@ -13,7 +13,7 @@ import io.minio.PutObjectArgs; /** * Minio 鏂囦欢瀛樺偍 * - * @author ruoyi + * @author wfc */ @Service public class MinioSysFileServiceImpl implements ISysFileService diff --git a/wfc-modules/wfc-file/src/main/java/org/wfc/file/utils/FileUploadUtils.java b/wfc-modules/wfc-file/src/main/java/org/wfc/file/utils/FileUploadUtils.java index 392c750..0cb4531 100644 --- a/wfc-modules/wfc-file/src/main/java/org/wfc/file/utils/FileUploadUtils.java +++ b/wfc-modules/wfc-file/src/main/java/org/wfc/file/utils/FileUploadUtils.java @@ -19,7 +19,7 @@ import org.wfc.common.core.utils.uuid.Seq; /** * 鏂囦欢涓婁紶宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class FileUploadUtils { diff --git a/wfc-modules/wfc-gen/pom.xml b/wfc-modules/wfc-gen/pom.xml index ad7322f..61b23d4 100644 --- a/wfc-modules/wfc-gen/pom.xml +++ b/wfc-modules/wfc-gen/pom.xml @@ -53,13 +53,13 @@ mysql-connector-j - + org.wfc wfc-common-log - + org.wfc wfc-common-swagger diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/WfcGenApplication.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/WfcGenApplication.java index 2cee545..8289217 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/WfcGenApplication.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/WfcGenApplication.java @@ -9,7 +9,7 @@ import org.wfc.common.swagger.annotation.EnableCustomSwagger2; /** * 浠ｇ爜鐢熸垚 * - * @author ruoyi + * @author wfc */ @EnableCustomConfig @EnableRyFeignClients diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/config/GenConfig.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/config/GenConfig.java index fd646e9..c02f0d4 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/config/GenConfig.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/config/GenConfig.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * 浠ｇ爜鐢熸垚鐩稿叧閰嶇疆 * - * @author ruoyi + * @author wfc */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/controller/GenController.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/controller/GenController.java index d7381c5..3a1cc52 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/controller/GenController.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/controller/GenController.java @@ -31,7 +31,7 @@ import org.wfc.gen.service.IGenTableService; /** * 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊 * - * @author ruoyi + * @author wfc */ @RequestMapping("/gen") @RestController @@ -203,7 +203,7 @@ public class GenController extends BaseController private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"wfc.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTable.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTable.java index 21d3065..3b551c6 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTable.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTable.java @@ -11,7 +11,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 涓氬姟琛 gen_table * - * @author ruoyi + * @author wfc */ public class GenTable extends BaseEntity { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTableColumn.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTableColumn.java index 05998d7..46c203d 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTableColumn.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/domain/GenTableColumn.java @@ -7,7 +7,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 浠ｇ爜鐢熸垚涓氬姟瀛楁琛 gen_table_column * - * @author ruoyi + * @author wfc */ public class GenTableColumn extends BaseEntity { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableColumnMapper.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableColumnMapper.java index d7b9c5e..9216b57 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableColumnMapper.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableColumnMapper.java @@ -6,7 +6,7 @@ import org.wfc.gen.domain.GenTableColumn; /** * 涓氬姟瀛楁 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface GenTableColumnMapper { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableMapper.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableMapper.java index 9f95495..db88643 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableMapper.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/mapper/GenTableMapper.java @@ -6,7 +6,7 @@ import org.wfc.gen.domain.GenTable; /** * 涓氬姟 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface GenTableMapper { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableColumnServiceImpl.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableColumnServiceImpl.java index 52343cb..f5cd4fc 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableColumnServiceImpl.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableColumnServiceImpl.java @@ -10,7 +10,7 @@ import org.wfc.gen.mapper.GenTableColumnMapper; /** * 涓氬姟瀛楁 鏈嶅姟灞傚疄鐜 * - * @author ruoyi + * @author wfc */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableServiceImpl.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableServiceImpl.java index 4ce3825..3a05fa3 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableServiceImpl.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/GenTableServiceImpl.java @@ -40,7 +40,7 @@ import org.wfc.gen.util.VelocityUtils; /** * 涓氬姟 鏈嶅姟灞傚疄鐜 * - * @author ruoyi + * @author wfc */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableColumnService.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableColumnService.java index 31702f0..2272c44 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableColumnService.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableColumnService.java @@ -6,7 +6,7 @@ import org.wfc.gen.domain.GenTableColumn; /** * 涓氬姟瀛楁 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface IGenTableColumnService { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableService.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableService.java index 6511709..75a8831 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableService.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/service/IGenTableService.java @@ -7,7 +7,7 @@ import org.wfc.gen.domain.GenTable; /** * 涓氬姟 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface IGenTableService { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/GenUtils.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/GenUtils.java index 2b328a1..d22f2e0 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/GenUtils.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/GenUtils.java @@ -11,7 +11,7 @@ import org.wfc.gen.domain.GenTableColumn; /** * 浠ｇ爜鐢熸垚鍣 宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class GenUtils { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityInitializer.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityInitializer.java index fc76725..30271b4 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityInitializer.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityInitializer.java @@ -7,7 +7,7 @@ import org.wfc.common.core.constant.Constants; /** * VelocityEngine宸ュ巶 * - * @author ruoyi + * @author wfc */ public class VelocityInitializer { diff --git a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityUtils.java b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityUtils.java index 55c3531..50e6000 100644 --- a/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityUtils.java +++ b/wfc-modules/wfc-gen/src/main/java/org/wfc/gen/util/VelocityUtils.java @@ -16,7 +16,7 @@ import org.wfc.gen.domain.GenTableColumn; /** * 妯℃澘宸ュ叿绫 * - * @author ruoyi + * @author wfc */ public class VelocityUtils { diff --git a/wfc-modules/wfc-job/pom.xml b/wfc-modules/wfc-job/pom.xml index eb3e158..bb87ad2 100644 --- a/wfc-modules/wfc-job/pom.xml +++ b/wfc-modules/wfc-job/pom.xml @@ -59,13 +59,13 @@ mysql-connector-j - + org.wfc wfc-common-log - + org.wfc wfc-common-swagger diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/WfcJobApplication.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/WfcJobApplication.java index 135e010..4932a17 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/WfcJobApplication.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/WfcJobApplication.java @@ -8,7 +8,7 @@ import org.wfc.common.security.annotation.EnableRyFeignClients; /** * 瀹氭椂浠诲姟 * - * @author ruoyi + * @author wfc */ @EnableCustomConfig @EnableRyFeignClients diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/config/ScheduleConfig.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/config/ScheduleConfig.java index def9752..eac90fb 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/config/ScheduleConfig.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/config/ScheduleConfig.java @@ -9,7 +9,7 @@ ///** // * 瀹氭椂浠诲姟閰嶇疆锛堝崟鏈洪儴缃插缓璁垹闄ゆ绫诲拰qrtz鏁版嵁搴撹〃锛岄粯璁よ蛋鍐呭瓨浼氭渶楂樻晥锛 // * -// * @author ruoyi +// * @author wfc // */ //@Configuration //public class ScheduleConfig @@ -22,7 +22,7 @@ // // // quartz鍙傛暟 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "wfcScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 绾跨▼姹犻厤缃 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("wfcScheduler"); // // 寤舵椂鍚姩 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobController.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobController.java index e3aba8e..07778fa 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobController.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobController.java @@ -31,7 +31,7 @@ import org.wfc.job.util.ScheduleUtils; /** * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/job") diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobLogController.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobLogController.java index 8e6b77c..24dd3be 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobLogController.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobLogController.java @@ -22,7 +22,7 @@ import org.wfc.job.service.ISysJobLogService; /** * 璋冨害鏃ュ織鎿嶄綔澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/job/log") diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJob.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJob.java index fce93ac..2be9ffe 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJob.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJob.java @@ -16,7 +16,7 @@ import org.wfc.job.util.CronUtils; /** * 瀹氭椂浠诲姟璋冨害琛 sys_job * - * @author ruoyi + * @author wfc */ public class SysJob extends BaseEntity { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJobLog.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJobLog.java index c8c1aa9..4db5eab 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJobLog.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/domain/SysJobLog.java @@ -9,7 +9,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織琛 sys_job_log * - * @author ruoyi + * @author wfc */ public class SysJobLog extends BaseEntity { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobLogMapper.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobLogMapper.java index 8fbbcb2..c264f56 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobLogMapper.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobLogMapper.java @@ -6,7 +6,7 @@ import org.wfc.job.domain.SysJobLog; /** * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysJobLogMapper { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobMapper.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobMapper.java index 617f2fa..7d33d40 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobMapper.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/mapper/SysJobMapper.java @@ -6,7 +6,7 @@ import org.wfc.job.domain.SysJob; /** * 璋冨害浠诲姟淇℃伅 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysJobMapper { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobLogService.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobLogService.java index 0b89a63..532b192 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobLogService.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobLogService.java @@ -6,7 +6,7 @@ import org.wfc.job.domain.SysJobLog; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysJobLogService { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobService.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobService.java index 7dee655..aa8a1bd 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobService.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/ISysJobService.java @@ -8,7 +8,7 @@ import org.wfc.job.domain.SysJob; /** * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysJobService { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobLogServiceImpl.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobLogServiceImpl.java index 74a763d..b8cb1b4 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobLogServiceImpl.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobLogServiceImpl.java @@ -9,7 +9,7 @@ import org.wfc.job.mapper.SysJobLogMapper; /** * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobServiceImpl.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobServiceImpl.java index a797ac3..2dfa017 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobServiceImpl.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/service/SysJobServiceImpl.java @@ -19,7 +19,7 @@ import org.wfc.job.util.ScheduleUtils; /** * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/task/RyTask.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/task/RyTask.java index eee5c60..5ca6041 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/task/RyTask.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/task/RyTask.java @@ -6,7 +6,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 瀹氭椂浠诲姟璋冨害娴嬭瘯 * - * @author ruoyi + * @author wfc */ @Component("ryTask") public class RyTask diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/AbstractQuartzJob.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/AbstractQuartzJob.java index baf9599..6b3511d 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/AbstractQuartzJob.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/AbstractQuartzJob.java @@ -18,7 +18,7 @@ import org.wfc.job.service.ISysJobLogService; /** * 鎶借薄quartz璋冪敤 * - * @author ruoyi + * @author wfc */ public abstract class AbstractQuartzJob implements Job { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/CronUtils.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/CronUtils.java index d5faf09..405558c 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/CronUtils.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/CronUtils.java @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron琛ㄨ揪寮忓伐鍏风被 * - * @author ruoyi + * @author wfc * */ public class CronUtils diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/JobInvokeUtil.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/JobInvokeUtil.java index 7e257d2..88fafa8 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/JobInvokeUtil.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/JobInvokeUtil.java @@ -11,7 +11,7 @@ import org.wfc.job.domain.SysJob; /** * 浠诲姟鎵ц宸ュ叿 * - * @author ruoyi + * @author wfc */ public class JobInvokeUtil { diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzDisallowConcurrentExecution.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzDisallowConcurrentExecution.java index 4d13491..7545130 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzDisallowConcurrentExecution.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzDisallowConcurrentExecution.java @@ -8,7 +8,7 @@ import org.wfc.job.domain.SysJob; /** * 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級 * - * @author ruoyi + * @author wfc * */ @DisallowConcurrentExecution diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzJobExecution.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzJobExecution.java index 0139426..1782dbf 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzJobExecution.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/QuartzJobExecution.java @@ -7,7 +7,7 @@ import org.wfc.job.domain.SysJob; /** * 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級 * - * @author ruoyi + * @author wfc * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/ScheduleUtils.java b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/ScheduleUtils.java index df238bc..087ede9 100644 --- a/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/ScheduleUtils.java +++ b/wfc-modules/wfc-job/src/main/java/org/wfc/job/util/ScheduleUtils.java @@ -21,7 +21,7 @@ import org.wfc.job.domain.SysJob; /** * 瀹氭椂浠诲姟宸ュ叿绫 * - * @author ruoyi + * @author wfc * */ public class ScheduleUtils diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/WfcUserApplication.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/WfcUserApplication.java index d1e7d79..969bbc6 100644 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/WfcUserApplication.java +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/WfcUserApplication.java @@ -4,13 +4,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.wfc.common.security.annotation.EnableCustomConfig; import org.wfc.common.security.annotation.EnableRyFeignClients; -import org.wfc.common.swagger.annotation.EnableCustomSwagger2; /** * 鐢ㄦ埛骞冲彴妯″潡 */ @EnableCustomConfig -@EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication public class WfcUserApplication diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/SysJobController.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/SysJobController.java deleted file mode 100644 index 656967a..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/SysJobController.java +++ /dev/null @@ -1,158 +0,0 @@ -package org.wfc.user.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.wfc.common.core.constant.Constants; -import org.wfc.common.core.exception.job.TaskException; -import org.wfc.common.core.utils.StringUtils; -import org.wfc.common.core.utils.poi.ExcelUtil; -import org.wfc.common.core.web.controller.BaseController; -import org.wfc.common.core.web.domain.AjaxResult; -import org.wfc.common.core.web.page.TableDataInfo; -import org.wfc.common.log.annotation.Log; -import org.wfc.common.log.enums.BusinessType; -import org.wfc.common.security.annotation.RequiresPermissions; -import org.wfc.common.security.utils.SecurityUtils; -import org.wfc.user.domain.SysJob; -import org.wfc.user.service.ISysJobService; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/job") -public class SysJobController extends BaseController -{ - @Autowired - private ISysJobService jobService; - - /** - * 鏌ヨ瀹氭椂浠诲姟鍒楄〃 - */ - @GetMapping("/list") - public TableDataInfo list(SysJob sysJob) - { - startPage(); - List list = jobService.selectJobList(sysJob); - return getDataTable(list); - } - - /** - * 瀵煎嚭瀹氭椂浠诲姟鍒楄〃 - */ - @RequiresPermissions("monitor:job:export") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SysJob sysJob) - { - List list = jobService.selectJobList(sysJob); - ExcelUtil util = new ExcelUtil(SysJob.class); - util.exportExcel(response, list, "瀹氭椂浠诲姟"); - } - - /** - * 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅 - */ - @RequiresPermissions("monitor:job:query") - @GetMapping(value = "/{jobId}") - public AjaxResult getInfo(@PathVariable("jobId") Long jobId) - { - return success(jobService.selectJobById(jobId)); - } - - /** - * 鏂板瀹氭椂浠诲姟 - */ - @RequiresPermissions("monitor:job:add") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SysJob job) throws TaskException - { - if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) - { - return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'rmi'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) - { - return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'ldap(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) - { - return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'http(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) - { - return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊"); - } - job.setCreateBy(SecurityUtils.getUsername()); - return toAjax(1); - } - - /** - * 淇敼瀹氭椂浠诲姟 - */ - @RequiresPermissions("monitor:job:edit") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SysJob job) throws TaskException - { - if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) - { - return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'rmi'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) - { - return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'ldap(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) - { - return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁'http(s)'璋冪敤"); - } - else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) - { - return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊"); - } - job.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(false); - } - - /** - * 瀹氭椂浠诲姟鐘舵佷慨鏀 - */ - @RequiresPermissions("monitor:job:changeStatus") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public AjaxResult changeStatus(@RequestBody SysJob job) - { - return toAjax(false); - } - - /** - * 瀹氭椂浠诲姟绔嬪嵆鎵ц涓娆 - */ - @RequiresPermissions("monitor:job:changeStatus") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE) - @PutMapping("/run") - public AjaxResult run(@RequestBody SysJob job) - { - - return error("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒"); - } - - /** - * 鍒犻櫎瀹氭椂浠诲姟 - */ - @RequiresPermissions("monitor:job:remove") - @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobIds}") - public AjaxResult remove(@PathVariable Long[] jobIds) - { - - return success(); - } -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/SysJobLogController.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/SysJobLogController.java deleted file mode 100644 index a357b1e..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/SysJobLogController.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.wfc.user.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.wfc.common.core.utils.poi.ExcelUtil; -import org.wfc.common.core.web.controller.BaseController; -import org.wfc.common.core.web.domain.AjaxResult; -import org.wfc.common.core.web.page.TableDataInfo; -import org.wfc.common.log.annotation.Log; -import org.wfc.common.log.enums.BusinessType; -import org.wfc.common.security.annotation.RequiresPermissions; -import org.wfc.user.domain.SysJobLog; -import org.wfc.user.service.ISysJobLogService; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; - -/** - * 璋冨害鏃ュ織鎿嶄綔澶勭悊 - * - * @author ruoyi - */ -@RestController -@RequestMapping("/job/log") -public class SysJobLogController extends BaseController -{ - @Autowired - private ISysJobLogService jobLogService; - - /** - * 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃 - */ - @RequiresPermissions("monitor:job:list") - @GetMapping("/list") - public TableDataInfo list(SysJobLog sysJobLog) - { - startPage(); - List list = jobLogService.selectJobLogList(sysJobLog); - return getDataTable(list); - } - - /** - * 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃 - */ - @RequiresPermissions("monitor:job:export") - @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SysJobLog sysJobLog) - { - List list = jobLogService.selectJobLogList(sysJobLog); - ExcelUtil util = new ExcelUtil(SysJobLog.class); - util.exportExcel(response, list, "璋冨害鏃ュ織"); - } - - /** - * 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅 - */ - @RequiresPermissions("monitor:job:query") - @GetMapping(value = "/{jobLogId}") - public AjaxResult getInfo(@PathVariable Long jobLogId) - { - return success(jobLogService.selectJobLogById(jobLogId)); - } - - /** - * 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織 - */ - @RequiresPermissions("monitor:job:remove") - @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE) - @DeleteMapping("/{jobLogIds}") - public AjaxResult remove(@PathVariable Long[] jobLogIds) - { - return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); - } - - /** - * 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織 - */ - @RequiresPermissions("monitor:job:remove") - @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN) - @DeleteMapping("/clean") - public AjaxResult clean() - { - jobLogService.cleanJobLog(); - return success(); - } -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java new file mode 100644 index 0000000..b202be3 --- /dev/null +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java @@ -0,0 +1,104 @@ +package org.wfc.user.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.wfc.common.log.annotation.Log; +import org.wfc.common.log.enums.BusinessType; +import org.wfc.common.security.annotation.RequiresPermissions; +import org.wfc.user.domain.UUser; +import org.wfc.user.service.IUUserService; +import org.wfc.common.core.web.controller.BaseController; +import org.wfc.common.core.web.domain.AjaxResult; +import org.wfc.common.core.utils.poi.ExcelUtil; +import org.wfc.common.core.web.page.TableDataInfo; + +/** + * 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅Controller + * + * @author wfc + * @date 2024-11-25 + */ +@RestController +@RequestMapping("/user") +public class UUserController extends BaseController +{ + @Autowired + private IUUserService uUserService; + + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅鍒楄〃 + */ + @RequiresPermissions("user:user:list") + @GetMapping("/list") + public TableDataInfo list(UUser uUser) + { + startPage(); + List list = uUserService.selectUUserList(uUser); + return getDataTable(list); + } + + /** + * 瀵煎嚭鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅鍒楄〃 + */ + @RequiresPermissions("user:user:export") + @Log(title = "鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, UUser uUser) + { + List list = uUserService.selectUUserList(uUser); + ExcelUtil util = new ExcelUtil(UUser.class); + util.exportExcel(response, list, "鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅鏁版嵁"); + } + + /** + * 鑾峰彇鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅璇︾粏淇℃伅 + */ + @RequiresPermissions("user:user:query") + @GetMapping(value = "/{userId}") + public AjaxResult getInfo(@PathVariable("userId") Long userId) + { + return success(uUserService.selectUUserByUserId(userId)); + } + + /** + * 鏂板鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + @RequiresPermissions("user:user:add") + @Log(title = "鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody UUser uUser) + { + return toAjax(uUserService.insertUUser(uUser)); + } + + /** + * 淇敼鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + @RequiresPermissions("user:user:edit") + @Log(title = "鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody UUser uUser) + { + return toAjax(uUserService.updateUUser(uUser)); + } + + /** + * 鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + @RequiresPermissions("user:user:remove") + @Log(title = "鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public AjaxResult remove(@PathVariable Long[] userIds) + { + return toAjax(uUserService.deleteUUserByUserIds(userIds)); + } +} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/SysJob.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/SysJob.java deleted file mode 100644 index bd39414..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/SysJob.java +++ /dev/null @@ -1,170 +0,0 @@ -package org.wfc.user.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.wfc.common.core.annotation.Excel; -import org.wfc.common.core.annotation.Excel.ColumnType; -import org.wfc.common.core.constant.ScheduleConstants; -import org.wfc.common.core.utils.StringUtils; -import org.wfc.common.core.web.domain.BaseEntity; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import java.util.Date; - -/** - * 瀹氭椂浠诲姟璋冨害琛 sys_job - * - * @author ruoyi - */ -public class SysJob extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 浠诲姟ID */ - @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC) - private Long jobId; - - /** 浠诲姟鍚嶇О */ - @Excel(name = "浠诲姟鍚嶇О") - private String jobName; - - /** 浠诲姟缁勫悕 */ - @Excel(name = "浠诲姟缁勫悕") - private String jobGroup; - - /** 璋冪敤鐩爣瀛楃涓 */ - @Excel(name = "璋冪敤鐩爣瀛楃涓") - private String invokeTarget; - - /** cron鎵ц琛ㄨ揪寮 */ - @Excel(name = "鎵ц琛ㄨ揪寮 ") - private String cronExpression; - - /** cron璁″垝绛栫暐 */ - @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓娆℃墽琛,3=涓嶈Е鍙戠珛鍗虫墽琛") - private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; - - /** 鏄惁骞跺彂鎵ц锛0鍏佽 1绂佹锛 */ - @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹") - private String concurrent; - - /** 浠诲姟鐘舵侊紙0姝ｅ父 1鏆傚仠锛 */ - @Excel(name = "浠诲姟鐘舵", readConverterExp = "0=姝ｅ父,1=鏆傚仠") - private String status; - - public Long getJobId() - { - return jobId; - } - - public void setJobId(Long jobId) - { - this.jobId = jobId; - } - - @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖") - @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗") - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌") - @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩500涓瓧绗") - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌") - @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩255涓瓧绗") - public String getCronExpression() - { - return cronExpression; - } - - public void setCronExpression(String cronExpression) - { - this.cronExpression = cronExpression; - } - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - public Date getNextValidTime() - { - if (StringUtils.isNotEmpty(cronExpression)) - { - } - return null; - } - - public String getMisfirePolicy() - { - return misfirePolicy; - } - - public void setMisfirePolicy(String misfirePolicy) - { - this.misfirePolicy = misfirePolicy; - } - - public String getConcurrent() - { - return concurrent; - } - - public void setConcurrent(String concurrent) - { - this.concurrent = concurrent; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobId", getJobId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("cronExpression", getCronExpression()) - .append("nextValidTime", getNextValidTime()) - .append("misfirePolicy", getMisfirePolicy()) - .append("concurrent", getConcurrent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} \ No newline at end of file diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/SysJobLog.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/SysJobLog.java deleted file mode 100644 index 203052d..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/SysJobLog.java +++ /dev/null @@ -1,156 +0,0 @@ -package org.wfc.user.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.wfc.common.core.annotation.Excel; -import org.wfc.common.core.web.domain.BaseEntity; - -import java.util.Date; - -/** - * 瀹氭椂浠诲姟璋冨害鏃ュ織琛 sys_job_log - * - * @author ruoyi - */ -public class SysJobLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** ID */ - @Excel(name = "鏃ュ織搴忓彿") - private Long jobLogId; - - /** 浠诲姟鍚嶇О */ - @Excel(name = "浠诲姟鍚嶇О") - private String jobName; - - /** 浠诲姟缁勫悕 */ - @Excel(name = "浠诲姟缁勫悕") - private String jobGroup; - - /** 璋冪敤鐩爣瀛楃涓 */ - @Excel(name = "璋冪敤鐩爣瀛楃涓") - private String invokeTarget; - - /** 鏃ュ織淇℃伅 */ - @Excel(name = "鏃ュ織淇℃伅") - private String jobMessage; - - /** 鎵ц鐘舵侊紙0姝ｅ父 1澶辫触锛 */ - @Excel(name = "鎵ц鐘舵", readConverterExp = "0=姝ｅ父,1=澶辫触") - private String status; - - /** 寮傚父淇℃伅 */ - @Excel(name = "寮傚父淇℃伅") - private String exceptionInfo; - - /** 寮濮嬫椂闂 */ - private Date startTime; - - /** 鍋滄鏃堕棿 */ - private Date stopTime; - - public Long getJobLogId() - { - return jobLogId; - } - - public void setJobLogId(Long jobLogId) - { - this.jobLogId = jobLogId; - } - - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - public String getJobMessage() - { - return jobMessage; - } - - public void setJobMessage(String jobMessage) - { - this.jobMessage = jobMessage; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getExceptionInfo() - { - return exceptionInfo; - } - - public void setExceptionInfo(String exceptionInfo) - { - this.exceptionInfo = exceptionInfo; - } - - public Date getStartTime() - { - return startTime; - } - - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStopTime() - { - return stopTime; - } - - public void setStopTime(Date stopTime) - { - this.stopTime = stopTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobLogId", getJobLogId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("jobMessage", getJobMessage()) - .append("status", getStatus()) - .append("exceptionInfo", getExceptionInfo()) - .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) - .toString(); - } -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUser.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUser.java new file mode 100644 index 0000000..f230142 --- /dev/null +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/UUser.java @@ -0,0 +1,212 @@ +package org.wfc.user.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.wfc.common.core.annotation.Excel; +import org.wfc.common.core.web.domain.BaseEntity; + +/** + * 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅瀵硅薄 u_user + * + * @author wfc + * @date 2024-11-25 + */ +public class UUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 鐢ㄦ埛ID */ + private Long userId; + + /** 鐢ㄦ埛璐﹀彿 */ + @Excel(name = "鐢ㄦ埛璐﹀彿") + private String userName; + + /** 鐢ㄦ埛鏄电О */ + @Excel(name = "鐢ㄦ埛鏄电О") + private String nickName; + + /** 骞撮緞 */ + @Excel(name = "骞撮緞") + private String age; + + /** 鐢ㄦ埛鎬у埆锛0鐢 1濂 2鏈煡锛 */ + @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢,1=濂,2=鏈煡") + private String sex; + + /** 鐢ㄦ埛閭 */ + @Excel(name = "鐢ㄦ埛閭") + private String email; + + /** 鎵嬫満鍙风爜 */ + @Excel(name = "鎵嬫満鍙风爜") + private String phone; + + /** 鍦板潃 */ + @Excel(name = "鍦板潃") + private String address; + + /** 瀵嗙爜 */ + @Excel(name = "瀵嗙爜") + private String password; + + /** 甯愬彿鐘舵侊紙0姝ｅ父 1鍋滅敤锛 */ + @Excel(name = "甯愬彿鐘舵", readConverterExp = "0=姝ｅ父,1=鍋滅敤") + private String status; + + /** 鍒犻櫎鏍囧織锛0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛 */ + private String delFlag; + + /** 鏈鍚庣櫥褰旾P */ + @Excel(name = "鏈鍚庣櫥褰旾P") + private String loginIp; + + /** 鏈鍚庣櫥褰曟椂闂 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "鏈鍚庣櫥褰曟椂闂", width = 30, dateFormat = "yyyy-MM-dd") + private Date loginDate; + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + public void setNickName(String nickName) + { + this.nickName = nickName; + } + + public String getNickName() + { + return nickName; + } + public void setAge(String age) + { + this.age = age; + } + + public String getAge() + { + return age; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + public void setPassword(String password) + { + this.password = password; + } + + public String getPassword() + { + return password; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public String getLoginIp() + { + return loginIp; + } + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public Date getLoginDate() + { + return loginDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("age", getAge()) + .append("sex", getSex()) + .append("email", getEmail()) + .append("phone", getPhone()) + .append("address", getAddress()) + .append("password", getPassword()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/SysJobLogMapper.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/SysJobLogMapper.java deleted file mode 100644 index 4bcccdd..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/SysJobLogMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.wfc.user.mapper; - -import org.wfc.user.domain.SysJobLog; - -import java.util.List; - -/** - * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞 - * - * @author ruoyi - */ -public interface SysJobLogMapper -{ - /** - * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 - */ - public List selectJobLogList(SysJobLog jobLog); - - /** - * 鏌ヨ鎵鏈夎皟搴︿换鍔℃棩蹇 - * - * @return 璋冨害浠诲姟鏃ュ織鍒楄〃 - */ - public List selectJobLogAll(); - - /** - * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * - * @param jobLogId 璋冨害浠诲姟鏃ュ織ID - * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 - */ - public SysJobLog selectJobLogById(Long jobLogId); - - /** - * 鏂板浠诲姟鏃ュ織 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 缁撴灉 - */ - public int insertJobLog(SysJobLog jobLog); - - /** - * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * - * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ - public int deleteJobLogByIds(Long[] logIds); - - /** - * 鍒犻櫎浠诲姟鏃ュ織 - * - * @param jobId 璋冨害鏃ュ織ID - * @return 缁撴灉 - */ - public int deleteJobLogById(Long jobId); - - /** - * 娓呯┖浠诲姟鏃ュ織 - */ - public void cleanJobLog(); -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/SysJobMapper.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/SysJobMapper.java deleted file mode 100644 index d0f5c76..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/SysJobMapper.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.wfc.user.mapper; - -import org.wfc.user.domain.SysJob; - -import java.util.List; - -/** - * 璋冨害浠诲姟淇℃伅 鏁版嵁灞 - * - * @author ruoyi - */ -public interface SysJobMapper -{ - /** - * 鏌ヨ璋冨害浠诲姟鏃ュ織闆嗗悎 - * - * @param job 璋冨害淇℃伅 - * @return 鎿嶄綔鏃ュ織闆嗗悎 - */ - public List selectJobList(SysJob job); - - /** - * 鏌ヨ鎵鏈夎皟搴︿换鍔 - * - * @return 璋冨害浠诲姟鍒楄〃 - */ - public List selectJobAll(); - - /** - * 閫氳繃璋冨害ID鏌ヨ璋冨害浠诲姟淇℃伅 - * - * @param jobId 璋冨害ID - * @return 瑙掕壊瀵硅薄淇℃伅 - */ - public SysJob selectJobById(Long jobId); - - /** - * 閫氳繃璋冨害ID鍒犻櫎璋冨害浠诲姟淇℃伅 - * - * @param jobId 璋冨害ID - * @return 缁撴灉 - */ - public int deleteJobById(Long jobId); - - /** - * 鎵归噺鍒犻櫎璋冨害浠诲姟淇℃伅 - * - * @param ids 闇瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ - public int deleteJobByIds(Long[] ids); - - /** - * 淇敼璋冨害浠诲姟淇℃伅 - * - * @param job 璋冨害浠诲姟淇℃伅 - * @return 缁撴灉 - */ - public int updateJob(SysJob job); - - /** - * 鏂板璋冨害浠诲姟淇℃伅 - * - * @param job 璋冨害浠诲姟淇℃伅 - * @return 缁撴灉 - */ - public int insertJob(SysJob job); -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserMapper.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserMapper.java new file mode 100644 index 0000000..0b7141c --- /dev/null +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/mapper/UUserMapper.java @@ -0,0 +1,61 @@ +package org.wfc.user.mapper; + +import java.util.List; +import org.wfc.user.domain.UUser; + +/** + * 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅Mapper鎺ュ彛 + * + * @author wfc + * @date 2024-11-25 + */ +public interface UUserMapper +{ + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userId 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + public UUser selectUUserByUserId(Long userId); + + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅鍒楄〃 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅闆嗗悎 + */ + public List selectUUserList(UUser uUser); + + /** + * 鏂板鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 缁撴灉 + */ + public int insertUUser(UUser uUser); + + /** + * 淇敼鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 缁撴灉 + */ + public int updateUUser(UUser uUser); + + /** + * 鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userId 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteUUserByUserId(Long userId); + + /** + * 鎵归噺鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userIds 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteUUserByUserIds(Long[] userIds); +} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/ISysJobLogService.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/ISysJobLogService.java deleted file mode 100644 index 62a2b49..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/ISysJobLogService.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.wfc.user.service; - -import org.wfc.user.domain.SysJobLog; - -import java.util.List; - -/** - * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -public interface ISysJobLogService -{ - /** - * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 - */ - public List selectJobLogList(SysJobLog jobLog); - - /** - * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * - * @param jobLogId 璋冨害浠诲姟鏃ュ織ID - * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 - */ - public SysJobLog selectJobLogById(Long jobLogId); - - /** - * 鏂板浠诲姟鏃ュ織 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - */ - public void addJobLog(SysJobLog jobLog); - - /** - * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * - * @param logIds 闇瑕佸垹闄ょ殑鏃ュ織ID - * @return 缁撴灉 - */ - public int deleteJobLogByIds(Long[] logIds); - - /** - * 鍒犻櫎浠诲姟鏃ュ織 - * - * @param jobId 璋冨害鏃ュ織ID - * @return 缁撴灉 - */ - public int deleteJobLogById(Long jobId); - - /** - * 娓呯┖浠诲姟鏃ュ織 - */ - public void cleanJobLog(); -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/ISysJobService.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/ISysJobService.java deleted file mode 100644 index e173cdf..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/ISysJobService.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.wfc.user.service; - -import org.wfc.common.core.exception.job.TaskException; -import org.wfc.user.domain.SysJob; - -import java.util.List; - -/** - * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -public interface ISysJobService -{ - /** - * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟 - * - * @param job 璋冨害淇℃伅 - * @return 璋冨害浠诲姟闆嗗悎 - */ - public List selectJobList(SysJob job); - - /** - * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 - * - * @param jobId 璋冨害浠诲姟ID - * @return 璋冨害浠诲姟瀵硅薄淇℃伅 - */ - public SysJob selectJobById(Long jobId); - -} \ No newline at end of file diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserService.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserService.java new file mode 100644 index 0000000..b9a7a51 --- /dev/null +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUUserService.java @@ -0,0 +1,61 @@ +package org.wfc.user.service; + +import java.util.List; +import org.wfc.user.domain.UUser; + +/** + * 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅Service鎺ュ彛 + * + * @author wfc + * @date 2024-11-25 + */ +public interface IUUserService +{ + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userId 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + public UUser selectUUserByUserId(Long userId); + + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅鍒楄〃 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅闆嗗悎 + */ + public List selectUUserList(UUser uUser); + + /** + * 鏂板鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 缁撴灉 + */ + public int insertUUser(UUser uUser); + + /** + * 淇敼鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 缁撴灉 + */ + public int updateUUser(UUser uUser); + + /** + * 鎵归噺鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteUUserByUserIds(Long[] userIds); + + /** + * 鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅淇℃伅 + * + * @param userId 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 缁撴灉 + */ + public int deleteUUserByUserId(Long userId); +} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/SysJobLogServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/SysJobLogServiceImpl.java deleted file mode 100644 index 8cc48fc..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/SysJobLogServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.wfc.user.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.wfc.user.domain.SysJobLog; -import org.wfc.user.mapper.SysJobLogMapper; - -import java.util.List; - -/** - * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -@Service -public class SysJobLogServiceImpl implements ISysJobLogService -{ - @Autowired - private SysJobLogMapper jobLogMapper; - - /** - * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - * @return 璋冨害浠诲姟鏃ュ織闆嗗悎 - */ - @Override - public List selectJobLogList(SysJobLog jobLog) - { - return jobLogMapper.selectJobLogList(jobLog); - } - - /** - * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅 - * - * @param jobLogId 璋冨害浠诲姟鏃ュ織ID - * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅 - */ - @Override - public SysJobLog selectJobLogById(Long jobLogId) - { - return jobLogMapper.selectJobLogById(jobLogId); - } - - /** - * 鏂板浠诲姟鏃ュ織 - * - * @param jobLog 璋冨害鏃ュ織淇℃伅 - */ - @Override - public void addJobLog(SysJobLog jobLog) - { - jobLogMapper.insertJobLog(jobLog); - } - - /** - * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅 - * - * @param logIds 闇瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ - @Override - public int deleteJobLogByIds(Long[] logIds) - { - return jobLogMapper.deleteJobLogByIds(logIds); - } - - /** - * 鍒犻櫎浠诲姟鏃ュ織 - * - * @param jobId 璋冨害鏃ュ織ID - */ - @Override - public int deleteJobLogById(Long jobId) - { - return jobLogMapper.deleteJobLogById(jobId); - } - - /** - * 娓呯┖浠诲姟鏃ュ織 - */ - @Override - public void cleanJobLog() - { - jobLogMapper.cleanJobLog(); - } -} diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/SysJobServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/SysJobServiceImpl.java deleted file mode 100644 index fdf0a32..0000000 --- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/SysJobServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.wfc.user.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.wfc.user.domain.SysJob; -import org.wfc.user.mapper.SysJobMapper; - -import java.util.List; - -/** - * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞 - * - * @author ruoyi - */ -@Service -public class SysJobServiceImpl implements ISysJobService -{ - - @Autowired - private SysJobMapper jobMapper; - - - /** - * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟鍒楄〃 - * - * @param job 璋冨害淇℃伅 - * @return - */ - @Override - public List selectJobList(SysJob job) - { - return jobMapper.selectJobList(job); - } - - /** - * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅 - * - * @param jobId 璋冨害浠诲姟ID - * @return 璋冨害浠诲姟瀵硅薄淇℃伅 - */ - @Override - public SysJob selectJobById(Long jobId) - { - return jobMapper.selectJobById(jobId); - } - - -} \ No newline at end of file diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/UUserServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/UUserServiceImpl.java new file mode 100644 index 0000000..2bef70d --- /dev/null +++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/UUserServiceImpl.java @@ -0,0 +1,96 @@ +package org.wfc.user.service.impl; + +import java.util.List; +import org.wfc.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.wfc.user.mapper.UUserMapper; +import org.wfc.user.domain.UUser; +import org.wfc.user.service.IUUserService; + +/** + * 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅Service涓氬姟灞傚鐞 + * + * @author wfc + * @date 2024-11-25 + */ +@Service +public class UUserServiceImpl implements IUUserService +{ + @Autowired + private UUserMapper uUserMapper; + + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userId 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + @Override + public UUser selectUUserByUserId(Long userId) + { + return uUserMapper.selectUUserByUserId(userId); + } + + /** + * 鏌ヨ鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅鍒楄〃 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + */ + @Override + public List selectUUserList(UUser uUser) + { + return uUserMapper.selectUUserList(uUser); + } + + /** + * 鏂板鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 缁撴灉 + */ + @Override + public int insertUUser(UUser uUser) + { + uUser.setCreateTime(DateUtils.getNowDate()); + return uUserMapper.insertUUser(uUser); + } + + /** + * 淇敼鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param uUser 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * @return 缁撴灉 + */ + @Override + public int updateUUser(UUser uUser) + { + uUser.setUpdateTime(DateUtils.getNowDate()); + return uUserMapper.updateUUser(uUser); + } + + /** + * 鎵归噺鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅 + * + * @param userIds 闇瑕佸垹闄ょ殑鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteUUserByUserIds(Long[] userIds) + { + return uUserMapper.deleteUUserByUserIds(userIds); + } + + /** + * 鍒犻櫎鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅淇℃伅 + * + * @param userId 鐢ㄦ埛骞冲彴_鐢ㄦ埛淇℃伅涓婚敭 + * @return 缁撴灉 + */ + @Override + public int deleteUUserByUserId(Long userId) + { + return uUserMapper.deleteUUserByUserId(userId); + } +} diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/SysJobLogMapper.xml b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/SysJobLogMapper.xml deleted file mode 100644 index d11afdd..0000000 --- a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/SysJobLogMapper.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time - from sys_job_log - - - - - - - - - - delete from sys_job_log where job_log_id = #{jobLogId} - - - - delete from sys_job_log where job_log_id in - - #{jobLogId} - - - - - truncate table sys_job_log - - - - insert into sys_job_log( - job_log_id, - job_name, - job_group, - invoke_target, - job_message, - status, - exception_info, - create_time - )values( - #{jobLogId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{jobMessage}, - #{status}, - #{exceptionInfo}, - sysdate() - ) - - - \ No newline at end of file diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/SysJobMapper.xml b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/SysJobMapper.xml deleted file mode 100644 index da6876b..0000000 --- a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/SysJobMapper.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark - from sys_job - - - - - - - - - - delete from sys_job where job_id = #{jobId} - - - - delete from sys_job where job_id in - - #{jobId} - - - - - update sys_job - - job_name = #{jobName}, - job_group = #{jobGroup}, - invoke_target = #{invokeTarget}, - cron_expression = #{cronExpression}, - misfire_policy = #{misfirePolicy}, - concurrent = #{concurrent}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where job_id = #{jobId} - - - - insert into sys_job( - job_id, - job_name, - job_group, - invoke_target, - cron_expression, - misfire_policy, - concurrent, - status, - remark, - create_by, - create_time - )values( - #{jobId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{cronExpression}, - #{misfirePolicy}, - #{concurrent}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - \ No newline at end of file diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserMapper.xml b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserMapper.xml new file mode 100644 index 0000000..8172bfb --- /dev/null +++ b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UUserMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select user_id, user_name, nick_name, age, sex, email, phone, address, password, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark from u_user + + + + + + + + insert into u_user + + user_name, + nick_name, + age, + sex, + email, + phone, + address, + password, + status, + del_flag, + login_ip, + login_date, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{userName}, + #{nickName}, + #{age}, + #{sex}, + #{email}, + #{phone}, + #{address}, + #{password}, + #{status}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update u_user + + user_name = #{userName}, + nick_name = #{nickName}, + age = #{age}, + sex = #{sex}, + email = #{email}, + phone = #{phone}, + address = #{address}, + password = #{password}, + status = #{status}, + del_flag = #{delFlag}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where user_id = #{userId} + + + + delete from u_user where user_id = #{userId} + + + + delete from u_user where user_id in + + #{userId} + + + \ No newline at end of file diff --git a/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/domain/CreditCard.java b/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/domain/CreditCard.java index 1023f56..cb3a6d9 100644 --- a/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/domain/CreditCard.java +++ b/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/domain/CreditCard.java @@ -11,7 +11,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 鍙傛暟閰嶇疆琛 sys_config * - * @author ruoyi + * @author wfc */ public class CreditCard extends BaseEntity { diff --git a/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/service/impl/CreditCardServiceImpl.java b/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/service/impl/CreditCardServiceImpl.java index 64e0add..cefbf52 100644 --- a/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/service/impl/CreditCardServiceImpl.java +++ b/wfc-modules/wfc-pay/src/main/java/org/wfc/pay/service/impl/CreditCardServiceImpl.java @@ -18,7 +18,7 @@ import org.wfc.pay.service.ICreditCardService; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜 * - * @author ruoyi + * @author wfc */ @Service public class CreditCardServiceImpl implements ICreditCardService diff --git a/wfc-modules/wfc-system/pom.xml b/wfc-modules/wfc-system/pom.xml index bf90122..6c4eb85 100644 --- a/wfc-modules/wfc-system/pom.xml +++ b/wfc-modules/wfc-system/pom.xml @@ -47,25 +47,25 @@ mysql-connector-j - + org.wfc wfc-common-datasource - + org.wfc wfc-common-datascope - + org.wfc wfc-common-log - + org.wfc wfc-common-swagger diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/WfcSystemApplication.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/WfcSystemApplication.java index a0bb184..d828626 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/WfcSystemApplication.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/WfcSystemApplication.java @@ -8,7 +8,7 @@ import org.wfc.common.security.annotation.EnableRyFeignClients; /** * 绯荤粺妯″潡 * - * @author ruoyi + * @author wfc */ @EnableCustomConfig @EnableRyFeignClients diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java index 4590148..d8f155b 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java @@ -26,7 +26,7 @@ import org.wfc.system.service.ISysConfigService; /** * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/config") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDeptController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDeptController.java index 362af15..79f4031 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDeptController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDeptController.java @@ -21,7 +21,7 @@ import java.util.List; /** * 閮ㄩ棬淇℃伅 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/dept") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictDataController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictDataController.java index 1f59b89..f804d97 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictDataController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictDataController.java @@ -29,7 +29,7 @@ import org.wfc.system.service.ISysDictTypeService; /** * 鏁版嵁瀛楀吀淇℃伅 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/dict/data") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictTypeController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictTypeController.java index 04aae5e..e7dbd88 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictTypeController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysDictTypeController.java @@ -26,7 +26,7 @@ import org.wfc.system.service.ISysDictTypeService; /** * 鏁版嵁瀛楀吀淇℃伅 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/dict/type") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysLogininforController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysLogininforController.java index 48b4afa..a93873e 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysLogininforController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysLogininforController.java @@ -26,7 +26,7 @@ import org.wfc.system.service.ISysLogininforService; /** * 绯荤粺璁块棶璁板綍 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/logininfor") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysMenuController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysMenuController.java index aa310a1..6a137d9 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysMenuController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysMenuController.java @@ -24,7 +24,7 @@ import java.util.Map; /** * 鑿滃崟淇℃伅 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/menu") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysNoticeController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysNoticeController.java index 4eec7d0..f1b1285 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysNoticeController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysNoticeController.java @@ -24,7 +24,7 @@ import org.wfc.system.service.ISysNoticeService; /** * 鍏憡 淇℃伅鎿嶄綔澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/notice") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysOperlogController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysOperlogController.java index 58b2c15..1d7cc0c 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysOperlogController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysOperlogController.java @@ -24,7 +24,7 @@ import org.wfc.system.service.ISysOperLogService; /** * 鎿嶄綔鏃ュ織璁板綍 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/operlog") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysPostController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysPostController.java index 0001652..6b18b0b 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysPostController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysPostController.java @@ -26,7 +26,7 @@ import org.wfc.system.service.ISysPostService; /** * 宀椾綅淇℃伅鎿嶄綔澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/post") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysProfileController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysProfileController.java index 3a49074..2888f96 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysProfileController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysProfileController.java @@ -29,7 +29,7 @@ import org.wfc.system.service.ISysUserService; /** * 涓汉淇℃伅 涓氬姟澶勭悊 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/user/profile") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysRoleController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysRoleController.java index e4b8fa5..61d37fe 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysRoleController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysRoleController.java @@ -31,7 +31,7 @@ import org.wfc.system.service.ISysUserService; /** * 瑙掕壊淇℃伅 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/role") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserController.java index b012a35..414ff85 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserController.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; /** * 鐢ㄦ埛淇℃伅 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/user") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserOnlineController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserOnlineController.java index 3199466..e0912f6 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserOnlineController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserOnlineController.java @@ -26,7 +26,7 @@ import org.wfc.system.service.ISysUserOnlineService; /** * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶 * - * @author ruoyi + * @author wfc */ @RestController @RequestMapping("/online") diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysConfig.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysConfig.java index 735a6c3..7ee1165 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysConfig.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysConfig.java @@ -11,7 +11,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 鍙傛暟閰嶇疆琛 sys_config * - * @author ruoyi + * @author wfc */ public class SysConfig extends BaseEntity { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysMenu.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysMenu.java index 1c33c64..8e31ea0 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysMenu.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysMenu.java @@ -12,7 +12,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 鑿滃崟鏉冮檺琛 sys_menu * - * @author ruoyi + * @author wfc */ public class SysMenu extends BaseEntity { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysNotice.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysNotice.java index e58cffa..292f6cc 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysNotice.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysNotice.java @@ -10,7 +10,7 @@ import org.wfc.common.core.xss.Xss; /** * 閫氱煡鍏憡琛 sys_notice * - * @author ruoyi + * @author wfc */ public class SysNotice extends BaseEntity { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysPost.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysPost.java index c8ed441..7075cf6 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysPost.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysPost.java @@ -12,7 +12,7 @@ import org.wfc.common.core.web.domain.BaseEntity; /** * 宀椾綅琛 sys_post * - * @author ruoyi + * @author wfc */ public class SysPost extends BaseEntity { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleDept.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleDept.java index 77f4b9a..d7657ca 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleDept.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleDept.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 瑙掕壊鍜岄儴闂ㄥ叧鑱 sys_role_dept * - * @author ruoyi + * @author wfc */ public class SysRoleDept { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleMenu.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleMenu.java index 2d54556..0ca1f5c 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleMenu.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRoleMenu.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 瑙掕壊鍜岃彍鍗曞叧鑱 sys_role_menu * - * @author ruoyi + * @author wfc */ public class SysRoleMenu { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserOnline.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserOnline.java index d7e7152..5b5820b 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserOnline.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserOnline.java @@ -3,7 +3,7 @@ package org.wfc.system.domain; /** * 褰撳墠鍦ㄧ嚎浼氳瘽 * - * @author ruoyi + * @author wfc */ public class SysUserOnline { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserPost.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserPost.java index 5a77691..6f60034 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserPost.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserPost.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 鐢ㄦ埛鍜屽矖浣嶅叧鑱 sys_user_post * - * @author ruoyi + * @author wfc */ public class SysUserPost { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserRole.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserRole.java index 27b600b..a662f91 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserRole.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysUserRole.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 鐢ㄦ埛鍜岃鑹插叧鑱 sys_user_role * - * @author ruoyi + * @author wfc */ public class SysUserRole { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/MetaVo.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/MetaVo.java index 8d98048..2f40348 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/MetaVo.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/MetaVo.java @@ -5,7 +5,7 @@ import org.wfc.common.core.utils.StringUtils; /** * 璺敱鏄剧ず淇℃伅 * - * @author ruoyi + * @author wfc */ public class MetaVo { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/RouterVo.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/RouterVo.java index 4ef0c76..e54b164 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/RouterVo.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/RouterVo.java @@ -6,7 +6,7 @@ import java.util.List; /** * 璺敱閰嶇疆淇℃伅 * - * @author ruoyi + * @author wfc */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/TreeSelect.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/TreeSelect.java index ffd79af..4d1f25f 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/TreeSelect.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/TreeSelect.java @@ -10,7 +10,7 @@ import org.wfc.system.domain.SysMenu; /** * Treeselect鏍戠粨鏋勫疄浣撶被 * - * @author ruoyi + * @author wfc */ public class TreeSelect implements Serializable { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysConfigMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysConfigMapper.java index e38c7c5..3d9e5cd 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysConfigMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysConfigMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysConfig; /** * 鍙傛暟閰嶇疆 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysConfigMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDeptMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDeptMapper.java index accda1b..9a0b9ea 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDeptMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDeptMapper.java @@ -7,7 +7,7 @@ import org.wfc.system.api.domain.SysDept; /** * 閮ㄩ棬绠＄悊 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysDeptMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictDataMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictDataMapper.java index 9ba744d..dacd0b7 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictDataMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictDataMapper.java @@ -7,7 +7,7 @@ import org.wfc.system.api.domain.SysDictData; /** * 瀛楀吀琛 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysDictDataMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictTypeMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictTypeMapper.java index 5878082..82608e4 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictTypeMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysDictTypeMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysDictType; /** * 瀛楀吀琛 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysDictTypeMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysLogininforMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysLogininforMapper.java index 297f90b..f4406a6 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysLogininforMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysLogininforMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysLogininfor; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysLogininforMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysMenuMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysMenuMapper.java index 94a934f..1f7ab82 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysMenuMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysMenuMapper.java @@ -7,7 +7,7 @@ import org.wfc.system.domain.SysMenu; /** * 鑿滃崟琛 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysMenuMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysNoticeMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysNoticeMapper.java index 11df423..88eee4d 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysNoticeMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysNoticeMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysNotice; /** * 閫氱煡鍏憡琛 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysNoticeMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysOperLogMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysOperLogMapper.java index e90b05d..4ac572d 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysOperLogMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysOperLogMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysOperLog; /** * 鎿嶄綔鏃ュ織 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysOperLogMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysPostMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysPostMapper.java index fb8a40c..a2733a6 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysPostMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysPostMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysPost; /** * 宀椾綅淇℃伅 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysPostMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleDeptMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleDeptMapper.java index b757d30..1bba4a5 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleDeptMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleDeptMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysRoleDept; /** * 瑙掕壊涓庨儴闂ㄥ叧鑱旇〃 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysRoleDeptMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMapper.java index d58a385..4515fd8 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysRole; /** * 瑙掕壊琛 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysRoleMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMenuMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMenuMapper.java index d3ea935..9ff0f07 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMenuMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRoleMenuMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysRoleMenu; /** * 瑙掕壊涓庤彍鍗曞叧鑱旇〃 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysRoleMenuMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserMapper.java index 6494e00..7967395 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserMapper.java @@ -7,7 +7,7 @@ import org.wfc.system.api.domain.SysUser; /** * 鐢ㄦ埛琛 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysUserMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserPostMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserPostMapper.java index 489c6e8..7374773 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserPostMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserPostMapper.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysUserPost; /** * 鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysUserPostMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserRoleMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserRoleMapper.java index 626414b..340dae2 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserRoleMapper.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysUserRoleMapper.java @@ -7,7 +7,7 @@ import org.wfc.system.domain.SysUserRole; /** * 鐢ㄦ埛涓庤鑹插叧鑱旇〃 鏁版嵁灞 * - * @author ruoyi + * @author wfc */ public interface SysUserRoleMapper { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysConfigService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysConfigService.java index cb97071..b67e8cf 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysConfigService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysConfigService.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysConfig; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysConfigService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDeptService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDeptService.java index 8b4af86..4651bac 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDeptService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDeptService.java @@ -7,7 +7,7 @@ import org.wfc.system.domain.vo.TreeSelect; /** * 閮ㄩ棬绠＄悊 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysDeptService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictDataService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictDataService.java index 254dbc5..4ee2385 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictDataService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictDataService.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysDictData; /** * 瀛楀吀 涓氬姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysDictDataService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictTypeService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictTypeService.java index e9675cc..cc8198b 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictTypeService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysDictTypeService.java @@ -7,7 +7,7 @@ import org.wfc.system.api.domain.SysDictType; /** * 瀛楀吀 涓氬姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysDictTypeService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysLogininforService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysLogininforService.java index c816c49..ebd4230 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysLogininforService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysLogininforService.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysLogininfor; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysLogininforService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysMenuService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysMenuService.java index 1d24fe8..acbd35e 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysMenuService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysMenuService.java @@ -9,7 +9,7 @@ import org.wfc.system.domain.vo.TreeSelect; /** * 鑿滃崟 涓氬姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysMenuService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysNoticeService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysNoticeService.java index cdb4b61..16cd3ba 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysNoticeService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysNoticeService.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysNotice; /** * 鍏憡 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysNoticeService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysOperLogService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysOperLogService.java index 874b783..3cfd7b6 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysOperLogService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysOperLogService.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysOperLog; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysOperLogService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPermissionService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPermissionService.java index 560e753..77a06f6 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPermissionService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPermissionService.java @@ -7,7 +7,7 @@ import org.wfc.system.api.domain.SysUser; /** * 鏉冮檺淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysPermissionService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPostService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPostService.java index f96fb6d..1fa21c1 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPostService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPostService.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysPost; /** * 宀椾綅淇℃伅 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysPostService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysRoleService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysRoleService.java index 97c2176..d1918f9 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysRoleService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysRoleService.java @@ -8,7 +8,7 @@ import org.wfc.system.domain.SysUserRole; /** * 瑙掕壊涓氬姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysRoleService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserOnlineService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserOnlineService.java index 90f281d..a8b8780 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserOnlineService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserOnlineService.java @@ -6,7 +6,7 @@ import org.wfc.system.domain.SysUserOnline; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysUserOnlineService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserService.java index 4452258..ff47f4a 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserService.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserService.java @@ -6,7 +6,7 @@ import org.wfc.system.api.domain.SysUser; /** * 鐢ㄦ埛 涓氬姟灞 * - * @author ruoyi + * @author wfc */ public interface ISysUserService { diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysConfigServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysConfigServiceImpl.java index a4adf5a..2b4c4b5 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysConfigServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysConfigServiceImpl.java @@ -18,7 +18,7 @@ import org.wfc.system.service.ISysConfigService; /** * 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜 * - * @author ruoyi + * @author wfc */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeptServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeptServiceImpl.java index a5fa1d2..8f5a28d 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeptServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDeptServiceImpl.java @@ -24,7 +24,7 @@ import org.wfc.system.service.ISysDeptService; /** * 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇 * - * @author ruoyi + * @author wfc */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictDataServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictDataServiceImpl.java index 14ff0bc..5f0a3a8 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictDataServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictDataServiceImpl.java @@ -11,7 +11,7 @@ import org.wfc.system.service.ISysDictDataService; /** * 瀛楀吀 涓氬姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictTypeServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictTypeServiceImpl.java index d3220a4..50fb50f 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictTypeServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictTypeServiceImpl.java @@ -21,7 +21,7 @@ import org.wfc.system.service.ISysDictTypeService; /** * 瀛楀吀 涓氬姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysLogininforServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysLogininforServiceImpl.java index 64f3c73..9f9d618 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysLogininforServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysLogininforServiceImpl.java @@ -10,7 +10,7 @@ import org.wfc.system.service.ISysLogininforService; /** * 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysMenuServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysMenuServiceImpl.java index 31f46b1..4882f5f 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysMenuServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysMenuServiceImpl.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * 鑿滃崟 涓氬姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysNoticeServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysNoticeServiceImpl.java index b9a6d2a..f3571e1 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysNoticeServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysNoticeServiceImpl.java @@ -10,7 +10,7 @@ import org.wfc.system.service.ISysNoticeService; /** * 鍏憡 鏈嶅姟灞傚疄鐜 * - * @author ruoyi + * @author wfc */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysOperLogServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysOperLogServiceImpl.java index 3fa5ac8..59f3a27 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysOperLogServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysOperLogServiceImpl.java @@ -10,7 +10,7 @@ import org.wfc.system.service.ISysOperLogService; /** * 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPermissionServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPermissionServiceImpl.java index bd38fae..3457220 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPermissionServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPermissionServiceImpl.java @@ -17,7 +17,7 @@ import org.wfc.system.service.ISysRoleService; /** * 鐢ㄦ埛鏉冮檺澶勭悊 * - * @author ruoyi + * @author wfc */ @Service public class SysPermissionServiceImpl implements ISysPermissionService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPostServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPostServiceImpl.java index 76cefd4..25aca6a 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPostServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPostServiceImpl.java @@ -14,7 +14,7 @@ import org.wfc.system.service.ISysPostService; /** * 宀椾綅淇℃伅 鏈嶅姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysRoleServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysRoleServiceImpl.java index 08d3927..62bcc69 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysRoleServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysRoleServiceImpl.java @@ -28,7 +28,7 @@ import org.wfc.system.service.ISysRoleService; /** * 瑙掕壊 涓氬姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserOnlineServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserOnlineServiceImpl.java index 72280dc..8b4bdde 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserOnlineServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserOnlineServiceImpl.java @@ -9,7 +9,7 @@ import org.wfc.system.service.ISysUserOnlineService; /** * 鍦ㄧ嚎鐢ㄦ埛 鏈嶅姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserServiceImpl.java index 8c7ce02..057d03e 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserServiceImpl.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserServiceImpl.java @@ -34,7 +34,7 @@ import org.wfc.system.service.ISysUserService; /** * 鐢ㄦ埛 涓氬姟灞傚鐞 * - * @author ruoyi + * @author wfc */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java b/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java index 6d08665..0863687 100644 --- a/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java +++ b/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java @@ -7,7 +7,7 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer; /** * 鐩戞帶涓績 * - * @author ruoyi + * @author wfc */ @EnableAdminServer @SpringBootApplication diff --git a/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java b/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java index da15383..5a8839b 100644 --- a/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java +++ b/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java @@ -10,7 +10,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * 鐩戞帶鏉冮檺閰嶇疆 * - * @author ruoyi + * @author wfc */ @EnableWebSecurity public class WebSecurityConfigurer