diff --git a/deploy/start.sh b/deploy/start.sh new file mode 100644 index 0000000..9d7fb81 --- /dev/null +++ b/deploy/start.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# 创建日志目录 +mkdir -p ./logs + +# 启动应用并后台运行(仅保留edh-server.log) +nohup java -jar supervision-edh-1.0.0.jar \ + --logging.file.path=./logs \ + --logging.file.name=./logs/edh-server.log \ + > /dev/null 2>&1 & + +# 记录PID +echo $! > ./edh-server.pid + +echo "应用已在后台运行" +echo "PID: $(cat ./edh-server.pid)" +echo "日志文件: ./logs/edh-server.log" \ No newline at end of file diff --git a/src/main/java/com/supervision/edh/SupervisionEdhClient.java b/src/main/java/com/supervision/edh/SupervisionEdhClient.java index 7c9fc9c..a7c4e34 100644 --- a/src/main/java/com/supervision/edh/SupervisionEdhClient.java +++ b/src/main/java/com/supervision/edh/SupervisionEdhClient.java @@ -33,7 +33,7 @@ public class SupervisionEdhClient { /** * 请求url */ - private static final String url = "http://localhost:1788/supervision/edh/receive"; + private static final String url = "http://192.168.200.45:1788/supervision/edh/receive"; //private static final String url = "http://222.221.246.3:1788/supervision/edh/receive"; /** * 证书地址 @@ -54,7 +54,7 @@ public class SupervisionEdhClient { public static void main(String[] args) throws Exception { //数据文件内容主业务类型 10:基础信息数据 20:应用信息数据 //subType数据文件内容子业务类型 详见:数据类型字典表 基本信息(1011-1019、9001-9002) 应用信息(2011-2020、2051-2053) - testProv("1015"); + testProv("1011"); } public static void testProv(String subType) throws Exception { diff --git a/src/main/java/com/supervision/edh/constant/HttpStatus.java b/src/main/java/com/supervision/edh/constant/HttpStatus.java deleted file mode 100644 index 433d0d0..0000000 --- a/src/main/java/com/supervision/edh/constant/HttpStatus.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.supervision.edh.constant; - -/** - * 返回状态码 - * - * @author tcctyn - */ -public class HttpStatus -{ - /** - * 操作成功 - */ - public static final int SUCCESS = 200; - - /** - * 对象创建成功 - */ - public static final int CREATED = 201; - - /** - * 请求已经被接受 - */ - public static final int ACCEPTED = 202; - - /** - * 操作已经执行成功,但是没有返回数据 - */ - public static final int NO_CONTENT = 204; - - /** - * 资源已被移除 - */ - public static final int MOVED_PERM = 301; - - /** - * 重定向 - */ - public static final int SEE_OTHER = 303; - - /** - * 资源没有被修改 - */ - public static final int NOT_MODIFIED = 304; - - /** - * 参数列表错误(缺少,格式不匹配) - */ - public static final int BAD_REQUEST = 400; - - /** - * 未授权 - */ - public static final int UNAUTHORIZED = 401; - - /** - * 访问受限,授权过期 - */ - public static final int FORBIDDEN = 403; - - /** - * 资源,服务未找到 - */ - public static final int NOT_FOUND = 404; - - /** - * 不允许的http方法 - */ - public static final int BAD_METHOD = 405; - - /** - * 资源冲突,或者资源被锁 - */ - public static final int CONFLICT = 409; - - /** - * 不支持的数据,媒体类型 - */ - public static final int UNSUPPORTED_TYPE = 415; - - /** - * 系统内部错误 - */ - public static final int ERROR = 500; - - /** - * 接口未实现 - */ - public static final int NOT_IMPLEMENTED = 501; - - /** - * 系统警告消息 - */ - public static final int WARN = 601; -} diff --git a/src/main/java/com/supervision/edh/utils/BouncyCastlePFXGenerator.java b/src/main/java/com/supervision/edh/utils/BouncyCastlePFXGenerator.java index b9784ca..c5bf048 100644 --- a/src/main/java/com/supervision/edh/utils/BouncyCastlePFXGenerator.java +++ b/src/main/java/com/supervision/edh/utils/BouncyCastlePFXGenerator.java @@ -64,7 +64,7 @@ public class BouncyCastlePFXGenerator { public static void main(String[] args) { try { - generatePFX("edh.pfx", "YnYp123456"); + generatePFX("edh_prod.pfx", "YnYp@20256.30"); System.out.println("使用Bouncy Castle生成的PFX证书成功!"); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 03be480..16427b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -35,8 +35,9 @@ logging: cert: #本地 - path: D:\ynyp\药品追溯\d2d\edh.pfx + #path: D:\ynyp\药品追溯\d2d\edh_prod.pfx #服务器 - #path: /app/cert/edh.pfx - password: YnYp123456 + path: /home/sysroot/workspace/supervision-v4/jar-file/supervision-edh/cert/edh.pfx algorithm: RSA + #password: YnYp123456 + password: YnYp@20256.30