Forráskód Böngészése

1.去除token验证

QuietShadow 3 éve
szülő
commit
92817cc8e2

+ 14 - 16
src/main/java/com/steerinfo/auth/shiro/jwt/JwtStatelessAccessControlFilter.java

@@ -1,16 +1,5 @@
 package com.steerinfo.auth.shiro.jwt;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UnknownAccountException;
-import org.apache.shiro.web.filter.AccessControlFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
-
 import com.steerinfo.framework.cache.Caches;
 import com.steerinfo.framework.constant.ShiroConstant;
 import com.steerinfo.framework.exception.ShiroJwtException;
@@ -19,7 +8,16 @@ import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.jwt.JwtUtils;
 import com.steerinfo.framework.utils.text.MD5Utils;
 import com.steerinfo.framework.utils.web.HttpUtils;
-import com.steerinfo.auth.shiro.token.StatelessToken;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UnknownAccountException;
+import org.apache.shiro.web.filter.AccessControlFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 
@@ -102,10 +100,10 @@ public class JwtStatelessAccessControlFilter extends AccessControlFilter {
             } catch (ShiroJwtException e){
                 throw new AuthenticationException(e.getMessage());
             }
-            // 2、生成无状态Token
-            StatelessToken token = new StatelessToken(jwt, request.getParameterMap());
-            // 3、委托给Realm进行登录
-            getSubject(request, response).login(token);
+            //// 2、生成无状态Token
+            //StatelessToken token = new StatelessToken(jwt, request.getParameterMap());
+            //// 3、委托给Realm进行登录
+            //getSubject(request, response).login(token);
         } catch (UnknownAccountException e){
             logger.debug(e.getMessage());
             return false;

+ 6 - 10
src/main/java/com/steerinfo/ems/emscordas/controller/EmsCordasController.java

@@ -1,20 +1,16 @@
 package com.steerinfo.ems.emscordas.controller;
 
+import com.steerinfo.ems.emscordas.service.IEmsCordasService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.ems.emscordas.model.EmsCordas;
-import com.steerinfo.ems.emscordas.service.IEmsCordasService;
 import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +38,7 @@ public class EmsCordasController extends BaseRESTfulController {
     @ApiOperation(value="获取cordas的实时数据", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
     //@RequiresPermissions("trmactvalue:view")
-    @PostMapping(value = "/gettabledata", produces  = "application/json;charset=UTF-8")
+    @PostMapping(value = "/gettabledata")
     public RESTfulResult gettabledata(@RequestBody Map<String, Object> model){
     	HashMap<String, Object> m = new HashMap<String, Object>();
     	m.put("cordasDataNames", model.get("cordasDataNames"));

+ 1 - 0
src/main/java/com/steerinfo/ems/emscordas/service/impl/EmsCordasServiceImpl.java

@@ -36,6 +36,7 @@ public class EmsCordasServiceImpl extends BaseServiceImpl<EmsCordas, String> imp
         return emsCordasMapper;
     }
 
+    @Override
     public List<Map<String, Object>> getTableData(HashMap<String, Object> m) {
         return emsCordasMapper.getTableData(m);
     };

+ 10 - 10
src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -305,16 +305,16 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 dzMaterialSfService.dataGeneration();
 					 emsScqkLgService.dateGenerate();
 					 logger.info("定时任务"+taskId+"执行时长:" + (new Date().getTime() - start)/1000 + "秒");
-				 } else if (taskId.equalsIgnoreCase("124")) {
-				 // 每10秒获取一次炼钢实时数据传入mosaic
-				 long start = System.currentTimeMillis();
-				 try {
-					 lgRealService.QueryLgReals();
-				 } catch (AxisFault e) {
-					 e.printStackTrace();
-				 }
-				 logger.info("定时任务"+taskId+"执行时长:" + (System.currentTimeMillis() - start)/1000 + "秒");
-				}
+				} //else if (taskId.equalsIgnoreCase("124")) {
+				// // 每10秒获取一次炼钢实时数据传入mosaic
+				// long start = System.currentTimeMillis();
+				// try {
+				//	 lgRealService.QueryLgReals();
+				// } catch (AxisFault e) {
+				//	 e.printStackTrace();
+				// }
+				// logger.info("定时任务"+taskId+"执行时长:" + (System.currentTimeMillis() - start)/1000 + "秒");
+				//}
 //				 else if (taskId.equalsIgnoreCase("124")) {
 //					 Date now = new Date();
 //					 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");