From da78960a7a40f47d88d64b529553a85dd8dd04c2 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Thu, 17 Nov 2022 14:37:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=B3=BB=E7=BB=9FURL?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TemporaryFixController.java | 48 +++---------------- .../service/impl/YunBpmServiceImpl.java | 12 ++--- .../mesnac/anomaly/utils/yunBpmConfig.java | 7 ++- 3 files changed, 19 insertions(+), 48 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java index 5b18ff15..99c1f9dc 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java @@ -170,20 +170,21 @@ public class TemporaryFixController { public R getURL(@RequestBody Map paramMap) { String respBody = null; try { - if (paramMap.containsKey("url")){ + if (paramMap.containsKey("url1")){ String params = JSONUtil.toJsonStr(paramMap); - respBody = HttpUtil.post(String.valueOf(paramMap.get("url")), params, 1000 * 10); + respBody = HttpUtil.post(String.valueOf(paramMap.get("url1")), params, 1000 * 10); respBody = respBody.concat("[测试]"); }else { String requestUrl = yunBpmConfig.getApiBaseUrl() + "/api/login/Authentication/get_code"; Map params = new HashMap<>(); params.put("username", yunBpmConfig.userName); params.put("password", yunBpmConfig.passWord); - params.put("url", yunBpmConfig.getApiBaseUrl() + "/api/login?redirect_uri=" - + yunBpmConfig.getApiBaseUrl() + + params.put("url", yunBpmConfig.getYunBpmUrl() + "/api/login?redirect_uri=" + + yunBpmConfig.getYunBpmUrl() + "/api/oauth/authorize?client_id=api&response_type=code&scope=read&redirect_uri=" - + yunBpmConfig.getApiBaseUrl() + "/oauth"); - respBody = HttpUtil.post(requestUrl, JSONUtil.toJsonStr(params),1000 * 10); + + yunBpmConfig.getYunBpmUrl() + "/oauth"); + String jsonStr = JSONUtil.toJsonStr(params); + respBody = HttpUtil.post(requestUrl, jsonStr,1000 * 10); } } catch (Exception e) { return R.failed(e.toString()); @@ -191,41 +192,6 @@ public class TemporaryFixController { return R.ok(respBody); } -/* - @PostMapping("/import") - public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, @PathParam("handleType") final String handleType, @PathParam("mode") final String mode, @PathParam("user") String user, @RequestParam("file") MultipartFile multipartFile) { - ImportRequest importRequest = new ImportRequest(); - importRequest.setFileType(fileType); - importRequest.setSite(site); - importRequest.setUser(user); - importRequest.setMode(mode); - importRequest.setMasterType(handleType); - //----------------------------------------------------------------------------------------------------------------------------------------- - try { - Handler handler = HandlerFactory.getHandler(masterType); - String transInfo = handler.importFile(site, inputStream, fileType, mode); - String transInfo = masterDataImportService.importFile(multipartFile, importRequest); - return new APResult().getResult(0, transInfo, transInfo); - } catch (Exception e) { - e.printStackTrace(); - return new APResult().getResult(9999, e.getMessage(), e.getMessage()); - } - } - @PostMapping("/importData") - @ResponseBody - public R importData(MultipartFile file, boolean updateSupport) throws Exception - { - - ExcelUtil util = new ExcelUtil(TemporaryFix.class); - List temporaryFixList = util.importExcel(file.getInputStream()); - //String operName = ShiroUtils.getSysUser().getLoginName(); - //String message = agvInfoService.importagvInfo(agvInfoList, updateSupport, operName); - - boolean result = temporaryFixService.saveBatch(temporaryFixList); - return R.ok(result); - - }*/ - /** * 根据id删除对象 * diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java index 54376cea..6ca4fb68 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java @@ -191,7 +191,7 @@ public class YunBpmServiceImpl implements YunBpmService { String requestUrl = yunBpmConfig.getApiBaseUrl() + String.format(YunBpmApis.SAVE_OR_UPDATE_FORM, accessToken); String jsons = JSONUtil.toJsonStr(saveFormModel); - System.out.println(jsons); + logger.info("保存或更新BPM表单信息：" + jsons); String respBody = HttpUtil.post(requestUrl, JSONUtil.toJsonStr(saveFormModel)); return JSONUtil.toBean(respBody, YunBpmApiRes.class); } @@ -275,15 +275,15 @@ public class YunBpmServiceImpl implements YunBpmService { } private String getDefaultOauthCodeUrl() { - return yunBpmConfig.getApiBaseUrl() + "/api/login?redirect_uri=" - + yunBpmConfig.getApiBaseUrl() + + return yunBpmConfig.getYunBpmUrl() + "/api/login?redirect_uri=" + + yunBpmConfig.getYunBpmUrl() + "/api/oauth/authorize?client_id=api&response_type=code&scope=read&redirect_uri=" - + yunBpmConfig.getApiBaseUrl() + "/oauth"; + + yunBpmConfig.getYunBpmUrl() + "/oauth"; } public OAuthTokenInfo getTokenByOauthCode(String oAuthCode) { - String url = yunBpmConfig.getApiBaseUrl() + "/api"; - String redirectUri = yunBpmConfig.getApiBaseUrl() + "/oauth"; + String url = yunBpmConfig.getYunBpmUrl() + "/api"; + String redirectUri = yunBpmConfig.getYunBpmUrl() + "/oauth"; String requestUrl = yunBpmConfig.getApiBaseUrl() + "/api/login/Authentication/get_token?code=" + oAuthCode + "&client_secret=" + yunBpmConfig.getClientSecret() + "&client_id=" + yunBpmConfig.getClientId() + "&url=" + url + "&redirect_uri=" + redirectUri; diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java index 1ee0941b..94a26f71 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java @@ -9,12 +9,15 @@ public class yunBpmConfig { // public static final String userName = "zhangzy";//测试 // public static final String passWord = "123456";//测试 // public static final String apiBaseUrl = "http://172.16.77.181:8080";//测试 +// public static final String yunBpmUrl = "http://yunbpmcs.mesnac.com:8080";//测试 public static final String userName = "bpm_mes";//正式 public static final String passWord = "mesnac@2022";//正式 public static final String apiBaseUrl = "http://172.16.77.182:8080";//正式 + public static final String yunBpmUrl = "http://yunbpm.mesnac.com:8080";//正式 public static final String apiBaseToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYXBpIl0sImNvcnBJZCI6bnVsbCwidXNlcl9pZCI6ImU1MGVmMDE2NzhkZDQ2MGViZWUwNmYwZjE5OTU4M2JjIiwidXNlcl9uYW1lIjoiMjYyMjI2MTY0NTcwMzE3MCIsInNjb3BlIjpbInJlYWQiXSwibW9iaWxlIjpmYWxzZSwiaXNBZG1pbiI6dHJ1ZSwiZXhwIjoxNjYyNjI3MTM3LCJpc0FwcEFkbWluIjpmYWxzZSwiYXV0aG9yaXRpZXMiOlsiVVNFUiIsIkFVVEhfU1lTVEVNX01BTkFHRSJdLCJqdGkiOiI1YmJhNjQ3Yy0yNWNkLTRhZTMtYmRlMC0zYjE4NDYyZGI5YmYiLCJjbGllbnRfaWQiOiJhcGkifQ.NiQUUBapr9K5Tx3xIJzRaRfk426Rwl9bUiRCRpsF_fIQp19wot9FXJQWMTKF7mLkjbKxo6IBAfo-mGkpQRC_WLjaRnMGzVxalwXojN95KR1NAvAgSyiEsgwFDdatW_Yiwan4orHZHUc1Q_eyr_8AmZ-OIWrhFhS9hosky4FQx-v7M_L065a5xW8MDeuMOUSSoVWcxZP1Obo12PAMGHMBl36TJR4C7XanBSLw0kW7K3Ab6fhlJ6QLLC8SOb3dC4LTJToxFmXRNU7REKIs5Vu6087hJM7eSttZNu4aaSwqxeigWulHMFJGktSzQKl50l8breWXyb7AxcgvI0wG-FmA6g";//测试 + /** * 上传附件url */ @@ -41,7 +44,9 @@ public class yunBpmConfig { public static final String secretKey = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb3JwSWQiOm51bGwsInVzZXJfbmFtZSI6InpoYW5nenkiLCJtb2JpbGUiOmZhbHNlLCJpc0FkbWluIjpmYWxzZSwiYXV0aG9yaXRpZXMiOlsiVVNFUiIsIkFVVEhfU1lTVEVNX01BTkFHRSJdLCJjbGllbnRfaWQiOiJhcGkiLCJhdWQiOlsiYXBpIl0sInVzZXJfaWQiOiJiZDMzZWQ3MmI1NWU0YTMyODBlZjI3OTgxNjNkYjA2OSIsInNjb3BlIjpbInJlYWQiXSwiYXRpIjoiYTE2YWI0NzMtZTA5MC00Y2M1LWJjNzktYTNjNDc4YWFlNWQ2IiwiZXhwIjoxNjU5NTE2NDkxLCJpc0FwcEFkbWluIjpmYWxzZSwianRpIjoiMDhlNTU3OGYtNTdjOS00YTRkLTkzZWEtNzUyOGMxODNjZDdjIn0.LwTWHq1DS6NK0zbrbaQMS11I6sNmSBS3JN-QsjNH-lJCWg0voXwZ3MWEvr4S-DDOjdjeQRmhbtW5uxDZp4o3rwYRSg4sizoqStGmulqjEvjAdwbF-EzDChGdL8bWUYiWL9wWn0JP9-vBBkUei74H-By8vvSzB6CuJxr6CF1G4bAyBUTFFKzQovnRuiy9cqhXARe2rUi0lPQrOy7aFXX0V8NrwgUAJJxRdMR4COF9htjifD0aQwRtRvuuOtRuIuWPY0rZPtA161zQEwlp6owvccpNnRbgVj2SSHl8Jx89f5vgidWRjHLxxiY_j4toCj40-mHg7lI3YQWhDszI7Qnb0Q"; - + public static String getYunBpmUrl() { + return yunBpmUrl; + } public static String getApiBaseUrl() { return apiBaseUrl;