潘志宝
2024-11-05 bcfcec5562518e8f30cadc0b0fba0f780a37d207
Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
已添加1个文件
已修改2个文件
39 ■■■■ 文件已修改
iailab-module-model/iailab-module-model-biz/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/iail/mdk/model/common/Environment.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/resources/template/cpp.vm 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 -->
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();
    }
}
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;
    }