ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/device/uav/service/IUavService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ard-work/src/main/java/com/ruoyi/device/uav/controller/ArdUavController.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.util.StringUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.device.uav.service.UavService; import com.ruoyi.utils.forest.UavClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,115 +39,34 @@ @RequestMapping("/device/uav") @Api(tags = "æ 人æºå¤é¨æ¥å£") public class ArdUavController extends BaseController { public static final String USERNAME = "ardbailu";//ç¨æ·å public static final String PASSWORD = "ardkj12345";//å¯ç public static final String SALT = "0123456789012345";//ç //token ç»éåæ¯æ¬¡è¯·æ±,å¨header䏿ºå¸¦ private String token;//ç»å½æåè¿åçtoken private ObjectMapper om = new ObjectMapper(); @Autowired private UavClient uavClient; private UavService uavService; @PostConstruct public void created() { this.uavLogin(); this.uavService.login(); } public void uavLogin() { String codedPassword = this.Encrypt(PASSWORD, SALT); String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}"; try { String res = uavClient.POST("login", null, body); Map resMap = om.readValue(res, Map.class); Map data = (Map) resMap.get("data"); if (data != null) { this.token = (String) data.get("access_token"); } } catch (ForestNetworkException e) { e.printStackTrace(); } catch (JsonMappingException e) { throw new RuntimeException(e); } catch (JsonProcessingException e) { throw new RuntimeException(e); } } @GetMapping("/") @ApiOperation("æ 人æºgetæ¥å£") public Object get(@RequestParam String url, @RequestParam String data) { return doUavRequest(GET, url, data); return this.uavService.doUavRequest(GET, url, data); } @PostMapping("/") @ApiOperation("æ 人æºpostæ¥å£") public Object post(@RequestParam String url, @RequestParam String data) { return doUavRequest(POST, url, data); return this.uavService.doUavRequest(POST, url, data); } @DeleteMapping("/") @ApiOperation("æ 人æºdeleteæ¥å£") public Object delete(@RequestParam String url, @RequestParam String data) { return doUavRequest(DELETE, url, data); return this.uavService.doUavRequest(DELETE, url, data); } @Nullable private String doUavRequest(HttpMethod method, String url, String data) { String res = null; Method requestMethod = null; //è·åmethod try { requestMethod = UavClient.class.getMethod(method.name(), String.class, String.class, String.class); } catch (NoSuchMethodException e) { e.printStackTrace(); } //æ§è¡method try { res = (String) requestMethod.invoke(this.uavClient, url, this.token, data); } catch (InvocationTargetException e) { ForestNetworkException fe = (ForestNetworkException) e.getCause(); if (fe.getStatusCode() == 401) {//token失æ,éæ°ç»å½ this.uavLogin(); } try {//忬¡è°ç¨æ¥å£ res = (String) requestMethod.invoke(this.uavClient, url, this.token, data); } catch (IllegalAccessException ex) { throw new RuntimeException(ex); } catch (InvocationTargetException ex) { throw new RuntimeException(ex); } } catch (IllegalAccessException e) { throw new RuntimeException(e); } return res; } public String Encrypt(String sSrc, String sKey) { if (sKey == null) { System.out.print("Key为空null"); return null; } // 夿Keyæ¯å¦ä¸º16ä½ if (sKey.length() != 16) { System.out.print("Keyé¿åº¦ä¸æ¯16ä½"); return null; } byte[] encrypted = null; try { byte[] raw = sKey.getBytes("utf-8"); SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"ç®æ³/模å¼/è¡¥ç æ¹å¼" cipher.init(Cipher.ENCRYPT_MODE, skeySpec); encrypted = cipher.doFinal(sSrc.getBytes("utf-8")); } catch (Exception e) { e.printStackTrace(); ; } return new Base64().encodeToString(encrypted);//æ¤å¤ä½¿ç¨BASE64å转ç åè½ï¼åæ¶è½èµ·å°2次å å¯çä½ç¨ã } } ard-work/src/main/java/com/ruoyi/device/uav/service/IUavService.java
ÎļþÒÑɾ³ý ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
@@ -20,7 +20,7 @@ import java.util.Map; @Service public class UavService implements IUavService { public class UavService { public static final String USERNAME = "ardbailu";//ç¨æ·å public static final String PASSWORD = "ardkj12345";//å¯ç public static final String SALT = "0123456789012345";//ç @@ -36,7 +36,6 @@ this.login(); } @Override public String doUavRequest(HttpMethod method, String url, String data) { String res = null; Method requestMethod = null; @@ -57,9 +56,9 @@ try {//忬¡è°ç¨æ¥å£ res = (String) requestMethod.invoke(this.uavClient, url, this.token, data); } catch (IllegalAccessException ex) { throw new RuntimeException(ex); ex.printStackTrace(); } catch (InvocationTargetException ex) { throw new RuntimeException(ex); ex.printStackTrace(); } } catch (IllegalAccessException e) { throw new RuntimeException(e); @@ -68,7 +67,6 @@ return res; } @Override public void login() { String codedPassword = this.Encrypt(PASSWORD, SALT); String body = "{\"username\":\"" + USERNAME + "\",\"password\":\"" + codedPassword + "\"}"; @@ -82,21 +80,19 @@ } catch (ForestNetworkException e) { e.printStackTrace(); } catch (JsonMappingException e) { throw new RuntimeException(e); e.printStackTrace(); } catch (JsonProcessingException e) { throw new RuntimeException(e); e.printStackTrace(); } } public String Encrypt(String sSrc, String sKey) { if (sKey == null) { System.out.print("Key为空null"); return null; } // 夿Keyæ¯å¦ä¸º16ä½ if (sKey.length() != 16) { System.out.print("Keyé¿åº¦ä¸æ¯16ä½"); return null; } byte[] encrypted = null; @@ -108,7 +104,6 @@ encrypted = cipher.doFinal(sSrc.getBytes("utf-8")); } catch (Exception e) { e.printStackTrace(); ; } return new Base64().encodeToString(encrypted);//æ¤å¤ä½¿ç¨BASE64å转ç åè½ï¼åæ¶è½èµ·å°2次å å¯çä½ç¨ã } ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java
@@ -7,25 +7,6 @@ public class UavAuthLifeCircle implements MethodAnnotationLifeCycle<UavAuth, Object> { /** * 彿¹æ³è°ç¨æ¶è°ç¨æ¤æ¹æ³ï¼æ¤æ¶è¿æ²¡ææ§è¡è¯·æ±åé * æ¬¡æ¹æ³å¯ä»¥è·å¾è¯·æ±å¯¹åºçæ¹æ³è°ç¨ä¿¡æ¯ï¼ä»¥åå¨æä¼ å ¥çæ¹æ³è°ç¨åæ°å表 */ @Override public void onInvokeMethod(ForestRequest request, ForestMethod method, Object[] args) { System.out.println("!!!!!onInvokeMethod!!!!!! '" + method.getMethodName() + "' Arguments>>>>>>>>>: "); /* for (Object arg : args) { System.out.println(arg); } String token = (String) args[1]; if (token != null) { request.addHeader("x-auth-token", token); }*/ System.out.println("================="); } /** * åé请æ±åæ§è¡æ¤æ¹æ³ @@ -33,10 +14,6 @@ @Override public boolean beforeExecute(ForestRequest request) { String token = (String) getAttribute(request, "token"); System.out.println("!!!!beforeExecute!!!!"); System.out.println("request.getMethod().getMethodName():" + request.getMethod().getMethodName()); System.out.println(" token:" + token); System.out.println("================="); request.addHeader("x-auth-token", token); return true; } @@ -47,6 +24,5 @@ @Override public void onMethodInitialized(ForestMethod forestMethod, UavAuth uavAuth) { System.out.println("Method '" + forestMethod.getMethodName()); } }