From bcfcec5562518e8f30cadc0b0fba0f780a37d207 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 05 十一月 2024 09:35:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm | 7 ++++++-
iailab-module-model/iailab-module-model-biz/pom.xml | 6 ------
iailab-module-model/iailab-module-model-biz/src/main/java/iail/mdk/model/common/Environment.java | 26 ++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/pom.xml b/iailab-module-model/iailab-module-model-biz/pom.xml
index 77029ae..0d9bf13 100644
--- a/iailab-module-model/iailab-module-model-biz/pom.xml
+++ b/iailab-module-model/iailab-module-model-biz/pom.xml
@@ -15,7 +15,6 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <mdk.version>MDK.taisteel.202308231710</mdk.version>
<easypoi.version>4.1.0</easypoi.version>
<commons.io.version>2.11.0</commons.io.version>
<velocity.version>1.7</velocity.version>
@@ -123,11 +122,6 @@
<groupId>com.iail</groupId>
<artifactId>IAILMDK</artifactId>
<version>0.94.9</version>
- </dependency>
- <dependency>
- <groupId>com.iail</groupId>
- <artifactId>MDK</artifactId>
- <version>${mdk.version}</version>
</dependency>
<!-- MPK -->
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/iail/mdk/model/common/Environment.java b/iailab-module-model/iailab-module-model-biz/src/main/java/iail/mdk/model/common/Environment.java
new file mode 100644
index 0000000..75ba7d0
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/iail/mdk/model/common/Environment.java
@@ -0,0 +1,26 @@
+package iail.mdk.model.common;
+
+public class Environment {
+ public Environment() {
+ }
+
+ private native int jniInit();
+
+ private native int jniIsInit();
+
+ private native int jniRelease();
+
+ private native int statusCode();
+
+ public int init() {
+ return this.jniInit();
+ }
+
+ public int isInit() {
+ return this.jniIsInit();
+ }
+
+ public int release() {
+ return this.jniRelease();
+ }
+}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm b/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm
index e373f3b..939e6ba 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm
@@ -106,7 +106,12 @@
delete[] pArg;
pArg = nullptr;
- delete pArg;*/
+ delete pArg;
+
+ Py_DECREF(pReturn);
+ Py_DECREF(pFunc);
+ Py_DECREF(pModule);
+ Py_CLEAR(pModule);*/
return result;
}
--
Gitblit v1.9.3