【优化】 优化及代码格式化

zd-auth/pom.xml

@@ -24,12 +24,6 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 
-        <!-- SpringCloud Alibaba Sentinel -->
-        <!--<dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>-->
-
         <!-- zd Common Security-->
         <dependency>
             <groupId>com.zd.core</groupId>

zd-auth/src/main/java/com/zd/auth/controller/TokenController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -55,7 +56,7 @@ public class TokenController {
     @Autowired
     private RemoteStockService stockService;
     @Resource
-    private RedisTemplate<String,String> redisTemplate;
+    private RedisTemplate<String, String> redisTemplate;
 
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form) {
@@ -63,19 +64,19 @@ public class TokenController {
         String authType = form.getAuthType() == null ? BaseConstants.GRANT_TYPE_PASSWORD : form.getAuthType();
         LoginUser userInfo;
         if (Objects.equals(authType, BaseConstants.GRANT_TYPE_MOBILE)) {
-            String key = BaseConstants.DEFAULT_CODE_KEY +  BaseConstants.GRANT_TYPE_MOBILE + "@" + form.getUsername();
+            String key = BaseConstants.DEFAULT_CODE_KEY + BaseConstants.GRANT_TYPE_MOBILE + "@" + form.getUsername();
             String code = redisTemplate.opsForValue().get(key);
-            if (form.getPassword().equals(code)){
+            if (form.getPassword().equals(code)) {
                 R<LoginUser> userR = remoteUserService.getUserInfo(form.getUsername(), SecurityConstants.INNER);
-                if (userR.getCode()== HttpStatus.SUCCESS &&userR.getData()!=null){
-                    userInfo=userR.getData();
-                }else {
+                if (userR.getCode() == HttpStatus.SUCCESS && userR.getData() != null) {
+                    userInfo = userR.getData();
+                } else {
                     throw new ServiceException("系统异常");
                 }
-            }else {
-                throw new ServiceException("验证码不正确",503);
+            } else {
+                throw new ServiceException("验证码不正确", 503);
             }
-        }else {
+        } else {
             userInfo = sysLoginService.login(form.getUsername(), UserConstants.USER_LOGIN_PC, form.getPassword());
         }
         userInfo.setLoginType(UserConstants.USER_LOGIN_PC);
@@ -93,10 +94,8 @@ public class TokenController {
         // 区分大屏用户
         // 查询大屏链接
         AjaxResult result = remoteUserService.getRouters(userInfo.getUserid());
-
         try {
             List<Map<String, Object>> routers = (List<Map<String, Object>>) result.get("data");
-
             Map<String, Object> dataMenu = routers.stream().filter(
                     a -> "https://www.sxitdlc.com".equals(a.get("path") + "")).findFirst().orElse(null);
             if (dataMenu != null) {
@@ -147,7 +146,6 @@ public class TokenController {
         LoginUser loginUser = new LoginUser();
         BeanUtils.copyProperties(userInfo, loginUser);
         loginUser.setToken(token);
-
         redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, loginUser);
     }
 
@@ -171,25 +169,25 @@ public class TokenController {
     public R<?> send(@RequestBody LoginBody form) {
         String username = form.getUsername();
         R<LoginUser> userR = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
-        if (userR.getCode()!=HttpStatus.SUCCESS || userR.getData()==null){
-            throw new ServiceException("登录用户：" + username + " 不存在",530);
+        if (userR.getCode() != HttpStatus.SUCCESS || userR.getData() == null) {
+            throw new ServiceException("登录用户：" + username + " 不存在", 530);
         }
-        String key = BaseConstants.DEFAULT_CODE_KEY +  BaseConstants.GRANT_TYPE_MOBILE + "@" + username;
+        String key = BaseConstants.DEFAULT_CODE_KEY + BaseConstants.GRANT_TYPE_MOBILE + "@" + username;
         String code = RandomUtil.randomNumbers(6);
-        redisTemplate.opsForValue().set(key,code,CODE_EXPIRATION,TimeUnit.MINUTES);
-        logger.info("========================>{}<=========================",code);
-        String countKey = BaseConstants.DEFAULT_CODE_KEY + "@" + username+"_COUNT";
+        redisTemplate.opsForValue().set(key, code, CODE_EXPIRATION, TimeUnit.MINUTES);
+        logger.info("========================>{}<=========================", code);
+        String countKey = BaseConstants.DEFAULT_CODE_KEY + "@" + username + "_COUNT";
         String count = redisTemplate.opsForValue().get(countKey);
-        if (StringUtils.isEmpty(count)){
-            redisTemplate.opsForValue().set(countKey,"1",60,TimeUnit.MINUTES);
-        }else {
-            if (count!=null){
-                int i=Integer.parseInt(count);
-                if (i>=5){
-                    throw new ServiceException("验证码发送超过限制，请一小时后再试",530);
+        if (StringUtils.isEmpty(count)) {
+            redisTemplate.opsForValue().set(countKey, "1", 60, TimeUnit.MINUTES);
+        } else {
+            if (count != null) {
+                int i = Integer.parseInt(count);
+                if (i >= 5) {
+                    throw new ServiceException("验证码发送超过限制，请一小时后再试", 530);
                 }
                 i++;
-                redisTemplate.opsForValue().set(countKey,i+"",60,TimeUnit.MINUTES);
+                redisTemplate.opsForValue().set(countKey, i + "", 60, TimeUnit.MINUTES);
             }
         }
         return stockService.sendSydSms(code, 2, null, form.getUsername());
@@ -203,13 +201,10 @@ public class TokenController {
     @PostMapping("/learn/login")
     public R<?> learnLogin(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         int type = org.apache.commons.lang3.StringUtils.isNotBlank((String) params.get("type")) ? Integer.parseInt((String) params.get("type")) : 1;
-
         String machineCode = params.get("machineCode") == null ? "" : (String) params.get("machineCode");
         // 用户登录
         String username = (String) params.get("userName");
-
         int aioType = params.get("aioType") == null ? UserConstants.USER_LOGIN_AIO : Integer.parseInt(params.get("aioType") + "");
-
         logger.error("学习机登录，加密前：" + username + "，设备编码：" + machineCode);
         if (UserConstants.USER_LOGIN_HXP == aioType) {
             // TODO 终端传参数据有问题，暂临时后端处理
@@ -229,32 +224,24 @@ public class TokenController {
                 return R.fail("无效卡号或未绑定用户，请联系管理员！");
             }
         }
-
         R<SysUser> user = remoteUserService.getUserInfoByCardNum(username, SecurityConstants.INNER);
-
         if (R.FAIL == user.getCode()) {
             throw new ServiceException(user.getMsg());
         }
         if (StringUtils.isNull(user.getData())) {
             return R.fail("登录用户不存在！");
         }
-
-
         R<LoginUser> userResult = remoteUserService.getUserInfo(user.getData().getUserName(), aioType, SecurityConstants.INNER);
-
         if (R.FAIL == userResult.getCode() || 503 == userResult.getCode()) {
             return R.fail(userResult.getMsg());
         }
-
         if (userResult.getData() != null) {
-
             LoginUser userInfo = userResult.getData();
             userInfo.setLoginType(aioType);
             userInfo.setMachineCode(machineCode);
             if (userInfo.getSysUser() == null) {
                 return R.fail("登录用户不存在！");
             }
-
             Map<String, Object> map = null;
             if (type == 1) {
                 // 获取登录token
@@ -266,9 +253,7 @@ public class TokenController {
                     // 删除用户缓存记录
                     tokenService.delLoginUser(loginUser.getToken());
                 }
-
                 map = tokenService.createToken(userInfo);
-
                 if (UserConstants.USER_LOGIN_HXP == aioType) {
                     map.put("positionName", userInfo.getSysUser().getPositionName());
                     map.put("cabinetLock", userInfo.isCabinetLock());
@@ -284,12 +269,10 @@ public class TokenController {
                     redisService.setCacheObject(CacheConstants.LEARN_USER_KEY + userInfo.getSysUser().getUserId(), userInfo, BaseConstants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
                 }
             }
-
             return R.ok(map);
         } else {
             return R.fail("登录用户不存在！");
         }
-
     }
 
     /**
@@ -297,7 +280,6 @@ public class TokenController {
      */
     @PostMapping("/learn/loginOut")
     public R<?> learnLoginOut(HttpServletRequest request) {
-
         LoginUser loginUser = tokenService.getLoginUser(request);
         if (StringUtils.isNotNull(loginUser)) {
             SysUser user = loginUser.getSysUser();

zd-auth/src/main/java/com/zd/auth/service/SysLoginService.java

@@ -41,48 +41,45 @@ public class SysLoginService {
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username, password)) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
-            throw new ServiceException("用户/密码必须填写",530);
+            throw new ServiceException("用户/密码必须填写", 530);
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
-            throw new ServiceException("用户密码不在指定范围",530);
+            throw new ServiceException("用户密码不在指定范围", 530);
         }
         // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                 || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
-            throw new ServiceException("用户名不在指定范围",530);
+            throw new ServiceException("用户名不在指定范围", 530);
         }
         // 查询用户信息
         R<LoginUser> userResult = remoteUserService.getUserInfo(username, loginType, SecurityConstants.INNER);
-
         if (R.FAIL == userResult.getCode()) {
             throw new ServiceException(userResult.getMsg());
         }
-
-        if(HttpStatus.FORBIDDEN == userResult.getCode()){
+        if (HttpStatus.FORBIDDEN == userResult.getCode()) {
             throw new PreAuthorizeException();
         }
-
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new ServiceException("登录用户：" + username + " 不存在",530);
+            throw new ServiceException("登录用户：" + username + " 不存在", 530);
         }
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除",530);
+            throw new ServiceException("对不起，您的账号：" + username + " 已被删除", 530);
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用",530);
+            throw new ServiceException("对不起，您的账号：" + username + " 已停用", 530);
         }
         if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
 //            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
-            throw new ServiceException("用户不存在/密码错误",530);
+            throw new ServiceException("用户不存在/密码错误", 530);
         }
         recordLogininfor(user, BaseConstants.LOGIN_SUCCESS, "登录成功");
         return userInfo;
@@ -115,7 +112,6 @@ public class SysLoginService {
         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());
         }
@@ -125,9 +121,9 @@ public class SysLoginService {
     /**
      * 记录登录信息
      *
-     * @param user 用户名
-     * @param status   状态
-     * @param message  消息内容
+     * @param user    用户名
+     * @param status  状态
+     * @param message 消息内容
      * @return
      */
     public void recordLogininfor(SysUser user, String status, String message) {

zd-common/common-core/src/main/java/com/zd/common/core/annotation/DeviceID.java

@@ -13,7 +13,4 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface DeviceID {
-
-
-
 }

zd-common/common-core/src/main/java/com/zd/common/core/annotation/FunctionMapper.java

@@ -37,6 +37,4 @@ public @interface FunctionMapper {
      */
     String unit()  default "";
 
-
-    
 }

zd-common/common-core/src/main/java/com/zd/common/core/annotation/Log.java

@@ -17,20 +17,20 @@ public @interface Log {
     /**
      * 模块
      */
-    public String title() default "";
+    String title() default "";
 
     /**
      * 功能
      */
-    public BusinessType businessType() default BusinessType.OTHER;
+    BusinessType businessType() default BusinessType.OTHER;
 
     /**
      * 操作人类别
      */
-    public OperatorType operatorType() default OperatorType.MANAGE;
+    OperatorType operatorType() default OperatorType.MANAGE;
 
     /**
      * 是否保存请求的参数
      */
-    public boolean isSaveRequestData() default true;
+    boolean isSaveRequestData() default true;
 }

zd-common/common-core/src/main/java/com/zd/common/core/annotation/PreAuthorize.java

@@ -16,30 +16,30 @@ public @interface PreAuthorize {
     /**
      * 验证用户是否具备某权限
      */
-    public String hasPermi() default "";
+    String hasPermi() default "";
 
     /**
      * 验证用户是否不具备某权限，与 hasPermi逻辑相反
      */
-    public String lacksPermi() default "";
+    String lacksPermi() default "";
 
     /**
      * 验证用户是否具有以下任意一个权限
      */
-    public String[] hasAnyPermi() default {};
+    String[] hasAnyPermi() default {};
 
     /**
      * 判断用户是否拥有某个角色
      */
-    public String hasRole() default "";
+    String hasRole() default "";
 
     /**
      * 验证用户是否不具备某角色，与 isRole逻辑相反
      */
-    public String lacksRole() default "";
+    String lacksRole() default "";
 
     /**
      * 验证用户是否具有以下任意一个角色
      */
-    public String[] hasAnyRoles() default {};
+    String[] hasAnyRoles() default {};
 }

zd-common/common-core/src/main/java/com/zd/common/core/datascope/DataScopeAspect.java

@@ -242,6 +242,5 @@ public class DataScopeAspect {
                 baseEntity.getParams().put(DATA_SCOPE, "");
             }
         }
-
     }
 }

zd-common/common-core/src/main/java/com/zd/common/core/security/TokenService.java

@@ -14,56 +14,56 @@ public interface TokenService {
     /**
      * 创建令牌
      */
-    public Map<String, Object> createToken(LoginUser loginUser);
+    Map<String, Object> createToken(LoginUser loginUser);
 
     /**
      * 创建令牌
      */
-    public Map<String, Object> createProgramToken(LoginUser loginUser);
+    Map<String, Object> createProgramToken(LoginUser loginUser);
 
     /**
      * 获取用户身份信息
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser();
+    LoginUser getLoginUser();
 
     /**
      * 获取用户身份信息
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(HttpServletRequest request);
+    LoginUser getLoginUser(HttpServletRequest request);
 
     /**
      * 获取用户身份信息
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(String token);
+    LoginUser getLoginUser(String token);
 
     /**
      * 设置用户身份信息
      */
-    public void setLoginUser(LoginUser loginUser);
+    void setLoginUser(LoginUser loginUser);
 
     /**
      * delLoginUser
      * @param token
      */
-    public void delLoginUser(String token);
+    void delLoginUser(String token);
 
     /**
      * 刷新令牌有效期
      *
      * @param loginUser 登录信息
      */
-    public void refreshToken(LoginUser loginUser);
+    void refreshToken(LoginUser loginUser);
 
     /**
      * 刷新令牌有效期
      *
      * @param token token
      */
-    public void refreshToken(String token);
+    void refreshToken(String token);
 }

zd-common/common-core/src/main/java/com/zd/common/core/security/TokenServiceImpl.java

@@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class TokenServiceImpl implements TokenService {
 
-    //@Autowired
-    //private RedisService redisService;
     @Autowired
     private RedisTemplate redisTemplate;
 

zd-gateway/src/main/java/com/zd/gateway/ZdGatewayApplication.java

@@ -43,6 +43,5 @@ public class ZdGatewayApplication {
         } catch (UnknownHostException e) {
             e.printStackTrace();
         }
-
     }
 }

zd-gateway/src/main/java/com/zd/gateway/filter/BlackListUrlFilter.java

@@ -54,5 +54,4 @@ public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUr
             });
         }
     }
-
 }

zd-gateway/src/main/java/com/zd/gateway/handler/GatewayExceptionHandler.java

@@ -25,13 +25,10 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
     @Override
     public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
         ServerHttpResponse response = exchange.getResponse();
-
         if (exchange.getResponse().isCommitted()) {
             return Mono.error(ex);
         }
-
         String msg;
-
         if (ex instanceof NotFoundException) {
             msg = "服务未找到";
         } else if (ex instanceof ResponseStatusException) {
@@ -40,9 +37,7 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
         } else {
             msg = "内部服务器错误";
         }
-
         log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage());
-
         return ServletUtils.webFluxResponseWriter(response, msg);
     }
 }

zd-gateway/src/main/java/com/zd/gateway/service/ValidateCodeService.java

@@ -13,10 +13,10 @@ public interface ValidateCodeService {
     /**
      * 生成验证码
      */
-    public AjaxResult createCapcha() throws IOException, CaptchaException;
+    AjaxResult createCapcha() throws IOException, CaptchaException;
 
     /**
      * 校验验证码
      */
-    public void checkCapcha(String key, String value) throws CaptchaException;
+    void checkCapcha(String key, String value) throws CaptchaException;
 }

zd-gateway/src/main/java/com/zd/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -55,14 +55,11 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         if (!captchaOnOff) {
             return ajax;
         }
-
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();
         String verifyKey = BaseConstants.CAPTCHA_CODE_KEY + uuid;
-
         String capStr = null, code = null;
         BufferedImage image = null;
-
         String captchaType = captchaProperties.getType();
         // 生成验证码
         if ("math".equals(captchaType)) {
@@ -83,7 +80,6 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         } catch (IOException e) {
             return AjaxResult.error(e.getMessage());
         }
-
         ajax.put("uuid", uuid);
         ajax.put("img", Base64.encode(os.toByteArray()));
         return ajax;