去掉前后端websocket心跳检测以及自动检测用户退出机制，去掉所有前端访问业务时LicenseKey的校验

console/pom.xml

@@ -218,10 +218,10 @@
             <artifactId>fastjson2</artifactId>
             <version>2.0.23</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
     <build>
         <finalName>ssi</finalName>

console/src/main/java/com/jiayue/ssi/SsiApplication.java → console/src/main/java/com/jiayue/ssi/CenterForecastApplication.java

@@ -15,8 +15,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 @MapperScan("com.jiayue.ssi.mapper")
 //@EnableEncryptableProperties
-public class SsiApplication {
+public class CenterForecastApplication {
     public static void main(String[] args) {
-        SpringApplication.run(SsiApplication.class, args);
+        SpringApplication.run(CenterForecastApplication.class, args);
     }
 }

console/src/main/java/com/jiayue/ssi/aspectj/PreventReplayAspect.java

@@ -32,37 +32,33 @@ public class PreventReplayAspect {
 
     @Around("replayAspect()")
     public ResponseVO doAround(ProceedingJoinPoint pjp) throws Throwable {
-        try {
-            // 获取request
-            HttpServletRequest request = ServletUtils.getRequest();
-            // 时间戳
-            String sysTime = request.getParameter("sysTime");
-            long sj = System.currentTimeMillis() - Long.parseLong(sysTime);
-            // 判断客户端的时间是否超过60秒
-            if (sj / 1000 >= 60) {
-                // 超过60秒视为无效请求
-                ResponseInfo.doResponse(ServletUtils.getResponse(), "本次请求时间戳无效！", 406);
-                return null;
-//                log.error(request.getRemoteAddr() + "本次请求时间戳无效");
-//                return ResponseVO.fail("本次请求时间戳无效");
-            }
-            String lk = request.getParameter("lk");
-            Object islk = LocalCache.get(lk);
-            // 校验服务端授权码
-            if (islk == null || "".equals(islk)) {
-                // 记录用户失败日志
-                ResponseInfo.doResponse(ServletUtils.getResponse(), "本次请求时间戳无效！", 406);
-                return null;
-//                log.error(request.getRemoteAddr() + "本次请求授权码无效");
-//                return ResponseVO.fail("本次请求授权码无效");
-            } else {
-                // 清除本地授权码存储
-                LocalCache.remove(lk);
-            }
-        }
-        catch (Exception e) {
-            return ResponseVO.fail("防重放解析失败,不能操作！");
-        }
+//        try {
+//            // 获取request
+//            HttpServletRequest request = ServletUtils.getRequest();
+//            // 时间戳
+//            String sysTime = request.getParameter("sysTime");
+//            long sj = System.currentTimeMillis() - Long.parseLong(sysTime);
+//            // 判断客户端的时间是否超过60秒
+//            if (sj / 1000 >= 60) {
+//                // 超过60秒视为无效请求
+//                ResponseInfo.doResponse(ServletUtils.getResponse(), "本次请求时间戳无效！", 406);
+//                return null;
+//            }
+//            String lk = request.getParameter("lk");
+//            Object islk = LocalCache.get(lk);
+//            // 校验服务端授权码
+//            if (islk == null || "".equals(islk)) {
+//                // 记录用户失败日志
+//                ResponseInfo.doResponse(ServletUtils.getResponse(), "本次请求时间戳无效！", 406);
+//                return null;
+//            } else {
+//                // 清除本地授权码存储
+//                LocalCache.remove(lk);
+//            }
+//        }
+//        catch (Exception e) {
+//            return ResponseVO.fail("防重放解析失败,不能操作！");
+//        }
         // result的值就是被拦截方法的返回值
         ResponseVO result = (ResponseVO)pjp.proceed();
         return result;

console/src/main/java/com/jiayue/ssi/config/WebConfig.java

@@ -36,16 +36,7 @@ public class WebConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry){
         // 刷新token拦截器注册
         registry.addInterceptor(new TokenStatusInterceptor()).addPathPatterns("/**")
-                .excludePathPatterns("/sysParameterController/getUseSendMail","/refreshToken","/error","/getMailCode","/getVerifyCode","/login","/index.html","/user/login","/css/**","/images/**","/js/**","/fonts/**");
-    }
-    /**
-     * 初始加载
-     */
-    @Bean
-    public void initLoad() {
-        // 加载上报对象缓存
-        String useSendMail = sysParameterService.queryByKey("useSendMail", "true");
-        CacheConstants.use_send_mail = Boolean.parseBoolean(useSendMail);
+                .excludePathPatterns("/refreshToken","/error","/getVerifyCode","/login","/index.html","/user/login","/css/**","/images/**","/js/**","/fonts/**");
     }
 
     /**

console/src/main/java/com/jiayue/ssi/config/WebSecurityConfig.java

@@ -7,7 +7,6 @@ import com.jiayue.ssi.service.SysUserService;
 import com.jiayue.ssi.service.impl.UserServiceImpl;
 import com.jiayue.ssi.util.JwtTokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -95,7 +94,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         httpSecurity.addFilterBefore(new XssEscapeFilter(), LogoutFilter.class);
         httpSecurity.addFilterBefore(new SqlFilter(), LogoutFilter.class);
         httpSecurity.addFilterBefore(new VerifyCodeFilter(), LogoutFilter.class);
-        httpSecurity.addFilterBefore(new MailCodeFilter(), LogoutFilter.class);
         httpSecurity.addFilterBefore(new JwtAuthenticationTokenFilter(userServiceImpl, jwtTokenUtil, sysUserService,sysPolicyService), LogoutFilter.class);
 //        httpSecurity.headers().frameOptions().disable();
 //        httpSecurity.headers().httpStrictTransportSecurity().includeSubDomains(true).preload(true).maxAgeInSeconds(31536000);
@@ -107,7 +105,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .and().authorizeRequests()
 //                .antMatchers("/user/login","/captchaImage").permitAll()
                 .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
-                .antMatchers("/getVerifyCode/**","/getMailCode/**","/websocket/testsocket","/favicon.ico").permitAll()
+                .antMatchers("/getVerifyCode/**","/favicon.ico").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and().headers().cacheControl();

console/src/main/java/com/jiayue/ssi/config/WebSocketConfig.java

@@ -1,25 +0,0 @@
-package com.jiayue.ssi.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
-*
-*
-* @author xsl
-* @since 2023/08/21
-*/
-@Configuration
-public class WebSocketConfig {
-    /**
-     * ServerEndpointExporter类的作用是，会扫描所有的服务器端点，
-     * 把带有@ServerEndpoint 注解的所有类都添加进来
-     *
-     */
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter(){
-        return new ServerEndpointExporter();
-    }
-
-}

console/src/main/java/com/jiayue/ssi/config/WebSocketConfigurator.java

@@ -1,31 +0,0 @@
-package com.jiayue.ssi.config;
-
-import javax.servlet.http.HttpSession;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
-import java.util.Enumeration;
-import java.util.Map;
-
-/**
-* 用于将客户端的ip传递给websocket中的session，相当于是一个中介
-*
-* @author xsl
-* @since 2023/08/21
-*/
-public class WebSocketConfigurator extends ServerEndpointConfig.Configurator {
-    @Override
-    public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
-
-        Map<String, Object> attributes = sec.getUserProperties();
-        HttpSession session = (HttpSession) request.getHttpSession();
-        if (session != null) {
-            attributes.put("ActiveUserDto", session.getAttribute("ActiveUserDto"));
-            Enumeration<String> names = session.getAttributeNames();
-            while (names.hasMoreElements()) {
-                String name = names.nextElement();
-                attributes.put(name, session.getAttribute(name));
-            }
-        }
-    }
-}

console/src/main/java/com/jiayue/ssi/constant/CacheConstants.java

@@ -61,10 +61,10 @@ public class CacheConstants {
      * 登录账户密码错误次数 redis key
      */
     public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
-    /**
-     * 服务端心跳
-     */
-    public static final String HEART_KEY = "heart:";
+//    /**
+//     * 服务端心跳
+//     */
+//    public static final String HEART_KEY = "heart:";
     /**
      * 登录token存储，map<用户名，token:授权时间>
      */
@@ -87,16 +87,12 @@ public class CacheConstants {
      * 当前服务端访问的IP集合<IP,用户名>
      */
     public static ConcurrentMap<String, String> IP_USER_MAP = new ConcurrentHashMap<>();
-    /**
-     * 用于用户心跳
-     */
-    public static Map<String, ActiveUserDto> ACTIVE_USER_MAP = new ConcurrentHashMap<String,ActiveUserDto>();
+//    /**
+//     * 用于用户心跳
+//     */
+//    public static Map<String, ActiveUserDto> ACTIVE_USER_MAP = new ConcurrentHashMap<String,ActiveUserDto>();
     /**
      * 用于被踢用户的request存储
      */
     public static Map<String, HttpServletRequest> KICKED_USER_MAP = new ConcurrentHashMap<String, HttpServletRequest>();
-    /**
-     * 用于被踢用户的sessionId
-     */
-    public static Map<String, String> SESSIONID_USER_MAP = new ConcurrentHashMap<String, String>();
 }

console/src/main/java/com/jiayue/ssi/filter/JwtAuthenticationTokenFilter.java

@@ -68,7 +68,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws
             ServletException, IOException {
 //        SecurityContextHolder.getContext().getAuthentication();
-        if (!request.getRequestURI().equals("/getVerifyCode") && !request.getRequestURI().equals("/getMailCode")) {
+        if (!request.getRequestURI().equals("/getVerifyCode")) {
 
             String token = request.getHeader("Authorization");
             if (!StringUtils.isEmpty(token)) {

console/src/main/java/com/jiayue/ssi/filter/MailCodeFilter.java

@@ -1,95 +0,0 @@
-package com.jiayue.ssi.filter;
-
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.util.ResponseInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.util.LocalCache;
-
-import lombok.RequiredArgsConstructor;
-
-/**
- * 邮箱口令过滤器
- *
- * @author xsl
- * @since 2023/02/20
- */
-@RequiredArgsConstructor
-@Order(11)
-@Slf4j
-public class MailCodeFilter extends OncePerRequestFilter {
-    private String defaultFilterProcessUrl = "/user/login";
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        try {
-            if ("GET".equalsIgnoreCase(request.getMethod()) && "/getMailCode".equals(request.getServletPath())) {
-                String username = request.getParameter("username");
-                Object preventMailCode = LocalCache.get(CacheConstants.PREVENT_MAIL_CODE + username);
-                if (preventMailCode != null && !"".equals(preventMailCode)) {
-                    ResponseInfo.doResponse(response, "动态口令已发送过，请耐心等待再获取！", 405);
-                    return;
-                }
-            }
-            if ("POST".equalsIgnoreCase(request.getMethod()) && defaultFilterProcessUrl.equals(request.getServletPath())) {
-                // 是否需要邮箱口令验证
-                if (true) {
-                    // 验证码验证
-                    String username = request.getParameter("username");
-                    LocalCache.remove(CacheConstants.PREVENT_MAIL_CODE + username);
-                    Object mailCode = LocalCache.get(CacheConstants.MAIL_CODE_KEY + username);
-
-                    // 校验服务端验证码
-                    if (mailCode == null || "".equals(mailCode)) {
-                        // 记录用户失败日志
-                        LoginFactory.recordLogininfor(username, Constants.LOGIN_FAIL, "邮箱口令错误");
-                        ResponseInfo.doResponse(response, "邮箱口令错误！", 401);
-                        return;
-                    }
-                    // 页面录入的邮箱口令
-                    String mailbox = request.getParameter("mailbox");
-
-                    // 校验页面验证码
-                    if (StringUtils.isEmpty(mailbox)) {
-                        // 记录用户失败日志
-                        LoginFactory.recordLogininfor(username, Constants.LOGIN_FAIL, "邮箱口令错误");
-                        ResponseInfo.doResponse(response, "邮箱口令错误！", 401);
-                        return;
-                    }
-                    if (mailbox.length() != 6) {
-                        // 记录用户失败日志
-                        LoginFactory.recordLogininfor(username, Constants.LOGIN_FAIL, "邮箱口令错误");
-                        ResponseInfo.doResponse(response, "邮箱口令错误！", 401);
-                        return;
-                    }
-                    if (!String.valueOf(mailCode).toLowerCase().equals(mailbox.toLowerCase())) {
-                        // 记录用户失败日志
-                        LoginFactory.recordLogininfor(username, Constants.LOGIN_FAIL, "邮箱口令错误");
-                        // 删除缓存邮箱口令
-                        LocalCache.remove(CacheConstants.MAIL_CODE_KEY + username);
-                        LocalCache.remove(CacheConstants.PREVENT_MAIL_CODE + username);
-                        ResponseInfo.doResponse(response, "邮箱口令错误！", 401);
-                        return;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            ResponseInfo.doResponse(response, "邮箱口令错误！", 401);
-            return;
-        }
-        filterChain.doFilter(request, response);
-    }
-}

console/src/main/java/com/jiayue/ssi/filter/VerifySmFilter.java

@@ -8,8 +8,6 @@ import com.jiayue.ssi.constant.SecretKeyConstants;
 import com.jiayue.ssi.dto.ActiveUserDto;
 import com.jiayue.ssi.entity.SysUser;
 import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.service.SysLogininforService;
-import com.jiayue.ssi.service.WebSocketServer;
 import com.jiayue.ssi.service.impl.UserServiceImpl;
 import com.jiayue.ssi.servlet.ParameterRequestWrapper;
 import com.jiayue.ssi.util.*;
@@ -17,8 +15,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.annotation.Order;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -58,44 +54,14 @@ public class VerifySmFilter extends OncePerRequestFilter {
             ParameterRequestWrapper initWrapper = new ParameterRequestWrapper(request);
             // 不是登录操作
             if (!("POST".equalsIgnoreCase(request.getMethod())
-                    && defaultFilterProcessUrl.equals(request.getServletPath())) && !("/getVerifyCode".equals(request.getServletPath()))
-                    && !("/sysParameterController/getUseSendMail".equals(request.getServletPath())) && !("/getMailCode".equals(request.getServletPath()))) {
-                String tokenStr = "";
-                String tokenSign = "";
-                if ("/websocket/testsocket".equals(request.getServletPath())){
-                   if (WebSocketServer.getOnlineCount()+1>50){
-                        ResponseInfo.doResponse(response, "系统心跳探活数量达到上限，用户退出登录稍后再连接！", 407);
-                        return;
-                    }
-                    // 心跳
-                    tokenStr = request.getParameter("JY");
-                    tokenSign = request.getParameter("JySign");
-                }
-                else{
-                    // 验证token
-                    tokenStr = request.getHeader("Authorization");
-                    tokenSign = request.getHeader("JySign");
-                }
+                    && defaultFilterProcessUrl.equals(request.getServletPath())) && !("/getVerifyCode".equals(request.getServletPath()))) {
+                String tokenStr = request.getHeader("Authorization");
+                String tokenSign = request.getHeader("JySign");
 
                 if (StringUtils.isNotEmpty(tokenStr)) {
                     // 解密token
                     String decryptTokenStr = SM2CryptUtils.decrypt(tokenStr, SecretKeyConstants.SERVER_PRIVATE_KEY);
 
-                    if ("/websocket/testsocket".equals(request.getServletPath())){
-                        ActiveUserDto activeUserDto = new ActiveUserDto();
-                        String username = new JwtTokenUtil().getUsernameFromToken(decryptTokenStr);
-                        UserDetails userDetails = SpringUtils.getBean(UserServiceImpl.class).loadUserByUsername(username);
-                        SysUser sysUser = (SysUser)userDetails;
-                        activeUserDto.setSysUser(sysUser);
-                        activeUserDto.setHttpServletRequest(request);
-                        request.getSession().setAttribute("ActiveUserDto",activeUserDto);
-                        // 心跳
-//                        tokenStr = request.getParameter("JY");
-                        tokenSign = request.getParameter("JySign");
-                    }
-
-
-
                     // 验证签名
                     boolean verifySign =
                             SM2CryptUtils.verifySign(SecretKeyConstants.CLIENT_PUBLIC_KEY, decryptTokenStr, tokenSign);

console/src/main/java/com/jiayue/ssi/handler/CustomAuthenticationSuccessHandler.java

@@ -170,14 +170,6 @@ public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthent
             // 插入数据
             SpringUtils.getBean(SysLogininforService.class).insertLogininfor(logininfor);
 
-            Iterator<Map.Entry<String, String>> socketSessionMap = CacheConstants.SESSIONID_USER_MAP.entrySet().iterator();
-            while (socketSessionMap.hasNext()) {
-                Map.Entry<String, String> entry2 = socketSessionMap.next();
-                String cacheusername = entry2.getValue();
-                if (cacheusername.equals(sysUser.getUsername())) {
-                    socketSessionMap.remove();
-                }
-            }
 //            System.out.println(CacheConstants.SESSIONID_USER_MAP.toString());
 //            System.out.println("被踢用户的sessionid:"+kickedRequest.getSession().getId());
 //            CacheConstants.SESSIONID_USER_MAP.put(kickedRequest.getSession().getId(),sysUser.getUsername());
@@ -191,7 +183,7 @@ public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthent
         activeUserDto.setSysUser(sysUser);
         activeUserDto.setHttpServletRequest(request);
         activeUserDto.setLoginTime(System.currentTimeMillis());
-        CacheConstants.ACTIVE_USER_MAP.put(username,activeUserDto);
+//        CacheConstants.ACTIVE_USER_MAP.put(username,activeUserDto);
         CacheConstants.KICKED_USER_MAP.put(username,request);
         String obj = JSONUtil.toJsonStr(ResponseVO.success(token));
         // token加密处理

console/src/main/java/com/jiayue/ssi/job/AutoScanHeartUser.java

@@ -1,100 +0,0 @@
-package com.jiayue.ssi.job;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.LoginConstants;
-import com.jiayue.ssi.dto.ActiveUserDto;
-import com.jiayue.ssi.entity.SysLogininfor;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.mapper.SysUserMapper;
-import com.jiayue.ssi.service.SysLogininforService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.*;
-import eu.bitwalker.useragentutils.UserAgent;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
-* 自动扫描心跳用户
-*
-* @author xsl
-* @since 2023/04/06
-*/
-@Service
-@EnableScheduling
-@Slf4j
-public class AutoScanHeartUser {
-    @Autowired
-    SysUserService sysUserService;
-    @Autowired
-    SysUserMapper sysUserMapper;
-    /**
-     * 每2秒扫描一次
-     */
-    @Scheduled(fixedRate=2000)
-    public void autoScanHeartUser() throws Exception{
-        Iterator<Map.Entry<String, ActiveUserDto>> activeUserIterator = CacheConstants.ACTIVE_USER_MAP.entrySet().iterator();
-        while (activeUserIterator.hasNext()) {
-            Map.Entry<String,ActiveUserDto> entry = activeUserIterator.next();
-            String username = entry.getKey();
-            ActiveUserDto activeUserDto = entry.getValue();
-            SysUser sysUser = activeUserDto.getSysUser();
-
-            if (LocalCache.get(CacheConstants.HEART_KEY+username)==null && (System.currentTimeMillis()- activeUserDto.getLoginTime()>5000)){
-                // 设置用户离线状态
-                LambdaUpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<SysUser>().lambda();
-                updateWrapper.eq(SysUser::getId, sysUser.getId()).set(SysUser::getOnlineStatus, "1");
-                sysUserMapper.update(new SysUser(), updateWrapper);
-
-                // 记录用户退出日志
-                HttpServletRequest request = activeUserDto.getHttpServletRequest();
-                final UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
-                final String ip = IPUtils.getIpAddr(request);
-                String address = AddressUtils.getRealAddressByIP(ip);
-                // 获取客户端操作系统
-                String os = userAgent.getOperatingSystem().getName();
-                // 获取客户端浏览器
-                String browser = userAgent.getBrowser().getName();
-                // 封装对象
-                SysLogininfor logininfor = new SysLogininfor();
-                logininfor.setUserName(sysUser.getUsername());
-                logininfor.setIpaddr(ip);
-                logininfor.setLoginLocation(address);
-                logininfor.setBrowser(browser);
-                logininfor.setOs(os);
-                logininfor.setMsg("退出成功");
-                logininfor.setLoginTime(new Date());
-                logininfor.setCreateBy(sysUser.getUsername());
-                // 日志状态
-                logininfor.setStatus(Constants.SUCCESS);
-                // 插入数据
-                SpringUtils.getBean(SysLogininforService.class).insertLogininfor(logininfor);
-
-                // 将token存储内存中，便于重复登录比对
-                CacheConstants.LOGIN_TOKEN_MAP.remove(sysUser.getUsername());
-                LoginConstants.sessionMap.remove(sysUser.getUsername());
-                CacheConstants.KICKED_USER_MAP.remove(sysUser.getUsername());
-                Iterator<Map.Entry<String, String>> ipUserMap = CacheConstants.IP_USER_MAP.entrySet().iterator();
-                while (ipUserMap.hasNext()) {
-                    Map.Entry<String, String> entry1 = ipUserMap.next();
-                    String cacheusername = entry1.getValue();
-                    if (cacheusername.equals(entry.getKey())){
-                        ipUserMap.remove();
-                    }
-                }
-                activeUserIterator.remove();
-            }
-        }
-    }
-}

console/src/main/java/com/jiayue/ssi/service/WebSocketServer.java

@@ -1,143 +0,0 @@
-package com.jiayue.ssi.service;
-
-import com.alibaba.fastjson2.JSON;
-import com.jiayue.ssi.config.WebSocketConfigurator;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.dto.ActiveUserDto;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.util.LocalCache;
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.stereotype.Component;
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.util.Map;
-
-/**
-*
-*
-* @author xsl
-* @since 2023/08/21
-*/
-@Slf4j
-@Component
-@ServerEndpoint(value = "/websocket/testsocket",configurator = WebSocketConfigurator.class)
-public class WebSocketServer {
-    //静态变量，用来记录当前在线连接数。应该把它设计成线程安全的。
-    private static int onlineCount = 0;
-
-    //与某个客户端的连接会话，需要通过它来给客户端发送数据
-    private Session session;
-
-//    public WebSocketServer() {
-//        log.info("Websocket创建" + new Date().getTime());
-//    }
-
-        /**
-         * 连接建立成功调用的方法*/
-    @OnOpen
-    public void onOpen(Session session) {
-        this.session = session;
-        try {
-            Map<String, Object> userProperties = session.getUserProperties();
-            ActiveUserDto activeUserDto = (ActiveUserDto) userProperties.get("ActiveUserDto");
-            SysUser sysUser = activeUserDto.getSysUser();
-            CacheConstants.SESSIONID_USER_MAP.put(session.getId(),sysUser.getUsername());
-            addOnlineCount();
-//            log.info("连接成功，当前系统心跳连接数："+getOnlineCount());
-//            if (getOnlineCount()>3){
-//                log.info("超出连接数，关闭本次连接");
-//                onClose(session);
-//            }
-            sendMessage("连接成功");
-        } catch (Exception e) {
-            log.error("websocket IO异常");
-        }
-    }
-
-    /**
-     * 连接关闭调用的方法
-     */
-    @OnClose
-    public void onClose(Session session) {
-        try {
-            subOnlineCount();
-//            log.info("断开连接，当前系统心跳连接数："+getOnlineCount());
-            session.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message 客户端发送过来的消息*/
-    @OnMessage
-    public void onMessage(String message, Session session) throws Exception{
-        Map<String, Object> userProperties = session.getUserProperties();
-        ActiveUserDto activeUserDto = (ActiveUserDto) userProperties.get("ActiveUserDto");
-        SysUser sysUser = activeUserDto.getSysUser();
-        // 如果某个用户被踢掉，则不接收此用户的sessionid的心跳
-        if (CacheConstants.SESSIONID_USER_MAP.get(session.getId())!=null){
-            LocalCache.set(CacheConstants.HEART_KEY+sysUser.getUsername(),"在线",7000);
-            this.session.getBasicRemote().sendText((JSON.toJSONString(session.getId())));
-        }
-        else{
-            onClose(session);
-        }
-    }
-
-    /**
-     *
-     * @param session
-     * @param error
-     */
-    @OnError
-    public void onError(Session session, Throwable error) {
-        log.error("发生错误");
-//        error.printStackTrace();
-    }
-    /**
-     * 实现服务器主动推送
-     */
-    public void sendMessage(Object obj)  {
-        try {
-            synchronized (this.session) {
-                this.session.getBasicRemote().sendText((JSON.toJSONString(obj)));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-//    /**
-//     * 群发自定义消息
-//     * */
-//    public static void sendInfo(Object obj) {
-//        for (WebSocketServer item : webSocketSet) {
-//            try {
-//                item.sendMessage(obj);
-//            } catch (Exception e) {
-//                continue;
-//            }
-//        }
-//    }
-
-    public static synchronized int getOnlineCount() {
-        return onlineCount;
-    }
-
-    public static synchronized void addOnlineCount() {
-        WebSocketServer.onlineCount++;
-    }
-
-    public static synchronized void subOnlineCount() {
-        WebSocketServer.onlineCount--;
-    }
-
-
-}

console/src/test/java/com/jiayue/ssi/BaseTest.java

@@ -16,7 +16,7 @@ import org.springframework.web.context.WebApplicationContext;
  * @since 2018/10/11 12:47
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = SsiApplication.class, properties = "spring.config.location=classpath:/application.yml")
+@SpringBootTest(classes = CenterForecastApplication.class, properties = "spring.config.location=classpath:/application.yml")
 @WebAppConfiguration(value = "src/main/java")
 //@ContextHierarchy({ @ContextConfiguration(name = "parent", classes = { WebSecurityConfig.class}) })
 //@Transactional

ui/src/layout/components/Navbar.vue

@@ -175,18 +175,7 @@ export default {
     // },
     async getCurrentUser() {
       var user;
-      let sysTime1
-      let lk1
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime1 = res.data.sysTime
-        lk1 = res.data.lk
-      }).catch((error) => {
-      })
-      const searchParams1 = {
-        sysTime: sysTime1,
-        lk: lk1
-      }
-      await this.$axios.get('/sysUserController/getCurrentUser', {params: searchParams1}).then((res) => {
+      await this.$axios.get('/sysUserController/getCurrentUser').then((res) => {
         user = res.data.sysUser
         // 用户信息+菜单权限加密存储
         let encryptUserInfo = userinfoEncrypt(JSON.stringify(res.data))
@@ -214,19 +203,9 @@ export default {
         this.$message.error('获取当前用户数据出错' + error)
       })
 
-      let sysTime2
-      let lk2
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime2 = res.data.sysTime
-        lk2 = res.data.lk
-      }).catch((error) => {
-      })
-      const searchParams2 = {
-        sysTime: sysTime2,
-        lk: lk2
-      }
+
       // 检测用户密码是否符合要求
-      await this.$axios.get('/sysUserController/validatePasswordRule', {params: searchParams2}).then((res) => {
+      await this.$axios.get('/sysUserController/validatePasswordRule').then((res) => {
         if (res.data != 'true'){
           this.$message({
             type: 'warning',
@@ -279,17 +258,8 @@ export default {
      * 删除提交
      */
     readDone: debounce(async function (row) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       const param = {
-        id: row.id,
-        sysTime: sysTime,
-        lk: lk
+        id: row.id
       }
       await this.$axios.post('/sysAlarmController/readDone', param).then((res) => {
         if (res.code == 0) {
@@ -317,20 +287,9 @@ export default {
       this.open = false
     },
     async getAlarmData() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams = {
-        sysTime: sysTime,
-        lk: lk
-      }
       this.loading = true
       // 查询告警消息
-      await this.$axios.get('/sysAlarmController/getAll', {params: searchParams}).then((res) => {
+      await this.$axios.get('/sysAlarmController/getAll').then((res) => {
         this.alarmList = res.data
         if (res.data.length > 0) {
           // 改变消息图标

ui/src/layout/components/Sidebar/index.vue

@@ -28,8 +28,6 @@ import { mapGetters, mapState } from "vuex";
 import Logo from "./Logo";
 import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
-import {Message} from "element-ui";
-import router from "@/router";
 
 export default {
     components: { SidebarItem, Logo },
@@ -55,124 +53,5 @@ export default {
             return !this.sidebar.opened;
         }
     },
-  data() {
-    // return {
-    //   timer: null,
-    //   intervalId:null
-    // }
-
-    return{
-      websock: null, //建立的连接
-      lockReconnect: false, //是否真正建立连接
-      timeout: 1 * 1000, //20秒一次心跳
-      timeoutObj: null, //心跳心跳倒计时
-      serverTimeoutObj: null, //心跳倒计时
-      timeoutnum: null, //断开 重连倒计时
-      sessionid:null,
-      jumpsign:'1'
-    }
-
-
-  },
-  created() {
-    // //页面刚进入时开启长连接
-    this.initWebSocket();
-
-  },
-  destroyed() {
-    //页面销毁时关闭长连接
-    clearTimeout(this.timeoutObj);
-    // console.log('销毁页面')
-    this.websocketclose();
-
-  },
-  methods:{
-    initWebSocket() {
-      //建立连接
-      //初始化weosocket
-      let tokenStr = localStorage.getItem("jy")
-      let visitPort
-      if (process.env.NODE_ENV=='development'){
-        visitPort = '443'
-      }
-      else {
-        visitPort = '443'
-      }
-      let wsuri = 'wss:'+location.host.split(':')[0]+ ':'+visitPort+'/websocket/testsocket?JY='+tokenStr.split("&")[0]+'&'+'JySign='+tokenStr.split("&")[1];
-      //建立连接
-      this.websock = new WebSocket(wsuri);
-      //连接成功
-      this.websock.onopen = this.websocketonopen;
-      //连接错误
-      this.websock.onerror = this.websocketonerror;
-      //接收信息
-      this.websock.onmessage = this.websocketonmessage;
-      //连接关闭
-      this.websock.onclose = this.websocketclose;
-    },
-    start() {
-      //开启心跳
-      var self = this;
-      self.timeoutObj && clearTimeout(self.timeoutObj);
-      // self.serverTimeoutObj && clearTimeout(self.serverTimeoutObj);
-      self.timeoutObj = setTimeout(function() {
-        self.websock.send("heartbeat");
-      }, self.timeout);
-    },
-    websocketonopen() {
-      //连接成功事件
-      this.websocketsend(this.sessionid);
-      //提示成功
-      // console.log("连接成功", 3);
-      //开启心跳
-      this.start();
-    },
-    websocketonerror(e) {
-      // Message({
-      //   message: '后端超出探活数量，不允许再次连接',
-      //   type: 'error',
-      //   duration: 5 * 1000
-      // })
-      this.jumpsign='0'
-      this.$alert('后端超出探活数量，不允许再次连接!', {
-        confirmButtonText: '确定',
-        callback: action => {
-          location.replace('about:blank');
-        }
-      });
-
-      // this.$router.push('/404')
-      //连接失败事件
-      //错误
-      // console.log("WebSocket连接发生错误");
-      //重连
-      // this.reconnect();
-    },
-    websocketclose(e) {
-      //连接关闭事件
-      //提示关闭
-      if (this.jumpsign=='1'){
-        this.$router.go(0)
-        // console.log("连接已关闭");
-      }
-
-      //重连
-      // this.reconnect();
-    },
-    websocketonmessage(event) {
-      //接收服务器推送的信息
-      //打印收到服务器的内容
-      // console.log("收到服务器信息",event.data);
-      let data=event.data
-      this.sessionid = data
-      //收到服务器信息，心跳重置
-      this.start()
-    },
-    websocketsend(msg) {
-      //向服务器发送信息
-      this.websock.send(msg);
-    }
-
-  }
 };
 </script>

ui/src/permission.js

@@ -14,38 +14,38 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration
 const whiteList = ['/login'] // no redirect whitelist
 
 router.beforeEach(async (to, from, next) => {
-  var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
-  var isOpera = userAgent.indexOf("Opera") > -1; //判断是否Opera浏览器
-  // var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器
-  var isIE = (navigator.appName == 'Microsoft Internet Explorer') || ((navigator.appName == 'Netscape') && (new RegExp("Trident/.*rv:([0-9]{1,}[\.0-9]{0,})").exec(navigator.userAgent) != null))
-  // var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器
-  var isEdge = userAgent.indexOf("Edge") > -1; //判断是否IE的Edge浏览器
-  var isFF = userAgent.indexOf("Firefox") > -1; //判断是否Firefox浏览器
-  var isSafari = userAgent.indexOf("Safari") > -1 && userAgent.indexOf("Chrome") == -1; //判断是否Safari浏览器
-  var isChrome = userAgent.indexOf("Chrome") > -1 && userAgent.indexOf("Safari") > -1 && !isEdge; //判断Chrome浏览器
+  // var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+  // var isOpera = userAgent.indexOf("Opera") > -1; //判断是否Opera浏览器
+  // // var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器
+  // var isIE = (navigator.appName == 'Microsoft Internet Explorer') || ((navigator.appName == 'Netscape') && (new RegExp("Trident/.*rv:([0-9]{1,}[\.0-9]{0,})").exec(navigator.userAgent) != null))
+  // // var isEdge = userAgent.indexOf("Windows NT 6.1; Trident/7.0;") > -1 && !isIE; //判断是否IE的Edge浏览器
+  // var isEdge = userAgent.indexOf("Edge") > -1; //判断是否IE的Edge浏览器
+  // var isFF = userAgent.indexOf("Firefox") > -1; //判断是否Firefox浏览器
+  // var isSafari = userAgent.indexOf("Safari") > -1 && userAgent.indexOf("Chrome") == -1; //判断是否Safari浏览器
+  // var isChrome = userAgent.indexOf("Chrome") > -1 && userAgent.indexOf("Safari") > -1 && !isEdge; //判断Chrome浏览器
 
 
   // start progress bar
   NProgress.start()
-  if (!isChrome) {
-    if (to.path === '/404') {
-      next()
-    }
-    else{
-      //  把当前页面隐藏
-      Message({
-        message: '请使用Chrome内核的浏览器访问系统，如360、谷歌！',
-        type: 'error',
-        duration: 5 * 1000
-      })
-      removeToken()
-      next('/404')
-
-    }
-    NProgress.done
-  }
-  else{
-  }
+  // if (!isChrome) {
+  //   if (to.path === '/404') {
+  //     next()
+  //   }
+  //   else{
+  //     //  把当前页面隐藏
+  //     Message({
+  //       message: '请使用Chrome内核的浏览器访问系统，如360、谷歌！',
+  //       type: 'error',
+  //       duration: 5 * 1000
+  //     })
+  //     removeToken()
+  //     next('/404')
+  //
+  //   }
+  //   NProgress.done
+  // }
+  // else{
+  // }
   // set page title
   document.title = getPageTitle(to.meta.title)
   if (localStorage.getItem('jy')) {
@@ -77,16 +77,7 @@ router.beforeEach(async (to, from, next) => {
                   type: 'error',
                   duration: 5 * 1000
               })
-              let sysTime2;
-              let lk2;
-              service.get('/sysPolicyController/getLicenseKey').then((res) => {
-                sysTime2 = res.data.sysTime
-                lk2 = res.data.lk
-              }).catch((error) => {
-              })
               const searchParams2 = {
-                sysTime: sysTime2,
-                lk: lk2,
                 accessUrl: window.location.href
               }
               // 保存越权访问
@@ -135,19 +126,8 @@ router.beforeEach(async (to, from, next) => {
             next({ path: '/user/profile' })
           }
           else {
-            let sysTime2
-            let lk2
-            await service.get('/sysPolicyController/getLicenseKey').then((res) => {
-              sysTime2 = res.data.sysTime
-              lk2 = res.data.lk
-            }).catch((error) => {
-            })
-            const searchParams2 = {
-              sysTime: sysTime2,
-              lk: lk2
-            }
             // 检测用户密码是否符合要求
-            await service.get('/sysUserController/validatePasswordRule', {params: searchParams2}).then((res) => {
+            await service.get('/sysUserController/validatePasswordRule').then((res) => {
               if (res.data != 'true'){
                 Message({
                   type: 'warning',

ui/src/store/modules/permission.js

@@ -36,19 +36,8 @@ const permission = {
     // 生成路由
      GenerateRoutes({ commit }) {
       return new Promise(async (resolve,reject) => {
-        let sysTime2
-        let lk2
-        await service.get('/sysPolicyController/getLicenseKey').then((res) => {
-          sysTime2 = res.data.sysTime
-          lk2 = res.data.lk
-        }).catch((error) => {
-        })
-        const searchParams2 = {
-          sysTime: sysTime2,
-          lk: lk2
-        }
         // 向后端请求路由数据
-        await request.get('/getRouters', {params: searchParams2}).then((res) => {
+        await request.get('/getRouters').then((res) => {
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)

ui/src/views/auditManager/logininfo/index.vue

@@ -195,14 +195,6 @@ export default {
     },
     /** 查询登录日志列表 */
     getList:debounce(async function(){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       this.loading = true;
       let _startOperTime;
       let _endOperTime;
@@ -222,8 +214,6 @@ export default {
         startLoginTime:_startOperTime,
         endLoginTime:_endOperTime,
         sortOrder: this.sortOrder,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysLogininforController/getAll',
         {params: searchParams}).then((res) => {

ui/src/views/auditManager/logininforTotal/index.vue

@@ -95,20 +95,10 @@ export default {
         return
       }
 
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       this.loading = true;
       var searchParams = {
         startLoginTime:this.dateRange[0],
         endLoginTime:this.dateRange[1],
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysLogininforController/logininforTotal',
         {params: searchParams}).then((res) => {

ui/src/views/auditManager/operlog/index.vue

@@ -279,19 +279,9 @@ export default {
     };
   },
   async created() {
-    let sysTime
-    let lk
-    await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-      sysTime = res.data.sysTime
-      lk = res.data.lk
-    }).catch((error) => {
-    })
-    var searchParams = {
-      sysTime: sysTime,
-      lk: lk
-    }
+
     // 获取审计类型
-    await this.$axios.get('/sysOperlogController/getAuditType',{params: searchParams}).then((res) => {
+    await this.$axios.get('/sysOperlogController/getAuditType').then((res) => {
       this.auditTypeOptions = res.data
     }).catch((error) => {
     })
@@ -385,14 +375,6 @@ export default {
     },
     /** 查询操作日志列表 */
     getList: debounce(async function () {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-      console.log('order:'+this.sortOrder)
       this.loading = true;
       let _startOperTime;
       let _endOperTime;
@@ -414,8 +396,6 @@ export default {
         startOperTime: _startOperTime,
         endOperTime: _endOperTime,
         sortOrder: this.sortOrder,
-        sysTime: sysTime,
-        lk: lk
       }
 
       await this.$axios.get('/sysOperlogController/getAll',

ui/src/views/auditManager/operlogTotal/index.vue

@@ -96,20 +96,10 @@ export default {
         return
       }
 
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       this.loading = true;
       var searchParams = {
         startLoginTime: this.dateRange[0],
         endLoginTime: this.dateRange[1],
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysOperlogController/sysOperlogTotal',
         {params: searchParams}).then((res) => {

ui/src/views/bizManager/electricField/index.vue

@@ -200,19 +200,7 @@ export default {
   },
   methods: {
     async getData() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
-      var searchParams = {
-        sysTime: sysTime,
-        lk: lk
-      }
-      await this.$axios.get('/electricField/getAll', {params: searchParams}).then((res) => {
+      await this.$axios.get('/electricField/getAll').then((res) => {
         this.form = res.data
         this.loading = false
       }).catch((error) => {
@@ -223,16 +211,6 @@ export default {
     saveElectricField: debounce(function (formName) {
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
-
-          this.form.sysTime = sysTime
-          this.form.lk = lk
           this.tableLoading = true
           await this.$axios.post('/electricField/', this.form).then(res => {
             if (res.code == 0) {

ui/src/views/bizManager/forecastPowerShortTerm/index.vue

@@ -111,20 +111,12 @@ export default {
   },
   methods:{
     async getDraw(){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
+
 
       this.drawLoading = true
       var searchParams = {
         startTime: this.queryStartTime,
         endTime: this.queryEndTime,
-        sysTime: sysTime,
-        lk: lk
       }
       this.$axios.get('/forecastPowerShortTermController/getDraw',{params: searchParams}).then((res) => {
         this.drawData = res.data
@@ -133,21 +125,11 @@ export default {
       })
     },
     async getTable(){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         startTime: this.queryStartTime,
         endTime: this.queryEndTime,
-        sysTime: sysTime,
-        lk: lk
       }
       this.$axios.get('/forecastPowerShortTermController/getAll',
         {params: searchParams}).then((res) => {

ui/src/views/bizManager/nwp/index.vue

@@ -119,19 +119,10 @@ export default {
   },
   methods:{
     async getDraw(){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       this.drawLoading = true
       var searchParams = {
         startTime: this.queryStartTime,
         endTime: this.queryEndTime,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/nwpController/getDraw',{params: searchParams}).then((res) => {
         this.drawData = res.data
@@ -140,20 +131,11 @@ export default {
       })
     },
     async getTable(){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         startTime: this.queryStartTime,
         endTime: this.queryEndTime,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/nwpController/getAll',
         {params: searchParams}).then((res) => {

ui/src/views/examineManager/sysApprove/index.vue

@@ -199,13 +199,6 @@ export default {
     },
     /** 查询用户列表 */
     async getList() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
 
       this.loading = true;
       var searchParams = {
@@ -213,8 +206,6 @@ export default {
         pageSize: this.pageSize,
         approveStatus: this.queryParams.approveStatus,
         approveResult: this.queryParams.approveResult,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysApproveController/getAll',
         {params: searchParams}).then((res) => {
@@ -257,16 +248,6 @@ export default {
     },
     /** 提交按钮 */
     submitApprove: debounce(async function (row) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
-      row.sysTime = sysTime
-      row.lk = lk
       await this.$axios.post('/sysApproveController/submitApprove', row).then((res) => {
         if (res.code == 0) {
           this.$message.success('审核成功')

ui/src/views/login/index.vue

@@ -9,7 +9,6 @@
           auto-complete="off"
           tabindex="1"
           maxlength="20"
-          @input="onUsernameChange"
         >
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
         </el-input>
@@ -41,23 +40,6 @@
           <img :src="captchaUrl" @click="updateCaptcha" class="login-code-img"/>
         </div>
       </el-form-item>
-
-      <el-form-item prop="mailbox" v-if="useSendMail"  label-width="80px" label="邮箱口令">
-        <el-input
-          v-model="loginForm.mailbox"
-          auto-complete="off"
-          style="width: 58%"
-          tabindex="4"
-          maxlength="6"
-        >
-          <svg-icon slot="prefix" icon-class="mailbox" class="el-input__icon input-icon"/>
-        </el-input>
-        <div class="mail-box">
-          <el-button type="success" size="small" @click.prevent="sendMailCode" :disabled="isMailSend">
-            {{ sendBtnText }}
-          </el-button>
-        </div>
-      </el-form-item>
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -91,26 +73,12 @@ export default {
         password: '',
         // 验证码
         verifyCode: '',
-        // 邮箱验证码
-        mailbox: ''
       },
       murmur: '',
       verifyuuid: '',
-      // 是否使用邮箱口令
-      useSendMail: true,
-      // 是否已经发送了验证码
-      isMailSend: false,
-      // 计时器对象
-      timer: null,
-      // 倒数60秒
-      counter: 60,
-      // 文本
-      sendBtnText: '点击发送邮箱',
       captchaUrl: this.getCaptcha,
       captchaText: '',
       loginRules: {
-        /*  username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-          password: [{ required: true, trigger: 'blur', validator: validatePassword }]*/
         username: [{required: true, trigger: 'blur', message: '请输入用户名'}],
         password: [{required: true, trigger: 'blur', message: '请输入密码'}],
         verifyCode: [{required: true, trigger: 'blur', message: '请输入验证码'}, {
@@ -118,12 +86,6 @@ export default {
           max: 4,
           message: '请输入4位验证码',
           trigger: 'blur'
-        }],
-        mailbox: [{required: true, trigger: 'blur', message: '请输入邮箱口令'}, {
-          min: 6,
-          max: 6,
-          message: '请输入6位邮箱口令',
-          trigger: 'blur'
         }]
       },
       loading: false,
@@ -139,17 +101,6 @@ export default {
     }
   },
   created() {
-    // 获取是否邮箱口令
-    // this.$axios.get('/sysParameterController/getUseSendMail').then((res) => {
-    //   this.useSendMail = JSON.parse(res.data)
-    // }).catch((error) => {
-    //   // 登录失败刷新验证码
-    //   this.updateCaptcha()
-    //   this.loginForm.verifyCode = ''
-    //   this.loginForm.mailbox = ''
-    //   this.reset()
-    //   this.loading = false
-    // })
     (async () => {
       const f = await this.getFinger()
       // 指纹
@@ -180,68 +131,6 @@ export default {
         }
       })
     },
-    // 当账号变化时，重置发送按钮
-    onUsernameChange() {
-      this.reset()
-    },
-    /**
-     * 重置倒计时
-     */
-    reset() {
-      // 重置按钮可用
-      this.isMailSend = false
-      // 重置文本内容
-      this.sendBtnText = '点击发送邮箱'
-      if (this.timer) {
-        // 存在计时器对象，则清除
-        clearInterval(this.timer)
-        // 重置秒数，防止下次混乱
-        this.counter = 60
-        // 计时器对象重置为空
-        this.timer = null
-      }
-    },
-    /**
-     * 倒计时
-     */
-    countDown() {
-      // 将setInterval()方法赋值给前面定义的timer计时器对象，等用clearInterval()方法时方便清空这个计时器对象
-      this.timer = setInterval(() => {
-        // 替换文本，用es6里面的``这个来创建字符串模板，让秒实时改变
-        this.sendBtnText = `(${this.counter}秒)后重新发送`
-        this.counter--
-        if (this.counter < 0) {
-          // 当计时小于零时，取消该计时器
-          this.reset()
-        }
-      }, 1000)
-    },
-    /**
-     * 发送邮箱验证码
-     */
-    sendMailCode: debounce(function () {
-      // 判断账户是否已经输入
-      if (!this.loginForm.username) {
-        this.$message.error('请输入账号')
-        return false
-      }
-      // 将按钮禁用，防止再次点击
-      this.isMailSend = true
-      // 开始倒计时，60s之后才能再次点击
-      this.countDown()  // 这里实现倒计时的功能，文章下面开始介绍
-      var searchParams = {
-        username: this.loginForm.username
-      }
-      this.$axios.get(
-        '/getMailCode', {params: searchParams}
-      ).then((res) => {
-        if (res!=undefined){
-          if (res.code==0){
-            this.$message.success('邮件发送成功')
-          }
-        }
-      })
-    }, 1000),
     // 获取验证码
     getCaptcha: debounce(function () {
       var searchParams = {
@@ -297,8 +186,6 @@ export default {
             // 登录失败刷新验证码
             this.updateCaptcha()
             this.loginForm.verifyCode = ''
-            this.loginForm.mailbox = ''
-            this.reset()
             this.loading = false
           })
         } else {
@@ -414,11 +301,3 @@ export default {
 
 </style>
 
-<!--<style rel="stylesheet/scss" lang="scss" scoped>-->
-<!--.no-autofill-pwd{-->
-<!--  text-security:disc!important;-->
-<!--  -webkit-text-security:disc!important;-->
-
-<!--}-->
-<!--</style>-->
-

ui/src/views/monitor/onLine/index.vue

@@ -178,21 +178,10 @@ export default {
     /** 查询用户列表 */
     async getList() {
       this.loading = true;
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-        this.loading = false;
-      })
-
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         onLineStatus: this.queryParams.onLineStatus,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysUserController/getUserByHealthy',
         {params: searchParams}).then((res) => {

ui/src/views/monitor/server/index.vue

@@ -318,18 +318,7 @@ export default {
   methods: {
     /** 查询服务器信息 */
     async getList() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams = {
-        sysTime: sysTime,
-        lk: lk
-      }
-      await this.$axios.get('/monitor/server',{params: searchParams}).then((res) => {
+      await this.$axios.get('/monitor/server').then((res) => {
         this.server = res.data;
       }).catch((error) => {
         // this.$message.error(error)

ui/src/views/sysManager/ipBlacklist/index.vue

@@ -212,17 +212,6 @@ export default {
             }
           }
 
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
-
-          this.form.sysTime = sysTime
-          this.form.lk = lk
-
           await this.$axios.post('/ipBlacklistController/addIp', this.form).then((res) => {
             if (res.code == 0) {
               this.$message({
@@ -285,21 +274,11 @@ export default {
     },
     /** 查询用户列表 */
     async getList() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       this.loading = true;
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         ip: this.queryParams.ip,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/ipBlacklistController/getAll',
         {params: searchParams}).then((res) => {
@@ -372,18 +351,8 @@ export default {
      * 删除提交
      */
     doDelete: debounce(async function (_selectData) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       const param = {
         id: _selectData.id,
-        sysTime: sysTime,
-        lk: lk
       }
       this.$axios.post('/ipBlacklistController/delIp', param).then((res) => {
         if (res.code == 0) {

ui/src/views/sysManager/roleManager/index.vue

@@ -376,18 +376,7 @@ export default {
     /** 查询角色列表 */
     async getList() {
       // 获取当前用户的角色
-      let sysTime2
-      let lk2
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime2 = res.data.sysTime
-        lk2 = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams2 = {
-        sysTime: sysTime2,
-        lk: lk2
-      }
-      await this.$axios.get('/sysRoleController/getUserByRole', {params: searchParams2}).then((res) => {
+      await this.$axios.get('/sysRoleController/getUserByRole').then((res) => {
         let sysRole = res.data
         if (sysRole.roleKey == 'XTGL') {
           // 不是系统管理员，隐藏查询和修改
@@ -400,21 +389,12 @@ export default {
       })
 
       this.loading = true;
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         roleName: this.queryParams.roleName,
         roleKey: this.queryParams.roleKey,
         status: this.queryParams.status,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysRoleController/getAll',
         {params: searchParams}).then((res) => {
@@ -450,17 +430,9 @@ export default {
     },
     /** 查询菜单树结构 */
     async getMenuTreeselect(pc) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
+
       var searchParams = {
         pc: pc,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysMenuController/treeselect',
         {params: searchParams}).then((res) => {
@@ -619,18 +591,7 @@ export default {
         return
       }
 
-      let sysTime2
-      let lk2
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime2 = res.data.sysTime
-        lk2 = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams2 = {
-        sysTime: sysTime2,
-        lk: lk2
-      }
-      await this.$axios.get('/sysRoleController/getUserByRole', {params: searchParams2}).then((res) => {
+      await this.$axios.get('/sysRoleController/getUserByRole').then((res) => {
         let sysRole = res.data
         if (sysRole.roleKey != 'XTGL') {
           this.xtglyedit = true
@@ -645,18 +606,9 @@ export default {
       }
       const roleId = _selectData.roleId
 
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
 
       var param = {
         roleId: roleId,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysRoleController/getInfo',
         {params: param}).then((res2) => {
@@ -665,17 +617,8 @@ export default {
       })
       this.title = "修改角色";
 
-      let sysTime1
-      let lk1
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime1 = res.data.sysTime
-        lk1 = res.data.lk
-      }).catch((error) => {
-      })
       var param1 = {
         roleId: roleId,
-        sysTime: sysTime1,
-        lk: lk1
       }
 
       await this.$axios.get('/sysMenuController/roleMenuTreeselect',
@@ -715,16 +658,6 @@ export default {
             }
           }
 
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
-          this.form.sysTime = sysTime
-          this.form.lk = lk
-
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys();
             // 更新操作
@@ -807,18 +740,9 @@ export default {
      * 删除提交
      */
     doDelete: debounce(async function (_selectData) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
 
       const param = {
         roleId: _selectData.roleId,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.post('/sysRoleController/delRole', param).then((res) => {
         if (res.code == 0) {

ui/src/views/sysManager/sysMenu/index.vue

@@ -363,16 +363,7 @@ export default {
     },
     /** 查询菜单列表 */
     async getList(){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       this.loading = true;
-      this.queryParams.sysTime = sysTime
-      this.queryParams.lk = lk
       await this.$axios.get('/sysMenuController/list',{params: this.queryParams}).then((res) => {
         this.menuList = this.handleTree(res.data, "menuId")
         this.loading = false;
@@ -393,18 +384,7 @@ export default {
     },
     /** 查询菜单下拉树结构 */
     async getTreeselect() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams = {
-        sysTime: sysTime,
-        lk: lk
-      }
-      await this.$axios.get('/sysMenuController/list',{params: searchParams}).then((res) => {
+      await this.$axios.get('/sysMenuController/list').then((res) => {
         this.menuOptions = []
         const menu = { menuId: 0, menuName: '主类目', children: [] }
         menu.children = this.handleTree(res.data, "menuId")
@@ -464,18 +444,8 @@ export default {
     handleUpdate:debounce(async function(row){
       this.reset()
       this.getTreeselect()
-
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       var searchParams = {
         menuId: row.menuId,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysMenuController/getDetailInfo',
         {params: searchParams}).then((res) => {
@@ -494,18 +464,9 @@ export default {
     submitForm:debounce(function(){
       this.$refs["form"].validate(async valid => {
         if (valid) {
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
           if (this.form.pc!=null){
             this.form.pc = this.form.pc.join(",")
           }
-          this.form.sysTime = sysTime
-          this.form.lk = lk
           if (this.form.menuId != undefined) {
             await this.$axios.post('/sysMenuController/updateMenu', this.form).then((res) => {
               if (res.code == 0) {
@@ -563,18 +524,8 @@ export default {
      * 删除提交
      */
     doDelete:debounce(async function(row){
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       const param = {
         menuId: row.menuId,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.post('/sysMenuController/delMenu', param).then((res) => {
         if (res.code == 0) {

ui/src/views/sysManager/sysParameter/index.vue

@@ -178,20 +178,12 @@ export default {
         })
       }
       this.add = false
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
+
       this.loading = true;
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         keywords: this.keywords,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysParameterController/getAll',
         {params: searchParams}).then((res) => {
@@ -223,15 +215,6 @@ export default {
       this.saveLoding = true
       this.$refs.xTable.validate(async valid => {
         if (valid) {
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
-          row.sysTime = sysTime
-          row.lk = lk
           if (this.addType) {
             await this.$axios.post('/sysParameterController/addParameter', row).then((res) => {
               if (res.code == 0) {
@@ -292,18 +275,8 @@ export default {
     removeEvent(row) {
       this.$XModal.confirm('您确定要删除该数据?').then(async type => {
         if (type === 'confirm') {
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
-
           const param = {
             id: row.id,
-            sysTime: sysTime,
-            lk: lk
           }
           await this.$axios.post('/sysParameterController/deleteParameter',param).then(response => {
             if (response.code == 0) {

ui/src/views/sysManager/sysPolicy/index.vue

@@ -219,18 +219,7 @@ export default {
   methods: {
     /** 查询用户列表 */
     async getList() {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams = {
-        sysTime: sysTime,
-        lk: lk
-      }
-      await this.$axios.get('/sysPolicyController/getAll', {params: searchParams}).then((res) => {
+      await this.$axios.get('/sysPolicyController/getAll').then((res) => {
         this.form = res.data
         this.form.passwordRule = res.data.passwordRule.split(',')
 
@@ -254,16 +243,7 @@ export default {
             this.form.passwordRule = this.form.passwordRule.join(",")
           }
           this.form.auditableEvent = this.form.auditableEvent.join(",")
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
 
-          this.form.sysTime = sysTime
-          this.form.lk = lk
           this.loading = true
           await this.$axios.post('/sysPolicyController', this.form).then((res) => {
             if (res.code == 0) {

ui/src/views/sysManager/userManager/index.vue

@@ -444,18 +444,7 @@ export default {
   methods: {
     async getUserByRole(){
       // 获取当前用户的角色
-      let sysTime2
-      let lk2
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime2 = res.data.sysTime
-        lk2 = res.data.lk
-      }).catch((error) => {
-      })
-      var searchParams2 = {
-        sysTime: sysTime2,
-        lk: lk2
-      }
-      await this.$axios.get('/sysRoleController/getUserByRole', {params: searchParams2}).then((res) => {
+      await this.$axios.get('/sysRoleController/getUserByRole').then((res) => {
         this.sysRole = res.data
       }).catch((error) => {
       })
@@ -552,19 +541,9 @@ export default {
      * 注销提交
      */
     doLogoff: debounce(async function (_selectData, againPwd) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       const param = {
         id: _selectData.id,
         againPwd: againPwd,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.post('/sysUserController/logOffUser', param).then((res) => {
         if (res.code == 0) {
@@ -630,23 +609,12 @@ export default {
     /** 查询用户列表 */
     async getList() {
       this.loading = true;
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-        this.loading = false;
-      })
-
       var searchParams = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         username: this.queryParams.username,
         phonenumber: this.queryParams.phonenumber,
         status: this.queryParams.status,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.get('/sysUserController/getAll',
         {params: searchParams}).then((res) => {
@@ -748,15 +716,6 @@ export default {
                 }
               }
             }).then(async ({value}) => {
-              let sysTime
-              let lk
-              await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-                sysTime = res.data.sysTime
-                lk = res.data.lk
-              }).catch((error) => {
-              })
-              this.form.sysTime = sysTime
-              this.form.lk = lk
               this.form.againPwd = value
 
               // 更新操作
@@ -802,15 +761,6 @@ export default {
                 }
               }
             }).then(async ({value}) => {
-              let sysTime
-              let lk
-              await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-                sysTime = res.data.sysTime
-                lk = res.data.lk
-              }).catch((error) => {
-              })
-              this.form.sysTime = sysTime
-              this.form.lk = lk
               this.form.againPwd = value
 
               // 更新操作
@@ -881,19 +831,9 @@ export default {
       })
     },
     doResetPwd: debounce(async function (row,againPwd) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       const param = {
         id: row.id,
         againPwd: againPwd,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.post('/sysUserController/resetPassword', param).then((res) => {
         if (res.code == 0) {
@@ -979,19 +919,9 @@ export default {
      * 删除提交
      */
     doDelete: debounce(async function (_selectData, againPwd) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
-
       const param = {
         id: _selectData.id,
         againPwd: againPwd,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.post('/sysUserController/delUser', param).then((res) => {
         if (res.code == 0) {
@@ -1159,19 +1089,10 @@ export default {
      * 解锁提交
      */
     doRelock: debounce(async function (_selectData, againPwd,expDate) {
-      let sysTime
-      let lk
-      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-        sysTime = res.data.sysTime
-        lk = res.data.lk
-      }).catch((error) => {
-      })
       const param = {
         id: _selectData.id,
         againPwd: againPwd,
         expDate:expDate,
-        sysTime: sysTime,
-        lk: lk
       }
       await this.$axios.post('/sysUserController/relockUser', param).then((res) => {
         if (res.code == 0) {
@@ -1205,19 +1126,8 @@ export default {
       const a = this.$axios
       const _this = this
       return new Promise(async function (resolve, reject) {
-        let sysTime
-        let lk
-        await a.get('/sysPolicyController/getLicenseKey').then((res) => {
-          sysTime = res.data.sysTime
-          lk = res.data.lk
-        }).catch((error) => {
-        })
-
-
         var param1 = {
           roleId: rowRoleId,
-          sysTime: sysTime,
-          lk: lk
         }
 
         await a.get('/sysMenuController/roleMenuTreeselectForUser',
@@ -1232,18 +1142,8 @@ export default {
       const a = this.$axios
       const _this = this
       return new Promise(async function (resolve, reject) {
-        let sysTime
-        let lk
-        await a.get('/sysPolicyController/getLicenseKey').then((res) => {
-          sysTime = res.data.sysTime
-          lk = res.data.lk
-        }).catch((error) => {
-        })
-
         var userRoleParams = {
           userId: userid,
-          sysTime: sysTime,
-          lk: lk
         }
         await a.get('/sysUserController/getUserRole',
           {params: userRoleParams}).then(res => {
@@ -1257,17 +1157,8 @@ export default {
           resolve(res.data)
         })
 
-        let sysTime1
-        let lk1
-        await  a.get('/sysPolicyController/getLicenseKey').then((res) => {
-          sysTime1 = res.data.sysTime
-          lk1 = res.data.lk
-        }).catch((error) => {
-        })
         var param1 = {
           roleId: _this.userRoleId,
-          sysTime: sysTime1,
-          lk: lk1
         }
 
         await a.get('/sysMenuController/roleMenuTreeselectForUser',
@@ -1283,18 +1174,8 @@ export default {
       const a = this.$axios
       let _this = this
       return new Promise(async function (resolve, reject) {
-        let sysTime
-        let lk
-        await a.get('/sysPolicyController/getLicenseKey').then((res) => {
-          sysTime = res.data.sysTime
-          lk = res.data.lk
-        }).catch((error) => {
-        })
-
         var searchParams = {
           usertype: usertype,
-          sysTime: sysTime,
-          lk: lk
         }
         await a.get('/sysRoleController/getRoleByType',
           {params: searchParams}).then(res => {
@@ -1412,20 +1293,10 @@ export default {
           }
         }
       }).then(async ({value}) => {
-        let sysTime
-        let lk
-        await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-          sysTime = res.data.sysTime
-          lk = res.data.lk
-        }).catch((error) => {
-        })
-
         // 提交后台角色分配
         const param = {
           userId: this.jsuserid,
           roleId: this.userRoleId,
-          sysTime: sysTime,
-          lk: lk,
           againPwd: value
         }
         await this.$axios.post('/sysUserController/authRole', param).then((res) => {

ui/src/views/sysManager/userManager/profile/resetPwd.vue

@@ -111,13 +111,6 @@ export default {
           //   this.$message.error('密码不满足8~20位大写字母、小写字母、数字、特殊字符三种以上的组合')
           //   return
           // }
-          let sysTime
-          let lk
-          await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
-            sysTime = res.data.sysTime
-            lk = res.data.lk
-          }).catch((error) => {
-          })
 
           // 用户信息解密
           let decryptUserInfo = userinfoDecrypt(localStorage.getItem('active'))
@@ -127,8 +120,6 @@ export default {
             oldPassword: this.pwd.oldPassword,
             newPassword: this.pwd.newPassword,
             confirmPassword: this.pwd.confirmPassword,
-            sysTime: sysTime,
-            lk: lk
           }
           await this.$axios.post('/sysUserController/updatePassword', param).then((res) => {
             if (res.code==0){