diff --git a/pom.xml b/pom.xml index 172fe9e5..0f5fef0f 100644 --- a/pom.xml +++ b/pom.xml @@ -944,21 +944,13 @@ - - com.nimbusds - nimbus-jose-jwt - 6.0 - - - com.github.dathlin - HslCommunication - 3.3.0 - + + - ZZJEE 智能快速开发平台 + jeewms www.jeewms.com diff --git a/src/main/java/test/HttpUtil.java b/src/main/java/test/HttpUtil.java deleted file mode 100644 index 86733d9d..00000000 --- a/src/main/java/test/HttpUtil.java +++ /dev/null @@ -1,130 +0,0 @@ -package test; - -import com.alibaba.fastjson.JSONObject; -import org.jeecgframework.web.cgform.util.SignatureUtil; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.ConnectException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class HttpUtil { - - /** - * 发起https请求并获取结果 - * - * @param requestUrl - * 请求地址 - * @param requestMethod - * 请求方式（GET、POST） - * @param outputStr - * 提交的数据 - * @return JSONObject(通过JSONObject.get(key)的方式获取json对象的属性值) - */ - public static JSONObject httpRequest(String requestUrl, - String requestMethod, String outputStr,String sign) { - JSONObject jsonObject = null; - StringBuffer buffer = new StringBuffer(); - HttpURLConnection httpUrlConn = null; - try { - // 创建SSLContext对象，并使用我们指定的信任管理器初始化 - URL url = new URL(requestUrl); - httpUrlConn = (HttpURLConnection) url.openConnection(); - httpUrlConn.setDoOutput(true); - httpUrlConn.setDoInput(true); - httpUrlConn.setUseCaches(false); - httpUrlConn.setRequestProperty("X-JEECG-SIGN",sign); -// httpUrlConn.setRequestProperty("content-type", "text/html"); - // 设置请求方式（GET/POST） - httpUrlConn.setRequestMethod(requestMethod); - if ("GET".equalsIgnoreCase(requestMethod)) { - httpUrlConn.connect(); - } - - // 当有数据需要提交时 - if (null != outputStr) { - OutputStream outputStream = httpUrlConn.getOutputStream(); - // 注意编码格式，防止中文乱码 - outputStream.write(outputStr.getBytes("UTF-8")); - outputStream.close(); - } - - // 将返回的输入流转换成字符串 - InputStream inputStream = httpUrlConn.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader( - inputStream, "utf-8"); - BufferedReader bufferedReader = new BufferedReader( - inputStreamReader); - - String str = null; - while ((str = bufferedReader.readLine()) != null) { - buffer.append(str); - } - bufferedReader.close(); - inputStreamReader.close(); - // 释放资源 - inputStream.close(); - inputStream = null; - httpUrlConn.disconnect(); - jsonObject = JSONObject.parseObject(buffer.toString()); - // jsonObject = JSONObject.fromObject(buffer.toString()); - } catch (ConnectException ce) { - org.jeecgframework.core.util.LogUtil - .info("Weixin server connection timed out."); - } catch (Exception e) { - //e.printStackTrace(); - org.jeecgframework.core.util.LogUtil.info("https request error:{}" - + e.getMessage()); - }finally{ - try { - httpUrlConn.disconnect(); - }catch (Exception e) { - e.printStackTrace(); - org.jeecgframework.core.util.LogUtil.info("http close error:{}"+ e.getMessage()); - } - } - return jsonObject; - } - - public static void main1(String args[]){ - String key="26F72780372E84B6CFAED6F7B19139CC47B1912B6CAED753"; - JSONObject jsonObject=new JSONObject(); - jsonObject.put("id","40281381537e969401537eb9902d0006"); - jsonObject.put("tableName","jform_contact"); - String body=jsonObject.toJSONString(); - Map param=new HashMap(); - param.put("body",body); - String sign=SignatureUtil.sign(param,key); - System.out.println(" -- sign -- "+ sign); - JSONObject resp=HttpUtil.httpRequest("http://localhost:8080/jeecg/api/cgFormDataController.do?getFormInfo","POST","body="+body,sign); - System.out.println(resp.toJSONString()); - } - - public static void main(String args[]){ -// dscUtil.updateGoodsFromDsc(); -// String res = dscUtil.getOrderList("1","",""); -// System.out.println(res); - - - - -// String key="26F72780372E84B6CFAED6F7B19139CC47B1912B6CAED753"; -// -// JSONObject data=new JSONObject(); -// data.put("id","nihao"); -// data.put("updateBy","0"); -// String body=data.toJSONString(); -// JSONObject resp=HttpUtil.httpRequest("http://localhost:8080/zzjee/rest/wmToDownGoodsController","POST","wmToDownGoodsstr="+body,""); -// System.out.println(resp.toJSONString()); - } - - - -} diff --git a/src/main/java/test/JeecgOneGUI.java b/src/main/java/test/JeecgOneGUI.java deleted file mode 100644 index 4add16b0..00000000 --- a/src/main/java/test/JeecgOneGUI.java +++ /dev/null @@ -1,42 +0,0 @@ -package test; - -import HslCommunication.BasicFramework.SoftBasic; -import HslCommunication.Core.Types.OperateResult; -import HslCommunication.Core.Types.OperateResultExOne; -import HslCommunication.Profinet.Siemens.SiemensPLCS; -import HslCommunication.Profinet.Siemens.SiemensS7Net; -import com.sap.conn.jco.JCoTable; -import com.zzjee.sap.SapRFC; -import org.jeecgframework.codegenerate.window.CodeWindow; -import org.jeecgframework.core.util.DateUtils; - -import java.sql.SQLOutput; -import java.text.ParseException; -import java.util.Calendar; -import java.util.HashMap; -import java.util.Map; - - -/** - * 【单表模型】代码生成器入口 - * @author admin - * @site www.jeecg.org - * - */ -public class JeecgOneGUI { - - public static void main(String[] args) throws ParseException { - SiemensPLCS siemensPLCS = SiemensPLCS.S200Smart; - SiemensS7Net siemensS7Net = null; - String defaultAddress = "M5.0"; - siemensS7Net = new SiemensS7Net(siemensPLCS); - siemensS7Net.setIpAddress("192.168.1.99"); - siemensS7Net.setPort(102); - OperateResult connect = siemensS7Net.ConnectServer(); - if(connect.IsSuccess){ - System.out.println("connect success"); - }else{ - System.out.println("connect error"); - } - } -} diff --git a/src/main/java/test/JeecgOneToMainUtil.java b/src/main/java/test/JeecgOneToMainUtil.java deleted file mode 100644 index cd5cf364..00000000 --- a/src/main/java/test/JeecgOneToMainUtil.java +++ /dev/null @@ -1,66 +0,0 @@ -package test; - -import java.util.ArrayList; -import java.util.List; - -import org.jeecgframework.codegenerate.generate.onetomany.CodeGenerateOneToMany; -import org.jeecgframework.codegenerate.pojo.onetomany.CodeParamEntity; -import org.jeecgframework.codegenerate.pojo.onetomany.SubTableEntity; - - -/** - * 代码生成器入口【一对多】 - * @author admin - * @site www.jeecg.org - * - */ -public class JeecgOneToMainUtil { - - /** - * 一对多(父子表)数据模型，生成方法 - * @param args - */ - public static void main(String[] args) { - //第一步：设置主表配置 - CodeParamEntity codeParamEntityIn = new CodeParamEntity(); - codeParamEntityIn.setTableName("jform_order_main");//表名 - codeParamEntityIn.setEntityName("TestOrderMain"); //实体名 - codeParamEntityIn.setEntityPackage("test"); //包名 - codeParamEntityIn.setFtlDescription("订单"); //描述 - - //第二步：设置子表集合配置 - List subTabParamIn = new ArrayList(); - //[1].子表一 - SubTableEntity po = new SubTableEntity(); - po.setTableName("jform_order_customer");//表名 - po.setEntityName("TestOrderCustom"); //实体名 - po.setEntityPackage("test"); //包名 - po.setFtlDescription("客户明细"); //描述 - //子表外键参数配置 - /*说明: - * a) 子表引用主表主键ID作为外键，外键字段必须以_ID结尾; - * b) 主表和子表的外键字段名字，必须相同（除主键ID外）; - * c) 多个外键字段，采用逗号分隔; - */ - po.setForeignKeys(new String[]{"fk_id"}); - subTabParamIn.add(po); - //[2].子表二 - SubTableEntity po2 = new SubTableEntity(); - po2.setTableName("jform_order_ticket"); //表名 - po2.setEntityName("TestOrderTicket"); //实体名 - po2.setEntityPackage("test"); //包名 - po2.setFtlDescription("产品明细"); //描述 - //子表外键参数配置 - /*说明: - * a) 子表引用主表主键ID作为外键，外键字段必须以_ID结尾; - * b) 主表和子表的外键字段名字，必须相同（除主键ID外）; - * c) 多个外键字段，采用逗号分隔; - */ - po2.setForeignKeys(new String[]{"fck_id"}); - subTabParamIn.add(po2); - codeParamEntityIn.setSubTabParam(subTabParamIn); - - //第三步：一对多(父子表)数据模型,代码生成 - CodeGenerateOneToMany.oneToManyCreate(subTabParamIn, codeParamEntityIn); - } -} diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp deleted file mode 100644 index c38169bb..00000000 --- a/src/main/webapp/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello World!

- -