diff --git a/.gitignore b/.gitignore index fab89b2..1aa94ab 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ *nohup.out* *uwsgi.pid* *.pytest_cache* -*common/java/lib/tess4j/libs/* \ No newline at end of file +*common/java/lib/java/libs/* \ No newline at end of file diff --git a/common/java/README.md b/common/java/README.md index 7c9e1f4..2c7852e 100644 --- a/common/java/README.md +++ b/common/java/README.md @@ -3,8 +3,12 @@ # [注意点]() * 在Python线程中如有调用java相关代码时,需要在Python线程体(run方法)中调用jpype.attachThreadToJVM() -## 一、tess4j -* 1、图片验证码识别 +## 一、使用 +* 请将依赖的java libs维护到config/java/pom.xml文件 +* 自定义jar包放到lib目录下(子目录也支持) + +## 二、目录说明 +### tess4j 图片验证码识别 ```python import jpype diff --git a/config/tess4j/pom.xml b/config/java/pom.xml similarity index 100% rename from config/tess4j/pom.xml rename to config/java/pom.xml diff --git a/init/app_ui/android/android_init.py b/init/app_ui/android/android_init.py index 657b405..d8362ce 100644 --- a/init/app_ui/android/android_init.py +++ b/init/app_ui/android/android_init.py @@ -1,5 +1,5 @@ #-*- coding:utf8 -*- -from init.tess4j.tess4j_maven_init import tess4j_maven_init +from init.java.java_maven_init import java_maven_init from init.app_ui.android.demoProject.demoProjectInit import DemoProjectInit def android_init(): @@ -7,7 +7,7 @@ def android_init(): 初始化android项目必要的数据 :return: """ - # 初始化图像识别tess4j依赖的libs - tess4j_maven_init() + # 初始化java依赖的libs + java_maven_init() # demoProject项目初始化 DemoProjectInit().init() diff --git a/init/app_ui/chrome/chrome_init.py b/init/app_ui/chrome/chrome_init.py index b60c4ce..5fa6707 100644 --- a/init/app_ui/chrome/chrome_init.py +++ b/init/app_ui/chrome/chrome_init.py @@ -1,10 +1,10 @@ #-*- coding:utf8 -*- -from init.tess4j.tess4j_maven_init import tess4j_maven_init +from init.java.java_maven_init import java_maven_init def chrome_init(): """ 初始化ios项目必要的数据 :return: """ - # 初始化图像识别tess4j依赖的libs - tess4j_maven_init() + # 初始化java依赖的libs + java_maven_init() diff --git a/init/app_ui/ios/ios_init.py b/init/app_ui/ios/ios_init.py index ba717d2..9ecefff 100644 --- a/init/app_ui/ios/ios_init.py +++ b/init/app_ui/ios/ios_init.py @@ -1,10 +1,10 @@ #-*- coding:utf8 -*- -from init.tess4j.tess4j_maven_init import tess4j_maven_init +from init.java.java_maven_init import java_maven_init def ios_init(): """ 初始化ios项目必要的数据 :return: """ - # 初始化图像识别tess4j依赖的libs - tess4j_maven_init() \ No newline at end of file + # 初始化java依赖的libs + java_maven_init() \ No newline at end of file diff --git a/init/app_ui/winwos/windows_init.py b/init/app_ui/winwos/windows_init.py index 093a15b..05658b9 100644 --- a/init/app_ui/winwos/windows_init.py +++ b/init/app_ui/winwos/windows_init.py @@ -1,5 +1,5 @@ #-*- coding:utf8 -*- -from init.tess4j.tess4j_maven_init import tess4j_maven_init +from init.java.java_maven_init import java_maven_init def windows_init(): """ @@ -7,4 +7,4 @@ def windows_init(): :return: """ # 初始化图像识别tess4j依赖的libs - tess4j_maven_init() \ No newline at end of file + java_maven_init() \ No newline at end of file diff --git a/init/tess4j/__init__.py b/init/java/__init__.py similarity index 100% rename from init/tess4j/__init__.py rename to init/java/__init__.py diff --git a/init/tess4j/tess4j_maven_init.py b/init/java/java_maven_init.py similarity index 51% rename from init/tess4j/tess4j_maven_init.py rename to init/java/java_maven_init.py index d84d97b..b71a328 100644 --- a/init/tess4j/tess4j_maven_init.py +++ b/init/java/java_maven_init.py @@ -3,15 +3,15 @@ import os import subprocess import sys -def tess4j_maven_init(): - print('开始tess4j maven更新......') +def java_maven_init(): + print('开始java maven更新......') print('删除旧的maven依赖包......') - FileTool.truncateDir('common/java/lib/tess4j/libs') + FileTool.truncateDir('common/java/lib/java/libs') print('删除旧的maven依赖包完成......') - maven_update_command = 'mvn -U -f ' + os.path.join(os.getcwd(),'config/tess4j/pom.xml') + ' dependency:copy-dependencies -DoutputDirectory=' + os.path.join(os.getcwd(), 'common/java/lib/tess4j/libs') + maven_update_command = 'mvn -U -f ' + os.path.join(os.getcwd(),'config/java/pom.xml') + ' dependency:copy-dependencies -DoutputDirectory=' + os.path.join(os.getcwd(), 'common/java/lib/java/libs') try: output = subprocess.check_output(maven_update_command, shell=True, timeout=3600) print(output.decode('utf-8')) except: - sys.exit('tess4j maven更新失败......') - print('完成tess4j maven更新......') \ No newline at end of file + sys.exit('java maven更新失败......') + print('完成java maven更新......') \ No newline at end of file diff --git a/init/web_ui/web_ui_init.py b/init/web_ui/web_ui_init.py index 6de0f77..a593be4 100644 --- a/init/web_ui/web_ui_init.py +++ b/init/web_ui/web_ui_init.py @@ -1,5 +1,5 @@ #-*- coding:utf8 -*- -from init.tess4j.tess4j_maven_init import tess4j_maven_init +from init.java.java_maven_init import java_maven_init from init.web_ui.demoProject.demoProjectInit import DemoProjectInit def init(): @@ -7,7 +7,7 @@ def init(): 初始化必要的数据 :return: """ - # 初始化图像识别tess4j依赖的libs - tess4j_maven_init() + # 初始化java依赖的libs + java_maven_init() # demoProject项目初始化 DemoProjectInit().init() \ No newline at end of file